From fdafb96852d1fe214ac2d83d1cfce7337cef6d02 Mon Sep 17 00:00:00 2001
From: Zhe Fang <founchoo@outlook.com>
Date: Thu, 12 Jun 2025 07:23:29 -0400
Subject: [PATCH] fix: update publish profiles and build configuration for
 ARM64, x64, and x86 platforms

---
 .github/workflows/dotnet-desktop.yml                 |  8 +-------
 .../BetterLyrics.WinUI3 (Package).wapproj            | 12 ++++++------
 .../Properties/PublishProfiles/win-arm64.pubxml      |  6 ++++--
 .../Properties/PublishProfiles/win-x64.pubxml        |  6 ++++--
 .../Properties/PublishProfiles/win-x86.pubxml        |  6 ++++--
 5 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index 5c8ec51..3686c87 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -59,13 +59,7 @@ jobs:
 
     # Create the app package by building and packaging the project
     - name: Create the app package
-      run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration /p:Platform=$env:Platform /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:AppxPackageDir="$env:Appx_Package_Dir" /p:GenerateAppxPackageOnBuild=true /p:SelfContained=true
-      env:
-        Appx_Bundle: Always
-        Appx_Package_Build_Mode: StoreUpload
-        Appx_Package_Dir: AppPackages\
-        Configuration: ${{ matrix.configuration }}
-        Platform: ${{ matrix.platform }}
+      run: msbuild
 
     # Remove the pfx
     - name: Remove the pfx
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj
index bedd6c0..f529e1b 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj	
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3 (Package)/BetterLyrics.WinUI3 (Package).wapproj	
@@ -52,27 +52,27 @@
     <PackageCertificateKeyFile>BetterLyrics.WinUI3 %28Package%29_TemporaryKey.pfx</PackageCertificateKeyFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Never</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Never</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Never</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Never</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Never</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
-    <AppxBundle>Always</AppxBundle>
+    <AppxBundle>Never</AppxBundle>
     <DefaultLanguage>en-US</DefaultLanguage>
   </PropertyGroup>
   <ItemGroup>
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-arm64.pubxml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-arm64.pubxml
index 8953cce..eacbe99 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-arm64.pubxml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-arm64.pubxml
@@ -7,8 +7,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>ARM64</Platform>
     <RuntimeIdentifier>win-arm64</RuntimeIdentifier>
-    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <PublishDir>bin\\\win-arm64\publish\</PublishDir>
     <SelfContained>true</SelfContained>
-    <PublishSingleFile>False</PublishSingleFile>
+    <PublishSingleFile>false</PublishSingleFile>
+    <Configuration>Release</Configuration>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x64.pubxml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x64.pubxml
index cd99561..b5df898 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x64.pubxml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x64.pubxml
@@ -7,8 +7,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x64</Platform>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <PublishDir>bin\\\win-x64\publish\</PublishDir>
     <SelfContained>true</SelfContained>
-    <PublishSingleFile>False</PublishSingleFile>
+    <PublishSingleFile>false</PublishSingleFile>
+    <Configuration>Release</Configuration>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x86.pubxml b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x86.pubxml
index a70c694..802b669 100644
--- a/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x86.pubxml
+++ b/BetterLyrics.WinUI3/BetterLyrics.WinUI3/Properties/PublishProfiles/win-x86.pubxml
@@ -7,8 +7,10 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <PublishProtocol>FileSystem</PublishProtocol>
     <Platform>x86</Platform>
     <RuntimeIdentifier>win-x86</RuntimeIdentifier>
-    <PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+    <PublishDir>bin\\\win-x86\publish\</PublishDir>
     <SelfContained>true</SelfContained>
-    <PublishSingleFile>False</PublishSingleFile>
+    <PublishSingleFile>false</PublishSingleFile>
+    <Configuration>Release</Configuration>
+    <TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
   </PropertyGroup>
 </Project>
\ No newline at end of file