Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 3c1cc3a

Browse files
ericstjericstj
committed
Merge pull request #2111 from ericstj/ericstj/DNX12101.BuildTools55.Corefx23011
Update dnx to 12101, buildtools to 55, and corefx packages to 23011
2 parents ec9ab7a + 3bb2f03 commit 3c1cc3a

File tree

196 files changed

+56238
-55455
lines changed

Some content is hidden

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

196 files changed

+56238
-55455
lines changed

‎dir.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@
1010

1111
<!-- Build Tools Versions -->
1212
<PropertyGroup>
13-
<BuildToolsVersion>1.0.25-prerelease-00053</BuildToolsVersion>
14-
<DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-beta5-11682</DnxVersion>
15-
<DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta5-11760</DnxVersion>
13+
<BuildToolsVersion>1.0.25-prerelease-00055</BuildToolsVersion>
14+
<DnxVersion>1.0.0-beta5-12101</DnxVersion>
1615
<DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'!='Unix'">dnx-coreclr-win-x86.$(DnxVersion)</DnxPackageName>
1716
<DnxPackageName Condition="'$(DnxPackageName)' == '' and '$(OsEnvironment)'=='Unix'">dnx-mono.$(DnxVersion)</DnxPackageName>
1817
<RoslynVersion>1.0.0-rc3-20150510-01</RoslynVersion>

‎src/.nuget/packages.Unix.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00053" />
3+
<package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00055" />
44
<package id="Microsoft.DotNet.BuildTools.ApiTools" version="1.0.0-prerelease" />
5-
<package id="dnx-mono" version="1.0.0-beta5-11760" />
5+
<package id="dnx-mono" version="1.0.0-beta5-12101" />
66
<package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc3-20150510-01" />
77
<package id="Microsoft.Build.Mono.Debug" version="14.1.0.0-prerelease" />
88
</packages>

‎src/.nuget/packages.Windows_NT.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00053" />
4-
<package id="dnx-coreclr-win-x86" version="1.0.0-beta5-11682" />
3+
<package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00055" />
4+
<package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
55
<package id="Microsoft.DotNet.BuildTools.ApiTools" version="1.0.0-prerelease" />
66
</packages>

