From e8c35976814074d0a4656da313215e28adee8748 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Sat, 6 Jun 2026 02:03:28 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade
 build 20260604.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From
 Version 10.0.0-beta.26301.2 -> To Version 10.0.0-beta.26304.4

---
 eng/Version.Details.props | 2 +-
 eng/Version.Details.xml   | 4 ++--
 global.json               | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 33f18e0ab72..8d5f744bc82 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet-arcade dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26301.2</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26304.4</MicrosoftDotNetArcadeSdkPackageVersion>
     <!-- dotnet-msbuild dependencies -->
     <MicrosoftBuildPackageVersion>18.0.2</MicrosoftBuildPackageVersion>
     <MicrosoftBuildFrameworkPackageVersion>18.0.2</MicrosoftBuildFrameworkPackageVersion>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 0a4170f5d9a..fa31d93846d 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -76,9 +76,9 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26301.2">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26304.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>2a80f6e04a835d6beee635c93331b38944de8129</Sha>
+      <Sha>7b306e34463421cef2816352743b943c6547dfab</Sha>
     </Dependency>
     <Dependency Name="optimization.windows_nt-x64.MIBC.Runtime" Version="1.0.0-prerelease.25467.1">
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-optimization</Uri>
diff --git a/global.json b/global.json
index c9fb0f5a8ab..97c35b70143 100644
--- a/global.json
+++ b/global.json
@@ -22,7 +22,7 @@
     "perl": "5.38.2.2"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26301.2",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26304.4",
     "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23255.2"
   }
 }

From c00486a230a36ba98497153dc92cf44d27ff55b1 Mon Sep 17 00:00:00 2001
From: Copilot <copilot@github.com>
Date: Fri, 12 Jun 2026 12:24:34 +0200
Subject: [PATCH 2/2] Fix fsharpqa_release CI failure: fallback perl download
 when not on PATH

When NativeToolsOnMachine is set but perl.exe is not available on PATH
(e.g. C:\arcade-tools does not exist on the CI machine), the build now
falls back to downloading perl via the native tools installer instead
of failing with 'The system cannot find the file specified'.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
 eng/Build.ps1 | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/eng/Build.ps1 b/eng/Build.ps1
index 148b48f6650..4bc1de3389d 100644
--- a/eng/Build.ps1
+++ b/eng/Build.ps1
@@ -552,6 +552,23 @@ try {
         $nativeTools
         write-host "Path = $env:PERL5Path"
     }
+    else {
+        $perlCmd = Get-Command "perl.exe" -ErrorAction SilentlyContinue
+        if ($perlCmd -ne $null) {
+            $env:PERL5Path = $perlCmd.Source
+        }
+        else {
+            # Perl not found on PATH despite NativeToolsOnMachine being set.
+            # Download it via native tools installer as a fallback.
+            $perlInstallBin = Join-Path $ToolsDir "bin"
+            $perlInstallerPath = Join-Path $PSScriptRoot "common\native\install-tool.ps1"
+            $perlEngCommonBaseDir = Join-Path $PSScriptRoot "common\native\"
+            & $perlInstallerPath -ToolName "perl" -InstallPath $perlInstallBin -BaseUri "https://netcorenativeassets.blob.core.windows.net/resource-packages/external" -CommonLibraryDirectory $perlEngCommonBaseDir -Version "5.38.2.2"
+            $env:PERL5Path = Join-Path $ToolsDir "bin\perl\5.38.2.2\perl\bin\perl.exe"
+        }
+        write-host "variable:NativeToolsOnMachine = true"
+        write-host "Path = $env:PERL5Path"
+    }
 
     $dotnetPath = InitializeDotNetCli
     $env:DOTNET_ROOT = "$dotnetPath"
@@ -629,7 +646,8 @@ try {
         }
         else
         {
-            Exec-Console "perl.exe" """$RepoRoot\tests\fsharpqa\testenv\bin\runall.pl"" -resultsroot ""$resultsRoot"" -results $resultsLog -log $errorLog -fail $failLog -cleanup:no -procs:$env:NUMBER_OF_PROCESSORS"
+            $perlExe = if ((Get-Command "perl.exe" -ErrorAction SilentlyContinue) -ne $null) { "perl.exe" } else { $env:PERL5Path }
+            Exec-Console $perlExe """$RepoRoot\tests\fsharpqa\testenv\bin\runall.pl"" -resultsroot ""$resultsRoot"" -results $resultsLog -log $errorLog -fail $failLog -cleanup:no -procs:$env:NUMBER_OF_PROCESSORS"
         }
 
         write-host "Exec-Console finished"