diff options
| author | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-01 22:27:56 -0700 |
|---|---|---|
| committer | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-01 22:27:56 -0700 |
| commit | 18543e3e5ac3a9e960a7b0f30f697ddb505c3613 (patch) | |
| tree | 01c775b9d98cf58217aa5dc5883b90810c38b822 | |
| parent | 87e9259abda877c2fb80ff54dc85f782e3c64df0 (diff) | |
| download | coreclr-18543e3e5ac3a9e960a7b0f30f697ddb505c3613.tar.gz coreclr-18543e3e5ac3a9e960a7b0f30f697ddb505c3613.tar.bz2 coreclr-18543e3e5ac3a9e960a7b0f30f697ddb505c3613.zip | |
Revert "Build managed tests with dotnet (#19230)"
This reverts commit 763142a210d858289d30365dd1d4f2772e48f30d.
| -rw-r--r-- | build-test.cmd | 4 | ||||
| -rw-r--r-- | tests/build.proj | 4 | ||||
| -rw-r--r-- | tests/dir.sdkbuild.props | 1 | ||||
| -rw-r--r-- | tests/src/dir.props | 4 |
4 files changed, 6 insertions, 7 deletions
diff --git a/build-test.cmd b/build-test.cmd index e956f04c18..17f67c1b8f 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -118,7 +118,7 @@ if defined __BuildAgainstPackagesArg ( set __RunArgs=-BuildOS=%__BuildOS% -BuildType=%__BuildType% -BuildArch=%__BuildArch% REM As we move from buildtools to arcade, __RunArgs should be replaced with __msbuildArgs -set __msbuildArgs=/p:__BuildOS=%__BuildOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% /nologo /verbosity:minimal /clp:Summary +set __msbuildArgs=/p:__BuildOS=%__BuildOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% if defined __ToolsetDir ( rem arm64 builds currently use private toolset which has not been released yet @@ -321,7 +321,7 @@ for /l %%G in (1, 1, %__BuildLoopCount%) do ( set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%";Append=!__AppendToLog! set TestBuildSlice=%%G - call %__DotnetHost% msbuild %__ProjectDir%\tests\build.proj !__msbuildLog! !__msbuildWrn! !__msbuildErr! %__msbuildArgs% %__BuildAgainstPackagesMsbuildArg% %__PriorityArg% %__PassThroughArg% %__unprocessedBuildArgs% + call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__PriorityArg% %__PassThroughArg% %__unprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. Refer to the build log files for details: diff --git a/tests/build.proj b/tests/build.proj index 6bdc8690bf..a421b130b6 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -51,8 +51,8 @@ </Target> <Target Name="RestorePackage"> - <Exec Condition="'$(__DistroRid)' == ''" Command="$(DotnetRestoreCommand) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> - <Exec Condition="'$(__DistroRid)' != ''" Command="$(DotnetRestoreCommand) -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> + <Exec Condition="'$(RunningOnCore)' == 'false'" Command="$(DotnetRestoreCommand) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> + <Exec Condition="'$(RunningOnCore)' == 'true'" Command="$(DotnetRestoreCommand) -r $(__DistroRid) $(RestoreProj) $(PackageVersionArg)" StandardOutputImportance="Low" /> </Target> <!-- Override RestorePackages from dir.traversal.targets and do a batch restore --> diff --git a/tests/dir.sdkbuild.props b/tests/dir.sdkbuild.props index bc5bed9b3f..c4cc31ec9f 100644 --- a/tests/dir.sdkbuild.props +++ b/tests/dir.sdkbuild.props @@ -10,7 +10,6 @@ <RuntimeFrameworkVersion>$(MicrosoftNETCoreAppPackageVersion)</RuntimeFrameworkVersion> <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> - <Platform>AnyCPU</Platform> <!-- Force the CLI to allow us to target higher netcoreapp than it may know about --> <NETCoreAppMaximumVersion>99.0</NETCoreAppMaximumVersion> diff --git a/tests/src/dir.props b/tests/src/dir.props index c5cc702882..2730073435 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -1,7 +1,7 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> - <Import Project="..\dir.common.props" Condition="'$(UsingMicrosoftNETSdk)' != 'true'" /> + <Import Project="..\dir.common.props" /> <!-- Setup Default symbol and optimization for Configuration --> <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> @@ -37,7 +37,7 @@ <BaseOutputPath Condition="'$(__TestRootDir)' != ''">$(__TestRootDir)</BaseOutputPath> <BaseOutputPathWithConfig>$(BaseOutputPath)\$(OSPlatformConfig)\</BaseOutputPathWithConfig> <BinDir>$(BaseOutputPathWithConfig)</BinDir> - <BaseIntermediateOutputPath>$(ProjectDir)..\bin\tests\obj\$(OSPlatformConfig)\Managed\</BaseIntermediateOutputPath> + <BaseIntermediateOutputPath>$(ProjectDir)\..\bin\tests\obj\$(OSPlatformConfig)\Managed\</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(__ManagedTestIntermediatesDir)' != ''">$(__ManagedTestIntermediatesDir)\</BaseIntermediateOutputPath> <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\$(BuildOS).$(Platform).$(Configuration)\Native\))</__NativeTestIntermediatesDir> <BuildProjectRelativeDir>$(MSBuildProjectName)\</BuildProjectRelativeDir> |