Use winapp CLI for workflows

.github/workflows/ci.yml

@@ -8,53 +8,25 @@ on:
 
 permissions:
   contents: read
-  actions: write
 
 jobs:
   build:
     name: Build
     runs-on: windows-latest
 
-    strategy:
-      matrix:
-        configuration: [Debug]
-        platform: [x86, x64, ARM64]
-
-    env:
-      Solution_Name: AuraClick.slnx
-      Appx_Package_Dir: Packages\
-      Dir_Name: AuraClick
-
     steps:
     - name: Checkout repository
       uses: actions/checkout@v7
 
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v6
-      with:
-        dotnet-version: 10.0.x
-
-    - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v3
-
-    - name: Restore the application
-      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
-      env:
-        Configuration: ${{ matrix.configuration }}
+    - name: Setup WinApp CLI
+      uses: microsoft/setup-WinAppCli@v0.2
 
     - 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:AppxPackageDir="$env:Appx_Package_Dir" /p:GenerateAppxPackageOnBuild=true
-      env:
-        Appx_Bundle: Always
-        Appx_Bundle_Platforms: x86|x64|ARM64
-        Appx_Package_Build_Mode: SideloadOnly
-        Configuration: ${{ matrix.configuration }}
-        Platform: ${{ matrix.platform }}
-        AppInstallerUri: https://cdn.auraclick.app
+      run: winapp pack AuraClick\AuraClick.csproj -c Debug --arch x86 --arch x64 --arch arm64 --output AuraClick.msixbundle
 
     - name: Upload MSIX package
       uses: actions/upload-artifact@v7
       with:
-        name: MSIX Package (${{ matrix.configuration }}, ${{ matrix.platform }})
-        path: ${{ env.Dir_Name }}\${{ env.Appx_Package_Dir }}
+        name: MSIX Package
+        path: AuraClick.msixbundle
         if-no-files-found: error

.github/workflows/release.yml

@@ -8,72 +8,28 @@ on:
 
 permissions:
   contents: read
-  actions: write
 
 jobs:
-  build:
-    name: Build
+  store:
     runs-on: windows-latest
 
-    strategy:
-      matrix:
-        configuration: [Release]
-        platform: [x64, x86, ARM64]
-
-    env:
-      Solution_Name: AuraClick.slnx
-      Dir_Name: AuraClick
-
     steps:
     - name: Checkout repository
       uses: actions/checkout@v7
 
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v6
-      with:
-        dotnet-version: 10.0.x
-
-    - name: Setup MSBuild
-      uses: microsoft/setup-msbuild@v3
-
-    - name: Restore the application
-      run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration
-      env:
-        Configuration: ${{ matrix.configuration }}
-
-    - name: Create the app package and appinstaller
-      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:AppxPackageDir="$env:Appx_Package_Dir" /p:GenerateAppxPackageOnBuild=true /p:GenerateAppInstallerFile=true /p:AppxPackageSigningEnabled=false /p:AppxPackageSigningTimestampDigestAlgorithm=SHA256 /p:AppxAutoIncrementPackageRevision=false /p:GenerateTestArtifacts=false /p:AppInstallerUri=$env:AppInstaller_Uri /p:HoursBetweenUpdateChecks=$env:Hours_Between_Update_Checks
-      env:
-        Appx_Bundle: Never
-        Appx_Package_Build_Mode: SideloadOnly
-        Appx_Package_Dir: Packages\
-        AppInstaller_Uri: https://cdn.auraclick.app/
-        Hours_Between_Update_Checks: 24
-        Configuration: ${{ matrix.configuration }}
-        Platform: ${{ matrix.platform }}
+    - name: Setup WinApp CLI
+      uses: microsoft/setup-WinAppCli@v0.2
 
