Skip to content

Commit b249477

Browse files
sake402josesimoes
sake402
authored and
josesimoes
committed
Support for generics (#1802)
***NO_CI***
1 parent 1ab17bc commit b249477

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+431
-236
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ CMake/Modules/FindINTEROP*.cmake
4848

4949
# Visual Studio cache/options directory contents but not the example launch.vs.json
5050
!.vs/
51-
.vs/*
51+
**/.vs/*
5252
!.vs/launch.vs.SAMPLE.json
5353
!.vs/tasks.vs.SAMPLE.json
5454
**/ipch/*
@@ -62,3 +62,4 @@ CMake/Modules/FindINTEROP*.cmake
6262
**/packages/*
6363
# except build/, which is used as an MSBuild target.
6464
!**/packages/build/
65+
/targets/os/win32/.vs/nanoCLR/v16

‎src/CLR/CorLib/CorLib.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -78,32 +78,32 @@
7878
<ProjectGuid>{58E950CC-2FF6-423C-B006-A70A19272F20}</ProjectGuid>
7979
<Keyword>Win32Proj</Keyword>
8080
<RootNamespace>CorLib</RootNamespace>
81-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
81+
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
8282
</PropertyGroup>
8383
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
8484
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
8585
<ConfigurationType>StaticLibrary</ConfigurationType>
8686
<UseDebugLibraries>true</UseDebugLibraries>
87-
<PlatformToolset>v141</PlatformToolset>
87+
<PlatformToolset>v142</PlatformToolset>
8888
<CharacterSet>Unicode</CharacterSet>
8989
</PropertyGroup>
9090
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
9191
<ConfigurationType>StaticLibrary</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)'=='Debug|x64'" Label="Configuration">
9898
<ConfigurationType>StaticLibrary</ConfigurationType>
9999
<UseDebugLibraries>true</UseDebugLibraries>
100-
<PlatformToolset>v141</PlatformToolset>
100+
<PlatformToolset>v142</PlatformToolset>
101101
<CharacterSet>Unicode</CharacterSet>
102102
</PropertyGroup>
103103
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
104104
<ConfigurationType>StaticLibrary</ConfigurationType>
105105
<UseDebugLibraries>false</UseDebugLibraries>
106-
<PlatformToolset>v141</PlatformToolset>
106+
<PlatformToolset>v142</PlatformToolset>
107107
<WholeProgramOptimization>true</WholeProgramOptimization>
108108
<CharacterSet>Unicode</CharacterSet>
109109
</PropertyGroup>

‎src/CLR/CorLib/CorLib.vcxproj.filters

-6
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,6 @@
6565
<ClCompile Include="corlib_native_System_Collections_ArrayList.cpp">
6666
<Filter>Source Files</Filter>
6767
</ClCompile>
68-
<ClCompile Include="corlib_native_System_Collections_Queue.cpp">
69-
<Filter>Source Files</Filter>
70-
</ClCompile>
71-
<ClCompile Include="corlib_native_System_Collections_Stack.cpp">
72-
<Filter>Source Files</Filter>
73-
</ClCompile>
7468
<ClCompile Include="corlib_native_System_Diagnostics_Debug.cpp">
7569
<Filter>Source Files</Filter>
7670
</ClCompile>

