Merge pull request #4268 from michael-hawker/sample-updates-7dot1

Small Sample updates 7.1
CommunityToolkit · Sep 23, 2021 · ad58a3e · ad58a3e
2 parents da3c229 + dd9e3b8
commit ad58a3e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj b/Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj
@@ -20,7 +20,7 @@
     <AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
     <Win32Resource>MiddleClickScrolling-CursorType.res</Win32Resource>
     <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
-    <NoWarn>$(NoWarn);2008</NoWarn>
+    <NoWarn>$(NoWarn);2008;CS0108;CS0618;</NoWarn>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/Properties/AssemblyInfo.cs b/Microsoft.Toolkit.Uwp.SampleApp/Properties/AssemblyInfo.cs
@@ -13,7 +13,7 @@
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany(".NET Foundation")]
 [assembly: AssemblyProduct("Microsoft.Toolkit.Uwp.SampleApp")]
-[assembly: AssemblyCopyright("Copyright © 2016-2020")]
+[assembly: AssemblyCopyright("Copyright © 2016-2021")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind b/Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind
@@ -16,13 +16,13 @@
                 <DataTemplate>
                     <StackPanel Margin="0,8">
                         <TextBlock Text="{Binding From}"
-                                   Style="{ThemeResource SubtitleTextBlockStyle}"/>
+                                   Style="{StaticResource SubtitleTextBlockStyle}"/>
                         <TextBlock Text="{Binding Subject}"
-                                   Style="{ThemeResource BodyTextBlockStyle}"
+                                   Style="{StaticResource BodyTextBlockStyle}"
                                    Foreground="{ThemeResource Brush-Blue-01}"
                                    MaxLines="1"/>
                         <TextBlock Text="{Binding Body}"
-                                   Style="{ThemeResource BodyTextBlockStyle}"
+                                   Style="{StaticResource BodyTextBlockStyle}"
                                    Opacity=".6"
                                    MaxLines="1"/>
                     </StackPanel>
@@ -37,17 +37,17 @@
                                                Height="50"
                                                CornerRadius="999"/>
                         <TextBlock Text="{Binding From}"
-                                   Style="{ThemeResource SubtitleTextBlockStyle}"
+                                   Style="{StaticResource SubtitleTextBlockStyle}"
                                    RelativePanel.RightOf="FromEllipse"
                                    Margin="12,-6,0,0"/>
                         <TextBlock x:Name="SubjectLine"
                                    Text="{Binding Subject}"
-                                   Style="{ThemeResource BodyTextBlockStyle}"
+                                   Style="{StaticResource BodyTextBlockStyle}"
                                    RelativePanel.Below="FromEllipse"
                                    Margin="0,12,0,0"/>
                         <TextBlock x:Name="Body"
                                    Text="{Binding Body}"
-                                   Style="{ThemeResource BodyTextBlockStyle}"
+                                   Style="{StaticResource BodyTextBlockStyle}"
                                    TextWrapping="Wrap"
                                    RelativePanel.Below="SubjectLine"
                                    Margin="0,12,0,0"/>

diff --git a/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json b/Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json
@@ -1,6 +1,6 @@
 {
   "new-section-title": "What's New",
-  "new-samples": [ "MVVM Toolkit", "EffectAnimations", "TabbedCommandBar", "ColorPicker", "ColorPickerButton", "SwitchPresenter" ],
+  "new-samples": [ "AttachedCardShadow (Win2D)", "Shadow Animations", "RichSuggestBox", "MetadataControl", "ConstrainedBox", "ControlSizeTrigger" ],
   "resources": [
     {
       "title": "Toolkit",