Infra changes to unify the tests to be built against a common project.json.

   1. tests\src\Common\test_dependencies\project.json - To consume corefx and other nuget feeds

   2. tests\src\Common\empty\project.json - To build against the mscorlib facade,to use this just Add
            <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib> to your project

diff --git a/Documentation/building/windows-test-instructions.md b/Documentation/building/windows-test-instructions.md
index 74ec2584b374f0404cb264e2b6ab08ce4ddd8578..8e8949ed0034800f0c21a7634bd85a58466e8e82 100644 (file)
--- a/Documentation/building/windows-test-instructions.md
+++ b/Documentation/building/windows-test-instructions.md
@@ -74,9 +74,6 @@ If you wish to run the test under a debugger (e.g. [WinDbg](http://msdn.microsof
 
      <repo_root>\binaries\tests\x64\debug\Exceptions\Finalization\Finalizer.cmd -debug <debuggerFullPath>
     
-Note:
-1. The Managed libraries in the above CORE_ROOT is populated from the [project.json](https://github.com/dotnet/coreclr/blob/master/tests/src/runtime/project.json), this is distinct from what was used to build the test.
-
 **Modifying a test**
 
 If test changes are needed, make the change and build the test project. This will binplace the binaries in test binaries folder (e.g. `<repo_root>\binaries\tests\x64\debug\Exceptions\Finalization`). At this point, follow the steps to re-run a failed test to re-run the modified test.
@@ -90,7 +87,6 @@ If test changes are needed, make the change and build the test project. This wil
 4. Add the project of the new test to `<repo_root>\tests\src\AllTestProjects.sln` in VS
 5. Add source files to this newly added project.
 6. Indicate the success of the test by returning `100`.
-7. Add the .NET CoreFX contract references, as required, via the Nuget Package Manager in Visual Studio. *Make sure this does not change the csproj. If it does, then undo the change in the csproj.*
 8. Add any other projects as a dependency, if needed.
 9. Build the test.
 10. Follow the steps to re-run a failed test to validate the new test.
@@ -104,3 +100,7 @@ Note:
      ``<DisableProjectBuild Condition=" '$(Platform)' == 'arm64' ">true</DisableProjectBuild>``
 
   ``</PropertyGroup>``
+
+2. To Add Nuget\MyGet Refernces use this (project.json)[https://github.com/dotnet/coreclr/blob/master/tests/src/Common/test_dependencies/project.json]
+
+3. To Build against the mscorlib facade add  ``<ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>`` to your project

diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index a14eb98a4eeb3f3410dd61a69b7aea126acc159f..554b1eee78d7cb4b3533bd34404fb6d63e2cf823 100644 (file)
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -9,13 +9,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectLockJsonFiles Include="$(SourceDir)\runtime\project.lock.json"/>
+    <ProjectLockJsonFiles Include="$(SourceDir)Common\test_runtime\project.lock.json"/>
+    <ProjectLockJsonFiles Include="$(SourceDir)Common\test_dependencies\project.lock.json"/>
   </ItemGroup>
 
   <Target Name="CopyDependecyToCoreRoot"
     Inputs="@(ProjectLockJsonFiles)"
     Outputs="$(CORE_ROOT)\*.*">
 
+    <MSBuild Projects="$(SourceDir)Common\test_runtime\test_runtime.csproj"/>
+
+    <MSBuild Projects="$(SourceDir)Common\test_dependencies\test_dependencies.csproj"/>
 
     <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items
          for the xunit wrapper projects -->

diff --git a/tests/runtest.proj b/tests/runtest.proj
index b6e714e313396eb99bdbc5bc2f79f2e6893026f7..c02b8c8f9f68d426cf831c8fcef30532599b70aa 100644 (file)
--- a/tests/runtest.proj
+++ b/tests/runtest.proj
@@ -89,6 +89,8 @@ $(_XunitEpilog)
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
     <IsTestProject>true</IsTestProject>
+    <ProjectJson>%24(TestWrappersPackagesConfigFileDirectory)project.json</ProjectJson>
+    <ProjectLockJson>%24(TestWrappersPackagesConfigFileDirectory)project.lock.json</ProjectLockJson>
   </PropertyGroup>
   <!-- Default configurations to help VS understand the configurations -->
   <PropertyGroup Condition=" '%24(Configuration)|%24(Platform)' == 'Debug|AnyCPU' ">
@@ -98,9 +100,6 @@ $(_XunitEpilog)
   <ItemGroup>
     <Compile Include="$(XunitWrapper).cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="%24(TestWrappersPackagesConfigFileDirectory)project.json" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
@@ -148,8 +147,7 @@ $(_XunitEpilog)
   </Target>
   
   <Target Name="BuildXunitWrapper">
-    <MSBuild Projects="$(XunitWrapperSrcDir)\$(XunitWrapper).csproj"
-             Properties="RestorePackages=false"/>
+    <MSBuild Projects="$(XunitWrapperSrcDir)\$(XunitWrapper).csproj"/>
   </Target>
 
   <Target Name="CreateXunitFacts">
@@ -352,11 +350,9 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
   </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. 
-       In order to avoid regenerating project.json for all the tests projects...I added a common project for all the tests.
-       This project is at tests\src\common\test_runtime\test_runtime.csproj. This project is adding common dependencies to
-       all the tests like dependency on Microsoft.netcore.runtime.coreclr ..etc. Project.json for this project is dynamically 
-       generated via task CreateTestRuntimeJsonFile. -->
+       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"/>
@@ -402,7 +398,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
              Targets="CreateTestRuntimeJsonFile"/>  
      
     <!-- generate project.lock.json file corresponding to above json file -->
-    <MSBuild Projects="src\Common\test_runtime\test_runtime.csproj"/>
+    <MSBuild Projects="src\Common\test_dependencies\test_dependencies.csproj"/>
     
     <!-- Package each perf test, upload it and trigger event to execute the tests -->  
     <MSBuild Projects="$(MSBuildProjectFile)" Targets="UploadPerfAssemblies" />  
@@ -417,7 +413,7 @@ namespace $([System.String]::Copy($(Category)).Replace(".","_").Replace("\","").
              Condition=" '$(BuildWrappers)'=='true' " />
 
     <!-- generate project.lock.json file corresponding to above json file -->
-    <MSBuild Projects="src\Common\test_runtime\test_runtime.csproj"
+    <MSBuild Projects="src\Common\test_dependencies\test_dependencies.csproj"
              Condition=" '$(BuildWrappers)'=='true' " />
 
     <!-- Default for building -->

diff --git a/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj b/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
index f0c88c070bb798fadcf09398d68ae2ad0f2e434a..1c1ceccb019c25bc1031c7371e60200b89a1841f 100644 (file)
--- a/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
+++ b/tests/src/Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj
@@ -38,11 +38,8 @@
     <Compile Include="TestFramework.cs" />
     <Compile Include="Utilities.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-</Project>
\ No newline at end of file
+</Project>

diff --git a/tests/src/Common/CoreCLRTestLibrary/project.json b/tests/src/Common/CoreCLRTestLibrary/project.json
deleted file mode 100644 (file)
index 3734242..0000000
--- a/tests/src/Common/CoreCLRTestLibrary/project.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.2-beta-24328-05",
-    "System.Collections": "4.0.12-beta-24328-05",
-    "System.Collections.NonGeneric": "4.0.2-beta-24328-05",
-    "System.Collections.Specialized": "4.0.2-beta-24328-05",
-    "System.ComponentModel": "4.0.2-beta-24328-05",
-    "System.Console": "4.0.1-beta-24328-05",
-    "System.Diagnostics.Process": "4.1.1-beta-24328-05",
-    "System.Globalization": "4.0.12-beta-24328-05",
-    "System.Globalization.Calendars": "4.0.2-beta-24328-05",
-    "System.IO": "4.1.1-beta-24328-05",
-    "System.IO.FileSystem": "4.0.2-beta-24328-05",
-    "System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
-    "System.Linq": "4.1.1-beta-24328-05",
-    "System.Linq.Queryable": "4.0.2-beta-24328-05",
-    "System.Reflection": "4.1.1-beta-24328-05",
-    "System.Reflection.Primitives": "4.0.2-beta-24328-05",
-    "System.Runtime": "4.1.1-beta-24328-05",
-    "System.Runtime.Extensions": "4.1.1-beta-24328-05",
-    "System.Runtime.Handles": "4.0.2-beta-24328-05",
-    "System.Runtime.InteropServices": "4.2.0-beta-24328-05",
-    "System.Runtime.Loader": "4.0.1-beta-24328-05",
-    "System.Text.Encoding": "4.0.12-beta-24328-05",
-    "System.Threading": "4.0.12-beta-24328-05",
-    "System.Threading.Thread": "4.0.1-beta-24328-05",
-    "System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
-    "System.Xml.XDocument": "4.0.12-beta-24328-05",
-    "System.Xml.XmlDocument": "4.0.2-beta-24328-05",
-    "System.Xml.XmlSerializer": "4.0.12-beta-24328-05",
-    "test_runtime": {
-      "target": "project",
-      "exclude": "compile"
-    }
-  },
-  "frameworks": {
-    "netcoreapp1.0": {}
-  },
-  "runtimes": {
-    "win7-x86": {},
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {},
-    "osx.10.10-x64": {},
-    "centos.7-x64": {},
-    "rhel.7-x64": {},
-    "debian.8-x64": {}
-  }
-}

diff --git a/tests/src/Common/Coreclr.TestWrapper/project.json b/tests/src/Common/Coreclr.TestWrapper/project.json
deleted file mode 100644 (file)
index 8168aa2..0000000
--- a/tests/src/Common/Coreclr.TestWrapper/project.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.2-beta-24328-05",
-    "System.Collections": "4.0.12-beta-24328-05",
-    "System.Collections.NonGeneric": "4.0.2-beta-24328-05",
-    "System.Collections.Specialized": "4.0.2-beta-24328-05",
-    "System.ComponentModel": "4.0.2-beta-24328-05",
-    "System.Console": "4.0.1-beta-24328-05",
-    "System.Diagnostics.Process": "4.1.1-beta-24328-05",
-    "System.Globalization": "4.0.12-beta-24328-05",
-    "System.Globalization.Calendars": "4.0.2-beta-24328-05",
-    "System.IO": "4.1.1-beta-24328-05",
-    "System.IO.FileSystem": "4.0.2-beta-24328-05",
-    "System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
-    "System.Linq": "4.1.1-beta-24328-05",
-    "System.Linq.Queryable": "4.0.2-beta-24328-05",
-    "System.Reflection": "4.1.1-beta-24328-05",
-    "System.Reflection.Primitives": "4.0.2-beta-24328-05",
-    "System.Runtime": "4.1.1-beta-24328-05",
-    "System.Runtime.Extensions": "4.1.1-beta-24328-05",
-    "System.Runtime.Handles": "4.0.2-beta-24328-05",
-    "System.Runtime.InteropServices": "4.2.0-beta-24328-05",
-    "System.Runtime.Loader": "4.0.1-beta-24328-05",
-    "System.Text.Encoding": "4.0.12-beta-24328-05",
-    "System.Threading": "4.0.12-beta-24328-05",
-    "System.Threading.Tasks": "4.0.12-beta-24328-05",
-    "System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
-    "System.Xml.XDocument": "4.0.12-beta-24328-05",
-    "System.Xml.XmlDocument": "4.0.2-beta-24328-05",
-    "System.Xml.XmlSerializer": "4.0.12-beta-24328-05",
-    "test_runtime": {
-      "target": "project",
-      "exclude": "compile"
-    }
-  },
-  "frameworks": {
-    "netcoreapp1.0": {}
-  },
-  "runtimes": {
-    "win7-x86": {},
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {},
-    "osx.10.10-x64": {},
-    "centos.7-x64": {},
-    "rhel.7-x64": {},
-    "debian.8-x64": {}
-  }
-}

diff --git a/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj b/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj
index 4d21611a86ba61cbc5ccdd5c6673c297aea04e23..b70f332f0f21aa7eecdac2a70221f1d023cc4ac7 100644 (file)
--- a/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj
+++ b/tests/src/Common/Desktop.Coreclr.TestWrapper/Desktop.Coreclr.TestWrapper.csproj
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+   <!-- dir.common.props was deliberately created so that Desktop and .Net Core can share most of the properties do not change it to dir.props-->
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.common.props))\dir.common.props" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -30,6 +31,8 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <ProjectJson></ProjectJson>
+    <ProjectLockJson></ProjectLockJson>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

