Skip to content

Commit 83385ce

Browse files
committed
Merge pull request #471 from roncain/port-rc1-fixes
Port rc1 fixes
2 parents 5f5f1e3 + fddb45b commit 83385ce

File tree

70 files changed

+28973
-5859
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+28973
-5859
lines changed

dir.props

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,12 @@
4343
<ToolsDir Condition="'$(ToolsDir)'==''">$(PackagesDir)Microsoft.DotNet.BuildTools.$(BuildToolsVersion)/lib/</ToolsDir>
4444
</PropertyGroup>
4545

46+
<!-- Test runtime -->
47+
<PropertyGroup>
48+
<TestRuntimeProjectJson Condition="'$(TestRuntimeProjectJson)' == ''">$(SourceDir)Common/test-runtime/project.json</TestRuntimeProjectJson>
49+
<TestRuntimeProjectLockJson Condition="'$(TestRuntimeProjectLockJson)' == ''">$(SourceDir)Common/test-runtime/project.lock.json</TestRuntimeProjectLockJson>
50+
</PropertyGroup>
51+
4652
<!-- list of nuget package sources passed to nuget.exe -->
4753
<ItemGroup>
4854
<NuGetSourceList Include="https:%2F%2Fwww.myget.org/F/dotnet-buildtools" />

src/Common/test-runtime/project.json

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"dependencies": {
3+
"Microsoft.NETCore.Platforms": "1.0.1-beta-*",
4+
"Microsoft.NETCore.TestHost": "1.0.0-beta-*",
5+
"Microsoft.NETCore.Console": "1.0.0-beta-*",
6+
7+
"coveralls.io": "1.4",
8+
"OpenCover": "4.6.166",
9+
"ReportGenerator": "2.3.1",
10+
11+
"Microsoft.DotNet.xunit.performance.analysis": "1.0.0-alpha-build0022",
12+
"Microsoft.DotNet.xunit.performance.runner.Windows": "1.0.0-alpha-build0022",
13+
14+
"System.Collections": "4.0.11-beta-*",
15+
"System.Collections.Concurrent": "4.0.11-beta-*",
16+
"System.Collections.NonGeneric": "4.0.1-beta-*",
17+
"System.Collections.Specialized": "4.0.1-beta-*",
18+
"System.ComponentModel": "4.0.1-beta-*",
19+
"System.ComponentModel.EventBasedAsync": "4.0.11-beta-*",
20+
"System.Diagnostics.Contracts": "4.0.1-beta-*",
21+
"System.Diagnostics.Debug": "4.0.11-beta-*",
22+
"System.Diagnostics.Tools": "4.0.1-beta-*",
23+
"System.Diagnostics.Tracing": "4.0.21-beta-*",
24+
"System.Globalization": "4.0.11-beta-*",
25+
"System.IO": "4.0.11-beta-*",
26+
"System.IO.Compression": "4.1.0-beta-*",
27+
"System.Linq": "4.0.1-beta-*",
28+
"System.Linq.Expressions": "4.0.11-beta-*",
29+
"System.Linq.Queryable": "4.0.1-beta-*",
30+
"System.Net.Http": "4.0.1-beta-*",
31+
"System.Net.Primitives": "4.0.11-beta-*",
32+
"System.Net.WebHeaderCollection": "4.0.1-beta-*",
33+
"System.Net.WebSockets": "4.0.0-beta-*",
34+
"System.Net.WebSockets.Client": "4.0.0-beta-*",
35+
"System.ObjectModel": "4.0.11-beta-*",
36+
"System.Reflection": "4.0.11",
37+
"System.Reflection.DispatchProxy": "4.0.1-beta-*",
38+
"System.Reflection.Extensions": "4.0.1-beta-*",
39+
"System.Reflection.Primitives": "4.0.1-beta-*",
40+
"System.Reflection.TypeExtensions": "4.0.1-beta-*",
41+
"System.Resources.ResourceManager": "4.0.1-beta-*",
42+
"System.Runtime": "4.0.21-beta-*",
43+
"System.Runtime.Extensions": "4.0.11-beta-*",
44+
"System.Runtime.Handles": "4.0.1-beta-*",
45+
"System.Runtime.InteropServices": "4.0.21-beta-*",
46+
"System.Runtime.Serialization.Xml": "4.1.0-beta-*",
47+
"System.Security.Claims": "4.0.1-beta-*",
48+
"System.Security.Cryptography.X509Certificates": "4.0.0-beta-*",
49+
"System.Security.Principal": "4.0.1-beta-*",
50+
"System.Text.Encoding": "4.0.11-beta-*",
51+
"System.Threading": "4.0.11-beta-*",
52+
"System.Threading.Tasks": "4.0.11-beta-*",
53+
"System.Threading.Timer": "4.0.1-beta-*",
54+
"System.Xml.ReaderWriter": "4.0.11-beta-*",
55+
"System.Xml.XDocument": "4.0.11-beta-*",
56+
"System.Xml.XmlDocument": "4.0.1-beta-*",
57+
"System.Xml.XmlSerializer": "4.0.11-beta-*",
58+
59+
"xunit": "2.1.0",
60+
"xunit.console.netcore": "1.0.2-prerelease-00101",
61+
"xunit.runner.utility": "2.1.0"
62+
},
63+
"frameworks": {
64+
"dnxcore50": { }
65+
},
66+
"runtimes": {
67+
"win7-x64": { },
68+
"win7-x86": { },
69+
"ubuntu.14.04-x64": { },
70+
"osx.10.10-x64": { }
71+
}
72+
}

0 commit comments

Comments
 (0)