[Dep] Try to enable Wasdk 1.6 .

HyPlayer · Jul 14, 2024 · a216203 · a216203
1 parent e64c7b5
commit a216203
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 10 deletions.
diff --git a/src/HyPlayer.App/App.csproj b/src/HyPlayer.App/App.csproj
@@ -19,6 +19,7 @@
     <Product>HyPlayer</Product>
     <UserSecretsId>3e757a82-9759-482b-851c-170ec2aa99dc</UserSecretsId>
     <SupportedOSPlatformVersion>10.0.19041.0</SupportedOSPlatformVersion>
+	<WindowsSdkPackageVersion>10.0.22621.35-preview</WindowsSdkPackageVersion>
   </PropertyGroup>
 
 
@@ -59,7 +60,7 @@
     <PackageReference Include="CommunityToolkit.WinUI.UI.Media" Version="7.1.2" />
     <PackageReference Include="Depository" Version="2.1.0" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
-    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.5.240627000" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.240531000-experimental1" />
     <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />

diff --git a/src/HyPlayer.App/App.xaml.cs b/src/HyPlayer.App/App.xaml.cs
@@ -3,7 +3,7 @@
 using Depository.Extensions;
 using HyPlayer.Extensions.DependencyInjectionExtensions;
 using HyPlayer.Extensions.Helpers;
-using HyPlayer.Interfaces.Views;
+using HyPlayer.Interfaces.Services;
 using HyPlayer.PlayCore;
 using HyPlayer.PlayCore.Abstraction;
 using HyPlayer.Services;

diff --git a/...pp/Interfaces/Views/INavigationService.cs → ...Interfaces/Services/INavigationService.cs b/...pp/Interfaces/Views/INavigationService.cs → ...Interfaces/Services/INavigationService.cs
@@ -1,8 +1,8 @@
-using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Navigation;
 using System;
 
-namespace HyPlayer.Interfaces.Views;
+namespace HyPlayer.Interfaces.Services;
 
 public interface INavigationService
 {

diff --git a/...ayer.App/Interfaces/Views/IPageService.cs → ...r.App/Interfaces/Services/IPageService.cs b/...ayer.App/Interfaces/Views/IPageService.cs → ...r.App/Interfaces/Services/IPageService.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace HyPlayer.Interfaces.Views;
+namespace HyPlayer.Interfaces.Services;
 
 public interface IPageService
 {

diff --git a/src/HyPlayer.App/Services/NavigationService.cs b/src/HyPlayer.App/Services/NavigationService.cs
@@ -1,4 +1,4 @@
-using HyPlayer.Interfaces.Views;
+using HyPlayer.Interfaces.Services;
 using Microsoft.UI.Xaml.Controls;
 using Microsoft.UI.Xaml.Media.Animation;
 using Microsoft.UI.Xaml.Navigation;

diff --git a/src/HyPlayer.App/Services/PageService.cs b/src/HyPlayer.App/Services/PageService.cs
@@ -1,4 +1,4 @@
-using HyPlayer.Interfaces.Views;
+using HyPlayer.Interfaces.Services;
 using HyPlayer.Views.Pages;
 using System;
 

diff --git a/src/HyPlayer.App/ViewModels/ShellViewModel.cs b/src/HyPlayer.App/ViewModels/ShellViewModel.cs
@@ -1,7 +1,7 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using HyPlayer.Interfaces.Services;
 using HyPlayer.Interfaces.ViewModels;
-using HyPlayer.Interfaces.Views;
 
 namespace HyPlayer.ViewModels
 {

diff --git a/src/HyPlayer.App/Views/Controls/Dialogs/SignInDialog.xaml.cs b/src/HyPlayer.App/Views/Controls/Dialogs/SignInDialog.xaml.cs
@@ -1,7 +1,7 @@
 using Depository.Abstraction.Interfaces;
 using Depository.Core;
 using Depository.Extensions;
-using HyPlayer.Interfaces.Views;
+using HyPlayer.Interfaces.Services;
 using HyPlayer.ViewModels;
 using Microsoft.UI.Xaml.Controls;
 

diff --git a/src/HyPlayer.App/Views/Controls/Search/SearchBox.xaml.cs b/src/HyPlayer.App/Views/Controls/Search/SearchBox.xaml.cs
@@ -1,3 +1,4 @@
+using HyPlayer.Interfaces.Services;
 using HyPlayer.Interfaces.Views;
 using HyPlayer.ViewModels;
 using HyPlayer.Views.Pages;

diff --git a/src/HyPlayer.App/Views/Pages/HomePage.xaml.cs b/src/HyPlayer.App/Views/Pages/HomePage.xaml.cs
@@ -1,4 +1,5 @@
 using AsyncAwaitBestPractices;
+using HyPlayer.Interfaces.Services;
 using HyPlayer.Interfaces.Views;
 using HyPlayer.NeteaseProvider.Models;
 using Microsoft.UI.Xaml;

diff --git a/src/HyPlayer.App/Views/Pages/ShellPage.xaml.cs b/src/HyPlayer.App/Views/Pages/ShellPage.xaml.cs
@@ -1,3 +1,4 @@
+using HyPlayer.Interfaces.Services;
 using HyPlayer.Interfaces.Views;
 using HyPlayer.ViewModels;
 using Microsoft.UI.Xaml;

diff --git a/src/HyPlayer.App/Views/Window/MainWindow.xaml.cs b/src/HyPlayer.App/Views/Window/MainWindow.xaml.cs
@@ -1,7 +1,7 @@
 using Depository.Abstraction.Interfaces;
 using Depository.Core;
 using Depository.Extensions;
-using HyPlayer.Interfaces.Views;
+using HyPlayer.Interfaces.Services;
 using HyPlayer.ViewModels;
 using HyPlayer.Views.Controls.Dialogs;
 using HyPlayer.Views.Pages;