diff --git a/tests/src/Common/empty/project.json b/tests/src/Common/empty/project.json
new file mode 100644 (file)
index 0000000..c6d5104
--- /dev/null
+++ b/tests/src/Common/empty/project.json
@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  },
+  "runtimes": {
+    "win7-x86": {},
+    "win7-x64": {},
+    "ubuntu.14.04-x64": {},
+    "osx.10.10-x64": {},
+    "centos.7-x64": {},
+    "rhel.7-x64": {},
+    "debian.8-x64": {}
+  }
+}

diff --git a/tests/src/Common/test_dependencies/project.json b/tests/src/Common/test_dependencies/project.json
new file mode 100644 (file)
index 0000000..0bc8803
--- /dev/null
+++ b/tests/src/Common/test_dependencies/project.json
@@ -0,0 +1,89 @@
+{
+  "dependencies": {
+    "xunit": "2.1.0",
+    "xunit.console.netcore": "1.0.2-prerelease-00101",
+    "xunit.runner.utility": "2.1.0",
+    "Microsoft.CodeAnalysis.Compilers": "1.1.1",
+    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0035",
+    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0035",
+    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0035",
+    "Microsoft.Win32.Primitives": "4.0.2-beta-24328-05",
+    "Newtonsoft.Json": "7.0.1",
+    "Microsoft.NETCore.Platforms": "1.0.2-beta-24328-05",
+    "Microsoft.NETCore.Targets": "1.0.3-beta-24328-05",
+    "System.Collections.Immutable": "1.2.1-beta-24328-05",
+    "System.Threading.Thread": "4.0.1-beta-24328-05",
+    "System.Collections": "4.0.12-beta-24328-05",
+    "System.Xml.XmlSerializer": "4.0.12-beta-24328-05",
+    "System.Collections.Concurrent": "4.0.13-beta-24328-05",
+    "System.ObjectModel": "4.0.13-beta-24328-05",
+    "System.Runtime.Numerics": "4.0.2-beta-24328-05",
+    "System.Collections.NonGeneric": "4.0.2-beta-24328-05",
+    "System.Collections.Specialized": "4.0.2-beta-24328-05",
+    "System.ComponentModel": "4.0.2-beta-24328-05",
+    "System.Reflection.Emit.Lightweight": "4.0.2-beta-24328-05",
+    "System.Reflection.TypeExtensions": "4.1.1-beta-24328-05",
+    "System.Console": "4.0.1-beta-24328-05",
+    "System.Diagnostics.Contracts": "4.0.2-beta-24328-05",
+    "System.Diagnostics.Debug": "4.0.12-beta-24328-05",
+    "System.Diagnostics.Process": "4.1.1-beta-24328-05",
+    "System.Diagnostics.Tools": "4.0.2-beta-24328-05",
+    "System.Diagnostics.Tracing": "4.1.1-beta-24328-05",
+    "System.Dynamic.Runtime": "4.0.12-beta-24328-05",
+    "System.Globalization": "4.0.12-beta-24328-05",
+    "System.Globalization.Calendars": "4.0.2-beta-24328-05",
+    "System.IO": "4.1.1-beta-24328-05",
+    "System.IO.FileSystem": "4.0.2-beta-24328-05",
+    "System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
+    "System.Linq": "4.1.1-beta-24328-05",
+    "System.Linq.Queryable": "4.0.2-beta-24328-05",
+    "System.Linq.Expressions": "4.1.1-beta-24328-05",
+    "System.Reflection": "4.1.1-beta-24328-05",
+    "System.Reflection.Extensions": "4.0.2-beta-24328-05",
+    "System.Resources.ResourceManager": "4.0.2-beta-24328-05",
+    "System.Runtime": "4.1.1-beta-24328-05",
+    "System.Runtime.CompilerServices.Unsafe": "4.0.1-beta-24328-05",
+    "System.Runtime.Extensions": "4.1.1-beta-24328-05",
+    "System.Runtime.Handles": "4.0.2-beta-24328-05",
+    "System.Runtime.InteropServices": "4.2.0-beta-24328-05",
+    "System.Runtime.InteropServices.RuntimeInformation": "4.0.1-beta-24328-05",
+    "System.Runtime.Loader": "4.0.1-beta-24328-05",
+    "System.Runtime.Serialization.Json": "4.0.3-beta-24328-05",
+    "System.Runtime.Serialization.Primitives": "4.1.1",
+    "System.Runtime.Serialization.Xml": "4.1.2-beta-24328-05",
+    "System.Security.Cryptography.Algorithms": "4.2.1-beta-24328-05",
+    "System.Text.Encoding": "4.0.12-beta-24328-05",
+    "System.Text.Encoding.Extensions": "4.0.12-beta-24328-05",
+    "System.Text.RegularExpressions": "4.2.0-beta-24328-05",
+    "System.Threading": "4.0.12-beta-24328-05",
+    "System.Threading.AccessControl": "4.0.1-beta-24328-05",
+    "System.Threading.Overlapped": "4.0.2-beta-24328-05",
+    "System.Threading.Tasks": "4.0.12-beta-24328-05",
+    "System.Threading.Tasks.Parallel": "4.0.2-beta-24328-05",
+    "System.Threading.ThreadPool": "4.0.11-beta-24328-05",
+    "System.Threading.Timer": "4.0.2-beta-24328-05",
+    "System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
+    "System.Xml.XDocument": "4.0.12-beta-24328-05",
+    "System.Xml.XmlDocument": "4.0.2-beta-24328-05",
+    "System.Xml.XPath": "4.0.2-beta-24328-05",
+    "System.Xml.XPath.XmlDocument": "4.0.2-beta-24328-05",
+    "System.Numerics.Vectors": "4.1.2-beta-24328-05",
+  },
+  "frameworks": {
+    "netcoreapp1.0": {
+      "imports": [
+        "dnxcore50",  
+        "portable-net45+win8"
+      ]
+    }
+  },
+  "runtimes": {
+    "win7-x86": {},
+    "win7-x64": {},
+    "ubuntu.14.04-x64": {},
+    "osx.10.10-x64": {},
+    "centos.7-x64": {},
+    "rhel.7-x64": {},
+    "debian.8-x64": {}
+  }
+}