-    - name: Upload unsigned package artifacts
-      id: upload-unsigned-artifact
-      uses: actions/upload-artifact@v7
-      with:
-        name: Unsigned Package (${{ matrix.configuration }}, ${{ matrix.platform }})
-        path: ${{ env.Dir_Name }}\Packages\
-        if-no-files-found: error
+    - name: Create Store package
+      run: winapp pack AuraClick\AuraClick.csproj --arch x86 --arch x64 --arch arm64 --output AuraClick.msixbundle
 
-    - name: sign
-      uses: signpath/github-action-submit-signing-request@v3
-      with:
-        api-token: ${{ secrets.SIGNPATH_API_TOKEN }}
-        organization-id: ${{ vars.SIGNPATH_ORGANIZATION_ID }}
-        project-slug: auraclick
-        signing-policy-slug: release-signing
-        github-artifact-id: ${{steps.upload-unsigned-artifact.outputs.artifact-id}}
-        wait-for-completion: true
-        output-artifact-directory: msix-package-signed
+    - name: Configure Store credentials
+      run: >
+        winapp store reconfigure
+        --tenantId '${{ secrets.AZURE_AD_TENANT_ID }}'
+        --sellerId '${{ secrets.SELLER_ID }}'
+        --clientId '${{ secrets.AZURE_AD_APPLICATION_CLIENT_ID }}'
+        --clientSecret '${{ secrets.AZURE_AD_APPLICATION_SECRET }}'
 
-    - name: Upload signed package artifacts
-      uses: actions/upload-artifact@v7
-      with:
-        name: Signed Package (${{ matrix.configuration }}, ${{ matrix.platform }})
-        path: msix-package-signed
-        if-no-files-found: error
+    - name: Publish to Store
+      run: winapp store publish AuraClick.msixbundle --appId 9NTVRZD0MF7F

AuraClick/AuraClick.csproj

@@ -1,14 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
     <RootNamespace>AuraClick</RootNamespace>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
+    <ApplicationIcon Condition="Exists('Assets\AppIcon.ico')">Assets\AppIcon.ico</ApplicationIcon>
     <Platforms>x86;x64;ARM64</Platforms>
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
-    <PublishProfile>win-$(Platform).pubxml</PublishProfile>
+    <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">win-$([System.Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture.ToString().ToLowerInvariant())</RuntimeIdentifier>
+    <PublishProfile Condition="Exists('Properties\PublishProfiles\win-$(Platform).pubxml')">win-$(Platform).pubxml</PublishProfile>
     <UseWinUI>true</UseWinUI>
     <WinUISDKReferences>false</WinUISDKReferences>
     <EnableMsixTooling>true</EnableMsixTooling>
@@ -19,6 +20,10 @@
     <AssemblyTitle>Aura Click</AssemblyTitle>
   </PropertyGroup>
 
+  <ItemGroup>
+    <Content Include="Assets\**\*" />
+  </ItemGroup>
+
   <ItemGroup>
     <Manifest Include="$(ApplicationManifest)" />
   </ItemGroup>

AuraClick/Package.appxmanifest

@@ -4,20 +4,24 @@
   xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
   xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
   xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap10="http://schemas.microsoft.com/appx/manifest/uap/windows10/10"
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
-  IgnorableNamespaces="uap rescap">
+  IgnorableNamespaces="uap uap10 rescap">
 
   <Identity
-    Name="RyanLuu.AuraClick"
+    Name="RyanLuu.35188CB935F49"
     Publisher="CN=F928CF5C-7038-45EB-A55F-2CDFC6B12328"
-    Version="0.1.0.0" />
+    Version="0.0.1.0" />
 
-  <mp:PhoneIdentity PhoneProductId="2532d4fd-42fb-4b02-a922-9be41e17cb00" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
+  <mp:PhoneIdentity PhoneProductId="1af52403-3fb1-46e8-90f8-fd84f5dd65b6" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
     <DisplayName>ms-resource:AppDisplayName</DisplayName>
     <PublisherDisplayName>Ryan Luu</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
+    <uap10:PackageIntegrity>
+      <uap10:Content Enforcement="on"/>
+    </uap10:PackageIntegrity>
   </Properties>
 
   <Dependencies>