-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
61 changed files
with
2,162 additions
and
1,934 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,4 @@ | ||
| # 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. | ||
|
|
||
| name: .NET Core Desktop | ||
| name: Windows Forms build and package | ||
|
|
||
| on: | ||
| push: | ||
|
|
@@ -34,9 +16,8 @@ jobs: | |
|
|
||
| env: | ||
| Solution_Name: Vocup.sln # Replace with your solution name, i.e. MyWpfApp.sln. | ||
| Test_Project_Path: tests\Vocup.UnitTests\Vocup.UnitTests.csproj # Replace with the path to your test project, i.e. MyWpfApp.Tests\MyWpfApp.Tests.csproj. | ||
| Wap_Project_Directory: src\Vocup.Packaging # Replace with the Wap project directory relative to the solution, i.e. MyWpfApp.Package. | ||
| Wap_Project_Path: src\Vocup.Packaging\Vocup.Packaging.wapproj # Replace with the path to your Wap project, i.e. MyWpf.App.Package\MyWpfApp.Package.wapproj. | ||
| App_Project_Directory: src\Vocup.WinForms | ||
| App_Project_Name: Vocup.WinForms | ||
|
|
||
| steps: | ||
| - name: Checkout | ||
|
|
@@ -56,41 +37,79 @@ jobs: | |
|
|
||
| # Execute all unit tests in the solution | ||
| - name: Execute unit tests | ||
| run: dotnet test | ||
| run: dotnet test --configuration ${{ matrix.configuration }} --arch x64 | ||
|
|
||
| # Restore the application to populate the obj folder with RuntimeIdentifiers | ||
| - name: Restore the application | ||
| run: msbuild $env:Solution_Name /t:Restore /p:Configuration=$env:Configuration | ||
| env: | ||
| Configuration: ${{ matrix.configuration }} | ||
| if: matrix.configuration == 'Release' | ||
| run: msbuild $env:Solution_Name /t:Restore /p:Configuration=${{ matrix.configuration }} | ||
|
|
||
| # Decode the base 64 encoded pfx and save the Signing_Certificate | ||
| - name: Decode the pfx | ||
| - name: Create MSIX package (x86) | ||
| if: matrix.configuration == 'Release' | ||
| 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) | ||
| run: msbuild $env:App_Project_Directory /p:Configuration=${{ matrix.configuration }} /p:Platform=x86 /p:GenerateAppxPackageOnBuild=true | ||
|
|
||
| # Create the app package by building and packaging the Windows Application Packaging project | ||
| - name: Create the app package | ||
| - name: Create MSIX package (x64) | ||
| if: matrix.configuration == 'Release' | ||
| 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 | ||
| env: | ||
| Appx_Bundle: Always | ||
| Appx_Bundle_Platforms: x86|x64|arm64 | ||
| Appx_Package_Build_Mode: StoreUpload | ||
| Configuration: ${{ matrix.configuration }} | ||
|
|
||
| # Remove the pfx | ||
| - name: Remove the pfx | ||
| run: msbuild $env:App_Project_Directory /p:Configuration=${{ matrix.configuration }} /p:Platform=x64 /p:GenerateAppxPackageOnBuild=true | ||
|
|
||
| - name: Create MSIX package (arm64) | ||
| if: matrix.configuration == 'Release' | ||
| run: Remove-Item -path $env:Wap_Project_Directory\GitHubActionsWorkflow.pfx | ||
| run: msbuild $env:App_Project_Directory /p:Configuration=${{ matrix.configuration }} /p:Platform=arm64 /p:GenerateAppxPackageOnBuild=true | ||
|
|
||
| - name: Gather MSIX files | ||
| id: gather | ||
| if: matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/') | ||
| run: | | ||
| $gatherDirectory = Join-Path $env:App_Project_Directory "obj" "Bundle" | ||
| New-Item -ItemType Directory -Path $gatherDirectory | Out-Null | ||
| $msixFiles = Get-ChildItem -Path (Join-Path $env:App_Project_Directory "bin") -Recurse -Include "$env:App_Project_Name*.appx" | ||
| $msixFiles | ForEach-Object { Copy-Item -Path $_.FullName -Destination $gatherDirectory } | ||
| Write-Output "Copied $($msixFiles.Count) MSIX files to $gatherDirectory" | ||
| $version = $msixFiles[0].BaseName.Split("_")[1] | ||
| Write-Output "Bundle version based on MSIX file name is $version" | ||
| $uploadDirectory = Join-Path $env:App_Project_Directory "bin" "AppPackages" | ||
| New-Item -ItemType Directory -Path $uploadDirectory | Out-Null | ||
| $uploadFile = Join-Path $uploadDirectory "$($env:App_Project_Name)_$($version)_x86_x64_arm64_bundle.appxupload" | ||
| # Upload the MSIX package: https://github.com/marketplace/actions/upload-a-build-artifact | ||
| $bundleDirectory = Join-Path $uploadDirectory "$($env:App_Project_Name)_$($version)_Test" | ||
| New-Item -ItemType Directory -Path $bundleDirectory | Out-Null | ||
| $bundleFile = Join-Path $bundleDirectory "$($env:App_Project_Name)_$($version)_x86_x64_arm64.appxbundle" | ||
| $symbolFiles = Get-ChildItem -Path (Join-Path $env:App_Project_Directory "bin") -Recurse -Include "$env:App_Project_Name*.appxsym" | ||
| $symbolFiles | ForEach-Object { Copy-Item -Path $_.FullName -Destination $bundleDirectory } | ||
| Write-Output "Copied $($symbolFiles.Count) symbol files to $bundleDirectory" | ||
| Write-Output "gather_directory=$gatherDirectory" >> $env:GITHUB_OUTPUT | ||
| Write-Output "bundle_directory=$bundleDirectory" >> $env:GITHUB_OUTPUT | ||
| Write-Output "bundle_version=$version" >> $env:GITHUB_OUTPUT | ||
| Write-Output "bundle_file=$bundleFile" >> $env:GITHUB_OUTPUT | ||
| Write-Output "upload_directory=$uploadDirectory" >> $env:GITHUB_OUTPUT | ||
| Write-Output "upload_file=$uploadFile" >> $env:GITHUB_OUTPUT | ||
| - name: Create MSIX bundle | ||
| if: matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/') | ||
| uses: LanceMcCarthy/[email protected] | ||
| with: | ||
| msix-folder: ${{ steps.gather.outputs.gather_directory }} | ||
| msixbundle-filepath: ${{ steps.gather.outputs.bundle_file }} | ||
| msixbundle-version: ${{ steps.gather.outputs.bundle_version }} | ||
|
|
||
| - name: Create MSIX upload | ||
| if: matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/') | ||
| run: | | ||
| $uploadFile = "${{ steps.gather.outputs.upload_file }}" | ||
| $bundleDirectory = "${{ steps.gather.outputs.bundle_directory }}" | ||
| Compress-Archive -Path "$bundleDirectory\*" -DestinationPath $uploadFile | ||
| - name: Upload build artifacts | ||
| if: matrix.configuration == 'Release' && startsWith(github.ref, 'refs/tags/') | ||
| uses: actions/upload-artifact@v4 | ||
| with: | ||
| name: MSIX Package | ||
| path: ${{ env.Wap_Project_Directory }}\AppPackages | ||
| path: ${{ steps.gather.outputs.upload_file }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <Nullable>enable</Nullable> | ||
| <AvaloniaVersion>11.2.1</AvaloniaVersion> | ||
| <AvaloniaVersion>11.2.2</AvaloniaVersion> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.