Using full versions, update CoreFX dependencies to beta-24328-05.

To fix tests, change dnxcore50 -> netcoreapp1.0 and add test_runtime.
dotnet · 339823ac081a4314b790e52cafcd664dc9591468 · dagood committed Jul 26, 2016 · Jul 26, 2016 · 339823a
1 parent f09a1f3
commit 339823ac081a4314b790e52cafcd664dc9591468
Unified Split

Showing 588 changed files with 18,686 additions and 16,304 deletions.
diff --git a/global.json b/global.json
@@ -0,0 +1,3 @@
+{
+  "projects": [ "./tests/src", "./tests/src/Common" ]
+}
diff --git a/tests/dir.props b/tests/dir.props
@@ -1,4 +1,4 @@
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <!--
     $(OS) is set to Unix/Windows_NT. This comes from an environment variable on Windows and MSBuild on Unix.
@@ -43,7 +43,7 @@
     <ValidatePackageVersions>true</ValidatePackageVersions>
     <ProhibitFloatingDependencies>true</ProhibitFloatingDependencies>
 
-    <CoreFxExpectedPrerelease>rc3-24117-00</CoreFxExpectedPrerelease>
+    <CoreFxExpectedPrerelease>beta-24328-05</CoreFxExpectedPrerelease>
     <CoreClrPackageVersion>1.0.4-beta-24325-02</CoreClrPackageVersion>
 
     <CoreFxVersionsIdentityRegex>^(?i)((System\..*)|(Microsoft\.CSharp)|(Microsoft\.NETCore.*)|(Microsoft\.Win32\..*)|(Microsoft\.VisualBasic))(?&lt;!TestData)$</CoreFxVersionsIdentityRegex>
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
@@ -3,8 +3,8 @@
 
   <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(BuildToolsTaskDir)Microsoft.DotNet.Build.Tasks.dll"/>
   <ItemGroup>
-    <TestTargetFramework Include="DNXCore,Version=v5.0">
-      <Folder>dnxcore50</Folder>
+    <TestTargetFramework Include=".NETCoreApp,Version=v1.0">
+      <Folder>netcoreapp1.0</Folder>
     </TestTargetFramework>
   </ItemGroup>
 