diff --git a/tests/src/Common/test_dependencies/test_dependencies.csproj b/tests/src/Common/test_dependencies/test_dependencies.csproj
new file mode 100644 (file)
index 0000000..1676021
--- /dev/null
+++ b/tests/src/Common/test_dependencies/test_dependencies.csproj
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <CLRTestKind>BuildOnly</CLRTestKind>
+  </PropertyGroup>
+  <ItemGroup>
+     <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" /> 
+  </ItemGroup>
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
+  <Target Name="Build"
+     DependsOnTargets="ResolveReferences" /> 
+</Project>

diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json
index 976c048597af8dc3d09bd8002c3378bfe87a76ec..9c6fdf163361def0db9ce8fe0bf7503e7bd7776f 100644 (file)
--- a/tests/src/Common/test_runtime/project.json
+++ b/tests/src/Common/test_runtime/project.json
@@ -1,27 +1,22 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Targets": "1.0.3-beta-24328-05",
-    "System.Collections.Concurrent": "4.0.13-beta-24328-05",
-    "System.Collections.Immutable": "1.2.1-beta-24328-05",
-    "System.Diagnostics.Tracing": "4.1.1-beta-24328-05",
-    "System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
-    "System.Linq": "4.1.1-beta-24328-05",
-    "System.Linq.Expressions": "4.1.1-beta-24328-05",
-    "System.ObjectModel": "4.0.13-beta-24328-05",
-    "System.Reflection.Emit.Lightweight": "4.0.2-beta-24328-05",
-    "System.Reflection.TypeExtensions": "4.1.1-beta-24328-05",
-    "System.Runtime.Numerics": "4.0.2-beta-24328-05",
-    "System.Text.RegularExpressions": "4.2.0-beta-24328-05",
-    "System.Threading": "4.0.12-beta-24328-05",
-    "System.Threading.Overlapped": "4.0.2-beta-24328-05",
-    "System.Threading.Thread": "4.0.1-beta-24328-05",
-    "System.Threading.ThreadPool": "4.0.11-beta-24328-05",
-    "System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
-    "System.Xml.XDocument": "4.0.12-beta-24328-05",
-    "System.Xml.XmlDocument": "4.0.2-beta-24328-05",
-    "System.Xml.XmlSerializer": "4.0.12-beta-24328-05"
+    "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease",
   },
   "frameworks": {
-    "netcoreapp1.0": {}
+    "netcoreapp1.0": {
+      "imports": [
+        "dnxcore50",  
+        "portable-net45+win8"
+      ]
+    }
+  },
+  "runtimes": {
+    "win7-x86": {},
+    "win7-x64": {},
+    "ubuntu.14.04-x64": {},
+    "osx.10.10-x64": {},
+    "centos.7-x64": {},
+    "rhel.7-x64": {},
+    "debian.8-x64": {}
   }
 }

