diff options
| author | wtgodbe <wigodbe@microsoft.com> | 2017-05-18 11:22:42 -0700 |
|---|---|---|
| committer | wtgodbe <wigodbe@microsoft.com> | 2017-05-19 10:55:07 -0700 |
| commit | 40151f7f049643d8945a1bb712701b7ce80f5384 (patch) | |
| tree | 7f2010d754e09c54340eb0330b7d3ce347cf4734 /tests/dir.props | |
| parent | 7a755987c3ceee405a1457df4bff9ac6f4218eda (diff) | |
| download | coreclr-40151f7f049643d8945a1bb712701b7ce80f5384.tar.gz coreclr-40151f7f049643d8945a1bb712701b7ce80f5384.tar.bz2 coreclr-40151f7f049643d8945a1bb712701b7ce80f5384.zip | |
Clean up 2.0.0 BuildTools PR
Diffstat (limited to 'tests/dir.props')
| -rw-r--r-- | tests/dir.props | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/tests/dir.props b/tests/dir.props index d5533ee252..e98b3036eb 100644 --- a/tests/dir.props +++ b/tests/dir.props @@ -59,56 +59,23 @@ <TargetingPackPath Condition="'$(BaseTargetingPackPath)' == ''">$(RootBinDir)TargetingPack\</TargetingPackPath> </PropertyGroup> - <Import Condition="Exists('$(ToolsDir)BuildVersion.targets')" Project="$(ToolsDir)BuildVersion.targets" /> + <!-- Import Build tools common props file where repo-independent properties are found --> + <Import Condition="Exists('$(ToolsDir)Build.Common.props')" Project="$(ToolsDir)Build.Common.props" /> <!-- Provides properties for dependency versions and configures dependency verification/auto-upgrade. --> <Import Project="$(ProjectDir)..\dependencies.props" /> - <!-- Common nuget properties --> - <PropertyGroup> - <NuGetToolPath Condition="'$(NuGetToolPath)'==''">$(PackagesDir)NuGet.exe</NuGetToolPath> - <NuGetConfigFile Condition="'$(NuGetConfigFile)'==''">$(SourceDir)NuGet.Config</NuGetConfigFile> - <NuGetConfigCommandLine>-ConfigFile "$(NuGetConfigFile)"</NuGetConfigCommandLine> - - <NugetRestoreCommand>"$(NuGetToolPath)"</NugetRestoreCommand> - <NugetRestoreCommand>$(NugetRestoreCommand) install</NugetRestoreCommand> - <!-- Trim off the last slash so that nuget doesn't get confused and say there are illegal characters on - the path. --> - <NugetRestoreCommand>$(NugetRestoreCommand) -OutputDirectory "$(PackagesDir.TrimEnd('\\'))"</NugetRestoreCommand> - <NugetRestoreCommand>$(NugetRestoreCommand) $(NuGetConfigCommandLine)</NugetRestoreCommand> - <NugetRestoreCommand>$(NugetRestoreCommand) -Verbosity detailed</NugetRestoreCommand> - <NugetRestoreCommand Condition="'$(OsEnvironment)'=='Unix'">mono $(NuGetRestoreCommand)</NugetRestoreCommand> - </PropertyGroup> - - <!-- list of nuget package sources passed to dnu --> <ItemGroup> <!-- Need to escape double forward slash (%2F) or MSBuild will normalize to one slash on Unix. --> - <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" /> - <DnuSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> - <DnuSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> + <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-corefxlab/api/v3/index.json" /> + <DotnetSourceList Include="https:%2F%2Fdotnet.myget.org/F/dotnet-core/api/v3/index.json" /> + <DotnetSourceList Include="https:%2F%2Fapi.nuget.org/v3/index.json" /> </ItemGroup> - - - <!-- list of directories to perform batch restore --> - <ItemGroup> - <DnuRestoreDir Include=""$(MSBuildProjectDirectory)\**\*.csproj"" /> - </ItemGroup> <PropertyGroup Condition="'$(BuildAllProjects)'=='true'"> <!-- When we do a traversal build we get all packages up front, don't restore them again --> <RestorePackages>false</RestorePackages> </PropertyGroup> - - <PropertyGroup> - <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'!='Unix'">$(DotnetCliPath)dotnet.exe</DotnetToolCommand> - <DotnetToolCommand Condition="'$(DotnetToolCommand)'=='' and '$(OsEnvironment)'=='Unix'">$(DotnetCliPath)dotnet</DotnetToolCommand> - - <DnuRestoreSource>@(DnuSourceList -> '--source %(Identity)', ' ')</DnuRestoreSource> - - <DnuRestoreCommand>"$(DotnetToolCommand)"</DnuRestoreCommand> - <DnuRestoreCommand>$(DnuRestoreCommand) restore</DnuRestoreCommand> - <DnuRestoreCommand>$(DnuRestoreCommand) --packages "$(PackagesDir.TrimEnd('/\'.ToCharArray()))" $(DnuRestoreSource)</DnuRestoreCommand> - </PropertyGroup> <!-- Which tests shall we build? Default: Priority 0 tests. At the command-line, the user can specify /p:CLRTestPriorityToBuild=666 (for example), and |