Skip to content

Commit 4dc5631

Browse files
Project Collection Build Service (51degrees)Project Collection Build Service (51degrees)
Project Collection Build Service (51degrees)
authored and
Project Collection Build Service (51degrees)
committed
Merge pull request 6449 from hotfix/v4.3.13 into master
2 parents 15a423c + f83df9f commit 4dc5631

File tree

36 files changed

+229
-218
lines changed

36 files changed

+229
-218
lines changed

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ rather than the files themselves. As such, these need to be downloaded individua
5555

5656
You will need either Visual Studio 2019 or the [C++ Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/) installed.
5757
If you have Visual Studio Code, you'll still need to install the build tools from the link above.
58+
- Minimum Platform Toolset Version `v142`
59+
- Minimum Windows SDK Version `10.0.18362.0`
5860

5961
### Linux
6062

‎VisualStudio/DeviceDetection.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.27004.2005
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31205.134
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{A630C077-67E7-46C0-8C6C-A8370F5733CE}"
77
EndProject

‎VisualStudio/Examples/C/Hash/ExampleBase/ExampleBase.vcxproj‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,32 +28,32 @@
2828
<VCProjectVersion>15.0</VCProjectVersion>
2929
<ProjectGuid>{66F0AA5B-6E82-40D4-8165-C2328561CAB0}</ProjectGuid>
3030
<RootNamespace>ExampleBase</RootNamespace>
31-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
31+
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
3232
</PropertyGroup>
3333
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3535
<ConfigurationType>StaticLibrary</ConfigurationType>
3636
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>v141</PlatformToolset>
37+
<PlatformToolset>v142</PlatformToolset>
3838
<CharacterSet>Unicode</CharacterSet>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4141
<ConfigurationType>StaticLibrary</ConfigurationType>
4242
<UseDebugLibraries>false</UseDebugLibraries>
43-
<PlatformToolset>v141</PlatformToolset>
43+
<PlatformToolset>v142</PlatformToolset>
4444
<WholeProgramOptimization>true</WholeProgramOptimization>
4545
<CharacterSet>Unicode</CharacterSet>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4848
<ConfigurationType>StaticLibrary</ConfigurationType>
4949
<UseDebugLibraries>true</UseDebugLibraries>
50-
<PlatformToolset>v141</PlatformToolset>
50+
<PlatformToolset>v142</PlatformToolset>
5151
<CharacterSet>Unicode</CharacterSet>
5252
</PropertyGroup>
5353
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5454
<ConfigurationType>StaticLibrary</ConfigurationType>
5555
<UseDebugLibraries>false</UseDebugLibraries>
56-
<PlatformToolset>v141</PlatformToolset>
56+
<PlatformToolset>v142</PlatformToolset>
5757
<WholeProgramOptimization>true</WholeProgramOptimization>
5858
<CharacterSet>Unicode</CharacterSet>
5959
</PropertyGroup>

