Sync from upstream

runs-on · Sep 11, 2024 · 5df4554 · 5df4554
1 parent fd1d661
commit 5df4554
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/releases/ubuntu22/arm64/images/ubuntu/templates/ubuntu22-full-arm64.pkr.hcl b/releases/ubuntu22/arm64/images/ubuntu/templates/ubuntu22-full-arm64.pkr.hcl
@@ -123,6 +123,7 @@ source "amazon-ebs" "build_ebs" {
   run_tags = {
     creator     = "RunsOn"
     contact     = "[email protected]"
+    ami_name    = "${var.ami_name}"
   }
 
   tags = {

diff --git a/releases/ubuntu22/x64/images/ubuntu/templates/ubuntu22-full-x64.pkr.hcl b/releases/ubuntu22/x64/images/ubuntu/templates/ubuntu22-full-x64.pkr.hcl
@@ -133,6 +133,7 @@ source "amazon-ebs" "build_ebs" {
   run_tags = {
     creator     = "RunsOn"
     contact     = "[email protected]"
+    ami_name    = "${var.ami_name}"
   }
 
   tags = {

diff --git a/releases/ubuntu24/arm64/images/ubuntu/templates/ubuntu24-full-arm64.pkr.hcl b/releases/ubuntu24/arm64/images/ubuntu/templates/ubuntu24-full-arm64.pkr.hcl
@@ -133,6 +133,7 @@ source "amazon-ebs" "build_ebs" {
   run_tags = {
     creator     = "RunsOn"
     contact     = "[email protected]"
+    ami_name    = "${var.ami_name}"
   }
 
   tags = {

diff --git a/releases/ubuntu24/x64/images/ubuntu/templates/ubuntu24-full-x64.pkr.hcl b/releases/ubuntu24/x64/images/ubuntu/templates/ubuntu24-full-x64.pkr.hcl
@@ -133,6 +133,7 @@ source "amazon-ebs" "build_ebs" {
   run_tags = {
     creator     = "RunsOn"
     contact     = "[email protected]"
+    ami_name    = "${var.ami_name}"
   }
 
   tags = {

diff --git a/releases/windows22/x64/images/windows/scripts/helpers/VisualStudioHelpers.ps1 b/releases/windows22/x64/images/windows/scripts/helpers/VisualStudioHelpers.ps1
@@ -29,7 +29,7 @@ Function Install-VisualStudio {
         [Parameter(Mandatory)] [String] $Channel,
         [Parameter(Mandatory)] [String[]] $RequiredComponents,
         [String] $ExtraArgs = "",
-        [Parameter(Mandatory)] [String] $SignatureThumbprint
+        [Parameter(Mandatory)] [String[]] $SignatureThumbprint
     )
 
     $bootstrapperUrl = "https://aka.ms/vs/${Version}/${Channel}/vs_${Edition}.exe"

diff --git a/releases/windows22/x64/images/windows/toolsets/toolset-2019.json b/releases/windows22/x64/images/windows/toolsets/toolset-2019.json
@@ -247,7 +247,9 @@
         "subversion" : "16",
         "edition" : "Enterprise",
         "channel": "release",
-        "signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE",
+        "signature": ["F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE",
+                       "C2048FB509F1C37A8C3E9EC6648118458AA01780" 
+                    ],
         "workloads": [
             "Component.Dotfuscator",
             "Component.Linux.CMake",