Skip to content

Commit 5b295ef

Browse files
AlfredTouringAlfredTouring
committed
Merge tag 'v7.4.1.1'
2 parents 24f0077 + 316465b commit 5b295ef

File tree

4 files changed

+55
-75
lines changed

4 files changed

+55
-75
lines changed

‎.NET/Examples/ConsoleWindowsLinuxMac/ConsoleWindowsLinuxMac_VS2012.sln‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎.NET/Examples/ConsoleWindowsLinuxMac/ConsoleWindowsLinuxMac_VS2017.sln‎ renamed to ‎.NET/Examples/ConsoleWindowsLinuxMac/ConsoleWindowsLinuxMac_VS2022.sln‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.28010.2016
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleWindowsLinuxMac", "ConsoleWindowsLinuxMac.csproj", "{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}"
7-
EndProject
8-
Global
9-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|Any CPU = Debug|Any CPU
11-
Release|Any CPU = Release|Any CPU
12-
EndGlobalSection
13-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.Build.0 = Release|Any CPU
18-
EndGlobalSection
19-
GlobalSection(SolutionProperties) = preSolution
20-
HideSolutionNode = FALSE
21-
EndGlobalSection
22-
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {39121D88-458A-43C8-8D25-5DCD44FF288C}
24-
EndGlobalSection
25-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.9.34728.123
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleWindowsLinuxMac", "ConsoleWindowsLinuxMac.csproj", "{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {39121D88-458A-43C8-8D25-5DCD44FF288C}
24+
EndGlobalSection
25+
EndGlobal

‎.NET/Examples/ConsoleWindowsLinuxMac/ConsoleWindowsLinuxMac_VS2019.sln‎ renamed to ‎.NET/Examples/WindowsDesktop/WindowsDesktop_VS2022.sln‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
2-
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29503.13
5-
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleWindowsLinuxMac", "ConsoleWindowsLinuxMac.csproj", "{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}"
7-
EndProject
8-
Global
9-
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10-
Debug|Any CPU = Debug|Any CPU
11-
Release|Any CPU = Release|Any CPU
12-
EndGlobalSection
13-
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14-
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15-
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
16-
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
17-
{5855D6A9-761F-4BA4-B240-7A80DACB6D1A}.Release|Any CPU.Build.0 = Release|Any CPU
18-
EndGlobalSection
19-
GlobalSection(SolutionProperties) = preSolution
20-
HideSolutionNode = FALSE
21-
EndGlobalSection
22-
GlobalSection(ExtensibilityGlobals) = postSolution
23-
SolutionGuid = {39121D88-458A-43C8-8D25-5DCD44FF288C}
24-
EndGlobalSection
25-
EndGlobal
1+
2+
Microsoft Visual Studio Solution File, Format Version 12.00
3+
# Visual Studio Version 17
4+
VisualStudioVersion = 17.9.34728.123
5+
MinimumVisualStudioVersion = 10.0.40219.1
6+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsDesktop", "WindowsDesktop.csproj", "{7EF7C07E-265E-469D-BCC6-260A6C757CB0}"
7+
EndProject
8+
Global
9+
GlobalSection(SolutionConfigurationPlatforms) = preSolution
10+
Debug|Any CPU = Debug|Any CPU
11+
Release|Any CPU = Release|Any CPU
12+
EndGlobalSection
13+
GlobalSection(ProjectConfigurationPlatforms) = postSolution
14+
{7EF7C07E-265E-469D-BCC6-260A6C757CB0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
15+
{7EF7C07E-265E-469D-BCC6-260A6C757CB0}.Debug|Any CPU.Build.0 = Debug|Any CPU
16+
{7EF7C07E-265E-469D-BCC6-260A6C757CB0}.Release|Any CPU.ActiveCfg = Release|Any CPU
17+
{7EF7C07E-265E-469D-BCC6-260A6C757CB0}.Release|Any CPU.Build.0 = Release|Any CPU
18+
EndGlobalSection
19+
GlobalSection(SolutionProperties) = preSolution
20+
HideSolutionNode = FALSE
21+
EndGlobalSection
22+
GlobalSection(ExtensibilityGlobals) = postSolution
23+
SolutionGuid = {39121D88-458A-43C8-8D25-5DCD44FF288C}
24+
EndGlobalSection
25+
EndGlobal

‎.github/workflows/Release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ on:
88
jobs:
99
build:
1010

11-
runs-on: windows-2019
11+
runs-on: windows-2022
1212

1313
steps:
1414
- uses: actions/checkout@v1
1515
- uses: nuget/setup-nuget@v1
16-
- run: nuget restore $Env:GITHUB_WORKSPACE\.NET\Examples\ConsoleWindowsLinuxMac\ConsoleWindowsLinuxMac_VS2019.sln
16+
- run: nuget restore $Env:GITHUB_WORKSPACE\.NET\Examples\ConsoleWindowsLinuxMac\ConsoleWindowsLinuxMac_VS2022.sln
1717
- name: Build Windows Desktop
1818
run: |
19-
cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
20-
.\MSBuild.exe $Env:GITHUB_WORKSPACE\.NET\Examples\WindowsDesktop\WindowsDesktop_VS2019.sln -p:Configuration=Release
19+
cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
20+
.\MSBuild.exe $Env:GITHUB_WORKSPACE\.NET\Examples\WindowsDesktop\WindowsDesktop_VS2022.sln -p:Configuration=Release
2121
rm $Env:GITHUB_WORKSPACE\.NET\Examples\WindowsDesktop\obj -r -fo
2222
- name: Build Console example
2323
run: |
24-
cd "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\"
24+
cd "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\"
2525
.\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
2626
.\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
2727
.\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

0 commit comments

Comments
 (0)