@@ -413,7 +413,7 @@ public void TestDefaultCSharpAutoBuilder()
413
413
actions . RunProcess [ "cmd.exe /C dotnet --info" ] = 0 ;
414
414
actions . RunProcess [ @"cmd.exe /C dotnet clean C:\Project\test.csproj" ] = 0 ;
415
415
actions . RunProcess [ @"cmd.exe /C dotnet restore C:\Project\test.csproj" ] = 0 ;
416
- actions . RunProcess [ @"cmd.exe /C dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project\test.csproj" ] = 0 ;
416
+ actions . RunProcess [ @"cmd.exe /C dotnet build --no-incremental C:\Project\test.csproj" ] = 0 ;
417
417
actions . FileExists [ "csharp.log" ] = true ;
418
418
actions . FileExists [ @"C:\Project\test.csproj" ] = true ;
419
419
actions . GetEnvironmentVariable [ "CODEQL_EXTRACTOR_CSHARP_TRAP_DIR" ] = "" ;
@@ -440,7 +440,7 @@ public void TestLinuxCSharpAutoBuilder()
440
440
actions . RunProcess [ "dotnet --info" ] = 0 ;
441
441
actions . RunProcess [ @"dotnet clean C:\Project/test.csproj" ] = 0 ;
442
442
actions . RunProcess [ @"dotnet restore C:\Project/test.csproj" ] = 0 ;
443
- actions . RunProcess [ @"dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project/test.csproj" ] = 0 ;
443
+ actions . RunProcess [ @"dotnet build --no-incremental C:\Project/test.csproj" ] = 0 ;
444
444
actions . FileExists [ "csharp.log" ] = true ;
445
445
actions . FileExists [ @"C:\Project/test.csproj" ] = true ;
446
446
actions . GetEnvironmentVariable [ "CODEQL_EXTRACTOR_CSHARP_TRAP_DIR" ] = "" ;
@@ -715,9 +715,9 @@ public void TestWindowsCmdIgnoreErrors()
715
715
public void TestWindowCSharpMsBuild ( )
716
716
{
717
717
actions . RunProcess [ @"cmd.exe /C C:\Project\.nuget\nuget.exe restore C:\Project\test1.sln -DisableParallelProcessing" ] = 0 ;
718
- actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test1.sln /p:UseSharedCompilation=false / t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /p:MvcBuildViews=true /P:Fu=Bar" ] = 0 ;
718
+ actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test1.sln /t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /P:Fu=Bar" ] = 0 ;
719
719
actions . RunProcess [ @"cmd.exe /C C:\Project\.nuget\nuget.exe restore C:\Project\test2.sln -DisableParallelProcessing" ] = 0 ;
720
- actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test2.sln /p:UseSharedCompilation=false / t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /p:MvcBuildViews=true /P:Fu=Bar" ] = 0 ;
720
+ actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test2.sln /t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /P:Fu=Bar" ] = 0 ;
721
721
actions . FileExists [ "csharp.log" ] = true ;
722
722
actions . FileExists [ @"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" ] = false ;
723
723
actions . FileExists [ @"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ] = false ;
@@ -746,9 +746,9 @@ public void TestWindowCSharpMsBuild()
746
746
public void TestWindowCSharpMsBuildMultipleSolutions ( )
747
747
{
748
748
actions . RunProcess [ @"cmd.exe /C nuget restore C:\Project\test1.csproj -DisableParallelProcessing" ] = 0 ;
749
- actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test1.csproj /p:UseSharedCompilation=false / t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /p:MvcBuildViews=true /P:Fu=Bar" ] = 0 ;
749
+ actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test1.csproj /t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /P:Fu=Bar" ] = 0 ;
750
750
actions . RunProcess [ @"cmd.exe /C nuget restore C:\Project\test2.csproj -DisableParallelProcessing" ] = 0 ;
751
- actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test2.csproj /p:UseSharedCompilation=false / t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /p:MvcBuildViews=true /P:Fu=Bar" ] = 0 ;
751
+ actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test2.csproj /t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /P:Fu=Bar" ] = 0 ;
752
752
actions . FileExists [ "csharp.log" ] = true ;
753
753
actions . FileExists [ @"C:\Project\test1.csproj" ] = true ;
754
754
actions . FileExists [ @"C:\Project\test2.csproj" ] = true ;
@@ -791,7 +791,7 @@ public void TestWindowCSharpMsBuildMultipleSolutions()
791
791
public void TestWindowCSharpMsBuildFailed ( )
792
792
{
793
793
actions . RunProcess [ @"cmd.exe /C nuget restore C:\Project\test1.sln -DisableParallelProcessing" ] = 0 ;
794
- actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test1.sln /p:UseSharedCompilation=false / t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /p:MvcBuildViews=true /P:Fu=Bar" ] = 1 ;
794
+ actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test1.sln /t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /P:Fu=Bar" ] = 1 ;
795
795
actions . FileExists [ "csharp.log" ] = true ;
796
796
actions . FileExists [ @"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" ] = false ;
797
797
actions . FileExists [ @"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ] = false ;
@@ -817,8 +817,8 @@ public void TestWindowCSharpMsBuildFailed()
817
817
[ Fact ]
818
818
public void TestSkipNugetMsBuild ( )
819
819
{
820
- actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test1.sln /p:UseSharedCompilation=false / t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /p:MvcBuildViews=true /P:Fu=Bar" ] = 0 ;
821
- actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test2.sln /p:UseSharedCompilation=false / t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /p:MvcBuildViews=true /P:Fu=Bar" ] = 0 ;
820
+ actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test1.sln /t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /P:Fu=Bar" ] = 0 ;
821
+ actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ test2.sln /t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /P:Fu=Bar" ] = 0 ;
822
822
actions . FileExists [ "csharp.log" ] = true ;
823
823
actions . FileExists [ @"C:\Program Files (x86)\Microsoft Visual Studio\Installer\vswhere.exe" ] = false ;
824
824
actions . FileExists [ @"C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" ] = false ;
@@ -862,7 +862,7 @@ public void TestSkipNugetDotnet()
862
862
actions . RunProcess [ "dotnet --info" ] = 0 ;
863
863
actions . RunProcess [ @"dotnet clean C:\Project/test.csproj" ] = 0 ;
864
864
actions . RunProcess [ @"dotnet restore C:\Project/test.csproj" ] = 0 ;
865
- actions . RunProcess [ @"dotnet build --no-incremental /p:UseSharedCompilation=false --no-restore C:\Project/test.csproj" ] = 0 ;
865
+ actions . RunProcess [ @"dotnet build --no-incremental --no-restore C:\Project/test.csproj" ] = 0 ;
866
866
actions . FileExists [ "csharp.log" ] = true ;
867
867
actions . FileExists [ @"C:\Project/test.csproj" ] = true ;
868
868
actions . GetEnvironmentVariable [ "CODEQL_EXTRACTOR_CSHARP_TRAP_DIR" ] = "" ;
@@ -894,7 +894,7 @@ public void TestDotnetVersionNotInstalled()
894
894
actions . RunProcess [ @"C:\Project/.dotnet/dotnet --info" ] = 0 ;
895
895
actions . RunProcess [ @"C:\Project/.dotnet/dotnet clean C:\Project/test.csproj" ] = 0 ;
896
896
actions . RunProcess [ @"C:\Project/.dotnet/dotnet restore C:\Project/test.csproj" ] = 0 ;
897
- actions . RunProcess [ @"C:\Project/.dotnet/dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project/test.csproj" ] = 0 ;
897
+ actions . RunProcess [ @"C:\Project/.dotnet/dotnet build --no-incremental C:\Project/test.csproj" ] = 0 ;
898
898
actions . FileExists [ "csharp.log" ] = true ;
899
899
actions . FileExists [ "test.csproj" ] = true ;
900
900
actions . GetEnvironmentVariable [ "CODEQL_EXTRACTOR_CSHARP_TRAP_DIR" ] = "" ;
@@ -929,7 +929,7 @@ public void TestDotnetVersionAlreadyInstalled()
929
929
actions . RunProcess [ @"C:\Project/.dotnet/dotnet --info" ] = 0 ;
930
930
actions . RunProcess [ @"C:\Project/.dotnet/dotnet clean C:\Project/test.csproj" ] = 0 ;
931
931
actions . RunProcess [ @"C:\Project/.dotnet/dotnet restore C:\Project/test.csproj" ] = 0 ;
932
- actions . RunProcess [ @"C:\Project/.dotnet/dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project/test.csproj" ] = 0 ;
932
+ actions . RunProcess [ @"C:\Project/.dotnet/dotnet build --no-incremental C:\Project/test.csproj" ] = 0 ;
933
933
actions . FileExists [ "csharp.log" ] = true ;
934
934
actions . FileExists [ "test.csproj" ] = true ;
935
935
actions . GetEnvironmentVariable [ "CODEQL_EXTRACTOR_CSHARP_TRAP_DIR" ] = "" ;
@@ -960,7 +960,7 @@ private void TestDotnetVersionWindows(Action action, int commandsRun)
960
960
actions . RunProcess [ @"cmd.exe /C C:\Project\.dotnet\dotnet --info" ] = 0 ;
961
961
actions . RunProcess [ @"cmd.exe /C C:\Project\.dotnet\dotnet clean C:\Project\test.csproj" ] = 0 ;
962
962
actions . RunProcess [ @"cmd.exe /C C:\Project\.dotnet\dotnet restore C:\Project\test.csproj" ] = 0 ;
963
- actions . RunProcess [ @"cmd.exe /C C:\Project\.dotnet\dotnet build --no-incremental /p:UseSharedCompilation=false C:\Project\test.csproj" ] = 0 ;
963
+ actions . RunProcess [ @"cmd.exe /C C:\Project\.dotnet\dotnet build --no-incremental C:\Project\test.csproj" ] = 0 ;
964
964
actions . FileExists [ "csharp.log" ] = true ;
965
965
actions . FileExists [ @"C:\Project\test.csproj" ] = true ;
966
966
actions . GetEnvironmentVariable [ "CODEQL_EXTRACTOR_CSHARP_TRAP_DIR" ] = "" ;
@@ -1008,7 +1008,7 @@ public void TestDirsProjWindows()
1008
1008
{
1009
1009
actions . RunProcess [ @"cmd.exe /C nuget restore C:\Project\dirs.proj -DisableParallelProcessing" ] = 1 ;
1010
1010
actions . RunProcess [ @"cmd.exe /C C:\Project\.nuget\nuget.exe restore C:\Project\dirs.proj -DisableParallelProcessing" ] = 0 ;
1011
- actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ dirs.proj /p:UseSharedCompilation=false / t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /p:MvcBuildViews=true /P:Fu=Bar" ] = 0 ;
1011
+ actions . RunProcess [ "cmd.exe /C CALL ^\" C:\\ Program Files ^(x86^)\\ Microsoft Visual Studio 12.0\\ VC\\ vcvarsall.bat^\" && set Platform=&& type NUL && msbuild C:\\ Project\\ dirs.proj /t:Windows /p:Platform=\" x86\" /p:Configuration=\" Debug\" /P:Fu=Bar" ] = 0 ;
1012
1012
actions . FileExists [ "csharp.log" ] = true ;
1013
1013
actions . FileExists [ @"C:\Project\a\test.csproj" ] = true ;
1014
1014
actions . FileExists [ @"C:\Project\dirs.proj" ] = true ;
@@ -1052,7 +1052,7 @@ public void TestDirsProjLinux()
1052
1052
{
1053
1053
actions . RunProcess [ @"nuget restore C:\Project/dirs.proj -DisableParallelProcessing" ] = 1 ;
1054
1054
actions . RunProcess [ @"mono C:\Project/.nuget/nuget.exe restore C:\Project/dirs.proj -DisableParallelProcessing" ] = 0 ;
1055
- actions . RunProcess [ @"msbuild C:\Project/dirs.proj /p:UseSharedCompilation=false / t:rebuild /p:MvcBuildViews=true " ] = 0 ;
1055
+ actions . RunProcess [ @"msbuild C:\Project/dirs.proj /t:rebuild" ] = 0 ;
1056
1056
actions . FileExists [ "csharp.log" ] = true ;
1057
1057
actions . FileExists [ @"C:\Project/a/test.csproj" ] = true ;
1058
1058
actions . FileExists [ @"C:\Project/dirs.proj" ] = true ;
0 commit comments