diff --git a/tests/src/Common/test_runtime/test_runtime.csproj b/tests/src/Common/test_runtime/test_runtime.csproj
index 0416083fcc598f9983607823221a4760f74228fa..71fefbe80bbf50061ce3df07df4aae8bd7e34d43 100644 (file)
--- a/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/tests/src/Common/test_runtime/test_runtime.csproj
@@ -5,15 +5,17 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <CLRTestKind>BuildOnly</CLRTestKind>
-    <!-- Skip validation of the test_runtime project created by the test build. -->
-    <ValidatePackageVersions>false</ValidatePackageVersions>
+    <!-- Reset the Default project.json-->
+    <ProjectJson></ProjectJson>
+    <ProjectLockJson></ProjectLockJson>
   </PropertyGroup>
   <ItemGroup>
      <DnuSourceList Include="$(CORE_ROOT)\.nuget\pkg" /> 
   </ItemGroup>
   <ItemGroup>
-    <None Include="$(TestRuntimeProjectJson)" />
+    <None Include="project.json" />
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
-  <Target Name="Build" /> 
+  <Target Name="Build"
+     DependsOnTargets="ResolveReferences" /> 
 </Project>

diff --git a/tests/src/baseservices/varargs/varargsupport_r.ilproj b/tests/src/baseservices/varargs/varargsupport_r.ilproj
index fefa179903b15e2058271c1dbcc27996af352f79..39e068117cf51e9bf04a6246c1c636bf79bfcecf 100644 (file)
--- a/tests/src/baseservices/varargs/varargsupport_r.ilproj
+++ b/tests/src/baseservices/varargs/varargsupport_r.ilproj
@@ -25,8 +25,6 @@
       <Visible>False</Visible>
     </CodeAnalysisDependentAssemblyPaths>
   </ItemGroup>
