VS 2019 Fixes (#2396)

* Fix unit test build (something upgraded with 2019 also broken 2017 builds) - SkipUnionWinmd prevents .net files from attempting to be bundled into the appx * Enable newer compiler when using VS2019
microsoft · May 29, 2019 · 6c5ede4 · 6c5ede4
1 parent f12fd7e
commit 6c5ede4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props
@@ -11,6 +11,7 @@
 
   <PropertyGroup Label="Configuration">
     <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset Condition="'$(VisualStudioVersion)' == '16.0'">v142</PlatformToolset>
     <GenerateProjectSpecificOutputFolder>false</GenerateProjectSpecificOutputFolder>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

diff --git a/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj b/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj
@@ -8,6 +8,7 @@
     <UnitTestPlatformVersion>15.0</UnitTestPlatformVersion>
     <ProjectSubType>NativeUnitTestProject</ProjectSubType>
     <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+    <SkipUnionWinmd>true</SkipUnionWinmd>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(ReactNativeWindowsDir)PropertySheets\React.Cpp.props" />