Skip to content

Commit f33cd60

Browse files
ge0rdige0rdi
committed
Use VS2019
1 parent 431e2b5 commit f33cd60

33 files changed

+128
-127
lines changed

‎Src/ClassicExplorer/ClassicExplorer.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,46 +30,46 @@
3030
<ProjectGuid>{9AF324B7-F786-4D85-B2E1-6E51720F874E}</ProjectGuid>
3131
<RootNamespace>ClassicExplorer</RootNamespace>
3232
<Keyword>AtlProj</Keyword>
33-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
33+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3434
</PropertyGroup>
3535
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="Configuration">
3737
<ConfigurationType>DynamicLibrary</ConfigurationType>
38-
<PlatformToolset>v141</PlatformToolset>
38+
<PlatformToolset>v142</PlatformToolset>
3939
<UseOfAtl>Static</UseOfAtl>
4040
<CharacterSet>Unicode</CharacterSet>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>DynamicLibrary</ConfigurationType>
45-
<PlatformToolset>v141</PlatformToolset>
45+
<PlatformToolset>v142</PlatformToolset>
4646
<UseOfAtl>Static</UseOfAtl>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5151
<ConfigurationType>DynamicLibrary</ConfigurationType>
52-
<PlatformToolset>v141</PlatformToolset>
52+
<PlatformToolset>v142</PlatformToolset>
5353
<UseOfAtl>Static</UseOfAtl>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|x64'" Label="Configuration">
5757
<ConfigurationType>DynamicLibrary</ConfigurationType>
58-
<PlatformToolset>v141</PlatformToolset>
58+
<PlatformToolset>v142</PlatformToolset>
5959
<UseOfAtl>Static</UseOfAtl>
6060
<CharacterSet>Unicode</CharacterSet>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6464
<ConfigurationType>DynamicLibrary</ConfigurationType>
65-
<PlatformToolset>v141</PlatformToolset>
65+
<PlatformToolset>v142</PlatformToolset>
6666
<UseOfAtl>Static</UseOfAtl>
6767
<CharacterSet>Unicode</CharacterSet>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7171
<ConfigurationType>DynamicLibrary</ConfigurationType>
72-
<PlatformToolset>v141</PlatformToolset>
72+
<PlatformToolset>v142</PlatformToolset>
7373
<UseOfAtl>Static</UseOfAtl>
7474
<CharacterSet>Unicode</CharacterSet>
7575
</PropertyGroup>

‎Src/ClassicExplorer/ClassicExplorerSettings/ClassicExplorerSettings.vcxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,26 @@
1818
<ProjectGuid>{E93271C8-0252-4A08-8227-1978C64C2D34}</ProjectGuid>
1919
<RootNamespace>ClassicExplorerSettings</RootNamespace>
2020
<Keyword>Win32Proj</Keyword>
21-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
21+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2222
</PropertyGroup>
2323
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2424
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="Configuration">
2525
<ConfigurationType>Application</ConfigurationType>
26-
<PlatformToolset>v141</PlatformToolset>
26+
<PlatformToolset>v142</PlatformToolset>
2727
<UseOfAtl>Static</UseOfAtl>
2828
<CharacterSet>Unicode</CharacterSet>
2929
<WholeProgramOptimization>true</WholeProgramOptimization>
3030
</PropertyGroup>
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3232
<ConfigurationType>Application</ConfigurationType>
33-
<PlatformToolset>v141</PlatformToolset>
33+
<PlatformToolset>v142</PlatformToolset>
3434
<UseOfAtl>Static</UseOfAtl>
3535
<CharacterSet>Unicode</CharacterSet>
3636
<WholeProgramOptimization>true</WholeProgramOptimization>
3737
</PropertyGroup>
3838
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3939
<ConfigurationType>Application</ConfigurationType>
40-
<PlatformToolset>v141</PlatformToolset>
40+
<PlatformToolset>v142</PlatformToolset>
4141
<UseOfAtl>Static</UseOfAtl>
4242
<CharacterSet>Unicode</CharacterSet>
4343
</PropertyGroup>

