From a38a062eee8b3ee53d2962ea216b8afff2724b18 Mon Sep 17 00:00:00 2001 From: Erik Bershel <110455084+erik-bershel@users.noreply.github.com> Date: Mon, 20 May 2024 10:03:57 +0200 Subject: [PATCH] [Windows] Add more compatible VS2022 VC components (#9876) * [Windows] Add more compatible VS2022 VC components * Updated chocolatey installation to use new certificate thumbprint * Azure CosmosDb Emulator SHA256 updated --------- Co-authored-by: Jack Hennessey --- images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 | 2 +- images/windows/scripts/build/Install-Chocolatey.ps1 | 2 +- images/windows/toolsets/toolset-2022.json | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 index c4b35e23d..b158899a0 100644 --- a/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 +++ b/images/windows/scripts/build/Install-AzureCosmosDbEmulator.ps1 @@ -5,6 +5,6 @@ Install-Binary -Type MSI ` -Url "https://aka.ms/cosmosdb-emulator" ` - -ExpectedSHA256Sum "e2915c766a02d0c0703ae12b28ef992c4f62fe33e65eb482abeeaaaf0ea85237" + -ExpectedSHA256Sum "6312237EE3E06C730F8DCFB3D26F5202D9E713C0603039231A72DB56DD2605B4" Invoke-PesterTests -TestFile "Tools" -TestName "Azure Cosmos DB Emulator" diff --git a/images/windows/scripts/build/Install-Chocolatey.ps1 b/images/windows/scripts/build/Install-Chocolatey.ps1 index 6dc2c6c15..cb5f09fa8 100644 --- a/images/windows/scripts/build/Install-Chocolatey.ps1 +++ b/images/windows/scripts/build/Install-Chocolatey.ps1 @@ -13,7 +13,7 @@ Add-MachinePathItem 'C:\ProgramData\Chocolatey\bin' Update-Environment # Verify and run choco installer -$signatureThumbprint = "83AC7D88C66CB8680BCE802E0F0F5C179722764B" +$signatureThumbprint = "B009C875F4E10FFBC62B785BAF4FC4D6BC2D5711" $installScriptPath = Invoke-DownloadWithRetry 'https://chocolatey.org/install.ps1' Test-FileSignature -Path $installScriptPath -ExpectedThumbprint $signatureThumbprint Invoke-Expression $installScriptPath diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json index 34f5bfc58..90c96cb36 100644 --- a/images/windows/toolsets/toolset-2022.json +++ b/images/windows/toolsets/toolset-2022.json @@ -212,6 +212,7 @@ "Microsoft.VisualStudio.Component.VC.Tools.ARM", "Microsoft.VisualStudio.Component.VC.Tools.ARM64", "Microsoft.VisualStudio.Component.VC.Tools.ARM64EC", + "Microsoft.VisualStudio.Component.VC.Tools.x86.x64", "Microsoft.VisualStudio.Component.VC.Modules.x86.x64", "Microsoft.VisualStudio.Component.VC.Redist.MSM", "Microsoft.VisualStudio.Component.VC.Runtimes.ARM.Spectre", @@ -224,6 +225,7 @@ "Microsoft.VisualStudio.Component.VC.MFC.ARM64.Spectre", "Microsoft.VisualStudio.Component.VC.ATLMFC", "Microsoft.VisualStudio.Component.VC.ATLMFC.Spectre", + "Microsoft.VisualStudio.Component.VC.ATL", "Microsoft.VisualStudio.Component.VC.ATL.Spectre", "Microsoft.VisualStudio.Component.VC.ATL.ARM", "Microsoft.VisualStudio.Component.VC.ATL.ARM.Spectre",