diff options
| author | Rob Mensching <rob@firegiant.com> | 2026-02-05 16:33:06 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2026-02-05 16:33:06 -0800 |
| commit | 1de742bfaf700f2c8d2fc4c6e094a97cef0a0f4a (patch) | |
| tree | 095e24b8fc6c95a139c0755cc6f7dc2ac3e0e52a | |
| parent | d4fbfa750c3e39f84f528ac1183e1cff35f8431b (diff) | |
| download | wix-1de742bfaf700f2c8d2fc4c6e094a97cef0a0f4a.tar.gz wix-1de742bfaf700f2c8d2fc4c6e094a97cef0a0f4a.tar.bz2 wix-1de742bfaf700f2c8d2fc4c6e094a97cef0a0f4a.zip | |
back to azure-cli
| -rw-r--r-- | .github/workflows/build.yml | 14 | ||||
| -rw-r--r-- | src/Directory.Build.targets | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index aeda9cc8..403b1874 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
| @@ -55,13 +55,13 @@ jobs: | |||
| 55 | reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpCount /d 10 /f | 55 | reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpCount /d 10 /f |
| 56 | reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 1 | 56 | reg add "HKLM\SOFTWARE\WOW6432Node\Microsoft\Windows\Windows Error Reporting\LocalDumps" /t REG_DWORD /v DumpType /d 1 |
| 57 | 57 | ||
| 58 | # - name: 'Az CLI login' | 58 | - name: 'Az CLI login' |
| 59 | # if: ${{ env.SignBuild == 'true' }} | 59 | if: ${{ env.SignBuild == 'true' }} |
| 60 | # uses: azure/login@v1 | 60 | uses: azure/login@a457da9ea143d694b1b9c7c869ebb04ebe844ef5 # tag: v2.3.0 |
| 61 | # with: | 61 | with: |
| 62 | # allow-no-subscriptions: true | 62 | client-id: ${{ secrets.WIX_SIGNING_CLIENTID }} |
| 63 | # client-id: ${{ secrets.WIX_SIGNING_CLIENTID }} | 63 | tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }} |
| 64 | # tenant-id: ${{ secrets.WIX_SIGNING_TENANTID }} | 64 | subscription-id: ${{ secrets.WIX_SIGNING_SUBSCRIPTIONID }} |
| 65 | 65 | ||
| 66 | - name: Dump GitHub OIDC claims (diagnostic) | 66 | - name: Dump GitHub OIDC claims (diagnostic) |
| 67 | shell: pwsh | 67 | shell: pwsh |
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 23018e86..7e13ae83 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>--publisher-name "WiX Toolset" --description "WiX Toolset" --description-url "https://wixtoolset.org/" --recurse-containers=false --azure-credential-type default --azure-key-vault-url "$(SigningKeyVaultUri)" --azure-key-vault-certificate "$(SigningCertName)"</SigningConfiguration> | 8 | <SigningConfiguration>--publisher-name "WiX Toolset" --description "WiX Toolset" --description-url "https://wixtoolset.org/" --recurse-containers=false --azure-credential-type azure-cli --azure-key-vault-url "$(SigningKeyVaultUri)" --azure-key-vault-certificate "$(SigningCertName)"</SigningConfiguration> |
| 9 | </PropertyGroup> | 9 | </PropertyGroup> |
| 10 | 10 | ||
| 11 | <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' "> | 11 | <PropertyGroup Condition=" '$(IsWixTestSupportProject)'=='true' "> |