@@ -96,6 +96,9 @@ module Commands =
9696 let csc exec cscExe flags srcFiles =
9797 exec cscExe ( sprintf " %s %s " flags ( srcFiles |> Seq.ofList |> String.concat " " ))
9898
99+ let vbc exec vbcExe flags srcFiles =
100+ exec vbcExe ( sprintf " %s %s " flags ( srcFiles |> Seq.ofList |> String.concat " " ))
101+
99102 let fsi exec fsiExe flags sources =
100103 exec fsiExe ( sprintf " %s %s " flags ( sources |> Seq.ofList |> String.concat " " ))
101104
@@ -123,6 +126,8 @@ type TestConfig =
123126 { EnvironmentVariables : Map < string , string >
124127 CSC : string
125128 csc_flags : string
129+ VBC : string
130+ vbc_flags : string
126131 BUILD_CONFIG : string
127132 FSC : string
128133 fsc_flags : string
@@ -183,11 +188,13 @@ let config configurationName envVars =
183188 let artifactsBinPath = artifactsPath ++ " bin"
184189 let coreClrRuntimePackageVersion = " 3.0.0-preview-27318-01"
185190 let csc_flags = " /nologo"
191+ let vbc_flags = " /nologo"
186192 let fsc_flags = " -r:System.Core.dll --nowarn:20 --define:COMPILED"
187193 let fsi_flags = " -r:System.Core.dll --nowarn:20 --define:INTERACTIVE --maxerrors:1 --abortonerror"
188194 let Is64BitOperatingSystem = WindowsPlatform.Is64BitOperatingSystem envVars
189195 let architectureMoniker = if Is64BitOperatingSystem then " x64" else " x86"
190196 let CSC = requireFile ( packagesDir ++ " Microsoft.Net.Compilers" ++ " 2.7.0" ++ " tools" ++ " csc.exe" )
197+ let VBC = requireFile ( packagesDir ++ " Microsoft.Net.Compilers" ++ " 2.7.0" ++ " tools" ++ " vbc.exe" )
191198 let ILDASM = requireFile ( packagesDir ++ ( " runtime.win-" + architectureMoniker + " .Microsoft.NETCore.ILDAsm" ) ++ coreClrRuntimePackageVersion ++ " runtimes" ++ ( " win-" + architectureMoniker) ++ " native" ++ " ildasm.exe" )
192199 let ILASM = requireFile ( packagesDir ++ ( " runtime.win-" + architectureMoniker + " .Microsoft.NETCore.ILAsm" ) ++ coreClrRuntimePackageVersion ++ " runtimes" ++ ( " win-" + architectureMoniker) ++ " native" ++ " ilasm.exe" )
193200 let coreclrdll = requireFile ( packagesDir ++ ( " runtime.win-" + architectureMoniker + " .Microsoft.NETCore.Runtime.CoreCLR" ) ++ coreClrRuntimePackageVersion ++ " runtimes" ++ ( " win-" + architectureMoniker) ++ " native" ++ " coreclr.dll" )
@@ -223,6 +230,7 @@ let config configurationName envVars =
223230 ILDASM = ILDASM
224231 ILASM = ILASM
225232 PEVERIFY = PEVERIFY
233+ VBC = VBC
226234 CSC = CSC
227235 BUILD_ CONFIG = configurationName
228236 FSC = FSC
@@ -235,7 +243,8 @@ let config configurationName envVars =
235243 FSharpCompilerInteractiveSettings = FSharpCompilerInteractiveSettings
236244 csc_ flags = csc_ flags
237245 fsc_ flags = fsc_ flags
238- fsi_ flags = fsi_ flags
246+ fsi_ flags = fsi_ flags
247+ vbc_ flags = vbc_ flags
239248 Directory= " "
240249 DotNetExe = dotNetExe
241250 DefaultPlatform = defaultPlatform }
@@ -462,6 +471,7 @@ let fscBothToOut cfg out arg = Printf.ksprintf (Commands.fsc cfg.Directory (exec
462471let fscBothToOutExpectFail cfg out arg = Printf.ksprintf ( Commands.fsc cfg.Directory ( execBothToOutExpectFail cfg cfg.Directory out) cfg.DotNetExe cfg.FSC) arg
463472let fscAppendErrExpectFail cfg errPath arg = Printf.ksprintf ( Commands.fsc cfg.Directory ( execAppendErrExpectFail cfg errPath) cfg.DotNetExe cfg.FSC) arg
464473let csc cfg arg = Printf.ksprintf ( Commands.csc ( exec cfg) cfg.CSC) arg
474+ let vbc cfg arg = Printf.ksprintf ( Commands.vbc ( exec cfg) cfg.VBC) arg
465475let ildasm cfg arg = Printf.ksprintf ( Commands.ildasm ( exec cfg) cfg.ILDASM) arg
466476let ilasm cfg arg = Printf.ksprintf ( Commands.ilasm ( exec cfg) cfg.ILASM) arg
467477let peverify cfg = Commands.peverify ( exec cfg) cfg.PEVERIFY " /nologo"
0 commit comments