‎Src/ClassicIE/ClassicIE.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,46 +30,46 @@
3030
<ProjectGuid>{65D5C193-E807-4094-AE19-19E6A310A312}</ProjectGuid>
3131
<RootNamespace>ClassicIE</RootNamespace>
3232
<Keyword>Win32Proj</Keyword>
33-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
33+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3434
</PropertyGroup>
3535
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="Configuration">
3737
<ConfigurationType>Application</ConfigurationType>
38-
<PlatformToolset>v141</PlatformToolset>
38+
<PlatformToolset>v142</PlatformToolset>
3939
<UseOfAtl>Static</UseOfAtl>
4040
<CharacterSet>Unicode</CharacterSet>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>Application</ConfigurationType>
45-
<PlatformToolset>v141</PlatformToolset>
45+
<PlatformToolset>v142</PlatformToolset>
4646
<UseOfAtl>Static</UseOfAtl>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5151
<ConfigurationType>Application</ConfigurationType>
52-
<PlatformToolset>v141</PlatformToolset>
52+
<PlatformToolset>v142</PlatformToolset>
5353
<UseOfAtl>Static</UseOfAtl>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|x64'" Label="Configuration">
5757
<ConfigurationType>Application</ConfigurationType>
58-
<PlatformToolset>v141</PlatformToolset>
58+
<PlatformToolset>v142</PlatformToolset>
5959
<UseOfAtl>Static</UseOfAtl>
6060
<CharacterSet>Unicode</CharacterSet>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6464
<ConfigurationType>Application</ConfigurationType>
65-
<PlatformToolset>v141</PlatformToolset>
65+
<PlatformToolset>v142</PlatformToolset>
6666
<UseOfAtl>Static</UseOfAtl>
6767
<CharacterSet>Unicode</CharacterSet>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7171
<ConfigurationType>Application</ConfigurationType>
72-
<PlatformToolset>v141</PlatformToolset>
72+
<PlatformToolset>v142</PlatformToolset>
7373
<UseOfAtl>Static</UseOfAtl>
7474
<CharacterSet>Unicode</CharacterSet>
7575
</PropertyGroup>

‎Src/ClassicIE/ClassicIEDLL/ClassicIEDLL.vcxproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,46 +30,46 @@
3030
<ProjectGuid>{BC0E6E7C-08C1-4F12-A754-4608E5A22FA8}</ProjectGuid>
3131
<RootNamespace>ClassicIEDLL</RootNamespace>
3232
<Keyword>AtlProj</Keyword>
33-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
33+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
3434
</PropertyGroup>
3535
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3636
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|Win32'" Label="Configuration">
3737
<ConfigurationType>DynamicLibrary</ConfigurationType>
38-
<PlatformToolset>v141</PlatformToolset>
38+
<PlatformToolset>v142</PlatformToolset>
3939
<UseOfAtl>Static</UseOfAtl>
4040
<CharacterSet>Unicode</CharacterSet>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
</PropertyGroup>
4343
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4444
<ConfigurationType>DynamicLibrary</ConfigurationType>
45-
<PlatformToolset>v141</PlatformToolset>
45+
<PlatformToolset>v142</PlatformToolset>
4646
<UseOfAtl>Static</UseOfAtl>
4747
<CharacterSet>Unicode</CharacterSet>
4848
<WholeProgramOptimization>true</WholeProgramOptimization>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5151
<ConfigurationType>DynamicLibrary</ConfigurationType>
52-
<PlatformToolset>v141</PlatformToolset>
52+
<PlatformToolset>v142</PlatformToolset>
5353
<UseOfAtl>Static</UseOfAtl>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Setup|x64'" Label="Configuration">
5757
<ConfigurationType>DynamicLibrary</ConfigurationType>
58-
<PlatformToolset>v141</PlatformToolset>
58+
<PlatformToolset>v142</PlatformToolset>
5959
<UseOfAtl>Static</UseOfAtl>
6060
<CharacterSet>Unicode</CharacterSet>
6161
<WholeProgramOptimization>true</WholeProgramOptimization>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6464
<ConfigurationType>DynamicLibrary</ConfigurationType>
65-
<PlatformToolset>v141</PlatformToolset>
65+
<PlatformToolset>v142</PlatformToolset>
6666
<UseOfAtl>Static</UseOfAtl>
6767
<CharacterSet>Unicode</CharacterSet>
6868
<WholeProgramOptimization>true</WholeProgramOptimization>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
7171
<ConfigurationType>DynamicLibrary</ConfigurationType>
72-
<PlatformToolset>v141</PlatformToolset>
72+
<PlatformToolset>v142</PlatformToolset>
7373
<UseOfAtl>Static</UseOfAtl>
7474
<CharacterSet>Unicode</CharacterSet>
7575
</PropertyGroup>