‎VisualStudio/Examples/C/Hash/Find Profiles/Find Profiles.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,58 +38,58 @@
3838
<ProjectGuid>{22E3BB54-2542-4641-9A07-7EFE0DD64670}</ProjectGuid>
3939
<Keyword>Win32Proj</Keyword>
4040
<RootNamespace>FindProfiles</RootNamespace>
41-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
41+
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
4242
</PropertyGroup>
4343
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4545
<ConfigurationType>Application</ConfigurationType>
4646
<UseDebugLibraries>true</UseDebugLibraries>
47-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset>v142</PlatformToolset>
4848
<CharacterSet>Unicode</CharacterSet>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5151
<ConfigurationType>Application</ConfigurationType>
5252
<UseDebugLibraries>true</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
<CharacterSet>Unicode</CharacterSet>
5555
</PropertyGroup>
5656
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Single|x64'" Label="Configuration">
5757
<ConfigurationType>Application</ConfigurationType>
5858
<UseDebugLibraries>true</UseDebugLibraries>
59-
<PlatformToolset>v141</PlatformToolset>
59+
<PlatformToolset>v142</PlatformToolset>
6060
<CharacterSet>Unicode</CharacterSet>
6161
</PropertyGroup>
6262
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Single|Win32'" Label="Configuration">
6363
<ConfigurationType>Application</ConfigurationType>
6464
<UseDebugLibraries>true</UseDebugLibraries>
65-
<PlatformToolset>v141</PlatformToolset>
65+
<PlatformToolset>v142</PlatformToolset>
6666
<CharacterSet>Unicode</CharacterSet>
6767
</PropertyGroup>
6868
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
6969
<ConfigurationType>Application</ConfigurationType>
7070
<UseDebugLibraries>false</UseDebugLibraries>
71-
<PlatformToolset>v141</PlatformToolset>
71+
<PlatformToolset>v142</PlatformToolset>
7272
<WholeProgramOptimization>true</WholeProgramOptimization>
7373
<CharacterSet>Unicode</CharacterSet>
7474
</PropertyGroup>
7575
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
7676
<ConfigurationType>Application</ConfigurationType>
7777
<UseDebugLibraries>false</UseDebugLibraries>
78-
<PlatformToolset>v141</PlatformToolset>
78+
<PlatformToolset>v142</PlatformToolset>
7979
<WholeProgramOptimization>true</WholeProgramOptimization>
8080
<CharacterSet>Unicode</CharacterSet>
8181
</PropertyGroup>
8282
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Single|x64'" Label="Configuration">
8383
<ConfigurationType>Application</ConfigurationType>
8484
<UseDebugLibraries>false</UseDebugLibraries>
85-
<PlatformToolset>v141</PlatformToolset>
85+
<PlatformToolset>v142</PlatformToolset>
8686
<WholeProgramOptimization>true</WholeProgramOptimization>
8787
<CharacterSet>Unicode</CharacterSet>
8888
</PropertyGroup>
8989
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Single|Win32'" Label="Configuration">
9090
<ConfigurationType>Application</ConfigurationType>
9191
<UseDebugLibraries>false</UseDebugLibraries>
92-
<PlatformToolset>v141</PlatformToolset>
92+
<PlatformToolset>v142</PlatformToolset>
9393
<WholeProgramOptimization>true</WholeProgramOptimization>
9494
<CharacterSet>Unicode</CharacterSet>
9595
</PropertyGroup>

‎VisualStudio/Examples/C/Hash/Getting Started/Getting Started.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,59 +38,59 @@
3838
<ProjectGuid>{B3E9FE89-CD37-4E20-973B-B091EA079076}</ProjectGuid>
3939
<Keyword>Win32Proj</Keyword>
4040
<RootNamespace>GettingStartedTrie</RootNamespace>
41-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
41+
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
4242
<ProjectName>Getting Started</ProjectName>
4343
</PropertyGroup>
4444
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4545
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4646
<ConfigurationType>Application</ConfigurationType>
4747
<UseDebugLibraries>true</UseDebugLibraries>
48-
<PlatformToolset>v141</PlatformToolset>
48+
<PlatformToolset>v142</PlatformToolset>
4949
<CharacterSet>Unicode</CharacterSet>
5050
</PropertyGroup>
5151
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5252
<ConfigurationType>Application</ConfigurationType>
5353
<UseDebugLibraries>true</UseDebugLibraries>
54-
<PlatformToolset>v141</PlatformToolset>
54+
<PlatformToolset>v142</PlatformToolset>
5555
<CharacterSet>Unicode</CharacterSet>
5656
</PropertyGroup>
5757
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Single|x64'" Label="Configuration">
5858
<ConfigurationType>Application</ConfigurationType>
5959
<UseDebugLibraries>true</UseDebugLibraries>
60-
<PlatformToolset>v141</PlatformToolset>
60+
<PlatformToolset>v142</PlatformToolset>
6161
<CharacterSet>Unicode</CharacterSet>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Single|Win32'" Label="Configuration">
6464
<ConfigurationType>Application</ConfigurationType>
6565
<UseDebugLibraries>true</UseDebugLibraries>
66-
<PlatformToolset>v141</PlatformToolset>
66+
<PlatformToolset>v142</PlatformToolset>
6767
<CharacterSet>Unicode</CharacterSet>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7070
<ConfigurationType>Application</ConfigurationType>
7171
<UseDebugLibraries>false</UseDebugLibraries>
72-
<PlatformToolset>v141</PlatformToolset>
72+
<PlatformToolset>v142</PlatformToolset>
7373
<WholeProgramOptimization>true</WholeProgramOptimization>
7474
<CharacterSet>Unicode</CharacterSet>
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
7777
<ConfigurationType>Application</ConfigurationType>
7878
<UseDebugLibraries>false</UseDebugLibraries>
79-
<PlatformToolset>v141</PlatformToolset>
79+
<PlatformToolset>v142</PlatformToolset>
8080
<WholeProgramOptimization>true</WholeProgramOptimization>
8181
<CharacterSet>Unicode</CharacterSet>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Single|x64'" Label="Configuration">
8484
<ConfigurationType>Application</ConfigurationType>
8585
<UseDebugLibraries>false</UseDebugLibraries>
86-
<PlatformToolset>v141</PlatformToolset>
86+
<PlatformToolset>v142</PlatformToolset>
8787
<WholeProgramOptimization>true</WholeProgramOptimization>
8888
<CharacterSet>Unicode</CharacterSet>
8989
</PropertyGroup>
9090
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Single|Win32'" Label="Configuration">
9191
<ConfigurationType>Application</ConfigurationType>
9292
<UseDebugLibraries>false</UseDebugLibraries>
93-
<PlatformToolset>v141</PlatformToolset>
93+
<PlatformToolset>v142</PlatformToolset>
9494
<WholeProgramOptimization>true</WholeProgramOptimization>
9595
<CharacterSet>Unicode</CharacterSet>
9696
</PropertyGroup>

