Adding support for insider SDK usage, and ListViewItem/GridViewItem visual updates

SdkVersion.props

@@ -3,20 +3,19 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SDKVersionRS2>10.0.15063.0</SDKVersionRS2>
-	<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.18362.0</SDKVersionInsider>
+    <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.21296.0</SDKVersionInsider>
   </PropertyGroup>
   <PropertyGroup>
-    <UseInsiderSDK>true</UseInsiderSDK>
     <!-- By default we use the publicly shipped SDK version which is 19H1 now -->
     <MuxSdkVersion Condition="$(UseInsiderSDK) != 'true'">$(SDKVersion19H1)</MuxSdkVersion>
 
     <!-- Setting UseInsiderSDK will allow the code to build to the newest insider SDK 
          In order to get this from a cmd prompt run 
-         set UseInsiderSDK=true and then launch muxcontrols.sln from that cmd prompt-->
-    <MuxSdkVersion Condition="$(UseInsiderSDK)=='true'">$(SDKVersionInsider)</MuxSdkVersion>
+         set UseInsiderSDK=true and then launch muxcontrols.sln from that cmd prompt -->
+    <MuxSdkVersion Condition="$(UseInsiderSDK) == 'true'">$(SDKVersionInsider)</MuxSdkVersion>
   </PropertyGroup>
 </Project>

build/Helix/PrepareHelixPayload.ps1

@@ -24,7 +24,7 @@ Copy-Item "$nugetPackagesDir\taef.redist.wlk.10.31.180822002\build\Binaries\$Pla
 New-Item -ItemType Directory -Force -Path "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\lib\netcoreapp2.1\*" "$payloadDir\.NETCoreApp2.1\"
 Copy-Item "$nugetPackagesDir\runtime.win-$Platform.microsoft.netcore.app.2.1.0\runtimes\win-$Platform\native\*" "$payloadDir\.NETCoreApp2.1\"
-Copy-Item "$nugetPackagesDir\MUXCustomBuildTasks.1.0.70\tools\$platform\WttLog.dll" $payloadDir
+Copy-Item "$nugetPackagesDir\MUXCustomBuildTasks.1.0.71\tools\$platform\WttLog.dll" $payloadDir
 
 function Copy-If-Exists
 {

build/Helix/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="MUXCustomBuildTasks" version="1.0.70" targetFramework="native" />
+  <package id="MUXCustomBuildTasks" version="1.0.71" targetFramework="native" />
   <package id="TAEF.Redist.Wlk" version="10.31.180822002" targetFramework="native" />
   <package id="microsoft.windows.apps.test" version="1.0.181203002" targetFramework="native" />
   <package id="runtime.win-x86.microsoft.netcore.app" version="2.1.0" targetFramework="native" />

dev/CommonStyles/CommonStyles.vcxitems

@@ -95,7 +95,6 @@
       <UseVisualStyle>Latest</UseVisualStyle>
       <Version>RS1</Version>
       <Type>ThemeResources</Type>
-      <UseNonstandardConditionalXAML>true</UseNonstandardConditionalXAML>
     </Page>
     <Page Include="$(MSBuildThisFileDirectory)ToggleSwitch_themeresources.xaml">
       <UseVisualStyle>Latest</UseVisualStyle>
@@ -127,11 +126,21 @@
       <Version>RS1</Version>
       <Type>ThemeResources</Type>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)GridViewItem_themeresources_21h1.xaml">
+      <UseVisualStyle>Latest</UseVisualStyle>
+      <Version>21H1</Version>
+      <Type>ThemeResources</Type>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ListViewItem_themeresources.xaml">
       <UseVisualStyle>Latest</UseVisualStyle>
       <Version>RS1</Version>
       <Type>ThemeResources</Type>
     </Page>
+    <Page Include="$(MSBuildThisFileDirectory)ListViewItem_themeresources_21h1.xaml">
+      <UseVisualStyle>Latest</UseVisualStyle>
+      <Version>21H1</Version>
+      <Type>ThemeResources</Type>
+    </Page>
     <Page Include="$(MSBuildThisFileDirectory)ListViewItem_themeresources_v2.5.xaml">
       <UseVisualStyle>V2dot5</UseVisualStyle>
       <Version>RS1</Version>

