Skip to content

Commit 71df467

Browse files
luau-projectluau-project
committed
clean up on .sln and .csproj files to account for x86, x64 or arm64 platforms
1 parent 56b1cf5 commit 71df467

5 files changed

Lines changed: 64 additions & 23 deletions

File tree

‎LuaInstaller.Console/LuaInstaller.Console.csproj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
23

34
<ItemGroup>
@@ -18,6 +19,7 @@
1819
<AssemblyVersion>0.6.0.0</AssemblyVersion>
1920
<FileVersion>0.6.0.0</FileVersion>
2021
<RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
22+
<Platforms>x86;x64;ARM64</Platforms>
2123
</PropertyGroup>
2224

2325
</Project>

‎LuaInstaller.Core/ArchitectureSelector.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using System;
2-
#if !NET6_0_OR_GREATER
2+
#if !(NET6_0_OR_GREATER || NET471_OR_GREATER || NETSTANDARD2_1_OR_GREATER)
33
using System.Runtime.InteropServices;
44
#endif
55

@@ -31,7 +31,7 @@ public LuaInstaller.Core.Architecture Architecture
3131
}
3232
}
3333

34-
#if NET6_0_OR_GREATER
34+
#if NET6_0_OR_GREATER || NET471_OR_GREATER || NETSTANDARD2_1_OR_GREATER
3535
private ArchitectureSelector()
3636
{
3737
Architecture result = Architecture.X86;

‎LuaInstaller.Core/LuaInstaller.Core.csproj‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
12
<Project Sdk="Microsoft.NET.Sdk">
23

34
<PropertyGroup>
@@ -13,16 +14,21 @@
1314
<AssemblyVersion>0.6.0.0</AssemblyVersion>
1415
<FileVersion>0.6.0.0</FileVersion>
1516
<RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
17+
<Platforms>x86;x64;ARM64</Platforms>
1618
</PropertyGroup>
17-
19+
20+
<PropertyGroup Condition=" '$(Platform)' == 'ARM64' Or '$(PlatformTarget)' == 'ARM64' Or '$(PlatformTarget)' == 'arm64' Or '$(RuntimeIdentifier)' == 'win-arm64' ">
21+
<DefineConstants>TARGET_ARM64</DefineConstants>
22+
</PropertyGroup>
23+
1824
<ItemGroup>
1925
<PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.11.2177" />
2026
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
2127
<PackageReference Include="SharpZipLib" Version="1.4.2" />
2228
</ItemGroup>
2329

24-
<ItemGroup>
25-
<Reference Include="System.Net.Http" Condition=" '$(TargetFramework)' == 'net461' "/>
30+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
31+
<Reference Include="System.Net.Http" />
2632
</ItemGroup>
2733

2834
</Project>

‎LuaInstaller.sln‎

Lines changed: 48 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.30114.105
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.13.35931.197
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaInstaller", "LuaInstaller\LuaInstaller.csproj", "{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}"
77
EndProject
@@ -11,24 +11,55 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LuaInstaller.Core", "LuaIns
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution
14-
Debug|Any CPU = Debug|Any CPU
15-
Release|Any CPU = Release|Any CPU
14+
Debug|x86 = Debug|x86
15+
Debug|x64 = Debug|x64
16+
Debug|ARM64 = Debug|ARM64
17+
Release|x86 = Release|x86
18+
Release|x64 = Release|x64
19+
Release|ARM64 = Release|ARM64
20+
EndGlobalSection
21+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Debug|x86.ActiveCfg = Debug|x86
23+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Debug|x86.Build.0 = Debug|x86
24+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Debug|x64.ActiveCfg = Debug|x64
25+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Debug|x64.Build.0 = Debug|x64
26+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Debug|ARM64.ActiveCfg = Debug|ARM64
27+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Debug|ARM64.Build.0 = Debug|ARM64
28+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Release|x86.ActiveCfg = Release|x86
29+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Release|x86.Build.0 = Release|x86
30+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Release|x64.ActiveCfg = Release|x64
31+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Release|x64.Build.0 = Release|x64
32+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Release|ARM64.ActiveCfg = Release|ARM64
33+
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Release|ARM64.Build.0 = Release|ARM64
34+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Debug|x86.ActiveCfg = Debug|x86
35+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Debug|x86.Build.0 = Debug|x86
36+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Debug|x64.ActiveCfg = Debug|x64
37+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Debug|x64.Build.0 = Debug|x64
38+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Debug|ARM64.ActiveCfg = Debug|ARM64
39+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Debug|ARM64.Build.0 = Debug|ARM64
40+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Release|x86.ActiveCfg = Release|x86
41+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Release|x86.Build.0 = Release|x86
42+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Release|x64.ActiveCfg = Release|x64
43+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Release|x64.Build.0 = Release|x64
44+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Release|ARM64.ActiveCfg = Release|ARM64
45+
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Release|ARM64.Build.0 = Release|ARM64
46+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Debug|x86.ActiveCfg = Debug|x86
47+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Debug|x86.Build.0 = Debug|x86
48+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Debug|x64.ActiveCfg = Debug|x64
49+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Debug|x64.Build.0 = Debug|x64
50+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Debug|ARM64.ActiveCfg = Debug|ARM64
51+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Debug|ARM64.Build.0 = Debug|ARM64
52+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Release|x86.ActiveCfg = Release|x86
53+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Release|x86.Build.0 = Release|x86
54+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Release|x64.ActiveCfg = Release|x64
55+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Release|x64.Build.0 = Release|x64
56+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Release|ARM64.ActiveCfg = Release|ARM64
57+
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Release|ARM64.Build.0 = Release|ARM64
1658
EndGlobalSection
1759
GlobalSection(SolutionProperties) = preSolution
1860
HideSolutionNode = FALSE
1961
EndGlobalSection
20-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
21-
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
22-
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Debug|Any CPU.Build.0 = Debug|Any CPU
23-
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Release|Any CPU.ActiveCfg = Release|Any CPU
24-
{6E44941C-E8A5-4D4E-973E-DB4DF1A5E067}.Release|Any CPU.Build.0 = Release|Any CPU
25-
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
26-
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Debug|Any CPU.Build.0 = Debug|Any CPU
27-
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Release|Any CPU.ActiveCfg = Release|Any CPU
28-
{B4D9A163-9B06-4772-94E4-2E951DA21569}.Release|Any CPU.Build.0 = Release|Any CPU
29-
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
30-
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Debug|Any CPU.Build.0 = Debug|Any CPU
31-
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Release|Any CPU.ActiveCfg = Release|Any CPU
32-
{2E7976DC-3027-41FB-9323-819635A4DFAF}.Release|Any CPU.Build.0 = Release|Any CPU
62+
GlobalSection(ExtensibilityGlobals) = postSolution
63+
SolutionGuid = {37F9F629-900A-42E0-8840-CB99271EF989}
3364
EndGlobalSection
3465
EndGlobal

‎LuaInstaller/LuaInstaller.csproj‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project Sdk="Microsoft.NET.Sdk">
23

34
<ItemGroup>
45
<ProjectReference Include="..\LuaInstaller.Core\LuaInstaller.Core.csproj" />
@@ -18,6 +19,7 @@
1819
<AssemblyVersion>0.6.0.0</AssemblyVersion>
1920
<FileVersion>0.6.0.0</FileVersion>
2021
<RuntimeIdentifiers>win-x64;win-x86;win-arm64</RuntimeIdentifiers>
22+
<Platforms>x86;x64;ARM64</Platforms>
2123
<ApplicationIcon>Assets\LuaInstaller-256x256.ico</ApplicationIcon>
2224
<PackageProjectUrl>https://github.com/luau-project/LuaInstaller</PackageProjectUrl>
2325
<RepositoryUrl>https://github.com/luau-project/LuaInstaller</RepositoryUrl>

0 commit comments

Comments
 (0)