‎VisualStudio/Examples/C/Hash/Match For Device Id/Match For Device Id.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,58 +46,58 @@
4646
<ProjectGuid>{C11D3CCB-F720-400B-89F7-A3C60B7079CC}</ProjectGuid>
4747
<Keyword>Win32Proj</Keyword>
4848
<RootNamespace>MatchForDeviceId</RootNamespace>
49-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
49+
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
5050
</PropertyGroup>
5151
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5353
<ConfigurationType>Application</ConfigurationType>
5454
<UseDebugLibraries>true</UseDebugLibraries>
55-
<PlatformToolset>v141</PlatformToolset>
55+
<PlatformToolset>v142</PlatformToolset>
5656
<CharacterSet>Unicode</CharacterSet>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5959
<ConfigurationType>Application</ConfigurationType>
6060
<UseDebugLibraries>true</UseDebugLibraries>
61-
<PlatformToolset>v141</PlatformToolset>
61+
<PlatformToolset>v142</PlatformToolset>
6262
<CharacterSet>Unicode</CharacterSet>
6363
</PropertyGroup>
6464
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Single|x64'" Label="Configuration">
6565
<ConfigurationType>Application</ConfigurationType>
6666
<UseDebugLibraries>true</UseDebugLibraries>
67-
<PlatformToolset>v141</PlatformToolset>
67+
<PlatformToolset>v142</PlatformToolset>
6868
<CharacterSet>Unicode</CharacterSet>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Single|Win32'" Label="Configuration">
7171
<ConfigurationType>Application</ConfigurationType>
7272
<UseDebugLibraries>true</UseDebugLibraries>
73-
<PlatformToolset>v141</PlatformToolset>
73+
<PlatformToolset>v142</PlatformToolset>
7474
<CharacterSet>Unicode</CharacterSet>
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7777
<ConfigurationType>Application</ConfigurationType>
7878
<UseDebugLibraries>false</UseDebugLibraries>
79-
<PlatformToolset>v141</PlatformToolset>
79+
<PlatformToolset>v142</PlatformToolset>
8080
<WholeProgramOptimization>true</WholeProgramOptimization>
8181
<CharacterSet>Unicode</CharacterSet>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
8484
<ConfigurationType>Application</ConfigurationType>
8585
<UseDebugLibraries>false</UseDebugLibraries>
86-
<PlatformToolset>v141</PlatformToolset>
86+
<PlatformToolset>v142</PlatformToolset>
8787
<WholeProgramOptimization>true</WholeProgramOptimization>
8888
<CharacterSet>Unicode</CharacterSet>
8989
</PropertyGroup>
9090
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Single|x64'" Label="Configuration">
9191
<ConfigurationType>Application</ConfigurationType>
9292
<UseDebugLibraries>false</UseDebugLibraries>
93-
<PlatformToolset>v141</PlatformToolset>
93+
<PlatformToolset>v142</PlatformToolset>
9494
<WholeProgramOptimization>true</WholeProgramOptimization>
9595
<CharacterSet>Unicode</CharacterSet>
9696
</PropertyGroup>
9797
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Single|Win32'" Label="Configuration">
9898
<ConfigurationType>Application</ConfigurationType>
9999
<UseDebugLibraries>false</UseDebugLibraries>
100-
<PlatformToolset>v141</PlatformToolset>
100+
<PlatformToolset>v142</PlatformToolset>
101101
<WholeProgramOptimization>true</WholeProgramOptimization>
102102
<CharacterSet>Unicode</CharacterSet>
103103
</PropertyGroup>

