diff --git a/eng/Build.ps1 b/eng/Build.ps1 index a92920d01e2..88a2d0a4340 100644 --- a/eng/Build.ps1 +++ b/eng/Build.ps1 @@ -514,19 +514,6 @@ try { TryDownloadDotnetFrameworkSdk $nativeTools = InitializeNativeTools - if (-not (Test-Path variable:NativeToolsOnMachine)) { - $env:PERL5Path = Join-Path $nativeTools "perl\5.32.1.1\perl\bin\perl.exe" - write-host "variable:NativeToolsOnMachine = unset or false" - $nativeTools - write-host "Path = $env:PERL5Path" - } - else { - $env:PERL5Path = Join-Path $nativeTools["perl"] "perl\bin\perl.exe" - write-host "variable:NativeToolsOnMachine = $variable:NativeToolsOnMachine" - $nativeTools.values - write-host "Path = $env:PERL5Path" - } - $dotnetPath = InitializeDotNetCli $env:DOTNET_ROOT = "$dotnetPath" Get-Item -Path Env: @@ -605,8 +592,7 @@ try { $env:FSCOREDLLPATH = "$ArtifactsDir\bin\fsc\$configuration\net472\FSharp.Core.dll" $env:LINK_EXE = "$RepoRoot\tests\fsharpqa\testenv\bin\link\link.exe" $env:OSARCH = $env:PROCESSOR_ARCHITECTURE - write-host "Exec-Console $env:PERL5Path" - Exec-Console $env:PERL5Path """$RepoRoot\tests\fsharpqa\testenv\bin\runall.pl"" -resultsroot ""$resultsRoot"" -results $resultsLog -log $errorLog -fail $failLog -cleanup:no -procs:$env:NUMBER_OF_PROCESSORS" + 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" write-host "Exec-Console finished" Pop-Location } diff --git a/global.json b/global.json index 639607972e0..7a32ddaf10c 100644 --- a/global.json +++ b/global.json @@ -15,7 +15,7 @@ "xcopy-msbuild": "17.6.0-2" }, "native-tools": { - "perl": "5.32.1.1" + "perl": "latest" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23402.2",