Skip to content

Commit ad58a3e

Browse files
Merge pull request #4268 from michael-hawker/sample-updates-7dot1
Small Sample updates 7.1
2 parents da3c229 + dd9e3b8 commit ad58a3e

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

Microsoft.Toolkit.Uwp.SampleApp/Microsoft.Toolkit.Uwp.SampleApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<AppxBundlePlatforms>x86|x64|arm|arm64</AppxBundlePlatforms>
2121
<Win32Resource>MiddleClickScrolling-CursorType.res</Win32Resource>
2222
<AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
23-
<NoWarn>$(NoWarn);2008</NoWarn>
23+
<NoWarn>$(NoWarn);2008;CS0108;CS0618;</NoWarn>
2424
</PropertyGroup>
2525
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
2626
<DebugSymbols>true</DebugSymbols>

Microsoft.Toolkit.Uwp.SampleApp/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
[assembly: AssemblyConfiguration("")]
1414
[assembly: AssemblyCompany(".NET Foundation")]
1515
[assembly: AssemblyProduct("Microsoft.Toolkit.Uwp.SampleApp")]
16-
[assembly: AssemblyCopyright("Copyright © 2016-2020")]
16+
[assembly: AssemblyCopyright("Copyright © 2016-2021")]
1717
[assembly: AssemblyTrademark("")]
1818
[assembly: AssemblyCulture("")]
1919

Microsoft.Toolkit.Uwp.SampleApp/SamplePages/ListDetailsView/ListDetailsView.bind

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
<DataTemplate>
1717
<StackPanel Margin="0,8">
1818
<TextBlock Text="{Binding From}"
19-
Style="{ThemeResource SubtitleTextBlockStyle}"/>
19+
Style="{StaticResource SubtitleTextBlockStyle}"/>
2020
<TextBlock Text="{Binding Subject}"
21-
Style="{ThemeResource BodyTextBlockStyle}"
21+
Style="{StaticResource BodyTextBlockStyle}"
2222
Foreground="{ThemeResource Brush-Blue-01}"
2323
MaxLines="1"/>
2424
<TextBlock Text="{Binding Body}"
25-
Style="{ThemeResource BodyTextBlockStyle}"
25+
Style="{StaticResource BodyTextBlockStyle}"
2626
Opacity=".6"
2727
MaxLines="1"/>
2828
</StackPanel>
@@ -37,17 +37,17 @@
3737
Height="50"
3838
CornerRadius="999"/>
3939
<TextBlock Text="{Binding From}"
40-
Style="{ThemeResource SubtitleTextBlockStyle}"
40+
Style="{StaticResource SubtitleTextBlockStyle}"
4141
RelativePanel.RightOf="FromEllipse"
4242
Margin="12,-6,0,0"/>
4343
<TextBlock x:Name="SubjectLine"
4444
Text="{Binding Subject}"
45-
Style="{ThemeResource BodyTextBlockStyle}"
45+
Style="{StaticResource BodyTextBlockStyle}"
4646
RelativePanel.Below="FromEllipse"
4747
Margin="0,12,0,0"/>
4848
<TextBlock x:Name="Body"
4949
Text="{Binding Body}"
50-
Style="{ThemeResource BodyTextBlockStyle}"
50+
Style="{StaticResource BodyTextBlockStyle}"
5151
TextWrapping="Wrap"
5252
RelativePanel.Below="SubjectLine"
5353
Margin="0,12,0,0"/>

Microsoft.Toolkit.Uwp.SampleApp/landingPageLinks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"new-section-title": "What's New",
3-
"new-samples": [ "MVVM Toolkit", "EffectAnimations", "TabbedCommandBar", "ColorPicker", "ColorPickerButton", "SwitchPresenter" ],
3+
"new-samples": [ "AttachedCardShadow (Win2D)", "Shadow Animations", "RichSuggestBox", "MetadataControl", "ConstrainedBox", "ControlSizeTrigger" ],
44
"resources": [
55
{
66
"title": "Toolkit",

0 commit comments

Comments
 (0)