‎VisualStudio/Examples/C/Hash/Match Metrics/Match Metrics.vcxproj‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,58 +46,58 @@
4646
<ProjectGuid>{21918EB5-0A76-4CDF-860A-F3725C357260}</ProjectGuid>
4747
<Keyword>Win32Proj</Keyword>
4848
<RootNamespace>MatchMetrics</RootNamespace>
49-
<WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
49+
<WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
5050
</PropertyGroup>
5151
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5353
<ConfigurationType>Application</ConfigurationType>
5454
<UseDebugLibraries>true</UseDebugLibraries>
55-
<PlatformToolset>v141</PlatformToolset>
55+
<PlatformToolset>v142</PlatformToolset>
5656
<CharacterSet>Unicode</CharacterSet>
5757
</PropertyGroup>
5858
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
5959
<ConfigurationType>Application</ConfigurationType>
6060
<UseDebugLibraries>true</UseDebugLibraries>
61-
<PlatformToolset>v141</PlatformToolset>
61+
<PlatformToolset>v142</PlatformToolset>
6262
<CharacterSet>Unicode</CharacterSet>
6363
</PropertyGroup>
6464
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Single|x64'" Label="Configuration">
6565
<ConfigurationType>Application</ConfigurationType>
6666
<UseDebugLibraries>true</UseDebugLibraries>
67-
<PlatformToolset>v141</PlatformToolset>
67+
<PlatformToolset>v142</PlatformToolset>
6868
<CharacterSet>Unicode</CharacterSet>
6969
</PropertyGroup>
7070
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-Single|Win32'" Label="Configuration">
7171
<ConfigurationType>Application</ConfigurationType>
7272
<UseDebugLibraries>true</UseDebugLibraries>
73-
<PlatformToolset>v141</PlatformToolset>
73+
<PlatformToolset>v142</PlatformToolset>
7474
<CharacterSet>Unicode</CharacterSet>
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7777
<ConfigurationType>Application</ConfigurationType>
7878
<UseDebugLibraries>false</UseDebugLibraries>
79-
<PlatformToolset>v141</PlatformToolset>
79+
<PlatformToolset>v142</PlatformToolset>
8080
<WholeProgramOptimization>true</WholeProgramOptimization>
8181
<CharacterSet>Unicode</CharacterSet>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
8484
<ConfigurationType>Application</ConfigurationType>
8585
<UseDebugLibraries>false</UseDebugLibraries>
86-
<PlatformToolset>v141</PlatformToolset>
86+
<PlatformToolset>v142</PlatformToolset>
8787
<WholeProgramOptimization>true</WholeProgramOptimization>
8888
<CharacterSet>Unicode</CharacterSet>
8989
</PropertyGroup>
9090
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Single|x64'" Label="Configuration">
9191
<ConfigurationType>Application</ConfigurationType>
9292
<UseDebugLibraries>false</UseDebugLibraries>
93-
<PlatformToolset>v141</PlatformToolset>
93+
<PlatformToolset>v142</PlatformToolset>
9494
<WholeProgramOptimization>true</WholeProgramOptimization>
9595
<CharacterSet>Unicode</CharacterSet>
9696
</PropertyGroup>
9797
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-Single|Win32'" Label="Configuration">
9898
<ConfigurationType>Application</ConfigurationType>
9999
<UseDebugLibraries>false</UseDebugLibraries>
100-
<PlatformToolset>v141</PlatformToolset>
100+
<PlatformToolset>v142</PlatformToolset>
101101
<WholeProgramOptimization>true</WholeProgramOptimization>
102102
<CharacterSet>Unicode</CharacterSet>
103103
</PropertyGroup>

0 commit comments

Comments
 (0)