‎Src/Lib/Lib.vcxproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,32 +22,32 @@
2222
<ProjectGuid>{D42FE717-485B-492D-884A-1999F6D51154}</ProjectGuid>
2323
<RootNamespace>Lib</RootNamespace>
2424
<Keyword>Win32Proj</Keyword>
25-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
25+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
2626
</PropertyGroup>
2727
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2929
<ConfigurationType>StaticLibrary</ConfigurationType>
30-
<PlatformToolset>v141</PlatformToolset>
30+
<PlatformToolset>v142</PlatformToolset>
3131
<UseOfAtl>Static</UseOfAtl>
3232
<CharacterSet>Unicode</CharacterSet>
3333
<WholeProgramOptimization>true</WholeProgramOptimization>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3636
<ConfigurationType>StaticLibrary</ConfigurationType>
37-
<PlatformToolset>v141</PlatformToolset>
37+
<PlatformToolset>v142</PlatformToolset>
3838
<UseOfAtl>Static</UseOfAtl>
3939
<CharacterSet>Unicode</CharacterSet>
4040
</PropertyGroup>
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4242
<ConfigurationType>StaticLibrary</ConfigurationType>
43-
<PlatformToolset>v141</PlatformToolset>
43+
<PlatformToolset>v142</PlatformToolset>
4444
<UseOfAtl>Static</UseOfAtl>
4545
<CharacterSet>Unicode</CharacterSet>
4646
<WholeProgramOptimization>true</WholeProgramOptimization>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4949
<ConfigurationType>StaticLibrary</ConfigurationType>
50-
<PlatformToolset>v141</PlatformToolset>
50+
<PlatformToolset>v142</PlatformToolset>
5151
<UseOfAtl>Static</UseOfAtl>
5252
<CharacterSet>Unicode</CharacterSet>
5353
</PropertyGroup>

‎Src/OpenShell.sln

Lines changed: 2 additions & 2 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 15
4-
VisualStudioVersion = 15.0.27130.2010
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.29324.140
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Skins", "Skins", "{409484D8-C0DB-4991-AF03-124128EDEF98}"
77
EndProject

‎Src/Setup/BuildBinaries.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ md Output\PDB64
66

77
echo -- Compiling
88

9-
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\15.0\Bin\
9+
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\Current\Bin\
1010

1111
REM ********* Build 64-bit solution
1212
echo --- 64bit

‎Src/Setup/BuildInstaller.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Utility\Release\Utility.exe crcmsi Temp
6565

6666
REM ********* Build bootstrapper
6767
echo --- Bootstrapper
68-
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\15.0\Bin\
68+
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.Component.MSBuild -property installationPath`) do set MSBuildDir=%%i\MSBuild\Current\Bin\
6969

7070
"%MSBuildDir%MSBuild.exe" Setup.sln /m /t:Rebuild /p:Configuration="Release" /p:Platform="Win32" /verbosity:quiet /nologo
7171
@if ERRORLEVEL 1 exit /b 1

‎Src/Setup/Setup.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
<ProjectGuid>{A4A4D3B1-24E7-401E-A37C-72141D7603DC}</ProjectGuid>
1515
<RootNamespace>Setup</RootNamespace>
1616
<Keyword>Win32Proj</Keyword>
17-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2121
<ConfigurationType>Application</ConfigurationType>
22-
<PlatformToolset>v141</PlatformToolset>
22+
<PlatformToolset>v142</PlatformToolset>
2323
<CharacterSet>Unicode</CharacterSet>
2424
<WholeProgramOptimization>true</WholeProgramOptimization>
2525
</PropertyGroup>
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2727
<ConfigurationType>Application</ConfigurationType>
28-
<PlatformToolset>v141</PlatformToolset>
28+
<PlatformToolset>v142</PlatformToolset>
2929
<CharacterSet>Unicode</CharacterSet>
3030
</PropertyGroup>
3131
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

‎Src/Setup/SetupHelper/SetupHelper.vcxproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,18 @@
1414
<ProjectGuid>{E1017135-9916-4B11-9AC5-1EC0BD8F8CD6}</ProjectGuid>
1515
<RootNamespace>SetupHelper</RootNamespace>
1616
<Keyword>Win32Proj</Keyword>
17-
<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
17+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1818
</PropertyGroup>
1919
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2020
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2121
<ConfigurationType>Application</ConfigurationType>
22-
<PlatformToolset>v141</PlatformToolset>
22+
<PlatformToolset>v142</PlatformToolset>
2323
<CharacterSet>Unicode</CharacterSet>
2424
<WholeProgramOptimization>true</WholeProgramOptimization>
2525
</PropertyGroup>
2626
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2727
<ConfigurationType>Application</ConfigurationType>
28-
<PlatformToolset>v141</PlatformToolset>
28+
<PlatformToolset>v142</PlatformToolset>
2929
<CharacterSet>Unicode</CharacterSet>
3030
</PropertyGroup>
3131
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

0 commit comments

Comments
 (0)