diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/build.proj | 4 | ||||
| -rw-r--r-- | tests/dir.sdkbuild.props | 1 | ||||
| -rw-r--r-- | tests/src/dir.props | 4 |
3 files changed, 4 insertions, 5 deletions
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> |