SimpleToolkit.* packages replacement
This commit is contained in:
@@ -10,7 +10,7 @@ using VDownload.Core.ViewModels.Authentication;
|
|||||||
using VDownload.Core.ViewModels.Home;
|
using VDownload.Core.ViewModels.Home;
|
||||||
using VDownload.Core.ViewModels.Settings;
|
using VDownload.Core.ViewModels.Settings;
|
||||||
using VDownload.Services.UI.DictionaryResources;
|
using VDownload.Services.UI.DictionaryResources;
|
||||||
using SimpleToolkit.UI.Models;
|
using MSEssentials.UI.Common.MVVM;
|
||||||
using VDownload.Core.ViewModels.About;
|
using VDownload.Core.ViewModels.About;
|
||||||
using VDownload.Core.ViewModels.Subscriptions;
|
using VDownload.Core.ViewModels.Subscriptions;
|
||||||
using VDownload.Core.Strings;
|
using VDownload.Core.Strings;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ using VDownload.Models;
|
|||||||
using VDownload.Services.Data.Settings;
|
using VDownload.Services.Data.Settings;
|
||||||
using VDownload.Services.UI.StoragePicker;
|
using VDownload.Services.UI.StoragePicker;
|
||||||
using VDownload.Sources.Twitch.Configuration.Models;
|
using VDownload.Sources.Twitch.Configuration.Models;
|
||||||
using SimpleToolkit.MVVM;
|
using MSEssentials.UI.Common.MVVM;
|
||||||
using System.Text.RegularExpressions;
|
using System.Text.RegularExpressions;
|
||||||
using VDownload.Services.Utility.Filename;
|
using VDownload.Services.Utility.Filename;
|
||||||
using VDownload.Services.UI.Dialogs;
|
using VDownload.Services.UI.Dialogs;
|
||||||
|
|||||||
@@ -15,8 +15,7 @@
|
|||||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
|
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
|
||||||
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
|
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
|
||||||
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
|
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.2.2" />
|
||||||
<PackageReference Include="SimpleToolkit.MVVM" Version="1.7.8" />
|
<PackageReference Include="MSEssentials.UI.Common.MVVM" Version="1.7.10" />
|
||||||
<PackageReference Include="SimpleToolkit.UI.Models" Version="1.7.8" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
xmlns:i="using:Microsoft.Xaml.Interactivity"
|
xmlns:i="using:Microsoft.Xaml.Interactivity"
|
||||||
xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
|
xmlns:ic="using:Microsoft.Xaml.Interactions.Core"
|
||||||
xmlns:cb="using:SimpleToolkit.UI.WinUI.Behaviors"
|
xmlns:cb="using:MSEssentials.UI.WinUI.Behaviors"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
<Window.SystemBackdrop>
|
<Window.SystemBackdrop>
|
||||||
<MicaBackdrop Kind="Base"/>
|
<MicaBackdrop Kind="Base"/>
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
xmlns:ct="using:CommunityToolkit.WinUI"
|
xmlns:ct="using:CommunityToolkit.WinUI"
|
||||||
xmlns:ctc="using:CommunityToolkit.WinUI.Controls"
|
xmlns:ctc="using:CommunityToolkit.WinUI.Controls"
|
||||||
xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
|
xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
|
||||||
xmlns:c="using:SimpleToolkit.UI.WinUI.Controls"
|
xmlns:c="using:MSEssentials.UI.WinUI.Controls"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Background="{ThemeResource ViewBackgroundColor}"
|
Background="{ThemeResource ViewBackgroundColor}"
|
||||||
x:Name="Root">
|
x:Name="Root">
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
xmlns:ct="using:CommunityToolkit.WinUI"
|
xmlns:ct="using:CommunityToolkit.WinUI"
|
||||||
xmlns:ctc="using:CommunityToolkit.WinUI.Controls"
|
xmlns:ctc="using:CommunityToolkit.WinUI.Controls"
|
||||||
xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
|
xmlns:ctuc="using:CommunityToolkit.WinUI.UI.Controls"
|
||||||
xmlns:c="using:SimpleToolkit.UI.WinUI.Controls"
|
xmlns:c="using:MSEssentials.UI.WinUI.Controls"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
Background="{ThemeResource ViewBackgroundColor}">
|
Background="{ThemeResource ViewBackgroundColor}">
|
||||||
|
|
||||||
|
|||||||
@@ -24,8 +24,8 @@
|
|||||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
|
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
|
||||||
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
|
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
|
||||||
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
|
<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
|
||||||
<PackageReference Include="SimpleToolkit.UI.WinUI.Behaviors" Version="1.7.8" />
|
<PackageReference Include="MSEssentials.UI.WinUI.Behaviors" Version="1.7.10" />
|
||||||
<PackageReference Include="SimpleToolkit.UI.WinUI.Controls" Version="1.7.8" />
|
<PackageReference Include="MSEssentials.UI.WinUI.Controls" Version="1.7.10" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
using Microsoft.UI.Xaml;
|
using Microsoft.UI.Xaml;
|
||||||
using Microsoft.Windows.AppNotifications;
|
using Microsoft.Windows.AppNotifications;
|
||||||
using Microsoft.Windows.AppNotifications.Builder;
|
using Microsoft.Windows.AppNotifications.Builder;
|
||||||
using SimpleToolkit.UI.WinUI.Helpers;
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -71,7 +70,7 @@ namespace VDownload.Services.UI.Notifications
|
|||||||
|
|
||||||
#region PRIVATE METHODS
|
#region PRIVATE METHODS
|
||||||
|
|
||||||
private void NotificationInvoked(AppNotificationManager sender, AppNotificationActivatedEventArgs args) => WindowHelper.ShowWindow(_window);
|
private void NotificationInvoked(AppNotificationManager sender, AppNotificationActivatedEventArgs args) => _window.AppWindow.Show(true);
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
|
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
|
||||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
|
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
|
||||||
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
|
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
|
||||||
<PackageReference Include="SimpleToolkit.UI.WinUI.Helpers" Version="1.7.8" />
|
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
using SimpleToolkit.Extensions;
|
using MSEssentials.Extensions;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="SimpleToolkit.Extensions" Version="1.7.11" />
|
<PackageReference Include="MSEssentials.Extensions" Version="1.7.13" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:v="using:VDownload.Core.Views"
|
xmlns:v="using:VDownload.Core.Views"
|
||||||
xmlns:lt="using:SimpleToolkit.UI.WinUI.Converters"
|
xmlns:lt="using:MSEssentials.UI.WinUI.Converters"
|
||||||
xmlns:ct="using:CommunityToolkit.WinUI.Converters">
|
xmlns:ct="using:CommunityToolkit.WinUI.Converters">
|
||||||
<v:ViewModelToViewConverter x:Key="ViewModelToViewConverter"/>
|
<v:ViewModelToViewConverter x:Key="ViewModelToViewConverter"/>
|
||||||
|
|
||||||
|
|||||||
@@ -174,7 +174,7 @@
|
|||||||
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
|
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
|
||||||
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
|
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240227000" />
|
||||||
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
|
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.3233" />
|
||||||
<PackageReference Include="SimpleToolkit.UI.WinUI.Converters" Version="1.7.8" />
|
<PackageReference Include="MSEssentials.UI.WinUI.Converters" Version="1.7.10" />
|
||||||
<Manifest Include="$(ApplicationManifest)" />
|
<Manifest Include="$(ApplicationManifest)" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user