-  <PropertyGroup>
-  </PropertyGroup>
   <ItemGroup>
     <Compile Include="varargsupport.il" />
   </ItemGroup>

diff --git a/tests/src/dir.props b/tests/src/dir.props
index c47ec0fb4a524f4f12ce0f633a3f4e44d5a9c160..3b2754c221c8c0db6396bdbe7042374aa9d30b31 100644 (file)
--- a/tests/src/dir.props
+++ b/tests/src/dir.props
@@ -73,5 +73,9 @@
   <PropertyGroup>
     <ZapRequire Condition="'$(ZapRequire)' == ''">2</ZapRequire>
   </PropertyGroup>
-
+  
+  <PropertyGroup>
+    <ProjectJson>$(SourceDir)Common\test_dependencies\project.json</ProjectJson>
+    <ProjectLockJson>$(SourceDir)Common\test_dependencies\project.lock.json</ProjectLockJson>
+  </PropertyGroup>
 </Project>

diff --git a/tests/src/dir.targets b/tests/src/dir.targets
index 05ae65acb2ec17699ec817803579d0e2aa7eb2f4..31d930488064fbeaab7aa6f9b1de6eba02a6de46 100644 (file)
--- a/tests/src/dir.targets
+++ b/tests/src/dir.targets
@@ -43,6 +43,11 @@
     <_CLRTestNeedsProjectToRun Condition=" '$(_CLRTestNeedsToRun)' and '!$(_CLRTestBuildsExecutable)' ">true</_CLRTestNeedsProjectToRun>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(ReferenceLocalMscorlib)' == 'true'">
