Skip to content

Commit 892999e

Browse files
Sergio0694Sergio0694
committed
Update NuGet packages and WinUI styles
1 parent 17f1251 commit 892999e

21 files changed

+608
-674
lines changed

‎samples/MvvmSample.Core/MvvmSample.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
</ItemGroup>
4747
<ItemGroup>
4848
<PackageReference Include="CommunityToolkit.Mvvm" Version="7.0.3" />
49-
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.0" />
50-
<PackageReference Include="Refit" Version="6.0.38" />
49+
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
50+
<PackageReference Include="Refit" Version="6.3.2" />
5151
</ItemGroup>
5252
</Project>

‎samples/MvvmSampleUwp/App.xaml

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,27 @@
77
<Application.Resources>
88
<ResourceDictionary>
99

10-
<!--Resource dictionaries-->
10+
<!-- Resource dictionaries -->
1111
<ResourceDictionary.MergedDictionaries>
12-
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"/>
13-
<ResourceDictionary Source="Controls/InteractiveSample.xaml"/>
12+
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
13+
<ResourceDictionary Source="Controls/InteractiveSample.xaml" />
1414
</ResourceDictionary.MergedDictionaries>
1515

16-
<!--MarkdownTextBlock style-->
16+
<!-- MarkdownTextBlock style -->
1717
<Style TargetType="controls:MarkdownTextBlock">
18-
<Setter Property="Background" Value="#60222222"/>
19-
<Setter Property="Padding" Value="8"/>
18+
<Setter Property="Background" Value="#20222222" />
19+
<Setter Property="Padding" Value="12" />
20+
<Setter Property="BorderThickness" Value="1" />
21+
<Setter Property="BorderBrush" Value="{ThemeResource SystemChromeBlackLowColor}" />
22+
<Setter Property="CornerRadius" Value="4" />
2023
<Setter Property="Header2FontWeight" Value="Bold" />
2124
<Setter Property="Header2FontSize" Value="20" />
2225
<Setter Property="Header2Margin" Value="0, 15, 0, 15" />
2326
<Setter Property="Header2Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />
2427
</Style>
28+
29+
<!-- Misc resources -->
30+
<Thickness x:Key="DocumentationPageContentPadding">20</Thickness>
2531
</ResourceDictionary>
2632
</Application.Resources>
2733
</Application>

‎samples/MvvmSampleUwp/Controls/InteractiveSample.xaml

Lines changed: 26 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,58 @@
11
<ResourceDictionary
22
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
33
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
4+
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
45
xmlns:local="using:MvvmSampleUwp.Controls"
5-
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
6-
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls">
6+
xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
77

8-
<!--Operator button-->
8+
<!-- Operator button -->
99
<Style TargetType="local:InteractiveSample">
10-
<Setter Property="HorizontalAlignment" Value="Stretch"/>
11-
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
12-
<Setter Property="VerticalAlignment" Value="Stretch"/>
13-
<Setter Property="VerticalContentAlignment" Value="Stretch"/>
14-
<Setter Property="IsTabStop" Value="False"/>
10+
<Setter Property="HorizontalAlignment" Value="Stretch" />
11+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
12+
<Setter Property="VerticalAlignment" Value="Stretch" />
13+
<Setter Property="VerticalContentAlignment" Value="Stretch" />
14+
<Setter Property="IsTabStop" Value="False" />
1515
<Setter Property="Template">
1616
<Setter.Value>
1717
<ControlTemplate TargetType="local:InteractiveSample">
1818
<Border
19-
CornerRadius="4"
20-
BorderThickness="2"
21-
BorderBrush="{ThemeResource SystemControlHighlightAccentBrush}"
2219
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
23-
VerticalAlignment="{TemplateBinding VerticalAlignment}">
20+
VerticalAlignment="{TemplateBinding VerticalAlignment}"
21+
Background="{ThemeResource SubtleFillColorTertiaryBrush}"
22+
BorderBrush="{ThemeResource SystemChromeBlackLowColor}"
23+
BorderThickness="1"
24+
CornerRadius="4">
2425
<muxc:TabView
25-
IsAddTabButtonVisible="False"
2626
HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
27-
VerticalAlignment="{TemplateBinding VerticalAlignment}">
27+
VerticalAlignment="{TemplateBinding VerticalAlignment}"
28+
IsAddTabButtonVisible="False">
2829
<muxc:TabView.Resources>
2930
<x:Double x:Key="TabViewHeaderPadding">0</x:Double>
3031
<x:Double x:Key="TabViewItemHeaderFontSize">14</x:Double>
31-
<StaticResource x:Key="TabViewItemHeaderBackgroundSelected" ResourceKey="SystemControlHighlightAccentBrush"/>
3232
</muxc:TabView.Resources>
3333
<muxc:TabViewItem
34+
FontWeight="Bold"
3435
Header="INTERACTIVE SAMPLE"
35-
IsClosable="False"
36-
FontWeight="Bold">
36+
IsClosable="False">
3737
<ContentPresenter
38-
Background="#60222222"
3938
Padding="12"
40-
Content="{TemplateBinding Content}"/>
39+
Background="#60121212"
40+
Content="{TemplateBinding Content}" />
4141
</muxc:TabViewItem>
42-
<muxc:TabViewItem
43-
Header="See XAML"
44-
IsClosable="False">
42+
<muxc:TabViewItem Header="See XAML" IsClosable="False">
4543
<ScrollViewer>
4644
<controls:MarkdownTextBlock
47-
Background="#FF202020"
4845
Padding="8"
49-
Text="{TemplateBinding XamlCode}"/>
46+
Background="#FF202020"
47+
Text="{TemplateBinding XamlCode}" />
5048
</ScrollViewer>
5149
</muxc:TabViewItem>
52-
<muxc:TabViewItem
53-
Header="See C#"
54-
IsClosable="False">
50+
<muxc:TabViewItem Header="See C#" IsClosable="False">
5551
<ScrollViewer>
5652
<controls:MarkdownTextBlock
57-
Background="#FF202020"
5853
Padding="8"
59-
Text="{TemplateBinding CSharpCode}"/>
54+
Background="#FF202020"
55+
Text="{TemplateBinding CSharpCode}" />
6056
</ScrollViewer>
6157
</muxc:TabViewItem>
6258
</muxc:TabView>
@@ -65,5 +61,5 @@
6561
</Setter.Value>
6662
</Setter>
6763
</Style>
68-
64+
6965
</ResourceDictionary>

‎samples/MvvmSampleUwp/MvvmSampleUwp.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,22 +244,22 @@
244244
</ItemGroup>
245245
<ItemGroup>
246246
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
247-
<Version>5.0.2</Version>
247+
<Version>6.0.0</Version>
248248
</PackageReference>
249249
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
250-
<Version>6.2.12</Version>
250+
<Version>6.2.13</Version>
251251
</PackageReference>
252252
<PackageReference Include="Microsoft.Toolkit">
253-
<Version>7.0.0</Version>
253+
<Version>7.1.2</Version>
254254
</PackageReference>
255255
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
256-
<Version>7.0.0</Version>
256+
<Version>7.1.2</Version>
257257
</PackageReference>
258258
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Markdown">
259-
<Version>7.0.0</Version>
259+
<Version>7.1.2</Version>
260260
</PackageReference>
261261
<PackageReference Include="Microsoft.UI.Xaml">
262-
<Version>2.5.0</Version>
262+
<Version>2.7.0</Version>
263263
</PackageReference>
264264
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
265265
<Version>2.0.1</Version>

0 commit comments

Comments
 (0)