Skip to content

Commit 1f6fbc5

Browse files
Sergio0694Sergio0694
committed
Updated NuGet dependencies
1 parent 5691816 commit 1f6fbc5

File tree

6 files changed

+30
-30
lines changed

6 files changed

+30
-30
lines changed

‎samples/MvvmSample.Core/Models/Post.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
using System.Collections.Generic;
66
using System.Linq;
7-
using Newtonsoft.Json;
7+
using System.Text.Json.Serialization;
88

99
namespace MvvmSample.Core.Models
1010
{
@@ -16,7 +16,7 @@ public class PostsQueryResponse
1616
/// <summary>
1717
/// Gets or sets the listing data for the response.
1818
/// </summary>
19-
[JsonProperty("data")]
19+
[JsonPropertyName("data")]
2020
public PostListing Data { get; set; }
2121
}
2222

@@ -28,7 +28,7 @@ public class PostListing
2828
/// <summary>
2929
/// Gets or sets the items in this listing.
3030
/// </summary>
31-
[JsonProperty("children")]
31+
[JsonPropertyName("children")]
3232
public IList<PostData> Items { get; set; }
3333
}
3434

@@ -40,7 +40,7 @@ public class PostData
4040
/// <summary>
4141
/// Gets or sets the <see cref="Post"/> instance.
4242
/// </summary>
43-
[JsonProperty("data")]
43+
[JsonPropertyName("data")]
4444
public Post Data { get; set; }
4545
}
4646

@@ -52,13 +52,13 @@ public class Post
5252
/// <summary>
5353
/// Gets or sets the title of the post.
5454
/// </summary>
55-
[JsonProperty("title")]
55+
[JsonPropertyName("title")]
5656
public string Title { get; set; }
5757

5858
/// <summary>
5959
/// Gets or sets the URL to the post thumbnail, if present.
6060
/// </summary>
61-
[JsonProperty("thumbnail")]
61+
[JsonPropertyName("thumbnail")]
6262
public string Thumbnail { get; set; }
6363

6464
/// <summary>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<TargetFramework>netstandard2.0</TargetFramework>
5-
<LangVersion>8.0</LangVersion>
5+
<LangVersion>8.0</LangVersion>
66
<UserSecretsId>4e66f7b4-01a8-4f00-8733-4ae6a08c741f</UserSecretsId>
77
</PropertyGroup>
88

@@ -43,9 +43,9 @@
4343
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
4444
</Content>
4545
</ItemGroup>
46-
<ItemGroup>
47-
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.0.0-preview5" />
48-
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.0" />
49-
<PackageReference Include="Refit" Version="5.2.1" />
50-
</ItemGroup>
46+
<ItemGroup>
47+
<PackageReference Include="Microsoft.Toolkit.Mvvm" Version="7.0.0" />
48+
<PackageReference Include="Nito.AsyncEx.Coordination" Version="5.1.0" />
49+
<PackageReference Include="Refit" Version="6.0.38" />
50+
</ItemGroup>
5151
</Project>

‎samples/MvvmSampleUwp/MvvmSampleUwp.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -244,25 +244,25 @@
244244
</ItemGroup>
245245
<ItemGroup>
246246
<PackageReference Include="Microsoft.Extensions.DependencyInjection">
247-
<Version>3.1.9</Version>
247+
<Version>5.0.1</Version>
248248
</PackageReference>
249249
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
250-
<Version>6.2.10</Version>
250+
<Version>6.2.12</Version>
251251
</PackageReference>
252252
<PackageReference Include="Microsoft.Toolkit">
253-
<Version>7.0.0-build.486</Version>
253+
<Version>7.0.0</Version>
254254
</PackageReference>
255255
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
256-
<Version>7.0.0-build.486</Version>
256+
<Version>7.0.0</Version>
257257
</PackageReference>
258258
<PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls.Markdown">
259-
<Version>7.0.0-build.486</Version>
259+
<Version>7.0.0</Version>
260260
</PackageReference>
261261
<PackageReference Include="Microsoft.UI.Xaml">
262-
<Version>2.4.2</Version>
262+
<Version>2.5.0</Version>
263263
</PackageReference>
264-
<PackageReference Include="refit">
265-
<Version>5.2.1</Version>
264+
<PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
265+
<Version>2.0.1</Version>
266266
</PackageReference>
267267
</ItemGroup>
268268
<ItemGroup>

