From fa5aada59bc85b27167ed4ef3a33a0b2528f6f9d Mon Sep 17 00:00:00 2001 From: BluesKutya <33314772+BluesKutya@users.noreply.github.com> Date: Sun, 8 May 2022 23:43:26 +0200 Subject: [PATCH] update buildinfo --- .github/workflows/dotnet-desktop.yml | 38 ++++++++++++++------------- ApplyPatch/ApplyPatch.csproj | 39 ++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 18 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index d3f35c5..c644cd6 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -56,10 +56,10 @@ 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. MyWpfApp.sln. - Test_Project_Path: your-test-project-path # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. - Wap_Project_Directory: your-wap-project-directory-name # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. - Wap_Project_Path: your-wap-project-path # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. + Solution_Name: ApplyPatch.sln # Replace with your solution name, i.e. MyWpfApp.sln. + #Test_Project_Path: your-test-project-path # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. + #Wap_Project_Directory: your-wap-project-directory-name # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. + Wap_Project_Path: ApplyPatch\ApplyPatch.csproj # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. steps: - name: Checkout @@ -71,7 +71,7 @@ jobs: - name: Install .NET Core uses: actions/setup-dotnet@v2 with: - dotnet-version: 5.0.x + dotnet-version: 3.1.x # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe @@ -88,15 +88,17 @@ jobs: Configuration: ${{ matrix.configuration }} # Decode the base 64 encoded pfx and save the Signing_Certificate - - name: Decode the pfx - run: | - $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}") - $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx - [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte) + #- name: Decode the pfx + # run: | + # $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}") + # $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx + # [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte) # Create the app package by building and packaging the Windows Application Packaging project + # /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} + # - name: Create the app package - run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }} + run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle env: Appx_Bundle: Always Appx_Bundle_Platforms: x86|x64 @@ -104,12 +106,12 @@ jobs: Configuration: ${{ matrix.configuration }} # Remove the pfx - - name: Remove the pfx - run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx + #- name: Remove the pfx + # run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact - - name: Upload build artifacts - uses: actions/upload-artifact@v3 - with: - name: MSIX Package - path: ${{ env.Wap_Project_Directory }}\AppPackages + #- name: Upload build artifacts + # uses: actions/upload-artifact@v3 + # with: + # name: MSIX Package + # path: ${{ env.Wap_Project_Directory }}\AppPackages diff --git a/ApplyPatch/ApplyPatch.csproj b/ApplyPatch/ApplyPatch.csproj index 4cf7b77..53660db 100644 --- a/ApplyPatch/ApplyPatch.csproj +++ b/ApplyPatch/ApplyPatch.csproj @@ -11,6 +11,22 @@ v4.0 512 true + false + ..\ApplyPatch.Package\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 2.0.0.0 + false + true + true AnyCPU @@ -38,6 +54,21 @@ app.manifest + + 80E503E8D2AB941BBA6FB74DFF4EA197162B558E + + + ApplyPatch_TemporaryKey.pfx + + + true + + + true + + + ApplyPatch.Program + @@ -95,6 +126,7 @@ + SettingsSingleFileGenerator @@ -107,5 +139,12 @@ + + + False + .NET Framework 3.5 SP1 + false + + \ No newline at end of file