From 33ea9b563d43687456f66b31e8e0448fc7566f01 Mon Sep 17 00:00:00 2001
From: Canhua Li <licanhua@live.com>
Date: Tue, 16 Feb 2021 16:04:14 -0800
Subject: [PATCH] Use fluent icons new codepoints for datepicker, timepicker,
 flipview, scrollbar, pipspage (#4129)

* update flip and scrollbar

* update calendarview, pipspager, loopcontrols

* pipspager
---
 dev/CalendarView/CalendarView.vcxitems        |   5 +
 .../CalendarView_21h1_themeresources.xaml     |   8 ++
 .../CalendarView_themeresources.xaml          |   7 +-
 dev/CommonStyles/CommonStyles.vcxitems        |   8 ++
 .../Common_21h1_themeresources.xaml           | 104 ++++++++++++++++++
 dev/CommonStyles/Common_themeresources.xaml   |  12 ++
 dev/FlipView/FlipView_themeresources.xaml     |   8 +-
 dev/PipsPager/PipsPager.vcxitems              |   5 +
 .../PipsPager_21h1_themeresources.xaml        |   9 ++
 dev/ScrollBar/ScrollBar_themeresources.xaml   |   8 +-
 dev/dll/Microsoft.UI.Xaml.vcxproj             |   5 +-
 11 files changed, 167 insertions(+), 12 deletions(-)
 create mode 100644 dev/CalendarView/CalendarView_21h1_themeresources.xaml
 create mode 100644 dev/CommonStyles/Common_21h1_themeresources.xaml
 create mode 100644 dev/PipsPager/PipsPager_21h1_themeresources.xaml

diff --git a/dev/CalendarView/CalendarView.vcxitems b/dev/CalendarView/CalendarView.vcxitems
index b7ecb8caeb..0003faf1c6 100644
--- a/dev/CalendarView/CalendarView.vcxitems
+++ b/dev/CalendarView/CalendarView.vcxitems
@@ -20,6 +20,11 @@
       <Version>RS1</Version>
       <Type>ThemeResources</Type>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)CalendarView_21h1_themeresources.xaml">
+      <UseVisualStyle>Latest</UseVisualStyle>
+      <Version>21H1</Version>
+      <Type>ThemeResources</Type>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)CalendarView_themeresources_v2.5.xaml">
       <UseVisualStyle>V2dot5</UseVisualStyle>
       <Version>RS1</Version>
diff --git a/dev/CalendarView/CalendarView_21h1_themeresources.xaml b/dev/CalendarView/CalendarView_21h1_themeresources.xaml
new file mode 100644
index 0000000000..d9b12c0b08
--- /dev/null
+++ b/dev/CalendarView/CalendarView_21h1_themeresources.xaml
@@ -0,0 +1,8 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<ResourceDictionary 
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <x:String x:Key="CalendarViewPreviousButtonCaretUp">&#xF090;</x:String>
+    <x:String x:Key="CalendarViewNextButtonCaretDown">&#xF08E;</x:String>
+</ResourceDictionary>
diff --git a/dev/CalendarView/CalendarView_themeresources.xaml b/dev/CalendarView/CalendarView_themeresources.xaml
index 32104c860c..b21162c41f 100644
--- a/dev/CalendarView/CalendarView_themeresources.xaml
+++ b/dev/CalendarView/CalendarView_themeresources.xaml
@@ -107,6 +107,9 @@
 
     <Style TargetType="CalendarView" BasedOn="{StaticResource CalendarViewRevealStyle}" />
 
+    <x:String x:Key="CalendarViewPreviousButtonCaretUp">&#xE0E4;</x:String>
+    <x:String x:Key="CalendarViewNextButtonCaretDown">&#xE0E5;</x:String>
+
     <Style x:Key="CalendarViewRevealStyle" TargetType="CalendarView">
         <Setter Property="FocusBorderBrush" Value="{ThemeResource CalendarViewFocusBorderBrush}" />
         <Setter Property="SelectedHoverBorderBrush" Value="{ThemeResource CalendarViewSelectedHoverBorderBrush}" />
@@ -457,8 +460,8 @@
                                     <ColumnDefinition Width="*" />
                                 </Grid.ColumnDefinitions>
                                 <Button x:Name="HeaderButton" Content="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HeaderText}" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreViews}" Style="{StaticResource NavigationButtonStyle}" Foreground="{TemplateBinding Foreground}" Padding="12,0,0,0" HorizontalContentAlignment="Left" />
