aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2024-10-04 13:44:19 -0700
committerRob Mensching <rob@firegiant.com>2024-10-04 13:44:19 -0700
commit73c897383236ddbbbc6ba257634013c1269ceec2 (patch)
treedffde8f09cd98708b84e5c2cdc2e5e22cbb8db90
parent6879c941119532d0ec7bf9f5c05faa2231553b57 (diff)
downloadwix-4.0.6.tar.gz
wix-4.0.6.tar.bz2
wix-4.0.6.zip
WiX Toolset v4.0.6v4.0.6
-rw-r--r--.github/workflows/build.yml5
-rw-r--r--src/Directory.Build.targets2
-rw-r--r--src/version.txt2
3 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b745272c..5f113d37 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -67,7 +67,10 @@ jobs:
67 run: ./src/build_official.cmd 67 run: ./src/build_official.cmd
68 env: 68 env:
69 RuntimeTestsEnabled: true 69 RuntimeTestsEnabled: true
70 SigningVaultUri: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_VAULTURI || '' }} 70 SigningKeyVaultUri: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_VAULTURI || '' }}
71 SigningTenantId: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_TENANTID || '' }}
72 SigningClientId: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_CLIENTID || '' }}
73 SigningClientSecret: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_SECRET || '' }}
71 SigningCertName: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_CERTNAME || '' }} 74 SigningCertName: ${{ github.ref == 'refs/heads/master' && secrets.WIX_SIGNING_CERTNAME || '' }}
72 75
73 - name: Validate test results 76 - 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 @@
5 <PropertyGroup> 5 <PropertyGroup>
6 <SigningToolExe>$(ToolsFolder)\sign.exe</SigningToolExe> 6 <SigningToolExe>$(ToolsFolder)\sign.exe</SigningToolExe>
7 <SigningCommand>code azure-key-vault</SigningCommand> 7 <SigningCommand>code azure-key-vault</SigningCommand>
8 <SigningConfiguration>--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)"</SigningConfiguration> 8 <SigningConfiguration>--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"</SigningConfiguration>
9 </PropertyGroup> 9 </PropertyGroup>
10 10
11 <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' "> 11 <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' ">
diff --git a/src/version.txt b/src/version.txt
index 4451606d..d13e837c 100644
--- a/src/version.txt
+++ b/src/version.txt
@@ -1 +1 @@
4.0.6-build.{height} 4.0.6