From 099b73fb6f8673ac6a7fba3f2f9a33d4f5c891e8 Mon Sep 17 00:00:00 2001 From: Luca Auer Date: Tue, 8 Oct 2024 15:05:56 +0200 Subject: [PATCH] Try add experimental ARM64 build --- .github/workflows/ci.yml | 15 +++++- Image-Sort.sln | 52 ++++++++++++++++++- src/ImageSort.WPF/ImageSort.WPF.csproj | 3 +- .../ImageSort.WindowsSetup.wixproj | 9 ++-- src/ImageSort.WindowsSetup/Product.wxs | 20 ++++--- .../ImageSort.WindowsUpdater.csproj | 1 + 6 files changed, 86 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f008c688..b873290a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,6 +41,7 @@ jobs: dotnet tool install --global wix dotnet build -c Release -r win-x86 -p:Platform=x86 dotnet build -c Release -r win-x64 -p:Platform=x64 + dotnet build -c Release -r win-arm64 -p:Platform=ARM64 cd ..\..; - name: Upload x86 MSI file id: upload-x86-msi-file @@ -66,6 +67,18 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} TIME: ${{ github.run_number }} + - name: Upload ARM64 MSI file + id: upload-arm64-msi-file + uses: actions/upload-release-asset@v1.0.2 + if: ${{ github.event_name == 'release' }} + with: + asset_path: .\artifacts\ARM64\ImageSort.ARM64.msi + asset_name: ImageSort.ARM64.msi + asset_content_type: application/octet-stream + upload_url: ${{ github.event.release.upload_url }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + TIME: ${{ github.run_number }} - name: Install winget-create if: ${{ github.event_name == 'release' && !github.event.release.prerelease }} run: choco install wingetcreate @@ -77,4 +90,4 @@ jobs: - name: Update and submit Winget manifest if: ${{ github.event_name == 'release' && !github.event.release.prerelease }} run: | - wingetcreate.exe update --submit --token ${{ secrets.PAT_WINGET }} --urls "${{ steps.upload-x86-msi-file.outputs.browser_download_url }}" "${{ steps.upload-x64-msi-file.outputs.browser_download_url }}" --version "${{ steps.gitversion.outputs.assemblySemVer }}" Lolle2000la.ImageSort + wingetcreate.exe update --submit --token ${{ secrets.PAT_WINGET }} --urls "${{ steps.upload-x86-msi-file.outputs.browser_download_url }}" "${{ steps.upload-x64-msi-file.outputs.browser_download_url }}" "${{ steps.upload-arm64-msi-file.outputs.browser_download_url }}" --version "${{ steps.gitversion.outputs.assemblySemVer }}" Lolle2000la.ImageSort diff --git a/Image-Sort.sln b/Image-Sort.sln index fb4107f2..c691b894 100644 --- a/Image-Sort.sln +++ b/Image-Sort.sln @@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSort.WPF", "src\ImageS EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImageSort.UnitTests", "tests\ImageSort.UnitTests\ImageSort.UnitTests.csproj", "{4E5B0352-9E1A-4930-9455-F1B2A9E682D8}" EndProject -Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "ImageSort.WindowsSetup", "src\ImageSort.WindowsSetup\ImageSort.WindowsSetup.wixproj", "{E23B5421-90AF-437C-A2B1-73EFD57283EA}" +Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "ImageSort.WindowsSetup", "src\ImageSort.WindowsSetup\ImageSort.WindowsSetup.wixproj", "{E23B5421-90AF-437C-A2B1-73EFD57283EA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9550B546-E9B0-45D2-AA67-2B9819BB8BF2}" ProjectSection(SolutionItems) = preProject @@ -34,119 +34,160 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|ARM64 = Debug|ARM64 Debug|x64 = Debug|x64 Debug|x86 = Debug|x86 MSIX|Any CPU = MSIX|Any CPU + MSIX|ARM64 = MSIX|ARM64 MSIX|x64 = MSIX|x64 MSIX|x86 = MSIX|x86 Release|Any CPU = Release|Any CPU + Release|ARM64 = Release|ARM64 Release|x64 = Release|x64 Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Debug|ARM64.Build.0 = Debug|ARM64 {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Debug|x64.ActiveCfg = Debug|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Debug|x64.Build.0 = Debug|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Debug|x86.ActiveCfg = Debug|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Debug|x86.Build.0 = Debug|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.MSIX|Any CPU.ActiveCfg = MSIX|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.MSIX|Any CPU.Build.0 = MSIX|Any CPU + {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.MSIX|ARM64.ActiveCfg = MSIX|ARM64 + {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.MSIX|ARM64.Build.0 = MSIX|ARM64 {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.MSIX|x64.ActiveCfg = MSIX|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.MSIX|x64.Build.0 = MSIX|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.MSIX|x86.ActiveCfg = MSIX|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.MSIX|x86.Build.0 = MSIX|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Release|Any CPU.ActiveCfg = Release|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Release|Any CPU.Build.0 = Release|Any CPU + {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Release|ARM64.ActiveCfg = Release|ARM64 + {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Release|ARM64.Build.0 = Release|ARM64 {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Release|x64.ActiveCfg = Release|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Release|x64.Build.0 = Release|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Release|x86.ActiveCfg = Release|Any CPU {7DAF4545-3E6D-4015-8C8F-C312B6D3F465}.Release|x86.Build.0 = Release|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Debug|ARM64.Build.0 = Debug|ARM64 {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Debug|x64.ActiveCfg = Debug|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Debug|x64.Build.0 = Debug|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Debug|x86.ActiveCfg = Debug|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Debug|x86.Build.0 = Debug|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.MSIX|Any CPU.ActiveCfg = MSIX|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.MSIX|Any CPU.Build.0 = MSIX|Any CPU + {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.MSIX|ARM64.ActiveCfg = MSIX|ARM64 + {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.MSIX|ARM64.Build.0 = MSIX|ARM64 {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.MSIX|x64.ActiveCfg = MSIX|x64 {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.MSIX|x64.Build.0 = MSIX|x64 {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.MSIX|x86.ActiveCfg = MSIX|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.MSIX|x86.Build.0 = MSIX|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Release|Any CPU.ActiveCfg = Release|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Release|Any CPU.Build.0 = Release|Any CPU + {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Release|ARM64.ActiveCfg = Release|Any CPU + {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Release|ARM64.Build.0 = Release|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Release|x64.ActiveCfg = Release|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Release|x64.Build.0 = Release|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Release|x86.ActiveCfg = Release|Any CPU {FF41F5A7-55C5-47BD-8A6D-D8EB86E9C967}.Release|x86.Build.0 = Release|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Debug|ARM64.Build.0 = Debug|ARM64 {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Debug|x64.ActiveCfg = Debug|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Debug|x64.Build.0 = Debug|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Debug|x86.ActiveCfg = Debug|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Debug|x86.Build.0 = Debug|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.MSIX|Any CPU.ActiveCfg = MSIX|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.MSIX|Any CPU.Build.0 = MSIX|Any CPU + {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.MSIX|ARM64.ActiveCfg = MSIX|ARM64 + {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.MSIX|ARM64.Build.0 = MSIX|ARM64 {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.MSIX|x64.ActiveCfg = MSIX|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.MSIX|x64.Build.0 = MSIX|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.MSIX|x86.ActiveCfg = MSIX|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.MSIX|x86.Build.0 = MSIX|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Release|Any CPU.ActiveCfg = Release|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Release|Any CPU.Build.0 = Release|Any CPU + {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Release|ARM64.ActiveCfg = Release|ARM64 + {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Release|ARM64.Build.0 = Release|ARM64 {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Release|x64.ActiveCfg = Release|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Release|x64.Build.0 = Release|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Release|x86.ActiveCfg = Release|Any CPU {4E5B0352-9E1A-4930-9455-F1B2A9E682D8}.Release|x86.Build.0 = Release|Any CPU {E23B5421-90AF-437C-A2B1-73EFD57283EA}.Debug|Any CPU.ActiveCfg = Debug|x86 + {E23B5421-90AF-437C-A2B1-73EFD57283EA}.Debug|ARM64.ActiveCfg = Debug|ARM64 {E23B5421-90AF-437C-A2B1-73EFD57283EA}.Debug|x64.ActiveCfg = Debug|x86 {E23B5421-90AF-437C-A2B1-73EFD57283EA}.Debug|x86.ActiveCfg = Debug|x86 {E23B5421-90AF-437C-A2B1-73EFD57283EA}.MSIX|Any CPU.ActiveCfg = Release|x86 {E23B5421-90AF-437C-A2B1-73EFD57283EA}.MSIX|Any CPU.Build.0 = Release|x86 + {E23B5421-90AF-437C-A2B1-73EFD57283EA}.MSIX|ARM64.ActiveCfg = Debug|ARM64 + {E23B5421-90AF-437C-A2B1-73EFD57283EA}.MSIX|ARM64.Build.0 = Debug|ARM64 {E23B5421-90AF-437C-A2B1-73EFD57283EA}.MSIX|x64.ActiveCfg = Release|x86 {E23B5421-90AF-437C-A2B1-73EFD57283EA}.MSIX|x86.ActiveCfg = Release|x86 {E23B5421-90AF-437C-A2B1-73EFD57283EA}.Release|Any CPU.ActiveCfg = Release|x86 - {E23B5421-90AF-437C-A2B1-73EFD57283EA}.Release|x64.ActiveCfg = Release|x86 + {E23B5421-90AF-437C-A2B1-73EFD57283EA}.Release|ARM64.ActiveCfg = Release|ARM64 + {E23B5421-90AF-437C-A2B1-73EFD57283EA}.Release|x64.ActiveCfg = Release|x64 {E23B5421-90AF-437C-A2B1-73EFD57283EA}.Release|x86.ActiveCfg = Release|x86 {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Debug|Any CPU.Build.0 = Debug|Any CPU + {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Debug|ARM64.ActiveCfg = Debug|ARM64 {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Debug|x64.ActiveCfg = Debug|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Debug|x64.Build.0 = Debug|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Debug|x86.ActiveCfg = Debug|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Debug|x86.Build.0 = Debug|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.MSIX|Any CPU.ActiveCfg = MSIX|Any CPU + {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.MSIX|ARM64.ActiveCfg = MSIX|ARM64 {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.MSIX|x64.ActiveCfg = MSIX|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.MSIX|x86.ActiveCfg = MSIX|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Release|Any CPU.ActiveCfg = Release|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Release|Any CPU.Build.0 = Release|Any CPU + {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Release|ARM64.ActiveCfg = Release|ARM64 + {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Release|ARM64.Build.0 = Release|ARM64 {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Release|x64.ActiveCfg = Release|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Release|x64.Build.0 = Release|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Release|x86.ActiveCfg = Release|Any CPU {826C2537-7F2E-4CE5-BC4E-65D800FF2868}.Release|x86.Build.0 = Release|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DF9B003E-4B31-494D-8186-15CE8DD69489}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {DF9B003E-4B31-494D-8186-15CE8DD69489}.Debug|ARM64.Build.0 = Debug|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Debug|x64.ActiveCfg = Debug|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Debug|x64.Build.0 = Debug|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Debug|x86.ActiveCfg = Debug|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Debug|x86.Build.0 = Debug|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.MSIX|Any CPU.ActiveCfg = MSIX|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.MSIX|Any CPU.Build.0 = MSIX|Any CPU + {DF9B003E-4B31-494D-8186-15CE8DD69489}.MSIX|ARM64.ActiveCfg = MSIX|Any CPU + {DF9B003E-4B31-494D-8186-15CE8DD69489}.MSIX|ARM64.Build.0 = MSIX|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.MSIX|x64.ActiveCfg = MSIX|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.MSIX|x64.Build.0 = MSIX|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.MSIX|x86.ActiveCfg = MSIX|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.MSIX|x86.Build.0 = MSIX|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Release|Any CPU.ActiveCfg = Release|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Release|Any CPU.Build.0 = Release|Any CPU + {DF9B003E-4B31-494D-8186-15CE8DD69489}.Release|ARM64.ActiveCfg = Release|Any CPU + {DF9B003E-4B31-494D-8186-15CE8DD69489}.Release|ARM64.Build.0 = Release|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Release|x64.ActiveCfg = Release|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Release|x64.Build.0 = Release|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Release|x86.ActiveCfg = Release|Any CPU {DF9B003E-4B31-494D-8186-15CE8DD69489}.Release|x86.Build.0 = Release|Any CPU {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Debug|Any CPU.ActiveCfg = Debug|x86 + {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Debug|ARM64.Build.0 = Debug|ARM64 + {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Debug|ARM64.Deploy.0 = Debug|ARM64 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Debug|x64.ActiveCfg = Debug|x64 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Debug|x86.ActiveCfg = Debug|x86 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|Any CPU.ActiveCfg = MSIX|x86 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|Any CPU.Build.0 = MSIX|x86 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|Any CPU.Deploy.0 = MSIX|x86 + {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|ARM64.ActiveCfg = MSIX|ARM64 + {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|ARM64.Build.0 = MSIX|ARM64 + {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|ARM64.Deploy.0 = MSIX|ARM64 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|x64.ActiveCfg = MSIX|x64 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|x64.Build.0 = MSIX|x64 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|x64.Deploy.0 = MSIX|x64 @@ -154,22 +195,29 @@ Global {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|x86.Build.0 = MSIX|x86 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.MSIX|x86.Deploy.0 = MSIX|x86 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Release|Any CPU.ActiveCfg = Release|x86 + {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Release|ARM64.ActiveCfg = Release|ARM64 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Release|x64.ActiveCfg = Release|x64 {1E511652-E2A5-44EE-B0F6-E8E53FD6AA8F}.Release|x86.ActiveCfg = Release|x86 {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Debug|ARM64.Build.0 = Debug|ARM64 {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Debug|x64.ActiveCfg = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Debug|x64.Build.0 = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Debug|x86.ActiveCfg = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Debug|x86.Build.0 = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.MSIX|Any CPU.ActiveCfg = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.MSIX|Any CPU.Build.0 = Debug|Any CPU + {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.MSIX|ARM64.ActiveCfg = Debug|ARM64 + {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.MSIX|ARM64.Build.0 = Debug|ARM64 {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.MSIX|x64.ActiveCfg = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.MSIX|x64.Build.0 = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.MSIX|x86.ActiveCfg = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.MSIX|x86.Build.0 = Debug|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Release|Any CPU.ActiveCfg = Release|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Release|Any CPU.Build.0 = Release|Any CPU + {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Release|ARM64.ActiveCfg = Release|Any CPU + {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Release|ARM64.Build.0 = Release|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Release|x64.ActiveCfg = Release|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Release|x64.Build.0 = Release|Any CPU {D72448F9-569A-4BFA-A0C7-79F20BE17F4F}.Release|x86.ActiveCfg = Release|Any CPU diff --git a/src/ImageSort.WPF/ImageSort.WPF.csproj b/src/ImageSort.WPF/ImageSort.WPF.csproj index 821395da..d7d699b4 100644 --- a/src/ImageSort.WPF/ImageSort.WPF.csproj +++ b/src/ImageSort.WPF/ImageSort.WPF.csproj @@ -1,3 +1,4 @@ + @@ -6,7 +7,7 @@ true Image Sort Debug;Release;MSIX - AnyCPU;x86;x64 + AnyCPU;x86;x64;ARM64 true diff --git a/src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj b/src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj index c9e8b9ff..122b2489 100644 --- a/src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj +++ b/src/ImageSort.WindowsSetup/ImageSort.WindowsSetup.wixproj @@ -4,10 +4,13 @@ false - x86 - x86 + + ImageSort.$(Platform) $(Platform) + win-arm64 + win-$(Platform) + RuntimeIdentifier=$(RuntimeIdentifier); ..\..\artifacts\$(Platform) @@ -41,7 +44,7 @@ INSTALLFOLDER True net8.0-windows - win-$(Platform) + $(RuntimeIdentifier) diff --git a/src/ImageSort.WindowsSetup/Product.wxs b/src/ImageSort.WindowsSetup/Product.wxs index c150f3cf..a117c234 100644 --- a/src/ImageSort.WindowsSetup/Product.wxs +++ b/src/ImageSort.WindowsSetup/Product.wxs @@ -11,10 +11,16 @@ + + + + + + @@ -54,7 +60,7 @@ - + @@ -77,11 +83,11 @@ - @@ -89,7 +95,7 @@ - + diff --git a/src/ImageSort.WindowsUpdater/ImageSort.WindowsUpdater.csproj b/src/ImageSort.WindowsUpdater/ImageSort.WindowsUpdater.csproj index 21a82bf7..645b929f 100644 --- a/src/ImageSort.WindowsUpdater/ImageSort.WindowsUpdater.csproj +++ b/src/ImageSort.WindowsUpdater/ImageSort.WindowsUpdater.csproj @@ -3,6 +3,7 @@ net8.0 Debug;Release;MSIX + AnyCPU;x86;x64;ARM64