+    <ProjectJson>$(SourceDir)Common/empty/project.json</ProjectJson>
+    <ProjectLockJson>$(SourceDir)Common/empty/project.lock.json</ProjectLockJson>
+  </PropertyGroup>
+
   <!--
   If it needs ProjectToRun, turn the project into a ProjectReference so it gets built
   -->

diff --git a/tests/src/dirs.proj b/tests/src/dirs.proj
index eb0cd5896da7d0a38e641f5a1a2c6d1ce6f73dd4..99a50a4f6c06fd50c5f8d18a0fe2448d43b8756c 100644 (file)
--- a/tests/src/dirs.proj
+++ b/tests/src/dirs.proj
@@ -18,6 +18,7 @@
       <DisabledProjects Include="*\**\cs_template.csproj" />
       <DisabledProjects Include="Common\Coreclr.TestWrapper\Coreclr.TestWrapper.csproj" />
       <DisabledProjects Include="Common\test_runtime\test_runtime.csproj" />
+      <DisabledProjects Include="Common\test_dependencies\test_dependencies.csproj" />
       <DisabledProjects Include="GC\Performance\Framework\GCPerfTestFramework.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\regressions\DD117522\Test.csproj" />
       <DisabledProjects Include="Loader\classloader\generics\GenericMethods\VSW491668.csproj" /> <!-- issue 5501 -->

