Skip to content

Commit 37b2be1

Browse files
vzarytovskiibaronfel
authored andcommitted
Fixed platform name 'windows'->'win'
1 parent 996bb82 commit 37b2be1

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

tests/FSharp.Test.Utilities/TestFramework.fs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -223,20 +223,20 @@ let config configurationName envVars =
223223
let requirePackage = requireFile packagesDir
224224
let requireArtifact = requireFile artifactsBinPath
225225
let CSC = requirePackage ("Microsoft.Net.Compilers" ++ "2.7.0" ++ "tools" ++ "csc.exe")
226-
let ILDASM_EXE = if operatingSystem = "windows" then "ildasm.exe" else "ildasm"
226+
let ILDASM_EXE = if operatingSystem = "win" then "ildasm.exe" else "ildasm"
227227
let ILDASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILDAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILDASM_EXE)
228-
let ILASM_EXE = if operatingSystem = "windows" then "ilasm.exe" else "ilasm"
228+
let ILASM_EXE = if operatingSystem = "win" then "ilasm.exe" else "ilasm"
229229
let ILASM = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.ILAsm") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ ILASM_EXE)
230-
let CORECLR_DLL = if operatingSystem = "windows" then "coreclr.dll" elif operatingSystem = "osx" then "libcoreclr.dylib" else "libcoreclr.so"
230+
let CORECLR_DLL = if operatingSystem = "win" then "coreclr.dll" elif operatingSystem = "osx" then "libcoreclr.dylib" else "libcoreclr.so"
231231
let coreclrdll = requirePackage (("runtime." + operatingSystem + "-" + architectureMoniker + ".Microsoft.NETCore.Runtime.CoreCLR") ++ coreClrRuntimePackageVersion ++ "runtimes" ++ (operatingSystem + "-" + architectureMoniker) ++ "native" ++ CORECLR_DLL)
232-
let PEVERIFY_EXE = if operatingSystem = "windows" then "PEVerify.exe" else "PEVerify"
232+
let PEVERIFY_EXE = if operatingSystem = "win" then "PEVerify.exe" else "PEVerify"
233233
let PEVERIFY = requireArtifact ("PEVerify" ++ configurationName ++ peverifyArchitecture ++ PEVERIFY_EXE)
234234
let FSharpBuild = requireArtifact ("FSharp.Build" ++ configurationName ++ fsharpBuildArchitecture ++ "FSharp.Build.dll")
235235
let FSharpCompilerInteractiveSettings = requireArtifact ("FSharp.Compiler.Interactive.Settings" ++ configurationName ++ fsharpCompilerInteractiveSettingsArchitecture ++ "FSharp.Compiler.Interactive.Settings.dll")
236236

237237
let dotNetExe =
238238
// first look for {repoRoot}\.dotnet\dotnet.exe, otherwise fallback to %PATH%
239-
let DOTNET_EXE = if operatingSystem = "windows" then "dotnet.exe" else "dotnet"
239+
let DOTNET_EXE = if operatingSystem = "win" then "dotnet.exe" else "dotnet"
240240
let repoLocalDotnetPath = repoRoot ++ ".dotnet" ++ DOTNET_EXE
241241
if File.Exists(repoLocalDotnetPath) then repoLocalDotnetPath
242242
else DOTNET_EXE

0 commit comments

Comments
 (0)