‎src/CLR/Core/Core.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -90,32 +90,32 @@
9090
<ProjectGuid>{89CF8BDB-9C8A-4D18-BC3E-4312C5BD34B1}</ProjectGuid>
9191
<Keyword>Win32Proj</Keyword>
9292
<RootNamespace>Core</RootNamespace>
93-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
93+
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
9494
</PropertyGroup>
9595
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
9696
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
9797
<ConfigurationType>StaticLibrary</ConfigurationType>
9898
<UseDebugLibraries>true</UseDebugLibraries>
99-
<PlatformToolset>v141</PlatformToolset>
99+
<PlatformToolset>v142</PlatformToolset>
100100
<CharacterSet>Unicode</CharacterSet>
101101
</PropertyGroup>
102102
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
103103
<ConfigurationType>StaticLibrary</ConfigurationType>
104104
<UseDebugLibraries>false</UseDebugLibraries>
105-
<PlatformToolset>v141</PlatformToolset>
105+
<PlatformToolset>v142</PlatformToolset>
106106
<WholeProgramOptimization>true</WholeProgramOptimization>
107107
<CharacterSet>Unicode</CharacterSet>
108108
</PropertyGroup>
109109
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
110110
<ConfigurationType>StaticLibrary</ConfigurationType>
111111
<UseDebugLibraries>true</UseDebugLibraries>
112-
<PlatformToolset>v141</PlatformToolset>
112+
<PlatformToolset>v142</PlatformToolset>
113113
<CharacterSet>Unicode</CharacterSet>
114114
</PropertyGroup>
115115
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
116116
<ConfigurationType>StaticLibrary</ConfigurationType>
117117
<UseDebugLibraries>false</UseDebugLibraries>
118-
<PlatformToolset>v141</PlatformToolset>
118+
<PlatformToolset>v142</PlatformToolset>
119119
<WholeProgramOptimization>true</WholeProgramOptimization>
120120
<CharacterSet>Unicode</CharacterSet>
121121
</PropertyGroup>

‎src/CLR/Core/Execution.cpp