-                                <Button x:Name="PreviousButton" Grid.Column="1" Content="&#xE0E4;" FontFamily="{ThemeResource SymbolThemeFontFamily}" IsTabStop="True" Padding="1" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Center" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentBefore}" Style="{StaticResource NavigationButtonStyle}" />
-                                <Button x:Name="NextButton" Grid.Column="2" Content="&#xE0E5;" FontFamily="{ThemeResource SymbolThemeFontFamily}" IsTabStop="True" Padding="1" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Center" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentAfter}" Style="{StaticResource NavigationButtonStyle}" />
+                                <Button x:Name="PreviousButton" Grid.Column="1" Content="{ThemeResource CalendarViewPreviousButtonCaretUp}" FontFamily="{ThemeResource SymbolThemeFontFamily}" IsTabStop="True" Padding="1" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Center" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentBefore}" Style="{StaticResource NavigationButtonStyle}" />
+                                <Button x:Name="NextButton" Grid.Column="2" Content="{ThemeResource CalendarViewNextButtonCaretDown}" FontFamily="{ThemeResource SymbolThemeFontFamily}" IsTabStop="True" Padding="1" Foreground="{TemplateBinding Foreground}" HorizontalContentAlignment="Center" IsEnabled="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=TemplateSettings.HasMoreContentAfter}" Style="{StaticResource NavigationButtonStyle}" />
                             </Grid>
                             <Grid x:Name="Views" Grid.Row="1">
                                 <Grid.Clip>
diff --git a/dev/CommonStyles/CommonStyles.vcxitems b/dev/CommonStyles/CommonStyles.vcxitems
index 7f5b46654a..bbe1c31808 100755
--- a/dev/CommonStyles/CommonStyles.vcxitems
+++ b/dev/CommonStyles/CommonStyles.vcxitems
@@ -20,6 +20,12 @@
       <Type>ThemeResources</Type>
       <Priority>1</Priority>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)Common_21h1_themeresources.xaml">
+      <UseVisualStyle>Latest</UseVisualStyle>
+      <Version>21H1</Version>
+      <Type>ThemeResources</Type>
+      <Priority>1</Priority>
+    </Page>    
     <Page Include="$(MSBuildThisFileDirectory)Common_themeresources_v2.5.xaml">
       <UseVisualStyle>V2dot5</UseVisualStyle>
       <Version>RS1</Version>
@@ -141,6 +147,7 @@
       <UseVisualStyle>Latest</UseVisualStyle>
       <Version>21H1</Version>
       <Type>ThemeResources</Type>
+      <RequireInsiderSDK>true</RequireInsiderSDK>
     </Page>
     <Page Include="$(MSBuildThisFileDirectory)ListViewItem_themeresources.xaml">
       <UseVisualStyle>Latest</UseVisualStyle>
@@ -151,6 +158,7 @@
       <UseVisualStyle>Latest</UseVisualStyle>
       <Version>21H1</Version>
       <Type>ThemeResources</Type>
+      <RequireInsiderSDK>true</RequireInsiderSDK>
     </Page>
     <Page Include="$(MSBuildThisFileDirectory)ListViewItem_themeresources_v2.5.xaml">
       <UseVisualStyle>V2dot5</UseVisualStyle>