diff --git a/tests/src/performance/perflab/project.json b/tests/src/performance/perflab/project.json
deleted file mode 100644 (file)
index 53ee516..0000000
--- a/tests/src/performance/perflab/project.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0035",
-    "Microsoft.NETCore.Platforms": "1.0.2-beta-24328-05",
-    "System.Console": "4.0.1-beta-24328-05",
-    "System.IO.FileSystem": "4.0.2-beta-24328-05",
-    "System.Reflection": "4.1.1-beta-24328-05",
-    "System.Linq": "4.1.1-beta-24328-05",
-    "System.Linq.Expressions": "4.1.1-beta-24328-05",
-    "System.Text.RegularExpressions": "4.2.0-beta-24328-05",
-    "xunit": "2.1.0",
-    "xunit.console.netcore": "1.0.2-prerelease-00101",
-    "xunit.runner.utility": "2.1.0",
-    "test_runtime": {
-      "target": "project",
-      "exclude": "compile"
-    }
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "runtimes": {
-    "win7-x86": {},
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {},
-    "osx.10.10-x64": {},
-    "centos.7-x64": {},
-    "rhel.7-x64": {},
-    "debian.8-x64": {}
-  }
-}

diff --git a/tests/src/runtime/project.json b/tests/src/runtime/project.json
deleted file mode 100644 (file)
index abee464..0000000
--- a/tests/src/runtime/project.json
+++ /dev/null
@@ -1,84 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.DotNet.CoreCLR.TestDependencies": "1.0.0-prerelease",
-    "Microsoft.NETCore.Platforms": "1.0.2-beta-24328-05",
-    "System.Collections": "4.0.12-beta-24328-05",
-    "System.Collections.Concurrent": "4.0.13-beta-24328-05",
-    "System.Collections.NonGeneric": "4.0.2-beta-24328-05",
-    "System.Collections.Specialized": "4.0.2-beta-24328-05",
-    "System.Console": "4.0.1-beta-24328-05",
-    "System.Diagnostics.Contracts": "4.0.2-beta-24328-05",
-    "System.Diagnostics.Debug": "4.0.12-beta-24328-05",
-    "System.Diagnostics.Process": "4.1.1-beta-24328-05",
-    "System.Diagnostics.Tools": "4.0.2-beta-24328-05",
-    "System.Diagnostics.Tracing": "4.1.1-beta-24328-05",
-    "System.Dynamic.Runtime": "4.0.12-beta-24328-05",
-    "System.Globalization": "4.0.12-beta-24328-05",
-    "System.Globalization.Calendars": "4.0.2-beta-24328-05",
-    "System.IO": "4.1.1-beta-24328-05",
-    "System.IO.FileSystem": "4.0.2-beta-24328-05",
-    "System.IO.FileSystem.Primitives": "4.0.2-beta-24328-05",
-    "System.Linq": "4.1.1-beta-24328-05",
-    "System.Linq.Queryable": "4.0.2-beta-24328-05",
-    "System.Linq.Expressions": "4.1.1-beta-24328-05",
-    "System.Reflection": "4.1.1-beta-24328-05",
-    "System.Reflection.Extensions": "4.0.2-beta-24328-05",
-    "System.Resources.ResourceManager": "4.0.2-beta-24328-05",
-    "System.Runtime": "4.1.1-beta-24328-05",
-    "System.Runtime.CompilerServices.Unsafe": "4.0.1-beta-24328-05",
-    "System.Runtime.Extensions": "4.1.1-beta-24328-05",
-    "System.Runtime.Handles": "4.0.2-beta-24328-05",
-    "System.Runtime.InteropServices": "4.2.0-beta-24328-05",
-    "System.Runtime.InteropServices.RuntimeInformation": "4.0.1-beta-24328-05",
-    "System.Runtime.Loader": "4.0.1-beta-24328-05",
-    "System.Runtime.Serialization.Json": "4.0.3-beta-24328-05",
-    "System.Runtime.Serialization.Primitives": "4.1.1",
-    "System.Runtime.Serialization.Xml": "4.1.2-beta-24328-05",
-    "System.Security.Cryptography.Algorithms": "4.2.1-beta-24328-05",
-    "System.Text.Encoding": "4.0.12-beta-24328-05",
-    "System.Text.Encoding.Extensions": "4.0.12-beta-24328-05",
-    "System.Text.RegularExpressions": "4.2.0-beta-24328-05",
-    "System.Threading": "4.0.12-beta-24328-05",
-    "System.Threading.AccessControl": "4.0.1-beta-24328-05",
-    "System.Threading.Overlapped": "4.0.2-beta-24328-05",
-    "System.Threading.Tasks": "4.0.12-beta-24328-05",
-    "System.Threading.Tasks.Parallel": "4.0.2-beta-24328-05",
-    "System.Threading.ThreadPool": "4.0.11-beta-24328-05",
-    "System.Threading.Timer": "4.0.2-beta-24328-05",
-    "System.Xml.ReaderWriter": "4.1.0-beta-24328-05",
-    "System.Xml.XDocument": "4.0.12-beta-24328-05",
-    "System.Xml.XmlDocument": "4.0.2-beta-24328-05",
-    "System.Xml.XPath": "4.0.2-beta-24328-05",
-    "System.Xml.XPath.XmlDocument": "4.0.2-beta-24328-05",
-    "System.Numerics.Vectors": "4.1.2-beta-24328-05",
-    "Newtonsoft.Json": "7.0.1",
-    "Microsoft.CodeAnalysis.Compilers": "1.1.1",
-    "Microsoft.DotNet.xunit.performance": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0035",
-    "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0035",
-    "xunit": "2.1.0",
-    "xunit.console.netcore": "1.0.2-prerelease-00101",
-    "xunit.runner.utility": "2.1.0",
-    "test_runtime": {
-      "target": "project",
-      "exclude": "compile"
-    }
-  },
-  "frameworks": {
-    "netcoreapp1.0": {
-      "imports": [
-        "dnxcore50",  
-        "portable-net45+win8"
-      ]
-    }
-  },
-  "runtimes": {
-    "win7-x86": {},
-    "win7-x64": {},
-    "ubuntu.14.04-x64": {},
-    "osx.10.10-x64": {},
-    "centos.7-x64": {},
-    "rhel.7-x64": {},
-    "debian.8-x64": {}
-  }
-}