Merge pull request #471 from roncain/port-rc1-fixes

Port rc1 fixes
dotnet · Oct 27, 2015 · 83385ce · 83385ce
2 parents 5f5f1e3 + fddb45b
commit 83385ce
Show file tree

Hide file tree

Showing 70 changed files with 28,973 additions and 5,859 deletions.
diff --git a/dir.props b/dir.props
@@ -43,6 +43,12 @@
     <ToolsDir Condition="'$(ToolsDir)'==''">$(PackagesDir)Microsoft.DotNet.BuildTools.$(BuildToolsVersion)/lib/</ToolsDir>
   </PropertyGroup>
 
+  <!-- Test runtime -->
+  <PropertyGroup>
+    <TestRuntimeProjectJson Condition="'$(TestRuntimeProjectJson)' == ''">$(SourceDir)Common/test-runtime/project.json</TestRuntimeProjectJson>
+    <TestRuntimeProjectLockJson Condition="'$(TestRuntimeProjectLockJson)' == ''">$(SourceDir)Common/test-runtime/project.lock.json</TestRuntimeProjectLockJson>
+  </PropertyGroup>
+
   <!-- list of nuget package sources passed to nuget.exe -->
   <ItemGroup>
     <NuGetSourceList Include="https:%2F%2Fwww.myget.org/F/dotnet-buildtools" />

diff --git a/src/Common/test-runtime/project.json b/src/Common/test-runtime/project.json
@@ -0,0 +1,72 @@
+{
+    "dependencies": {
+      "Microsoft.NETCore.Platforms": "1.0.1-beta-*",
+      "Microsoft.NETCore.TestHost": "1.0.0-beta-*",
+      "Microsoft.NETCore.Console": "1.0.0-beta-*",
+
+      "coveralls.io": "1.4",
+      "OpenCover": "4.6.166",
+      "ReportGenerator": "2.3.1",
+
+      "Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0022",
+      "Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0022",
+
+      "System.Collections": "4.0.11-beta-*",
+      "System.Collections.Concurrent": "4.0.11-beta-*",
+      "System.Collections.NonGeneric": "4.0.1-beta-*",
+      "System.Collections.Specialized": "4.0.1-beta-*",
+      "System.ComponentModel": "4.0.1-beta-*",
+      "System.ComponentModel.EventBasedAsync": "4.0.11-beta-*",
+      "System.Diagnostics.Contracts": "4.0.1-beta-*",
+      "System.Diagnostics.Debug": "4.0.11-beta-*",
+      "System.Diagnostics.Tools": "4.0.1-beta-*",
+      "System.Diagnostics.Tracing": "4.0.21-beta-*",
+      "System.Globalization": "4.0.11-beta-*",
+      "System.IO": "4.0.11-beta-*",
+      "System.IO.Compression": "4.1.0-beta-*",
+      "System.Linq": "4.0.1-beta-*",
+      "System.Linq.Expressions": "4.0.11-beta-*",
+      "System.Linq.Queryable": "4.0.1-beta-*",
+      "System.Net.Http": "4.0.1-beta-*",
+      "System.Net.Primitives": "4.0.11-beta-*",
+      "System.Net.WebHeaderCollection": "4.0.1-beta-*",
+      "System.Net.WebSockets": "4.0.0-beta-*",
+      "System.Net.WebSockets.Client": "4.0.0-beta-*",
+      "System.ObjectModel": "4.0.11-beta-*",
+      "System.Reflection": "4.0.11",
+      "System.Reflection.DispatchProxy": "4.0.1-beta-*",
+      "System.Reflection.Extensions": "4.0.1-beta-*",
+      "System.Reflection.Primitives": "4.0.1-beta-*",
+      "System.Reflection.TypeExtensions": "4.0.1-beta-*",
+      "System.Resources.ResourceManager": "4.0.1-beta-*",
+      "System.Runtime": "4.0.21-beta-*",
+      "System.Runtime.Extensions": "4.0.11-beta-*",
+      "System.Runtime.Handles": "4.0.1-beta-*",
+      "System.Runtime.InteropServices": "4.0.21-beta-*",
+      "System.Runtime.Serialization.Xml": "4.1.0-beta-*",
+      "System.Security.Claims": "4.0.1-beta-*",
+      "System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
+      "System.Security.Principal": "4.0.1-beta-*",
+      "System.Text.Encoding": "4.0.11-beta-*",
+      "System.Threading": "4.0.11-beta-*",
+      "System.Threading.Tasks": "4.0.11-beta-*",
+      "System.Threading.Timer": "4.0.1-beta-*",
+      "System.Xml.ReaderWriter": "4.0.11-beta-*",
+      "System.Xml.XDocument": "4.0.11-beta-*",
+      "System.Xml.XmlDocument": "4.0.1-beta-*",
+      "System.Xml.XmlSerializer": "4.0.11-beta-*",
+
+      "xunit": "2.1.0",
+      "xunit.console.netcore": "1.0.2-prerelease-00101",
+      "xunit.runner.utility": "2.1.0"
+    },
+    "frameworks": {
+       "dnxcore50": { }
+    },
+    "runtimes": {
+       "win7-x64": { },
+       "win7-x86": { },
+       "ubuntu.14.04-x64": { },
+       "osx.10.10-x64": { }
+    }
+}