diff --git a/dev/CommonStyles/Common_21h1_themeresources.xaml b/dev/CommonStyles/Common_21h1_themeresources.xaml
new file mode 100644
index 0000000000..2a5d1062a5
--- /dev/null
+++ b/dev/CommonStyles/Common_21h1_themeresources.xaml
@@ -0,0 +1,104 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ResourceDictionary.ThemeDictionaries>
+        <ResourceDictionary x:Key="Default">
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="Light">
+        </ResourceDictionary>
+
+        <ResourceDictionary x:Key="HighContrast">
+        </ResourceDictionary>
+    </ResourceDictionary.ThemeDictionaries>
+
+    <x:String x:Key="ScrollBarCaretLeft">&#xF08D;</x:String>
+    <x:String x:Key="ScrollBarCaretRight">&#xF08F;</x:String>
+    <x:String x:Key="ScrollBarCaretUp">&#xF090;</x:String>
+    <x:String x:Key="ScrollBarCaretDown">&#xF08E;</x:String>
+
+    <x:String x:Key="FlipViewCaretLeft">&#xF08D;</x:String>
+    <x:String x:Key="FlipViewCaretRight">&#xF08F;</x:String>
+    <x:String x:Key="FlipViewCaretUp">&#xF090;</x:String>
+    <x:String x:Key="FlipViewCaretDown">&#xF08E;</x:String>
+
+    <x:String x:Key="LoopingSelectorUpButtonCaretUp">&#xF090;</x:String>
+    <x:String x:Key="LoopingSelectorDownButtonCaretDown">&#xF08E;</x:String>
+
+    <Style TargetType="LoopingSelector">
+        <Setter Property="ShouldLoop" Value="True" />
+        <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <Setter Property="ItemTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <StackPanel VerticalAlignment="Center">
+                        <TextBlock Text="{Binding PrimaryText}" FontFamily="{ThemeResource ContentControlThemeFontFamily}" />
+                    </StackPanel>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="Control">
+                    <Grid>
+
+                        <VisualStateManager.VisualStateGroups>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+
+                                <VisualState x:Name="PointerOver">
+
+                                    <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="UpButton" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DownButton" Storyboard.TargetProperty="Visibility">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="Visible" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                    </Storyboard>
+                                </VisualState>
+
+                            </VisualStateGroup>
+
+                        </VisualStateManager.VisualStateGroups>
+                        <ScrollViewer x:Name="ScrollViewer"
+                VerticalSnapPointsType="Mandatory"
+                VerticalSnapPointsAlignment="Near"
+                VerticalScrollBarVisibility="Hidden"
+                HorizontalScrollMode="Disabled"
+                ZoomMode="Disabled"
+                Template="{StaticResource ScrollViewerScrollBarlessTemplate}" />
+                        <RepeatButton x:Name="UpButton"
+                Content="{ThemeResource LoopingSelectorUpButtonCaretUp}"
+                FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                FontSize="8"
+                Height="22"
+                Padding="0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Top"
+                Visibility="Collapsed"
+                Style="{StaticResource DateTimePickerFlyoutButtonStyle}"
+                Background="{ThemeResource LoopingSelectorButtonBackground}"
+                IsTabStop="False" />
+                        <RepeatButton x:Name="DownButton"
+                Content="{ThemeResource LoopingSelectorDownButtonCaretDown}"
+                FontFamily="{ThemeResource SymbolThemeFontFamily}"
+                FontSize="8"
+                Height="22"
+                Padding="0"
+                HorizontalAlignment="Stretch"
+                VerticalAlignment="Bottom"
+                Visibility="Collapsed"
+                Style="{StaticResource DateTimePickerFlyoutButtonStyle}"
+                Background="{ThemeResource LoopingSelectorButtonBackground}"
+                IsTabStop="False" />
+
+                    </Grid>
+
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+ 
+</ResourceDictionary>
diff --git a/dev/CommonStyles/Common_themeresources.xaml b/dev/CommonStyles/Common_themeresources.xaml
index d76cd85826..9426bbdea2 100644
--- a/dev/CommonStyles/Common_themeresources.xaml
+++ b/dev/CommonStyles/Common_themeresources.xaml
@@ -40,4 +40,16 @@
 
     <!-- DateTimeFlyoutBorderPadding is defined since RS5. set it here to ensure it's always defined. -->
     <Thickness x:Key="DateTimeFlyoutBorderPadding">0</Thickness>
+
+    <!-- Caret/Chevron Icons -->
+    <x:String x:Key="ScrollBarCaretLeft">&#xE0E2;</x:String>
+    <x:String x:Key="ScrollBarCaretRight">&#xE0E3;</x:String>
+    <x:String x:Key="ScrollBarCaretUp">&#xE0E4;</x:String>
+    <x:String x:Key="ScrollBarCaretDown">&#xE0E5;</x:String>
+
+    <x:String x:Key="FlipViewCaretLeft">&#xE0E2;</x:String>
+    <x:String x:Key="FlipViewCaretRight">&#xE0E3;</x:String>
+    <x:String x:Key="FlipViewCaretUp">&#xE0E4;</x:String>
+    <x:String x:Key="FlipViewCaretDown">&#xE0E5;</x:String>
+
 </ResourceDictionary>
diff --git a/dev/FlipView/FlipView_themeresources.xaml b/dev/FlipView/FlipView_themeresources.xaml
index ef1d2e8654..d9173df602 100644
--- a/dev/FlipView/FlipView_themeresources.xaml
+++ b/dev/FlipView/FlipView_themeresources.xaml
@@ -153,7 +153,7 @@
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                         FontSize="12"
                                         Foreground="{ThemeResource FlipViewNextPreviousArrowForeground}"
