更新导入

2026-05-06 19:20:18 +08:00 · 2025-09-12 19:36:58 +08:00
parent 12c76a284f
commit d2edafe199
13 changed files with 33 additions and 45 deletions
--- a/Player/App.xaml.cs
+++ b/Player/App.xaml.cs
@@ -8,6 +8,7 @@ using The_Untamed_Music_Player.Contracts.Services;
 using The_Untamed_Music_Player.Models;
 using The_Untamed_Music_Player.Services;
 using The_Untamed_Music_Player.ViewModels;
+using WinUIEx;

 namespace The_Untamed_Music_Player;

--- a/Player/Helpers/Backdrop.cs
+++ b/Player/Helpers/Backdrop.cs
@@ -1,6 +1,7 @@
 using Microsoft.UI;
 using Windows.UI;
 using Windows.UI.Composition;
+using WinUIEx;

 namespace The_Untamed_Music_Player.Helpers;

--- a/Player/MainWindow.xaml.cs
+++ b/Player/MainWindow.xaml.cs
@@ -12,6 +12,7 @@ using The_Untamed_Music_Player.Services;
 using The_Untamed_Music_Player.ViewModels;
 using The_Untamed_Music_Player.Views;
 using Windows.UI.ViewManagement;
+using WinUIEx;
 using ZLogger;

 namespace The_Untamed_Music_Player;
--- a/Player/Properties/PublishProfiles/win-arm64.pubxml
+++ b/Player/Properties/PublishProfiles/win-arm64.pubxml
@@ -7,7 +7,5 @@
    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
    <SelfContained>True</SelfContained>
    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
  </PropertyGroup>
 </Project>
--- a/Player/Properties/PublishProfiles/win-x64.pubxml
+++ b/Player/Properties/PublishProfiles/win-x64.pubxml
@@ -7,7 +7,5 @@
    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
    <SelfContained>True</SelfContained>
    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
  </PropertyGroup>
 </Project>
--- a/Player/Properties/PublishProfiles/win-x86.pubxml
+++ b/Player/Properties/PublishProfiles/win-x86.pubxml
@@ -7,7 +7,5 @@
    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
    <SelfContained>True</SelfContained>
    <PublishSingleFile>False</PublishSingleFile>
-    <PublishReadyToRun Condition="'$(Configuration)' == 'Debug'">False</PublishReadyToRun>
-    <PublishReadyToRun Condition="'$(Configuration)' != 'Debug'">True</PublishReadyToRun>
  </PropertyGroup>
 </Project>
