From 41e11442b2ca93e444b60213b5ae99dcbab787d8 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Fri, 5 Apr 2024 09:51:01 -0700 Subject: WiX Toolset v5.0.0 --- .github/workflows/build.yml | 5 ++++- src/Directory.Build.targets | 2 +- src/version.txt | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9cc88dcf..8a320821 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,7 +67,10 @@ jobs: run: ./src/build_official.cmd env: RuntimeTestsEnabled: true - SigningVaultUri: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_VAULTURI || '' }} + SigningKeyVaultUri: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_VAULTURI || '' }} + SigningTenantId: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_TENANTID || '' }} + SigningClientId: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_CLIENTID || '' }} + SigningClientSecret: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_SECRET || '' }} SigningCertName: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_CERTNAME || '' }} - name: Validate test results diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 47c06a03..0ce90600 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -5,7 +5,7 @@ $(ToolsFolder)\sign.exe code azure-key-vault - --description "WiX Toolset" --description-url "https://wixtoolset.org/" --timestamp-url "http://timestamp.digicert.com" --file-list "$(MSBuildThisFileDirectory)signing-empty-file-list.txt" --azure-key-vault-managed-identity true --azure-key-vault-url "$(SigningVaultUri)" --azure-key-vault-certificate "$(SigningCertName)" + --description "WiX Toolset" --description-url "https://wixtoolset.org/" --file-list "$(MSBuildThisFileDirectory)signing-empty-file-list.txt" --azure-key-vault-url $(SigningKeyVaultUri) --azure-key-vault-tenant-id $(SigningTenantId) --azure-key-vault-client-id $(SigningClientId) --azure-key-vault-client-secret $(SigningClientSecret) --azure-key-vault-certificate $(SigningCertName) --timestamp-url "http://timestamp.digicert.com" diff --git a/src/version.txt b/src/version.txt index 8fc9c109..0062ac97 100644 --- a/src/version.txt +++ b/src/version.txt @@ -1 +1 @@ -5.0.0-build.{height} +5.0.0 -- cgit v1.2.3-55-g6feb