Restoring the Test Runtime libraries from a single project.json

This will ensure the expected version to be present at the runtime

Commit migrated from https://github.com/dotnet/coreclr/commit/3fc9f67dbe1765c489f469452b5b4b0b81579f98

diff --git a/docs/coreclr/building/windows-test-instructions.md b/docs/coreclr/building/windows-test-instructions.md
index 0c5aa76..74ec258 100644 (file)
--- a/docs/coreclr/building/windows-test-instructions.md
+++ b/docs/coreclr/building/windows-test-instructions.md
@@ -74,6 +74,9 @@ 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.

diff --git a/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets
index e5d2a7a..a14eb98 100644 (file)
--- a/src/coreclr/tests/publishdependency.targets
+++ b/src/coreclr/tests/publishdependency.targets
@@ -9,23 +9,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <AllProjectJsonLockFiles Include="$(SourceDir)**\*\project.lock.json"/>
+    <ProjectLockJsonFiles Include="$(SourceDir)\runtime\project.lock.json"/>
   </ItemGroup>
 
   <Target Name="CopyDependecyToCoreRoot"
-    Inputs="@(AllProjectJsonLockFiles)"
+    Inputs="@(ProjectLockJsonFiles)"
     Outputs="$(CORE_ROOT)\*.*">
-    
-    <ItemGroup>
-      <ProjectJsonLockFileExclude Include="$(SourceDir).nuget\project.lock.json" />
-      <ProjectJsonLockFileExclude Include="$(SourceDir)Test*\**\project.lock.json" />
-      <ProjectJsonLockFileExclude Include="$(SourceDir)Common\Coreclr.TestWrapper\**\project.lock.json" />
-      <ProjectJsonLockFileExclude Include="$(SourceDir)packages\**\*\project.lock.json" />
-    </ItemGroup>
 
-    <ItemGroup>
-      <ProjectLockJsonFiles Include="@(AllProjectJsonLockFiles)"  Exclude="@(ProjectJsonLockFileExclude)"/>
-    </ItemGroup>
 
     <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items
          for the xunit wrapper projects -->

diff --git a/src/coreclr/tests/src/runtime/project.json b/src/coreclr/tests/src/runtime/project.json
index 91bfae1..abee464 100644 (file)
--- a/src/coreclr/tests/src/runtime/project.json
+++ b/src/coreclr/tests/src/runtime/project.json
@@ -4,33 +4,61 @@
     "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"
@@ -38,7 +66,10 @@
   },
   "frameworks": {
     "netcoreapp1.0": {
-      "imports": "dnxcore50"
+      "imports": [
+        "dnxcore50",  
+        "portable-net45+win8"
+      ]
     }
   },
   "runtimes": {