dev/CommonStyles/TestUI/CommonStylesPage.xaml

@@ -251,6 +251,81 @@
                         <FontIcon Glyph="&#xE781;" />
                     </Button>
                 </StackPanel>
+                <StackPanel Style="{ThemeResource CompactPanelStyle}">
+                    <TextBlock  Text="ListViewItem/GridViewItem testing area" Style="{ThemeResource StandardGroupHeader}"/>
+                    <StackPanel Orientation='Horizontal' Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+                        <StackPanel>
+                            <StackPanel Orientation='Horizontal'>
+                                <TextBlock Text='ListView - SelectionMode=' VerticalAlignment='Center' Margin='2'/>
+                                <ComboBox x:Name='cmbListViewSelectionMode' SelectedIndex='2' SelectionChanged="CmbListViewSelectionMode_SelectionChanged">
+                                    <ComboBoxItem>None</ComboBoxItem>
+                                    <ComboBoxItem>Single</ComboBoxItem>
+                                    <ComboBoxItem>Multiple</ComboBoxItem>
+                                    <ComboBoxItem>Extended</ComboBoxItem>
+                                </ComboBox>
+                            </StackPanel>
+                            <CheckBox x:Name='chkListViewIsEnabled' Content='IsEnabled?' IsChecked='True' Margin='2' Checked="ChkListViewIsEnabled_Checked" Unchecked="ChkListViewIsEnabled_Unchecked"/>
+                            <ListView x:Name='listView1' CanReorderItems='True' AllowDrop='True' SelectionMode='Multiple' Width='300' HorizontalAlignment='Left' Margin='2'>
+                                <ListViewItem x:Name='listViewItem1' Content='List Item 1'/>
+                                <ListViewItem x:Name='listViewItem2' Content='List Item 2'/>
+                                <ListViewItem x:Name='listViewItem3' Content='List Item 3' IsSelected='true'/>
+                            </ListView>
+                        </StackPanel>
+                        <StackPanel>
+                            <StackPanel Orientation='Horizontal'>
+                                <TextBlock Text='GridView - SelectionMode=' VerticalAlignment='Center' Margin='2'/>
+                                <ComboBox x:Name='cmbGridViewSelectionMode' SelectedIndex='2' SelectionChanged="CmbGridViewSelectionMode_SelectionChanged">
+                                    <ComboBoxItem>None</ComboBoxItem>
+                                    <ComboBoxItem>Single</ComboBoxItem>
+                                    <ComboBoxItem>Multiple</ComboBoxItem>
+                                    <ComboBoxItem>Extended</ComboBoxItem>
+                                </ComboBox>
+                            </StackPanel>
+                            <CheckBox x:Name='chkGridViewIsEnabled' Content='IsEnabled?' IsChecked='True' Margin='2' Checked="ChkGridViewIsEnabled_Checked" Unchecked="ChkGridViewIsEnabled_Unchecked"/>
+                            <GridView x:Name='gridView1' CanReorderItems='True' AllowDrop='True' SelectionMode='Multiple' Width='300' HorizontalAlignment='Left' Margin='2'>
+                                <GridViewItem x:Name='gridViewItem1' Content='Item 1' MinWidth='120' MinHeight='60'/>
+                                <GridViewItem x:Name='gridViewItem2' Content='Item 2' MinWidth='120' MinHeight='60'/>
+                                <GridViewItem x:Name='gridViewItem3' Content='Item 3' MinWidth='120' MinHeight='60' IsSelected='true'/>
+                            </GridView>
+                        </StackPanel>
+                    </StackPanel>
+                    <StackPanel Orientation='Horizontal' Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+                        <StackPanel>
+                            <TextBlock Text='ListView - SelectionMode=Extended:' Margin='2'/>
+                            <ListView x:Name='listView2' CanReorderItems='True' AllowDrop='True' SelectionMode='Extended' Width='300' HorizontalAlignment='Left' Margin='2'>
+                                <ListViewItem x:Name='listViewItem4' Content='List Item 4' Height='5'/>
+                                <ListViewItem x:Name='listViewItem5' Content='List Item 5' Height='70'/>
+                                <ListViewItem x:Name='listViewItem6' Content='List Item 6' Height='90' IsSelected='true'/>
+                            </ListView>
+                        </StackPanel>
+                        <StackPanel>
+                            <TextBlock Text='GridView - SelectionMode=Extended:' Margin='2'/>
+                            <GridView x:Name='gridView2' CanReorderItems='True' AllowDrop='True' SelectionMode='Extended' Width='300' HorizontalAlignment='Left' Margin='2'>
+                                <GridViewItem x:Name='gridViewItem4' Content='Item 4' MinWidth='120' MinHeight='60'/>
+                                <GridViewItem x:Name='gridViewItem5' Content='Item 5' MinWidth='120' MinHeight='60'/>
+                                <GridViewItem x:Name='gridViewItem6' Content='Item 6' MinWidth='120' MinHeight='60' IsSelected='true'/>
+                            </GridView>
+                        </StackPanel>
+                    </StackPanel>
+                    <StackPanel Orientation='Horizontal' Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+                        <StackPanel>
+                            <TextBlock Text='ListView - SelectionMode=Single:' Margin='2'/>
+                            <ListView x:Name='listView3' CanReorderItems='True' AllowDrop='True' SelectionMode='Single' Width='300' HorizontalAlignment='Left' Margin='2'>
+                                <ListViewItem x:Name='listViewItem7' Content='List Item 7'/>
+                                <ListViewItem x:Name='listViewItem8' Content='List Item 8'/>
+                                <ListViewItem x:Name='listViewItem9' Content='List Item 9' IsSelected='true'/>
+                            </ListView>
+                        </StackPanel>
+                        <StackPanel>
+                            <TextBlock Text='GridView - SelectionMode=Single:' Margin='2'/>
+                            <GridView x:Name='gridView3' CanReorderItems='True' AllowDrop='True' SelectionMode='Single' Width='300' HorizontalAlignment='Left' Margin='2'>
+                                <GridViewItem x:Name='gridViewItem7' Content='Item 7' MinWidth='120' MinHeight='60'/>
+                                <GridViewItem x:Name='gridViewItem8' Content='Item 8' MinWidth='120' MinHeight='60'/>
+                                <GridViewItem x:Name='gridViewItem9' Content='Item 9' MinWidth='120' MinHeight='60' IsSelected='true'/>
+                            </GridView>
+                        </StackPanel>
+                    </StackPanel>
+                </StackPanel>
             </StackPanel>
             <StackPanel>
                 <TextBlock Text="Validating" Style="{ThemeResource StandardGroupHeader}"/>

dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs

@@ -312,5 +312,52 @@ private void StandardBackground_Click(object sender, RoutedEventArgs e)
             RootSampleControlsPanel.Background = new SolidColorBrush(Colors.Transparent);
         }
 
+        private void CmbListViewSelectionMode_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (listView1 != null)
+            {
+                listView1.SelectionMode = (ListViewSelectionMode)(sender as ComboBox).SelectedIndex;
+            }
+        }
+
+        private void CmbGridViewSelectionMode_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (gridView1 != null)
+            {
+                gridView1.SelectionMode = (ListViewSelectionMode)(sender as ComboBox).SelectedIndex;
+            }
+        }
+
+        private void ChkListViewIsEnabled_Checked(object sender, RoutedEventArgs e)
+        {
+            if (listView1 != null)
+            {
+                listView1.IsEnabled = true;
+            }
+        }
+
+        private void ChkListViewIsEnabled_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (listView1 != null)
+            {
+                listView1.IsEnabled = false;
+            }
+        }
+
+        private void ChkGridViewIsEnabled_Checked(object sender, RoutedEventArgs e)
+        {
+            if (gridView1 != null)
+            {
+                gridView1.IsEnabled = true;
+            }
+        }
+
+        private void ChkGridViewIsEnabled_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (gridView1 != null)
+            {
+                gridView1.IsEnabled = false;
+            }
+        }
     }
 }