From 0a11eb2bfcde235c8c962647d7919c719a554883 Mon Sep 17 00:00:00 2001 From: Marcel Welna <69851263+marciweleq@users.noreply.github.com> Date: Wed, 13 Mar 2024 22:19:50 +0100 Subject: [PATCH 1/3] Update main.yml --- .github/workflows/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d960e6b..68f84b1 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -22,7 +22,7 @@ jobs: # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on env: - Solution_Name: your-solution-name # Replace with your solution name, i.e. App1.sln. + Solution_Name: VulcanForWindows.sln # Replace with your solution name, i.e. App1.sln. steps: - name: Checkout @@ -42,7 +42,7 @@ jobs: # Restore the application to populate the obj folder with RuntimeIdentifiers - name: Restore the application - run: msbuild $env:VulcanForWindows /t:Restore /p:Configuration=$env:Configuration + run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration env: Configuration: ${{ matrix.configuration }} @@ -55,7 +55,7 @@ jobs: # Create the app package by building and packaging the project - name: Create the app package - run: msbuild $env:VulcanForWindows /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 + 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 env: Appx_Bundle: Never Appx_Package_Build_Mode: SideloadOnly @@ -72,4 +72,4 @@ jobs: uses: actions/upload-artifact@v2 with: name: MSIX Package - path: ${{ env.VulcanForWindows }}\\Packages + path: ${{ env.Solution_Name }}\\Packages From 525efdd9293c48d4151a794bc1b88dbf18be0dac Mon Sep 17 00:00:00 2001 From: Marcel Welna <69851263+marciweleq@users.noreply.github.com> Date: Wed, 13 Mar 2024 22:22:23 +0100 Subject: [PATCH 2/3] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 68f84b1..98fbb46 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,9 +5,9 @@ name: WinUI 3 MSIX app on: push: - branches: [ main ] + branches: [ master ] pull_request: - branches: [ main ] + branches: [ master ] jobs: From 00c24607e0f6d4185a4f51dec6c940af61bb435a Mon Sep 17 00:00:00 2001 From: Marcel Welna <69851263+marciweleq@users.noreply.github.com> Date: Wed, 13 Mar 2024 22:25:27 +0100 Subject: [PATCH 3/3] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 98fbb46..4b964e5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,7 +34,7 @@ jobs: - name: Install .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0 + dotnet-version: 6.0.x # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe