From 035f8fad8334bc339210190cc3448b0cc5504023 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 29 Jul 2025 02:02:13 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade
 build 20250728.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 8.0.0-beta.25366.2 -> To Version 8.0.0-beta.25378.1
---
 eng/Version.Details.xml                   |  8 ++++----
 eng/common/templates-official/job/job.yml | 10 ++++++----
 global.json                               |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7ee4cf8b9..6b44ec676 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -3,13 +3,13 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25366.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25378.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a73c08ec0de5a6e5e2a8668837df67edecb3a3da</Sha>
+      <Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25366.2">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25378.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>a73c08ec0de5a6e5e2a8668837df67edecb3a3da</Sha>
+      <Sha>8dca4f8ae100b102230287f8cc1b75264c9f1a6f</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml
index 9713e93c8..b98f6a650 100644
--- a/eng/common/templates-official/job/job.yml
+++ b/eng/common/templates-official/job/job.yml
@@ -21,6 +21,7 @@ parameters:
   # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md
   artifacts: ''
   enableMicrobuild: false
+  microbuildUseESRP: true
   enablePublishBuildArtifacts: false
   enablePublishBuildAssets: false
   enablePublishTestResults: false
@@ -135,10 +136,11 @@ jobs:
           signType: $(_SignType)
           zipSources: false
           feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
-          ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
-            ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
-          ${{ else }}:
-            ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
+          ${{ if eq(parameters.microbuildUseESRP, true) }}:
+            ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}:
+              ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
+            ${{ else }}:
+              ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
         env:
           TeamName: $(_TeamName)
           MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)'
diff --git a/global.json b/global.json
index 62014feab..4c2f4550e 100644
--- a/global.json
+++ b/global.json
@@ -3,7 +3,7 @@
     "dotnet": "8.0.117"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2",
-    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2"
+    "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25378.1",
+    "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25378.1"
   }
 }

From 2f9d562fde74e048b33eb004180983d86249bf0a Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Mon, 4 Aug 2025 15:50:08 -0700
Subject: [PATCH 2/2] Update GivenThatIWantToInstallDotnetFromAScript.cs

---
 .../GivenThatIWantToInstallDotnetFromAScript.cs             | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/Install-Scripts.Test/GivenThatIWantToInstallDotnetFromAScript.cs b/tests/Install-Scripts.Test/GivenThatIWantToInstallDotnetFromAScript.cs
index a7d57a397..e73afed9a 100644
--- a/tests/Install-Scripts.Test/GivenThatIWantToInstallDotnetFromAScript.cs
+++ b/tests/Install-Scripts.Test/GivenThatIWantToInstallDotnetFromAScript.cs
@@ -205,6 +205,10 @@ public void Dispose()
             {
                 // Directory to cleanup may not be there if installation fails. Not an issue. Ignore the exception.
             }
+            catch (UnauthorizedAccessException e)
+            {
+                throw new Exception($"Failed to remove {_sdkInstallationDirectory}");
+            }
         }
 
         [Theory]
@@ -663,4 +667,4 @@ private static IEnumerable<string> GetQualityOptionsFromFlags(Quality flags)
             }
         }
     }
-}
\ No newline at end of file
+}