diff options
author | William Godbe <wigodbe@microsoft.com> | 2017-05-19 14:14:33 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-19 14:14:33 -0700 |
commit | 7c41871f582fedc751ee6cabd95df3fbad36d847 (patch) | |
tree | 7040ece024e767ff0ba78fe31e12d7ac0bc644de /tests | |
parent | 25472eeb5db62ba18a5763a32fd693aa836b6e23 (diff) | |
parent | 40151f7f049643d8945a1bb712701b7ce80f5384 (diff) | |
download | coreclr-7c41871f582fedc751ee6cabd95df3fbad36d847.tar.gz coreclr-7c41871f582fedc751ee6cabd95df3fbad36d847.tar.bz2 coreclr-7c41871f582fedc751ee6cabd95df3fbad36d847.zip |
Merge pull request #11720 from wtgodbe/BuildToolsCleanup
Clean up 2.0.0 BuildTools PR
Diffstat (limited to 'tests')
-rw-r--r-- | tests/build.proj | 26 | ||||
-rw-r--r-- | tests/dir.props | 43 | ||||
-rw-r--r-- | tests/helixperftasks.targets | 6 | ||||
-rw-r--r-- | tests/scripts/scripts.csproj | 1 | ||||
-rw-r--r-- | tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj | 1 | ||||
-rw-r--r-- | tests/src/Common/external/external.depproj | 1 | ||||
-rw-r--r-- | tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj | 1 | ||||
-rw-r--r-- | tests/src/Common/test_dependencies/test_dependencies.csproj | 1 | ||||
-rw-r--r-- | tests/src/Common/test_runtime/test_runtime.csproj | 1 | ||||
-rw-r--r-- | tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj | 1 | ||||
-rw-r--r-- | tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj | 1 | ||||
-rw-r--r-- | tests/src/JIT/config/benchmark/benchmark.csproj | 1 | ||||
-rw-r--r-- | tests/src/TestWrappersConfig/TestWrappersConfig.csproj | 1 | ||||
-rw-r--r-- | tests/src/performance/performance.csproj | 1 |
14 files changed, 28 insertions, 58 deletions
diff --git a/tests/build.proj b/tests/build.proj index 260afb275a..066f2a2370 100644 --- a/tests/build.proj +++ b/tests/build.proj @@ -21,22 +21,18 @@ </PropertyGroup> <ItemGroup> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\scripts\scripts.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\Common\targeting_pack_ref\targeting_pack_ref.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\Common\test_dependencies\test_dependencies.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\Common\test_runtime\test_runtime.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\JIT\config\benchmark\benchmark.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\performance\performance.csproj" /> - <RestoreProjects Include="$(MSBuildThisFileDirectory)\src\TestWrappersConfig\TestWrappersConfig.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)scripts\scripts.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\build_against_pkg_dependencies\build_against_pkg_dependencies.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\targeting_pack_ref\targeting_pack_ref.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_dependencies\test_dependencies.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\Common\test_runtime\test_runtime.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+roslyn\benchmark+roslyn.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark+serialize\benchmark+serialize.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\JIT\config\benchmark\benchmark.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\performance\performance.csproj" /> + <RestoreProjects Include="$(MSBuildThisFileDirectory)src\TestWrappersConfig\TestWrappersConfig.csproj" /> </ItemGroup> - <PropertyGroup> - <DnuRestoreDirs>@(RestoreProjects -> '%(Identity)', ' ')</DnuRestoreDirs> - </PropertyGroup> - <Target Name="BuildTargetingPack" AfterTargets="BatchRestorePackages"> <Message Text="Building Targeting Pack" Importance="High" /> <MSBuild Projects="$(MSBuildThisFileDirectory)\src\Common\external\external.depproj" /> @@ -54,7 +50,7 @@ </Target> <Target Name="RestorePackage"> - <Exec Command="$(DnuRestoreCommand) $(RestoreProj)" + <Exec Command="$(DotnetRestoreCommand) $(RestoreProj)" StandardOutputImportance="Low" /> </Target> 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 diff --git a/tests/helixperftasks.targets b/tests/helixperftasks.targets index 62da5e4c32..d578360092 100644 --- a/tests/helixperftasks.targets +++ b/tests/helixperftasks.targets @@ -52,12 +52,8 @@ <Output TaskParameter="PerfTestAssemblies" ItemName="CoreCLRPerfTest" /> </GetPerfTestAssemblies> - <ItemGroup> - <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" /> - </ItemGroup> - <!-- Restore the runtime dependencies --> - <Exec Command="$(DnuRestoreCommand) "$(TestRuntimeProjectJson)"" + <Exec Command="$(DotnetRestoreCommand) "$(TestRuntimeProjectJson)"" StandardOutputImportance="Low" CustomErrorRegularExpression="^Unable to resolve .*" IgnoreExitCode="true" diff --git a/tests/scripts/scripts.csproj b/tests/scripts/scripts.csproj index dca723de8e..b1a1aab6e5 100644 --- a/tests/scripts/scripts.csproj +++ b/tests/scripts/scripts.csproj @@ -28,6 +28,7 @@ <ContainsPackageReferences>true</ContainsPackageReferences> <PrereleaseResolveNuGetPackages>false</PrereleaseResolveNuGetPackages> <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers> + <IsTestProject>false</IsTestProject> </PropertyGroup> <Import Project="$(MSBuildThisFileDirectory)..\src\dir.targets" /> <Target Name="Build" diff --git a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj index 3718f79578..dc74f7d4ad 100644 --- a/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj +++ b/tests/src/Common/build_against_pkg_dependencies/build_against_pkg_dependencies.csproj @@ -5,6 +5,7 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.NETCore.ILAsm"> diff --git a/tests/src/Common/external/external.depproj b/tests/src/Common/external/external.depproj index 710866f629..f9299ba6ba 100644 --- a/tests/src/Common/external/external.depproj +++ b/tests/src/Common/external/external.depproj @@ -15,6 +15,7 @@ <XUnitRunnerPackageId Condition="'$(TargetGroup)' != 'netfx'">xunit.console.netcore</XUnitRunnerPackageId> <XUnitRunnerPackageId Condition="'$(TargetGroup)' == 'netfx'">xunit.runner.console</XUnitRunnerPackageId> <CLRTestKind>SharedLibrary</CLRTestKind> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> diff --git a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj index f59dfa3905..620a447779 100644 --- a/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj +++ b/tests/src/Common/targeting_pack_ref/targeting_pack_ref.csproj @@ -5,6 +5,7 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.TargetingPack.Private.CoreCLR"> diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj index 65f01bf3a2..f5b1b319c7 100644 --- a/tests/src/Common/test_dependencies/test_dependencies.csproj +++ b/tests/src/Common/test_dependencies/test_dependencies.csproj @@ -7,6 +7,7 @@ <CLRTestKind>BuildOnly</CLRTestKind> <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker> <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.NETCore.CoreDisTools"> diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj index 7b01268dec..0212b05274 100644 --- a/tests/src/Common/test_runtime/test_runtime.csproj +++ b/tests/src/Common/test_runtime/test_runtime.csproj @@ -7,6 +7,7 @@ <CLRTestKind>BuildOnly</CLRTestKind> <NugetTargetMoniker>.NETCoreApp,Version=v2.0</NugetTargetMoniker> <NugetTargetMonikerShort>netcoreapp2.0</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.NETCore.Platforms"> diff --git a/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj index 0f2937aac4..f875cd9591 100644 --- a/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj +++ b/tests/src/JIT/config/benchmark+roslyn/benchmark+roslyn.csproj @@ -4,6 +4,7 @@ <PropertyGroup> <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.CodeAnalysis.Compilers"> diff --git a/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj index c0cb32f119..7b062e5d79 100644 --- a/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj +++ b/tests/src/JIT/config/benchmark+serialize/benchmark+serialize.csproj @@ -4,6 +4,7 @@ <PropertyGroup> <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="xunit.performance.api"> diff --git a/tests/src/JIT/config/benchmark/benchmark.csproj b/tests/src/JIT/config/benchmark/benchmark.csproj index c7a5d57116..e5285c1fec 100644 --- a/tests/src/JIT/config/benchmark/benchmark.csproj +++ b/tests/src/JIT/config/benchmark/benchmark.csproj @@ -4,6 +4,7 @@ <PropertyGroup> <NugetTargetMoniker>.NETStandard,Version=v1.4</NugetTargetMoniker> <NugetTargetMonikerShort>netstandard1.4</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="xunit.performance.api"> diff --git a/tests/src/TestWrappersConfig/TestWrappersConfig.csproj b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj index 80f52a0259..b108d48de7 100644 --- a/tests/src/TestWrappersConfig/TestWrappersConfig.csproj +++ b/tests/src/TestWrappersConfig/TestWrappersConfig.csproj @@ -5,6 +5,7 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <CLRTestKind>BuildOnly</CLRTestKind> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="Microsoft.NETCore.Platforms"> diff --git a/tests/src/performance/performance.csproj b/tests/src/performance/performance.csproj index 49659691bf..fbfdfcf16d 100644 --- a/tests/src/performance/performance.csproj +++ b/tests/src/performance/performance.csproj @@ -4,6 +4,7 @@ <PropertyGroup> <NugetTargetMoniker>.NETStandard,Version=v1.5</NugetTargetMoniker> <NugetTargetMonikerShort>netstandard1.5</NugetTargetMonikerShort> + <IsTestProject>false</IsTestProject> </PropertyGroup> <ItemGroup> <PackageReference Include="xunit.performance.api"> |