‎src/Common/tests/SystemXml/BaseLibManaged/project.lock.json

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
{
22
"locked": true,
3-
"version": -9997,
3+
"version": -9996,
44
"targets": {
55
"DNXCore,Version=v5.0": {
6-
"System.Private.Uri/4.0.0-beta-23008": {
7-
"runtime": [
8-
"lib/DNXCore50/System.Private.Uri.dll"
9-
]
6+
"System.Private.Uri/4.0.0-beta-23011": {
7+
"runtime": {
8+
"lib/DNXCore50/System.Private.Uri.dll": {}
9+
}
1010
},
11-
"System.Runtime/4.0.20-beta-23008": {
11+
"System.Runtime/4.0.20-beta-23011": {
1212
"dependencies": {
13-
"System.Private.Uri": "4.0.0-beta-23008"
13+
"System.Private.Uri": "4.0.0-beta-23011"
1414
},
15-
"compile": [
16-
"ref/any/System.Runtime.dll"
17-
],
18-
"runtime": [
19-
"lib/DNXCore50/System.Runtime.dll"
20-
]
15+
"compile": {
16+
"ref/dotnet/System.Runtime.dll": {}
17+
},
18+
"runtime": {
19+
"lib/DNXCore50/System.Runtime.dll": {}
20+
}
2121
},
22-
"System.Runtime.Extensions/4.0.10-beta-23008": {
22+
"System.Runtime.Extensions/4.0.10-beta-23011": {
2323
"dependencies": {
24-
"System.Runtime": "4.0.20-beta-23008"
24+
"System.Runtime": "4.0.20-beta-23011"
25+
},
26+
"compile": {
27+
"ref/dotnet/System.Runtime.Extensions.dll": {}
2528
},
26-
"compile": [
27-
"ref/any/System.Runtime.Extensions.dll"
28-
],
29-
"runtime": [
30-
"lib/DNXCore50/System.Runtime.Extensions.dll"
31-
]
29+
"runtime": {
30+
"lib/DNXCore50/System.Runtime.Extensions.dll": {}
31+
}
3232
}
3333
}
3434
},
3535
"libraries": {
36-
"System.Private.Uri/4.0.0-beta-23008": {
37-
"sha512": "q2VlKvy9ufHawdI5abrNKXvUIgFZYnBYMtPqK8gy1kEVhaQ1LWR7WLprwgI11mk7Ef18+P5mj08gCuXbl/rINw==",
36+
"System.Private.Uri/4.0.0-beta-23011": {
37+
"sha512": "yil581lvQfpXUFfLnfmS7t9+NDvy7NeSHfKYBF7CluatvDQxT6QmwRxi9zKXzCYB7OY6sqvrRFOgdeAxNalVkA==",
3838
"files": [
39-
"System.Private.Uri.4.0.0-beta-23008.nupkg",
40-
"System.Private.Uri.4.0.0-beta-23008.nupkg.sha512",
39+
"System.Private.Uri.4.0.0-beta-23011.nupkg",
40+
"System.Private.Uri.4.0.0-beta-23011.nupkg.sha512",
4141
"System.Private.Uri.nuspec",
4242
"lib/DNXCore50/System.Private.Uri.dll",
4343
"lib/netcore50/System.Private.Uri.dll",
@@ -46,30 +46,30 @@
4646
"runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
4747
]
4848
},
49-
"System.Runtime/4.0.20-beta-23008": {
50-
"sha512": "YX9/7Q6EHadgTLjH4Sa5zKHGMTMrwiMynAlQxMSQLGYCyJX6Z4/hejrBR7cNxrRddXnzxs5OALdEZqdU80zwxw==",
49+
"System.Runtime/4.0.20-beta-23011": {
50+
"sha512": "WFRsJnfRzXYIiDJRbTXGctncx6Hw1F/uS2c5a5CzUwHuA3D/CM152F2HjWt12dLgH0BOcGvcRjKl2AfJ6MnHVg==",
5151
"files": [
52-
"System.Runtime.4.0.20-beta-23008.nupkg",
53-
"System.Runtime.4.0.20-beta-23008.nupkg.sha512",
52+
"System.Runtime.4.0.20-beta-23011.nupkg",
53+
"System.Runtime.4.0.20-beta-23011.nupkg.sha512",
5454
"System.Runtime.nuspec",
5555
"lib/DNXCore50/System.Runtime.dll",
5656
"lib/net46/_._",
5757
"lib/netcore50/System.Runtime.dll",
58-
"ref/any/System.Runtime.dll",
58+
"ref/dotnet/System.Runtime.dll",
5959
"ref/net46/_._",
6060
"runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
6161
]
6262
},
63-
"System.Runtime.Extensions/4.0.10-beta-23008": {
64-
"sha512": "488ce5N/0JQ2EbMzolr3CiIwqY64HEtxh3bIRDZ87p1eY2hQ79pROseFjQQ5n9q7aG+xs1D5CWVzuXcps976tA==",
63+
"System.Runtime.Extensions/4.0.10-beta-23011": {
64+
"sha512": "Ctasd6O2G00QpY3QcZN1feOZqqbN8B5rmz7P2B5E7VQWS1Dd6+CI6JAwzLHItFnIQQotOb0cy/tJdVwhqa8Uyg==",
6565
"files": [
66-
"System.Runtime.Extensions.4.0.10-beta-23008.nupkg",
67-
"System.Runtime.Extensions.4.0.10-beta-23008.nupkg.sha512",
66+
"System.Runtime.Extensions.4.0.10-beta-23011.nupkg",
67+
"System.Runtime.Extensions.4.0.10-beta-23011.nupkg.sha512",
6868
"System.Runtime.Extensions.nuspec",
6969
"lib/DNXCore50/System.Runtime.Extensions.dll",
7070
"lib/net46/_._",
7171
"lib/netcore50/System.Runtime.Extensions.dll",
72-
"ref/any/System.Runtime.Extensions.dll",
72+
"ref/dotnet/System.Runtime.Extensions.dll",
7373
"ref/net46/_._",
7474
"runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
7575
]

0 commit comments

Comments
 (0)