Skip to content

Commit 5533c99

Browse files
authored
perl (#15784)
1 parent 3e037e7 commit 5533c99

File tree

2 files changed

+2
-16
lines changed

2 files changed

+2
-16
lines changed

eng/Build.ps1

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -514,19 +514,6 @@ try {
514514
TryDownloadDotnetFrameworkSdk
515515

516516
$nativeTools = InitializeNativeTools
517-
if (-not (Test-Path variable:NativeToolsOnMachine)) {
518-
$env:PERL5Path = Join-Path $nativeTools "perl\5.32.1.1\perl\bin\perl.exe"
519-
write-host "variable:NativeToolsOnMachine = unset or false"
520-
$nativeTools
521-
write-host "Path = $env:PERL5Path"
522-
}
523-
else {
524-
$env:PERL5Path = Join-Path $nativeTools["perl"] "perl\bin\perl.exe"
525-
write-host "variable:NativeToolsOnMachine = $variable:NativeToolsOnMachine"
526-
$nativeTools.values
527-
write-host "Path = $env:PERL5Path"
528-
}
529-
530517
$dotnetPath = InitializeDotNetCli
531518
$env:DOTNET_ROOT = "$dotnetPath"
532519
Get-Item -Path Env:
@@ -605,8 +592,7 @@ try {
605592
$env:FSCOREDLLPATH = "$ArtifactsDir\bin\fsc\$configuration\net472\FSharp.Core.dll"
606593
$env:LINK_EXE = "$RepoRoot\tests\fsharpqa\testenv\bin\link\link.exe"
607594
$env:OSARCH = $env:PROCESSOR_ARCHITECTURE
608-
write-host "Exec-Console $env:PERL5Path"
609-
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"
595+
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"
610596
write-host "Exec-Console finished"
611597
Pop-Location
612598
}

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"xcopy-msbuild": "17.6.0-2"
1616
},
1717
"native-tools": {
18-
"perl": "5.32.1.1"
18+
"perl": "latest"
1919
},
2020
"msbuild-sdks": {
2121
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23402.2",

0 commit comments

Comments
 (0)