+5-1
Original file line numberDiff line numberDiff line change
@@ -1797,7 +1797,11 @@ HRESULT CLR_RT_ExecutionEngine::InitializeLocals(
17971797
while (true)
17981798
{
17991799
dt = CLR_UncompressElementType(sig);
1800-
1800+
if (dt ==
1801+
DATATYPE_VOID) // there should never have been a local variable of type void, unless it's generic type
1802+
{
1803+
dt = DATATYPE_OBJECT;
1804+
}
18011805
switch (dt)
18021806
{
18031807
case DATATYPE_TYPE_PINNED:

‎src/CLR/Core/Hardware/Hardware.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@
2525
<ProjectGuid>{5D50772E-DAC8-407D-972F-37DEB4450B72}</ProjectGuid>
2626
<Keyword>Win32Proj</Keyword>
2727
<RootNamespace>Hardware</RootNamespace>
28-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
28+
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
2929
</PropertyGroup>
3030
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3232
<ConfigurationType>StaticLibrary</ConfigurationType>
3333
<UseDebugLibraries>true</UseDebugLibraries>
34-
<PlatformToolset>v141</PlatformToolset>
34+
<PlatformToolset>v142</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3838
<ConfigurationType>StaticLibrary</ConfigurationType>
3939
<UseDebugLibraries>false</UseDebugLibraries>
40-
<PlatformToolset>v141</PlatformToolset>
40+
<PlatformToolset>v142</PlatformToolset>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
<CharacterSet>Unicode</CharacterSet>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4545
<ConfigurationType>StaticLibrary</ConfigurationType>
4646
<UseDebugLibraries>true</UseDebugLibraries>
47-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset>v142</PlatformToolset>
4848
<CharacterSet>Unicode</CharacterSet>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>StaticLibrary</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
<WholeProgramOptimization>true</WholeProgramOptimization>
5555
<CharacterSet>Unicode</CharacterSet>
5656
</PropertyGroup>

‎src/CLR/Core/Hardware/Hardware_stub.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@
2525
<ProjectGuid>{31253D7F-147E-49A3-BC0D-E0ADE6CF040B}</ProjectGuid>
2626
<Keyword>Win32Proj</Keyword>
2727
<RootNamespace>Hardware_stub</RootNamespace>
28-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
28+
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
2929
</PropertyGroup>
3030
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3232
<ConfigurationType>StaticLibrary</ConfigurationType>
3333
<UseDebugLibraries>true</UseDebugLibraries>
34-
<PlatformToolset>v141</PlatformToolset>
34+
<PlatformToolset>v142</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3838
<ConfigurationType>StaticLibrary</ConfigurationType>
3939
<UseDebugLibraries>false</UseDebugLibraries>
40-
<PlatformToolset>v141</PlatformToolset>
40+
<PlatformToolset>v142</PlatformToolset>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
<CharacterSet>Unicode</CharacterSet>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4545
<ConfigurationType>StaticLibrary</ConfigurationType>
4646
<UseDebugLibraries>true</UseDebugLibraries>
47-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset>v142</PlatformToolset>
4848
<CharacterSet>Unicode</CharacterSet>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>StaticLibrary</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
<WholeProgramOptimization>true</WholeProgramOptimization>
5555
<CharacterSet>Unicode</CharacterSet>
5656
</PropertyGroup>

‎src/CLR/Core/Interpreter.cpp

+8-6
Original file line numberDiff line numberDiff line change
@@ -2265,7 +2265,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
22652265
CLR_RT_TypeDef_Instance type;
22662266
CLR_RT_TypeDef_Index cls;
22672267

2268-
if (type.ResolveToken(arg, assm) == false)
2268+
if (type.ResolveToken(arg, assm, evalPos) == false)
22692269
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
22702270

22712271
NANOCLR_CHECK_HRESULT(CLR_RT_TypeDescriptor::ExtractTypeIndexFromObject(evalPos[0], cls));
@@ -2287,6 +2287,8 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
22872287
CLR_RT_ProtectFromGC gc(safeSource);
22882288

22892289
NANOCLR_CHECK_HRESULT(evalPos[0].LoadFromReference(safeSource));
2290+
2291+
NANOCLR_CHECK_HRESULT(evalPos[0].LoadFromReference(safeSource));
22902292
}
22912293

22922294
goto Execute_LoadAndPromote;
@@ -2697,7 +2699,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
26972699
FETCH_ARG_COMPRESSED_TYPETOKEN(arg, ip);
26982700

26992701
CLR_RT_TypeDef_Instance typeInst;
2700-
if (typeInst.ResolveToken(arg, assm) == false)
2702+
if (typeInst.ResolveToken(arg, assm, evalPos) == false)
27012703
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
27022704

27032705
UPDATESTACK(stack, evalPos);
@@ -2726,7 +2728,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
27262728
// castclass typeTok.
27272729

27282730
CLR_RT_TypeDef_Instance typeInst;
2729-
if (typeInst.ResolveToken(arg, assm) == false)
2731+
if (typeInst.ResolveToken(arg, assm, evalPos) == false)
27302732
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
27312733

27322734
UPDATESTACK(stack, evalPos);
@@ -2877,7 +2879,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
28772879
CLR_RT_TypeDef_Instance type;
28782880
CLR_RT_TypeDef_Index cls;
28792881

2880-
if (!type.ResolveToken(arg, assm))
2882+
if (!type.ResolveToken(arg, assm, evalPos))
28812883
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
28822884

28832885
NANOCLR_CHECK_HRESULT(CLR_RT_TypeDescriptor::ExtractTypeIndexFromObject(evalPos[0], cls));
@@ -3078,7 +3080,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
30783080
case TBL_TypeDef:
30793081
{
30803082
CLR_RT_TypeDef_Instance cls;
3081-
if (cls.ResolveToken(arg, assm) == false)
3083+
if (cls.ResolveToken(arg, assm, evalPos) == false)
30823084
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
30833085

30843086
evalPos[0].SetReflection(cls);
@@ -3335,7 +3337,7 @@ HRESULT CLR_RT_Thread::Execute_IL(CLR_RT_StackFrame &stackArg)
33353337
FETCH_ARG_COMPRESSED_TYPETOKEN(arg, ip);
33363338

33373339
CLR_RT_TypeDef_Instance clsInst;
3338-
if (clsInst.ResolveToken(arg, assm) == false)
3340+
if (clsInst.ResolveToken(arg, assm, evalPos) == false)
33393341
NANOCLR_SET_AND_LEAVE(CLR_E_WRONG_TYPE);
33403342
CLR_INT32 len;
33413343

‎src/CLR/Core/InterruptHandler/InterruptHandler.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@
2525
<ProjectGuid>{D32EE397-7E49-452D-AC95-AFCB3C962E3D}</ProjectGuid>
2626
<Keyword>Win32Proj</Keyword>
2727
<RootNamespace>InterruptHandler</RootNamespace>
28-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
28+
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
2929
</PropertyGroup>
3030
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3232
<ConfigurationType>StaticLibrary</ConfigurationType>
3333
<UseDebugLibraries>true</UseDebugLibraries>
34-
<PlatformToolset>v141</PlatformToolset>
34+
<PlatformToolset>v142</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3838
<ConfigurationType>StaticLibrary</ConfigurationType>
3939
<UseDebugLibraries>false</UseDebugLibraries>
40-
<PlatformToolset>v141</PlatformToolset>
40+
<PlatformToolset>v142</PlatformToolset>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
<CharacterSet>Unicode</CharacterSet>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4545
<ConfigurationType>StaticLibrary</ConfigurationType>
4646
<UseDebugLibraries>true</UseDebugLibraries>
47-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset>v142</PlatformToolset>
4848
<CharacterSet>Unicode</CharacterSet>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>StaticLibrary</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
<WholeProgramOptimization>true</WholeProgramOptimization>
5555
<CharacterSet>Unicode</CharacterSet>
5656
</PropertyGroup>

‎src/CLR/Core/InterruptHandler/InterruptHandler_stub.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@
2525
<ProjectGuid>{5772D362-7277-49CF-9B49-42335A3154BD}</ProjectGuid>
2626
<Keyword>Win32Proj</Keyword>
2727
<RootNamespace>InterruptHandler_stub</RootNamespace>
28-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
28+
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
2929
</PropertyGroup>
3030
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3232
<ConfigurationType>StaticLibrary</ConfigurationType>
3333
<UseDebugLibraries>true</UseDebugLibraries>
34-
<PlatformToolset>v141</PlatformToolset>
34+
<PlatformToolset>v142</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3838
<ConfigurationType>StaticLibrary</ConfigurationType>
3939
<UseDebugLibraries>false</UseDebugLibraries>
40-
<PlatformToolset>v141</PlatformToolset>
40+
<PlatformToolset>v142</PlatformToolset>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
<CharacterSet>Unicode</CharacterSet>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4545
<ConfigurationType>StaticLibrary</ConfigurationType>
4646
<UseDebugLibraries>true</UseDebugLibraries>
47-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset>v142</PlatformToolset>
4848
<CharacterSet>Unicode</CharacterSet>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>StaticLibrary</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
<WholeProgramOptimization>true</WholeProgramOptimization>
5555
<CharacterSet>Unicode</CharacterSet>
5656
</PropertyGroup>

‎src/CLR/Core/NativeEventDispatcher/NativeEventDispatcher.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@
2525
<ProjectGuid>{6DD5CA4F-2AE9-44D3-B9D7-A2A4A35FC5B2}</ProjectGuid>
2626
<Keyword>Win32Proj</Keyword>
2727
<RootNamespace>NativeEventDispatcher</RootNamespace>
28-
<WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
28+
<WindowsTargetPlatformVersion>10.0.18362.0</WindowsTargetPlatformVersion>
2929
</PropertyGroup>
3030
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
3131
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3232
<ConfigurationType>StaticLibrary</ConfigurationType>
3333
<UseDebugLibraries>true</UseDebugLibraries>
34-
<PlatformToolset>v141</PlatformToolset>
34+
<PlatformToolset>v142</PlatformToolset>
3535
<CharacterSet>Unicode</CharacterSet>
3636
</PropertyGroup>
3737
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3838
<ConfigurationType>StaticLibrary</ConfigurationType>
3939
<UseDebugLibraries>false</UseDebugLibraries>
40-
<PlatformToolset>v141</PlatformToolset>
40+
<PlatformToolset>v142</PlatformToolset>
4141
<WholeProgramOptimization>true</WholeProgramOptimization>
4242
<CharacterSet>Unicode</CharacterSet>
4343
</PropertyGroup>
4444
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4545
<ConfigurationType>StaticLibrary</ConfigurationType>
4646
<UseDebugLibraries>true</UseDebugLibraries>
47-
<PlatformToolset>v141</PlatformToolset>
47+
<PlatformToolset>v142</PlatformToolset>
4848
<CharacterSet>Unicode</CharacterSet>
4949
</PropertyGroup>
5050
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5151
<ConfigurationType>StaticLibrary</ConfigurationType>
5252
<UseDebugLibraries>false</UseDebugLibraries>
53-
<PlatformToolset>v141</PlatformToolset>
53+
<PlatformToolset>v142</PlatformToolset>
5454
<WholeProgramOptimization>true</WholeProgramOptimization>
5555
<CharacterSet>Unicode</CharacterSet>
5656
</PropertyGroup>

0 commit comments

Comments
 (0)