-                                        Glyph="&#xE0E3;"
+                                        Glyph="{ThemeResource FlipViewCaretRight}"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         MirroredWhenRightToLeft="True"
@@ -202,7 +202,7 @@
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                         FontSize="12"
                                         Foreground="{ThemeResource FlipViewNextPreviousArrowForeground}"
-                                        Glyph="&#xE0E2;"
+                                        Glyph="{ThemeResource FlipViewCaretLeft}"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         MirroredWhenRightToLeft="True"
@@ -251,7 +251,7 @@
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                         FontSize="12"
                                         Foreground="{ThemeResource FlipViewNextPreviousArrowForeground}"
-                                        Glyph="&#xE0E5;"
+                                        Glyph="{ThemeResource FlipViewCaretDown}"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         UseLayoutRounding="False" />
@@ -299,7 +299,7 @@
                                         FontFamily="{ThemeResource SymbolThemeFontFamily}"
                                         FontSize="12"
                                         Foreground="{ThemeResource FlipViewNextPreviousArrowForeground}"
-                                        Glyph="&#xE0E4;"
+                                        Glyph="{ThemeResource FlipViewCaretUp}"
                                         HorizontalAlignment="Center"
                                         VerticalAlignment="Center"
                                         UseLayoutRounding="False" />
diff --git a/dev/PipsPager/PipsPager.vcxitems b/dev/PipsPager/PipsPager.vcxitems
index 38d8a0cb4e..39d799efc8 100755
--- a/dev/PipsPager/PipsPager.vcxitems
+++ b/dev/PipsPager/PipsPager.vcxitems
@@ -43,6 +43,11 @@
       <Version>RS1</Version>
       <Type>ThemeResources</Type>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)PipsPager_21h1_themeresources.xaml">
+      <UseVisualStyle>Latest</UseVisualStyle>
+      <Version>21H1</Version>
+      <Type>ThemeResources</Type>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)PipsPager_themeresources_v2.5.xaml">
       <UseVisualStyle>V2dot5</UseVisualStyle>
       <Version>RS1</Version>
diff --git a/dev/PipsPager/PipsPager_21h1_themeresources.xaml b/dev/PipsPager/PipsPager_21h1_themeresources.xaml
new file mode 100644
index 0000000000..053e76073d
--- /dev/null
+++ b/dev/PipsPager/PipsPager_21h1_themeresources.xaml
@@ -0,0 +1,9 @@
+<!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
+<ResourceDictionary
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+
+    <x:String x:Key="PipsPagerPreviousPageButtonGlyph">&#xF090;</x:String>
+    <x:String x:Key="PipsPagerNextPageButtonGlyph">&#xF08E;</x:String>
+    
+</ResourceDictionary>
diff --git a/dev/ScrollBar/ScrollBar_themeresources.xaml b/dev/ScrollBar/ScrollBar_themeresources.xaml
index 8c26b5f275..ea7e6a15ab 100755
--- a/dev/ScrollBar/ScrollBar_themeresources.xaml
+++ b/dev/ScrollBar/ScrollBar_themeresources.xaml
@@ -261,7 +261,7 @@
                                             </VisualState>
                                         </VisualStateGroup>
                                     </VisualStateManager.VisualStateGroups>
-                                    <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE0E3;" Foreground="{ThemeResource ScrollBarButtonArrowForeground}" FontSize="{StaticResource ScrollBarButtonArrowIconFontSize}" MirroredWhenRightToLeft="True" />
+                                    <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="{ThemeResource ScrollBarCaretRight}" Foreground="{ThemeResource ScrollBarButtonArrowForeground}" FontSize="{StaticResource ScrollBarButtonArrowIconFontSize}" MirroredWhenRightToLeft="True" />
                                 </Grid>
                             </ControlTemplate>
                             <ControlTemplate x:Key="HorizontalDecrementTemplate" TargetType="RepeatButton">
@@ -292,7 +292,7 @@
                                             </VisualState>
                                         </VisualStateGroup>
                                     </VisualStateManager.VisualStateGroups>
-                                    <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE0E2;" Foreground="{ThemeResource ScrollBarButtonArrowForeground}" FontSize="{StaticResource ScrollBarButtonArrowIconFontSize}" MirroredWhenRightToLeft="True" />
+                                    <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="{ThemeResource ScrollBarCaretLeft}" Foreground="{ThemeResource ScrollBarButtonArrowForeground}" FontSize="{StaticResource ScrollBarButtonArrowIconFontSize}" MirroredWhenRightToLeft="True" />
                                 </Grid>
                             </ControlTemplate>
                             <ControlTemplate x:Key="VerticalIncrementTemplate" TargetType="RepeatButton">