--- a/Player/Properties/launchsettings.json
+++ b/Player/Properties/launchsettings.json
@@ -1,8 +1,7 @@
 {
  "profiles": {
    "The Untamed Music Player (Package)": {
-      "commandName": "MsixPackage",
-      "nativeDebugging": false
+      "commandName": "MsixPackage"
    },
    "The Untamed Music Player (Unpackaged)": {
      "commandName": "Project"
--- a/Player/TemplateStudio.xml
+++ b/Player/TemplateStudio.xml
@@ -1,11 +0,0 @@
-<xml
-    xmlns:genTemplate="http://schemas.microsoft.com/appx/developer/templatestudio">
-    <genTemplate:Metadata>
-        <genTemplate:Item Name="generator" Value="Template Studio"/>
-        <genTemplate:Item Name="wizardVersion" Version="v5.5" />
-        <genTemplate:Item Name="projectType" Value="NavView" />
-        <genTemplate:Item Name="framework" Value="MVVMToolkit" />
-        <genTemplate:Item Name="platform" Value="WinUI" />
-        <genTemplate:Item Name="appmodel" Value="Desktop" />
-    </genTemplate:Metadata>
-</xml>
--- a/Player.csproj
+++ b/Player.csproj
@@ -10,28 +10,12 @@
    <Platforms>x86;x64;arm64</Platforms>
    <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
    <UseWinUI>True</UseWinUI>
-    <EnableMsixTooling>True</EnableMsixTooling>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
    <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
-    <PackageCertificateKeyFile>The Untamed Music Player_TemporaryKey.pfx</PackageCertificateKeyFile>
-    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
-    <PublishSelfContained>True</PublishSelfContained>
-    <WindowsAppSDKSelfContained>True</WindowsAppSDKSelfContained>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
-    <GenerateTestArtifacts>False</GenerateTestArtifacts>
-    <AppxBundle>Auto</AppxBundle>
-    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
    <LangVersion>preview</LangVersion>
-    <PublishReadyToRun>True</PublishReadyToRun>
-    <IsAotCompatible>True</IsAotCompatible>
-    <PublishAot>True</PublishAot>
-    <PublishTrimmed>True</PublishTrimmed>
-    <JsonSerializerIsReflectionEnabledByDefault>True</JsonSerializerIsReflectionEnabledByDefault>
+    <GenerateTestArtifacts>False</GenerateTestArtifacts>
  </PropertyGroup>
  <ItemGroup>
    <None Remove="Assets\**\*" />
@@ -90,9 +74,6 @@
    <PackageReference Include="ZLinq" Version="1.5.2" />
    <PackageReference Include="ZLogger" Version="2.5.10" />
  </ItemGroup>
-  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <ProjectCapability Include="Msix" />
-  </ItemGroup>
  <ItemGroup>
    <TrimmerRootAssembly Include="TagLibSharp" />
  </ItemGroup>
@@ -100,8 +81,13 @@
    <DefaultLanguage>en-us</DefaultLanguage>
    <GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
  </PropertyGroup>
+  <!-- 在此处定义“Msix” ProjectCapability 允许即使尚未还原 Windows App SDK Nuget 包，也可以为此项目激活单项目 MSIX 打包工具扩展。 -->
+  <ItemGroup Condition="'$(DisableMsixProjectCapabilityAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
+    <ProjectCapability Include="Msix" />
+  </ItemGroup>
+  <!-- 在此处定义“HasPackageAndPublishMenuAddedByProject”属性允许即使尚未还原 Windows App SDK Nuget 包，也可以为此项目启用解决方案资源管理器“打包和发布”上下文菜单项。 -->
  <PropertyGroup Condition="'$(DisableHasPackageAndPublishMenuAddedByProject)'!='true' and '$(EnableMsixTooling)'=='true'">
-    <HasPackageAndPublishMenu>true</HasPackageAndPublishMenu>
+    <HasPackageAndPublishMenu>True</HasPackageAndPublishMenu>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
    <DebugType>full</DebugType>
@@ -132,4 +118,21 @@
      <Generator>ResXFileCodeGenerator</Generator>
    </PRIResource>
  </ItemGroup>
+  <!-- 发布属性 -->
+  <PropertyGroup>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <PublishSelfContained>True</PublishSelfContained>
+    <WindowsAppSDKSelfContained>True</WindowsAppSDKSelfContained>
+    <PublishReadyToRun>True</PublishReadyToRun>
+    <IsAotCompatible>True</IsAotCompatible>
+    <PublishAot>True</PublishAot>
+    <PublishTrimmed>True</PublishTrimmed>
+    <JsonSerializerIsReflectionEnabledByDefault>True</JsonSerializerIsReflectionEnabledByDefault>
+    <PackageCertificateKeyFile>The Untamed Music Player_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <AppxPackageSigningEnabled>False</AppxPackageSigningEnabled>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
+    <EnableMsixTooling>True</EnableMsixTooling>
+  </PropertyGroup>
 </Project>
--- a/Player/Usings.cs
+++ b/Player/Usings.cs
@@ -1 +0,0 @@
-global using WinUIEx;
--- a/Player/ViewModels/MainViewModel.cs
+++ b/Player/ViewModels/MainViewModel.cs
@@ -8,6 +8,7 @@ using The_Untamed_Music_Player.Helpers;
 using The_Untamed_Music_Player.Models;
 using Windows.UI;
 using WinRT;
+using WinUIEx;

 namespace The_Untamed_Music_Player.ViewModels;

--- a/Player/Views/DesktopLyricWindow.xaml.cs
+++ b/Player/Views/DesktopLyricWindow.xaml.cs
@@ -12,6 +12,7 @@ using The_Untamed_Music_Player.ViewModels;
 using Windows.Foundation;
 using Windows.System;
 using WinRT.Interop;
+using WinUIEx;
 using ZLogger;
 using static The_Untamed_Music_Player.Helpers.ExternFunction;

--- a/Player/app.manifest
+++ b/Player/app.manifest
@@ -8,8 +8,7 @@
    </compatibility>
  <application xmlns="urn:schemas-microsoft-com:asm.v3">
    <windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true/PM</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, PerMonitor</dpiAwareness>
+      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
    </windowsSettings>
  </application>
 </assembly>