From 28b8d9a1f732a4d4c0b61cf9cb15c903a6dd3d94 Mon Sep 17 00:00:00 2001 From: Gary Verhaegen Date: Wed, 22 Sep 2021 18:39:40 +0200 Subject: [PATCH] bump dotnet (#10979) This bumps dotnet to the version required by the latest azuresigntool, and pins azuresigntool for the future. As usual for live CI upgrades, this will be rolled out using the blue/green approach. I'll keep each deployed commit in this PR. For future reference, this is PR [#10979]. [#10979]: https://github.com/digital-asset/daml/pull/10979 CHANGELOG_BEGIN CHANGELOG_END --- ci/copy-windows-release-artifacts.sh | 3 ++- infra/vsts_agent_windows.tf | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/copy-windows-release-artifacts.sh b/ci/copy-windows-release-artifacts.sh index 41c864fde1f..8c966955eda 100755 --- a/ci/copy-windows-release-artifacts.sh +++ b/ci/copy-windows-release-artifacts.sh @@ -16,12 +16,13 @@ chmod +wx "$INSTALLER" chmod +wx "$EE_INSTALLER" if ! [ -f /C/Users/u/.dotnet/tools/azuresigntool.exe ]; then - "/C/Program Files/dotnet/dotnet.exe" tool install --global AzureSignTool + "/C/Program Files/dotnet/dotnet.exe" tool install --global AzureSignTool --version 3.0.0 fi /C/Users/u/.dotnet/tools/azuresigntool.exe sign \ --azure-key-vault-url "$AZURE_KEY_VAULT_URL" \ --azure-key-vault-client-id "$AZURE_CLIENT_ID" \ + --azure-key-vault-tenant-id "$AZURE_TENANT_ID" \ --azure-key-vault-client-secret "$AZURE_CLIENT_SECRET" \ --azure-key-vault-certificate "$AZURE_KEY_VAULT_CERTIFICATE" \ --description "Daml SDK installer" \ diff --git a/infra/vsts_agent_windows.tf b/infra/vsts_agent_windows.tf index 8753776f67f..2b9dfbe96bd 100644 --- a/infra/vsts_agent_windows.tf +++ b/infra/vsts_agent_windows.tf @@ -147,7 +147,7 @@ net stop winrm sc.exe config winrm start=auto net start winrm -& choco install dotnetcore-2.1-sdk --no-progress --yes 2>&1 | %%{ "$_" } +& choco install dotnetcore-3.1-sdk --no-progress --yes 2>&1 | %%{ "$_" } echo "== Installing the VSTS agent"