diff options
| author | Mike Danes <onemihaid@hotmail.com> | 2017-06-02 10:41:59 +0300 |
|---|---|---|
| committer | Mike Danes <onemihaid@hotmail.com> | 2017-06-13 22:38:14 +0300 |
| commit | d25f56be196776131984841de94473e49ee12e39 (patch) | |
| tree | ff090dc5dd84608c1dfbc167f82d5802e0993254 /tests/runtest.proj | |
| parent | e977dde4c5f5210447564ca8779d3c6c00eaf7c1 (diff) | |
| download | coreclr-d25f56be196776131984841de94473e49ee12e39.tar.gz coreclr-d25f56be196776131984841de94473e49ee12e39.tar.bz2 coreclr-d25f56be196776131984841de94473e49ee12e39.zip | |
Do not copy bin subdirectories to test core_root
Diffstat (limited to 'tests/runtest.proj')
| -rw-r--r-- | tests/runtest.proj | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/tests/runtest.proj b/tests/runtest.proj index ff863430a2..eeca687c40 100644 --- a/tests/runtest.proj +++ b/tests/runtest.proj @@ -365,47 +365,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). Condition=" '$(BuildTestsAgainstPackages)'=='true' " /> </Target> - <!-- All the test projects need to add dependency to currently built runtime as they require that to run. - In addition the version number of built runtime can change so all project.json needs to be dynamically generated. - Instead the following task creates a project.json with dependencies like Microsoft.netcore.runtime.coreclr ..etc. - --> - <Target Name="CreateTestRuntimeJsonFile"> - <ItemGroup> - <CoreclrPackage Include="$(CORE_ROOT)\.nuget\**\Microsoft.NETCore.Runtime.CoreCLR.*.nupkg"/> - </ItemGroup> - <PropertyGroup> - <CoreclrPackageFileName>%(CoreclrPackage.Filename)</CoreclrPackageFileName> - <!-- Get package version number from nuget package filename at core_root --> - <CoreClrPackageVersion Condition="'$(BuildTestsAgainstPackages)'!='true'">$([System.String]::Copy('$(CoreclrPackageFileName)').Replace('Microsoft.NETCore.Runtime.CoreCLR.',''))</CoreClrPackageVersion> - <TestRuntimeJsonContents> - <![CDATA[ -{ - "dependencies": { - "Microsoft.NETCore.Runtime.CoreCLR": "$(CoreClrPackageVersion)", - "Microsoft.NETCore.TestHost": "1.0.0-rc3-24117-00" - }, - "frameworks": { - "dnxcore50": {} - }, - "runtimes": { - "$(TestNugetRuntimeId)":{} - } -} - - ]]> - </TestRuntimeJsonContents> - </PropertyGroup> - - <MakeDir Directories="$(TestRuntimeProjectJsonDir)" Condition="!Exists('$(TestRuntimeProjectJsonDir)')" /> - - <!-- Write the file --> - <WriteLinesToFile - File="$(TestRuntimeProjectJson)" - Lines="$(TestRuntimeJsonContents)" - Overwrite="true" /> - - </Target> - <Target Name="RunPerfTests" Condition="'$(Performance)'=='true'"> <Message Text="Executing steps for perf tests" Importance="High"/> @@ -423,11 +382,6 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\",""). <Target Name="Build"> - <!-- generate project.json for runtime dependency --> - <MSBuild Projects="$(MSBuildProjectFile)" - Targets="CreateTestRuntimeJsonFile" - Condition=" '$(BuildWrappers)'=='true' " /> - <!-- generate project.lock.json file corresponding to above json file --> <MSBuild Projects="src\Common\test_dependencies\test_dependencies.csproj" Condition=" '$(BuildWrappers)'=='true' " /> |