@@ -46,6 +46,7 @@ set processedArgs=
46
46
set __unprocessedBuildArgs =
47
47
set __RunArgs =
48
48
set __BuildAgainstPackagesArg =
49
+ set __BuildAgainstPackagesMsbuildArg =
49
50
set __SkipRestorePackages =
50
51
set __SkipManaged =
51
52
set __SkipNative =
@@ -82,7 +83,7 @@ if /i "%1" == "skipmanaged" (set __SkipManaged=1&set processedArgs=!pr
82
83
if /i " %1 " == " skipnative" (set __SkipNative=1& set processedArgs=!processedArgs! %1 & shift& goto Arg_Loop)
83
84
if /i " %1 " == " buildtesthostonly" (set __SkipNative=1& set __SkipManaged=1& set processedArgs=!processedArgs! %1 & shift& goto Arg_Loop)
84
85
if /i " %1 " == " toolset_dir" (set __ToolsetDir=%2 & set __PassThroughArgs=%__PassThroughArgs% %2 & set processedArgs=!processedArgs! %1 %2 & shift& shift& goto Arg_Loop)
85
- if /i " %1 " == " buildagainstpackages" (set __ZipTests=1& set __BuildAgainstPackagesArg=-BuildTestsAgainstPackages& set processedArgs=!processedArgs! %1 & shift& goto Arg_Loop)
86
+ if /i " %1 " == " buildagainstpackages" (set __ZipTests=1& set __BuildAgainstPackagesArg=-BuildTestsAgainstPackages& set __BuildAgainstPackagesMsbuildArg=/p:BuildTestsAgainstPackages=true & set processedArgs=!processedArgs! %1 & shift& goto Arg_Loop)
86
87
if /i " %1 " == " skiprestorepackages" (set __SkipRestorePackages=1& set processedArgs=!processedArgs! %1 & shift& goto Arg_Loop)
87
88
if /i " %1 " == " ziptests" (set __ZipTests=1& set processedArgs=!processedArgs! %1 & shift& goto Arg_Loop)
88
89
if /i " %1 " == " crossgen" (set __DoCrossgen=1& set processedArgs=!processedArgs! %1 & shift& goto Arg_Loop)
@@ -439,7 +440,7 @@ set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
439
440
set __msbuildErr = /flp2:ErrorsOnly;LogFile=" %__BuildErr% "
440
441
441
442
REM Build wrappers using the local SDK's msbuild. As we move to arcade, the other builds should be moved away from run.exe as well.
442
- call %__DotnetHost% msbuild %__ProjectDir% \tests\runtest.proj /p:BuildWrappers=true !__msbuildLog! !__msbuildWrn! !__msbuildErr! %__msbuildArgs% %TargetsWindowsMsbuildArg% %__unprocessedBuildArgs%
443
+ call %__DotnetHost% msbuild %__ProjectDir% \tests\runtest.proj /p:BuildWrappers=true !__msbuildLog! !__msbuildWrn! !__msbuildErr! %__msbuildArgs% %TargetsWindowsMsbuildArg% %__BuildAgainstPackagesMsbuildArg% % __unprocessedBuildArgs%
443
444
if errorlevel 1 (
444
445
echo Xunit Wrapper build failed
445
446
exit /b 1
0 commit comments