@@ -323,7 +323,7 @@
                                             </VisualState>
                                         </VisualStateGroup>
                                     </VisualStateManager.VisualStateGroups>
-                                    <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE0E5;" Foreground="{ThemeResource ScrollBarButtonArrowForeground}" FontSize="{StaticResource ScrollBarButtonArrowIconFontSize}" />
+                                    <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="{ThemeResource ScrollBarCaretDown}" Foreground="{ThemeResource ScrollBarButtonArrowForeground}" FontSize="{StaticResource ScrollBarButtonArrowIconFontSize}" />
                                 </Grid>
                             </ControlTemplate>
                             <ControlTemplate x:Key="VerticalDecrementTemplate" TargetType="RepeatButton">
@@ -354,7 +354,7 @@
                                             </VisualState>
                                         </VisualStateGroup>
                                     </VisualStateManager.VisualStateGroups>
-                                    <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="&#xE0E4;" Foreground="{ThemeResource ScrollBarButtonArrowForeground}" FontSize="{StaticResource ScrollBarButtonArrowIconFontSize}" />
+                                    <FontIcon x:Name="Arrow" FontFamily="{ThemeResource SymbolThemeFontFamily}" Glyph="{ThemeResource ScrollBarCaretUp}" Foreground="{ThemeResource ScrollBarButtonArrowForeground}" FontSize="{StaticResource ScrollBarButtonArrowIconFontSize}" />
                                 </Grid>
                             </ControlTemplate>
                             <ControlTemplate x:Key="VerticalThumbTemplate" TargetType="Thumb">
diff --git a/dev/dll/Microsoft.UI.Xaml.vcxproj b/dev/dll/Microsoft.UI.Xaml.vcxproj
index 7498f6682c..a414932558 100644
--- a/dev/dll/Microsoft.UI.Xaml.vcxproj
+++ b/dev/dll/Microsoft.UI.Xaml.vcxproj
@@ -72,6 +72,7 @@
       <IncludeInWindowsAppx>true</IncludeInWindowsAppx>
       <!-- Valid value: Latest, V2dot5 and Any, default is Any -->
       <UseVisualStyle>Any</UseVisualStyle>
+      <RequireInsiderSDK>false</RequireInsiderSDK>
     </Page>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
@@ -588,14 +589,14 @@
       <RS4StylePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == 'RS4' And '%(Type)' == 'DefaultStyle'" />
       <RS5StylePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == 'RS5' And '%(Type)' == 'DefaultStyle'" />
       <NineteenH1StylePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == '19H1' And '%(Type)' == 'DefaultStyle'" />
-      <TwentyOneH1StylePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == '21H1' And '%(Type)' == 'DefaultStyle' And '$(UseInsiderSDK)' == 'true'" />
+      <TwentyOneH1StylePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == '21H1' And '%(Type)' == 'DefaultStyle' And ('%(RequireInsiderSDK)' == 'false' or '$(UseInsiderSDK)' == 'true')" />
       <RS1ThemeResourcePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == 'RS1' And '%(Type)' == 'ThemeResources'" />
       <RS2ThemeResourcePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == 'RS2' And '%(Type)' == 'ThemeResources'" />
       <RS3ThemeResourcePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == 'RS3' And '%(Type)' == 'ThemeResources'" />
       <RS4ThemeResourcePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == 'RS4' And '%(Type)' == 'ThemeResources'" />
       <RS5ThemeResourcePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == 'RS5' And '%(Type)' == 'ThemeResources'" />
       <NineteenH1ThemeResourcePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == '19H1' And '%(Type)' == 'ThemeResources'" />
-      <TwentyOneH1ThemeResourcePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == '21H1' And '%(Type)' == 'ThemeResources' And '$(UseInsiderSDK)' == 'true'" />
+      <TwentyOneH1ThemeResourcePage Include="@(OrderedSharedPage)" Condition="'%(Version)' == '21H1' And '%(Type)' == 'ThemeResources' And ('%(RequireInsiderSDK)' == 'false' or '$(UseInsiderSDK)' == 'true')" />
     </ItemGroup>
   </Target>
   <PropertyGroup>