diff --git a/tests/src/Common/CoreCLRTestLibrary/project.json b/tests/src/Common/CoreCLRTestLibrary/project.json
@@ -1,36 +1,40 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00",
-    "System.Collections": "4.0.10",
-    "System.Collections.NonGeneric": "4.0.1-rc3-24117-00",
-    "System.Collections.Specialized": "4.0.1-rc3-24117-00",
-    "System.ComponentModel": "4.0.1-rc3-24117-00",
-    "System.Console": "4.0.0-rc3-24117-00",
-    "System.Diagnostics.Process": "4.1.0-rc3-24117-00",
-    "System.Globalization": "4.0.10",
-    "System.Globalization.Calendars": "4.0.0",
-    "System.IO": "4.0.10",
-    "System.IO.FileSystem": "4.0.1-rc3-24117-00",
-    "System.IO.FileSystem.Primitives": "4.0.0",
-    "System.Linq": "4.1.0-rc3-24117-00",
-    "System.Linq.Queryable": "4.0.1-rc3-24117-00",
-    "System.Reflection": "4.1.0-rc3-24117-00",
-    "System.Reflection.Primitives": "4.0.0",
-    "System.Runtime": "4.1.0-rc3-24117-00",
-    "System.Runtime.Extensions": "4.0.10",
-    "System.Runtime.Handles": "4.0.0",
-    "System.Runtime.InteropServices": "4.1.0-rc3-24117-00",
-    "System.Runtime.Loader": "4.0.0-rc3-24117-00",
-    "System.Text.Encoding": "4.0.10",
-    "System.Threading": "4.0.10",
-    "System.Threading.Thread": "4.0.0-rc3-24117-00",
-    "System.Xml.ReaderWriter": "4.0.11-rc3-24117-00",
-    "System.Xml.XDocument": "4.0.11-rc3-24117-00",
-    "System.Xml.XmlDocument": "4.0.1-rc3-24117-00",
-    "System.Xml.XmlSerializer": "4.0.11-rc3-24117-00"
+    "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": {
-    "dnxcore50": {}
+    "netcoreapp1.0": {}
   },
   "runtimes": {
     "win7-x86": {},
diff --git a/tests/src/Common/Coreclr.TestWrapper/project.json b/tests/src/Common/Coreclr.TestWrapper/project.json
@@ -1,36 +1,40 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00",
-    "System.Collections": "4.0.10",
-    "System.Collections.NonGeneric": "4.0.1-rc3-24117-00",
-    "System.Collections.Specialized": "4.0.1-rc3-24117-00",
-    "System.ComponentModel": "4.0.1-rc3-24117-00",
-    "System.Console": "4.0.0-rc3-24117-00",
-    "System.Diagnostics.Process": "4.1.0-rc3-24117-00",
-    "System.Globalization": "4.0.10",
-    "System.Globalization.Calendars": "4.0.0",
-    "System.IO": "4.0.10",
-    "System.IO.FileSystem": "4.0.1-rc3-24117-00",
-    "System.IO.FileSystem.Primitives": "4.0.0",
-    "System.Linq": "4.1.0-rc3-24117-00",
-    "System.Linq.Queryable": "4.0.1-rc3-24117-00",
-    "System.Reflection": "4.1.0-rc3-24117-00",
-    "System.Reflection.Primitives": "4.0.0",
-    "System.Runtime": "4.1.0-rc3-24117-00",
-    "System.Runtime.Extensions": "4.0.10",
-    "System.Runtime.Handles": "4.0.0",
-    "System.Runtime.InteropServices": "4.1.0-rc3-24117-00",
-    "System.Runtime.Loader": "4.0.0-rc3-24117-00",
-    "System.Text.Encoding": "4.0.10",
-    "System.Threading": "4.0.10",
-    "System.Threading.Tasks": "4.0.10",
-    "System.Xml.ReaderWriter": "4.0.11-rc3-24117-00",
-    "System.Xml.XDocument": "4.0.11-rc3-24117-00",
-    "System.Xml.XmlDocument": "4.0.1-rc3-24117-00",
-    "System.Xml.XmlSerializer": "4.0.11-rc3-24117-00"
+    "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": {
-    "dnxcore50": {}
+    "netcoreapp1.0": {}
   },
   "runtimes": {
     "win7-x86": {},
diff --git a/tests/src/Common/test_runtime/project.json b/tests/src/Common/test_runtime/project.json
@@ -0,0 +1,27 @@
+{
+  "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"
+  },
+  "frameworks": {
+    "netcoreapp1.0": {}
+  }
+}
diff --git a/tests/src/CoreMangLib/components/fileversioninfo/project.json b/tests/src/CoreMangLib/components/fileversioninfo/project.json
@@ -1,36 +1,40 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00",
-    "System.Collections": "4.0.10",
-    "System.Collections.NonGeneric": "4.0.1-rc3-24117-00",
-    "System.Collections.Specialized": "4.0.1-rc3-24117-00",
-    "System.ComponentModel": "4.0.1-rc3-24117-00",
-    "System.Console": "4.0.0-rc3-24117-00",
-    "System.Diagnostics.Process": "4.1.0-rc3-24117-00",
-    "System.Globalization": "4.0.10",
-    "System.Globalization.Calendars": "4.0.0",
-    "System.IO": "4.0.10",
-    "System.IO.FileSystem": "4.0.1-rc3-24117-00",
-    "System.IO.FileSystem.Primitives": "4.0.0",
-    "System.Linq": "4.1.0-rc3-24117-00",
-    "System.Linq.Queryable": "4.0.1-rc3-24117-00",
-    "System.Reflection": "4.1.0-rc3-24117-00",
-    "System.Reflection.Primitives": "4.0.0",
-    "System.Runtime": "4.1.0-rc3-24117-00",
-    "System.Runtime.Extensions": "4.0.10",
-    "System.Runtime.Handles": "4.0.0",
-    "System.Runtime.InteropServices": "4.1.0-rc3-24117-00",
-    "System.Runtime.Loader": "4.0.0-rc3-24117-00",
-    "System.Text.Encoding": "4.0.10",
-    "System.Threading": "4.0.10",
-    "System.Threading.Thread": "4.0.0-rc3-24117-00",
-    "System.Xml.ReaderWriter": "4.0.11-rc3-24117-00",
-    "System.Xml.XDocument": "4.0.11-rc3-24117-00",
-    "System.Xml.XmlDocument": "4.0.1-rc3-24117-00",
-    "System.Xml.XmlSerializer": "4.0.11-rc3-24117-00"
+    "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": {
-    "dnxcore50": {}
+    "netcoreapp1.0": {}
   },
   "runtimes": {
     "win7-x86": {},
diff --git a/tests/src/CoreMangLib/components/stopwatch/project.json b/tests/src/CoreMangLib/components/stopwatch/project.json
@@ -1,36 +1,40 @@
 {
   "dependencies": {
-    "Microsoft.NETCore.Platforms": "1.0.1-rc3-24117-00",
-    "System.Collections": "4.0.10",
-    "System.Collections.NonGeneric": "4.0.1-rc3-24117-00",
-    "System.Collections.Specialized": "4.0.1-rc3-24117-00",
-    "System.ComponentModel": "4.0.1-rc3-24117-00",
-    "System.Console": "4.0.0-rc3-24117-00",
-    "System.Diagnostics.Process": "4.1.0-rc3-24117-00",
-    "System.Globalization": "4.0.10",
-    "System.Globalization.Calendars": "4.0.0",
-    "System.IO": "4.0.10",
-    "System.IO.FileSystem": "4.0.1-rc3-24117-00",
-    "System.IO.FileSystem.Primitives": "4.0.0",
-    "System.Linq": "4.1.0-rc3-24117-00",
-    "System.Linq.Queryable": "4.0.1-rc3-24117-00",
-    "System.Reflection": "4.1.0-rc3-24117-00",
-    "System.Reflection.Primitives": "4.0.0",
-    "System.Runtime": "4.1.0-rc3-24117-00",
-    "System.Runtime.Extensions": "4.0.10",
-    "System.Runtime.Handles": "4.0.0",
-    "System.Runtime.InteropServices": "4.1.0-rc3-24117-00",
-    "System.Runtime.Loader": "4.0.0-rc3-24117-00",
-    "System.Text.Encoding": "4.0.10",
-    "System.Threading": "4.0.10",
-    "System.Threading.Thread": "4.0.0-rc3-24117-00",
-    "System.Xml.ReaderWriter": "4.0.11-rc3-24117-00",
-    "System.Xml.XDocument": "4.0.11-rc3-24117-00",
-    "System.Xml.XmlDocument": "4.0.1-rc3-24117-00",
-    "System.Xml.XmlSerializer": "4.0.11-rc3-24117-00"
+    "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": {
-    "dnxcore50": {}
+    "netcoreapp1.0": {}
   },
   "runtimes": {
     "win7-x86": {},