update to VS2022

underautomation · Apr 28, 2024 · 316465b · 316465b
1 parent a041e1f
commit 316465b
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 75 deletions.
diff --git a/.NET/Examples/ConsoleWindowsLinuxMac/ConsoleWindowsLinuxMac_VS2012.sln b/.NET/Examples/ConsoleWindowsLinuxMac/ConsoleWindowsLinuxMac_VS2012.sln
diff --git a/...inuxMac/ConsoleWindowsLinuxMac_VS2017.sln → ...inuxMac/ConsoleWindowsLinuxMac_VS2022.sln b/...inuxMac/ConsoleWindowsLinuxMac_VS2017.sln → ...inuxMac/ConsoleWindowsLinuxMac_VS2022.sln
@@ -1,25 +1,25 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28010.2016
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleWindowsLinuxMac", "ConsoleWindowsLinuxMac.csproj", "{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {39121D88-458A-43C8-8D25-5DCD44FF288C}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34728.123
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleWindowsLinuxMac", "ConsoleWindowsLinuxMac.csproj", "{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {39121D88-458A-43C8-8D25-5DCD44FF288C}
+	EndGlobalSection
+EndGlobal
diff --git a/...inuxMac/ConsoleWindowsLinuxMac_VS2019.sln → .../WindowsDesktop/WindowsDesktop_VS2022.sln b/...inuxMac/ConsoleWindowsLinuxMac_VS2019.sln → .../WindowsDesktop/WindowsDesktop_VS2022.sln
@@ -1,25 +1,25 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29503.13
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleWindowsLinuxMac", "ConsoleWindowsLinuxMac.csproj", "{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {39121D88-458A-43C8-8D25-5DCD44FF288C}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.9.34728.123
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsDesktop", "WindowsDesktop.csproj", "{7EF7C07E-265E-469D-BCC6-260A6C757CB0}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{7EF7C07E-265E-469D-BCC6-260A6C757CB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7EF7C07E-265E-469D-BCC6-260A6C757CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7EF7C07E-265E-469D-BCC6-260A6C757CB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7EF7C07E-265E-469D-BCC6-260A6C757CB0}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {39121D88-458A-43C8-8D25-5DCD44FF288C}
+	EndGlobalSection
+EndGlobal
diff --git a/.github/workflows/Release.yml b/.github/workflows/Release.yml
@@ -8,20 +8,20 @@ on:
 jobs:
   build:
 
-    runs-on: windows-2019
+    runs-on: windows-2022
 
     steps:
     - uses: actions/checkout@v1
     - uses: nuget/setup-nuget@v1
-    - run: nuget restore $Env:GITHUB_WORKSPACE\.NET\Examples\ConsoleWindowsLinuxMac\ConsoleWindowsLinuxMac_VS2019.sln
+    - run: nuget restore $Env:GITHUB_WORKSPACE\.NET\Examples\ConsoleWindowsLinuxMac\ConsoleWindowsLinuxMac_VS2022.sln
     - name: Build Windows Desktop
       run: |
-        cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
-        .\MSBuild.exe $Env:GITHUB_WORKSPACE\.NET\Examples\WindowsDesktop\WindowsDesktop_VS2019.sln -p:Configuration=Release
+        cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
+        .\MSBuild.exe $Env:GITHUB_WORKSPACE\.NET\Examples\WindowsDesktop\WindowsDesktop_VS2022.sln -p:Configuration=Release
         rm $Env:GITHUB_WORKSPACE\.NET\Examples\WindowsDesktop\obj -r -fo
     - name: Build Console example
       run: |
-        cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
+        cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
         .\MSBuild.exe $Env:GITHUB_WORKSPACE\.NET\Examples\ConsoleWindowsLinuxMac\ConsoleWindowsLinuxMac.csproj /p:DeployOnBuild=true /p:PublishProfile=win-x86 /p:Configuration=Release /p:OutDir=bin/win-x86
         .\MSBuild.exe $Env:GITHUB_WORKSPACE\.NET\Examples\ConsoleWindowsLinuxMac\ConsoleWindowsLinuxMac.csproj /p:DeployOnBuild=true /p:PublishProfile=win-x64 /p:Configuration=Release /p:OutDir=bin/win-x64
         .\MSBuild.exe $Env:GITHUB_WORKSPACE\.NET\Examples\ConsoleWindowsLinuxMac\ConsoleWindowsLinuxMac.csproj /p:DeployOnBuild=true /p:PublishProfile=win-arm /p:Configuration=Release /p:OutDir=bin/win-arm