Commite5041d4

committed

Support for targeting downlevel, then executing redirected back to vCurrent

1 parent3577b5a commite5041d4Copy full SHA for e5041d4

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ if not exist "%RESULTSDIR%" (mkdir "%RESULTSDIR%")`
`48`	`48`	`if /I"%2"=="fsharp" (goto :FSHARP)`
`49`	`49`	`if /I"%2"=="fsharpqa" (goto :FSHARPQA)`
`50`	`50`	`if /I"%2"=="fsharpqacrosstarget01" (goto :FSHARPQA)`
	`51`	`+if /I"%2"=="fsharpqacrosstarget02" (goto :FSHARPQA)`
`51`	`52`	`if /I"%2"=="compilerunit" (`
`52`	`53`	`setcompilerunitsuffix=net40`
`53`	`54`	`goto :COMPILERUNIT`
`@@ -172,7 +173,7 @@ if /I "%2" == "fsharpqacrosstarget01" (`
`172`	`173`	`if /I"%2"=="fsharpqacrosstarget02" (`
`173`	`174`	`setISCFLAGS=--noframework -r"%FSCOREDLLVPREVPATH%" -r"%X86_PROGRAMFILES%\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5\mscorlib.dll" -r System.dll -r System.Runtime.dll -r System.Xml.dll -r System.Data.dll -r System.Web.dll -r System.Core.dll -r System.Numerics.dll`
`174`	`175`	`setSIMULATOR_PIPE="%FSCBINPATH%\fsi.exe""%~dp0\fsharpqa\testenv\bin\ExecAssembly.fsx"`
`175`		`-setNO_TTAGS_ARG=%NO_TTAGS_ARG%,NoCrossVer,FSI`
	`176`	`+setNO_TTAGS_ARG=%NO_TTAGS_ARG%,NoCrossVer,NoCrossCrossVer,FSI`
`176`	`177`	`)`
`177`	`178`
`178`	`179`	`setRESULTFILE=FSharpQA_Results.log`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,4 @@`
`7`	`7`
`8`	`8`	`SOURCE=E_DLLImportInTypeDef01.fs SCFLAGS="--test:ErrorRanges"# E_DLLImportInTypeDef01.fs`
`9`	`9`	`SOURCE=CallingConventions01.fs SCFLAGS="--platform:x86"# CallingConventions01.fs - x86`
`10`		`-SOURCE=CallingConventions01.fs SCFLAGS="--platform:x64 --define:AMD64"# CallingConventions01.fs - x64`
	`10`	`+NoCrossCrossVerSOURCE=CallingConventions01.fs SCFLAGS="--platform:x64 --define:AMD64"# CallingConventions01.fs - x64`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`SOURCE=addressof_local_unit.fsx SCFLAGS=-a# addressof_local_unit.fsx`
`2`	`2`	`NoMTSOURCE=addressof001.fsx PRECMD="\$CSC_PIPE /t:library addressof001dll.cs"# addressof001.fsx`
`3`	`3`	`NoMTSOURCE=addressof002.fsx PRECMD="\$CSC_PIPE /t:library addressof002dll.cs"# addressof002.fsx`
`4`		`-NOMONOSOURCE=addressof003.fs SCFLAGS="--test:ErrorRanges" PRECMD="copy /y addressof003dll_%OSARCH%.dll addressof003dll.dll" PEVER=/MD# addressof003.fs`
	`4`	`+NOMONO,NoCrossCrossVerSOURCE=addressof003.fs SCFLAGS="--test:ErrorRanges" PRECMD="copy /y addressof003dll_%OSARCH%.dll addressof003dll.dll" PEVER=/MD# addressof003.fs`
`5`	`5`	`SOURCE=E_byrefvaluesnotpermitted001.fs SCFLAGS="--test:ErrorRanges"# E_byrefvaluesnotpermitted001.fs`
`6`	`6`	`SOURCE=E_byrefvaluesnotpermitted002.fs SCFLAGS="--test:ErrorRanges"# E_byrefvaluesnotpermitted002.fs`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,11 @@ let appdomain = System.AppDomain.CreateDomain("F# targeting NetFx 4.0", null, se`
`16`	`16`	`// Set the assembly to be loaded and executed. It will be a command line argument...`
`17`	`17`	`letassemblyundertest= fsi.CommandLineArgs.[1]`
`18`	`18`
	`19`	`+// capture the arguments that should be passed to the exe itself`
	`20`	`+letexeArgs= fsi.CommandLineArgs.[2..]`
	`21`	`+`
`19`	`22`	`// Execute the assembly`
`20`		`-letrv= appdomain.ExecuteAssembly(assemblyundertest);`
	`23`	`+letrv= appdomain.ExecuteAssembly(assemblyundertest, exeArgs);`
`21`	`24`
`22`	`25`	`// Return exit code to the automation harness`
`23`	`26`	`exit rv`

Comments

(0)