‎samples/MvvmSampleUwp/Shell.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
88
xmlns:mvvmSampleUwp="using:MvvmSampleUwp"
9-
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
9+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
1010
mc:Ignorable="d"
1111
d:DesignHeight="300"
1212
d:DesignWidth="400"
@@ -109,17 +109,17 @@
109109
<muxc:NavigationViewItem
110110
x:Name="RedditBrowserOverviewItem"
111111
Content="Putting Things Together"
112-
Icon="{extensions:FontIcon Glyph=&#xE74C;}"
112+
Icon="{ui:FontIcon Glyph=&#xE74C;}"
113113
ToolTipService.ToolTip="Examples of how to put multiple pieces together for building an app.">
114114
<muxc:NavigationViewItem.MenuItems>
115115
<muxc:NavigationViewItem
116116
x:Name="ViewModelsSetupItem"
117117
Content="Setting up the ViewModels"
118-
Icon="{extensions:FontIcon Glyph=&#xEBD2;}"
118+
Icon="{ui:FontIcon Glyph=&#xEBD2;}"
119119
ToolTipService.ToolTip="Setting up viewmodels for the two widgets."/>
120120
<muxc:NavigationViewItem
121121
Content="Creating a Service"
122-
Icon="{extensions:FontIcon Glyph=&#xF69E;}"
122+
Icon="{ui:FontIcon Glyph=&#xF69E;}"
123123
ToolTipService.ToolTip="Build custom services to expand the app's functionalities.">
124124
<muxc:NavigationViewItem.MenuItems>
125125
<muxc:NavigationViewItem
@@ -137,12 +137,12 @@
137137
<muxc:NavigationViewItem
138138
x:Name="BuildingTheUIItem"
139139
Content="Building the UI"
140-
Icon="{extensions:FontIcon Glyph=&#xEB3C;}"
140+
Icon="{ui:FontIcon Glyph=&#xEB3C;}"
141141
ToolTipService.ToolTip="Building the UI to connect to the backend."/>
142142
<muxc:NavigationViewItem
143143
x:Name="FinalResultItem"
144144
Content="The final result!"
145-
Icon="{extensions:FontIcon Glyph=&#xF1AD;}"
145+
Icon="{ui:FontIcon Glyph=&#xF1AD;}"
146146
ToolTipService.ToolTip="The final working sample!"/>
147147
</muxc:NavigationViewItem.MenuItems>
148148
</muxc:NavigationViewItem>

‎samples/MvvmSampleUwp/Views/Widgets/PostWidget.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
77
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
88
xmlns:widgets="using:MvvmSample.Core.ViewModels.Widgets"
9-
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
9+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
1010
mc:Ignorable="d"
1111
d:DesignHeight="300"
1212
d:DesignWidth="400">
@@ -26,7 +26,7 @@
2626
<!--Self text-->
2727
<Border
2828
Grid.Row="1"
29-
extensions:UIElementExtensions.ClipToBounds="True">
29+
ui:UIElementExtensions.ClipToBounds="True">
3030
<ScrollViewer CanContentRenderOutsideBounds="True">
3131
<TextBlock
3232
Text="{x:Bind ViewModel.Post.SelfText, Mode=OneWay}"

‎samples/MvvmSampleUwp/Views/Widgets/SubredditWidget.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
66
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7-
xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
7+
xmlns:ui="using:Microsoft.Toolkit.Uwp.UI"
88
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
99
xmlns:core="using:Microsoft.Xaml.Interactions.Core"
1010
xmlns:models="using:MvvmSample.Core.Models"
@@ -46,7 +46,7 @@
4646
</interactivity:Interaction.Behaviors>
4747
</ComboBox>
4848
<Button
49-
Content="{extensions:SymbolIcon Symbol=Refresh}"
49+
Content="{ui:SymbolIcon Symbol=Refresh}"
5050
Command="{x:Bind ViewModel.LoadPostsCommand}"/>
5151
</StackPanel>
5252
</Border>

0 commit comments

Comments
 (0)