From f75d77c66aaa50fc2779a1e58cc1285194b3c277 Mon Sep 17 00:00:00 2001 From: LeapwardKoex Date: Tue, 19 Nov 2024 20:29:51 +1300 Subject: [PATCH] Improve versioning in actions file --- .github/workflows/dotnet-desktop.yml | 57 +++++----------------------- 1 file changed, 9 insertions(+), 48 deletions(-) diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index b96d922..a42b321 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -1,41 +1,3 @@ -# This workflow uses actions that are not certified by GitHub. -# They are provided by a third-party and are governed by -# separate terms of service, privacy policy, and support -# documentation. - -# This workflow will build, test, sign and package a WPF or Windows Forms desktop application -# built on .NET Core. -# To learn how to migrate your existing application to .NET Core, -# refer to https://docs.microsoft.com/en-us/dotnet/desktop-wpf/migration/convert-project-from-net-framework -# -# To configure this workflow: -# -# 1. Configure environment variables -# GitHub sets default environment variables for every workflow run. -# Replace the variables relative to your project in the "env" section below. -# -# 2. Signing -# Generate a signing certificate in the Windows Application -# Packaging Project or add an existing signing certificate to the project. -# Next, use PowerShell to encode the .pfx file using Base64 encoding -# by running the following Powershell script to generate the output string: -# -# $pfx_cert = Get-Content '.\SigningCertificate.pfx' -Encoding Byte -# [System.Convert]::ToBase64String($pfx_cert) | Out-File 'SigningCertificate_Encoded.txt' -# -# Open the output file, SigningCertificate_Encoded.txt, and copy the -# string inside. Then, add the string to the repo as a GitHub secret -# and name it "Base64_Encoded_Pfx." -# For more information on how to configure your signing certificate for -# this workflow, refer to https://github.com/microsoft/github-actions-for-desktop-apps#signing -# -# Finally, add the signing certificate password to the repo as a secret and name it "Pfx_Key". -# See "Build the Windows Application Packaging project" below to see how the secret is used. -# -# For more information on GitHub Actions, refer to https://github.com/features/actions -# For a complete CI/CD sample to get started with GitHub Action workflows for Desktop Applications, -# refer to https://github.com/microsoft/github-actions-for-desktop-apps - name: .NET Core Desktop on: @@ -53,13 +15,12 @@ jobs: matrix: configuration: [Release] - runs-on: windows-latest # For a list of available runner types, refer to - # https://help.github.com/en/actions/reference/workflow-syntax-for-github-actions#jobsjob_idruns-on - + runs-on: windows-latest env: - Solution_Name: WpfMaiTouchEmulator.sln # Replace with your solution name, i.e. MyWpfApp.sln. - Wap_Project_Directory: . # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. - Wap_Project_Path: WpfMaiTouchEmulator.csproj # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. + Solution_Name: WpfMaiTouchEmulator.sln + Wap_Project_Directory: . + Wap_Project_Path: WpfMaiTouchEmulator.csproj + Build_Number: 1.6.0.${{ github.run_number }} steps: - name: Checkout @@ -92,7 +53,7 @@ jobs: # Create the app package by building and packaging the Windows Application Packaging project - 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 }} /p:Version=1.5.0.${{ github.run_number }} + 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 }} /p:Version=$env:Build_Number env: Appx_Bundle: Always Appx_Bundle_Platforms: x86|x64 @@ -110,7 +71,7 @@ jobs: aip-output-dir: ${{ github.workspace }}\setup aip-commands: | SetProperty FOO="foo" - SetVersion 1.5.0.${{ github.run_number }} + SetVersion $env:Build_Number # Remove the pfx - name: Remove the pfx @@ -119,11 +80,11 @@ jobs: - name: Upload build artifacts uses: actions/upload-artifact@v3 with: - name: Emulator package + name: MaiTouchEmulatorPortable path: ./bin/Release/net8.0-windows10.0.17763.0/ - name: Publish setup artifact uses: actions/upload-artifact@v3 with: - name: setup + name: MaiTouchEmulatorInstaller path: ./setup/installMaiTouchEmulator.msi