Incremental work #2 for new insider Windows SDK support

microsoft · Jan 15, 2021 · cc36164 · cc36164
1 parent 828d3a0
commit cc36164
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 26 deletions.
diff --git a/SdkVersion.props b/SdkVersion.props
@@ -6,10 +6,13 @@
 	<SDKVersionRS3>10.0.16299.0</SDKVersionRS3>
 	<SDKVersionRS4>10.0.17134.0</SDKVersionRS4>
 	<SDKVersionRS5>10.0.17763.0</SDKVersionRS5>
-	<SDKVersion19H1>10.0.18362.0</SDKVersion19H1>
-	<SDKVersionInsider>10.0.21290.0</SDKVersionInsider>
+    <SDKVersion19H1>10.0.18362.0</SDKVersion19H1>
+    <SDKVersion21H1>10.0.21290.0</SDKVersion21H1>
+    <SDKVersionInsider>10.0.21290.0</SDKVersionInsider>
   </PropertyGroup>
   <PropertyGroup>
+    <UseInsiderSDK>false</UseInsiderSDK>
+
     <!-- By default we use the publicly shipped SDK version which is 19H1 now -->
     <MuxSdkVersion Condition="$(UseInsiderSDK) != 'true'">$(SDKVersion19H1)</MuxSdkVersion>
 

diff --git a/dev/CommonStyles/CommonStyles.vcxitems b/dev/CommonStyles/CommonStyles.vcxitems
@@ -136,7 +136,7 @@
     </Page>
     <Page Include="$(MSBuildThisFileDirectory)GridViewItem_themeresources_vu.xaml">
       <UseVisualStyle>LatestWithVisualUpdate</UseVisualStyle>
-      <Version>RS1</Version>
+      <Version>21H1</Version>
       <Type>ThemeResources</Type>
       <UseNonstandardCondtionalXAML>true</UseNonstandardCondtionalXAML>
     </Page>
@@ -148,7 +148,7 @@
     </Page>
     <Page Include="$(MSBuildThisFileDirectory)ListViewItem_themeresources_vu.xaml">
       <UseVisualStyle>LatestWithVisualUpdate</UseVisualStyle>
-      <Version>RS1</Version>
+      <Version>21H1</Version>
       <Type>ThemeResources</Type>
       <UseNonstandardCondtionalXAML>true</UseNonstandardCondtionalXAML>
     </Page>