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

Commit aead23a

Browse files
stephentoubstephentoub
committed
Merge pull request #2590 from dotnet-bot/from-tfs
Merge changes from TFS
2 parents 80f9caf + 5d9f9d4 commit aead23a

File tree

398 files changed

+56299
-35611
lines changed

Some content is hidden

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

398 files changed

+56299
-35611
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": {
3-
"System.Runtime": "4.0.20-beta-*",
4-
"System.Runtime.Extensions": "4.0.10-beta-*"
3+
"System.Runtime": "4.0.20",
4+
"System.Runtime.Extensions": "4.0.10"
55
},
66
"frameworks": {
77
"dnxcore50": {}

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

Lines changed: 35 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"version": -9996,
44
"targets": {
55
"DNXCore,Version=v5.0": {
6-
"System.Private.Uri/4.0.0-beta-23024": {
6+
"System.Private.Uri/4.0.0": {
77
"runtime": {
88
"lib/DNXCore50/System.Private.Uri.dll": {}
99
}
1010
},
11-
"System.Runtime/4.0.20-beta-23024": {
11+
"System.Runtime/4.0.20": {
1212
"dependencies": {
13-
"System.Private.Uri": "4.0.0-beta-23024"
13+
"System.Private.Uri": "4.0.0"
1414
},
1515
"compile": {
1616
"ref/dotnet/System.Runtime.dll": {}
@@ -19,9 +19,9 @@
1919
"lib/DNXCore50/System.Runtime.dll": {}
2020
}
2121
},
22-
"System.Runtime.Extensions/4.0.10-beta-23024": {
22+
"System.Runtime.Extensions/4.0.10": {
2323
"dependencies": {
24-
"System.Runtime": "4.0.20-beta-23024"
24+
"System.Runtime": "4.0.20"
2525
},
2626
"compile": {
2727
"ref/dotnet/System.Runtime.Extensions.dll": {}
@@ -33,12 +33,12 @@
3333
}
3434
},
3535
"libraries": {
36-
"System.Private.Uri/4.0.0-beta-23024": {
36+
"System.Private.Uri/4.0.0": {
3737
"serviceable": true,
38-
"sha512": "SJbplxSAYqzECE4GzsXfkES5vug34KI34ERs2ySNAfuVcEbtto0YieQQqLQERzYINfbFVbOPbV4yN3VTzjW0DQ==",
38+
"sha512": "CtuxaCKcRIvPcsqquVl3mPp79EDZPMr2UogfiFCxCs+t2z1VjbpQsKNs1GHZ8VQetqbk1mr0V1yAfMe6y8CHDA==",
3939
"files": [
40-
"System.Private.Uri.4.0.0-beta-23024.nupkg",
41-
"System.Private.Uri.4.0.0-beta-23024.nupkg.sha512",
40+
"System.Private.Uri.4.0.0.nupkg",
41+
"System.Private.Uri.4.0.0.nupkg.sha512",
4242
"System.Private.Uri.nuspec",
4343
"lib/DNXCore50/System.Private.Uri.dll",
4444
"lib/netcore50/System.Private.Uri.dll",
@@ -47,16 +47,20 @@
4747
"runtimes/win8-aot/lib/netcore50/System.Private.Uri.dll"
4848
]
4949
},
50-
"System.Runtime/4.0.20-beta-23024": {
50+
"System.Runtime/4.0.20": {
5151
"serviceable": true,
52-
"sha512": "vacwPrf5OZcHwSL58Vdoq/vqqMrz1xbHXdZiSA5cHBCIVmo5bD9Gw+Qu4NgGekCxV3fgKs9Qq97oibezsZZ+8w==",
52+
"sha512": "X7N/9Bz7jVPorqdVFO86ns1sX6MlQM+WTxELtx+Z4VG45x9+LKmWH0GRqjgKprUnVuwmfB9EJ9DQng14Z7/zwg==",
5353
"files": [
54-
"System.Runtime.4.0.20-beta-23024.nupkg",
55-
"System.Runtime.4.0.20-beta-23024.nupkg.sha512",
54+
"System.Runtime.4.0.20.nupkg",
55+
"System.Runtime.4.0.20.nupkg.sha512",
5656
"System.Runtime.nuspec",
5757
"lib/DNXCore50/System.Runtime.dll",
58+
"lib/MonoAndroid10/_._",
59+
"lib/MonoTouch10/_._",
5860
"lib/net46/_._",
5961
"lib/netcore50/System.Runtime.dll",
62+
"lib/xamarinios10/_._",
63+
"lib/xamarinmac20/_._",
6064
"ref/dotnet/System.Runtime.dll",
6165
"ref/dotnet/System.Runtime.xml",
6266
"ref/dotnet/de/System.Runtime.xml",
@@ -68,20 +72,28 @@
6872
"ref/dotnet/ru/System.Runtime.xml",
6973
"ref/dotnet/zh-hans/System.Runtime.xml",
7074
"ref/dotnet/zh-hant/System.Runtime.xml",
75+
"ref/MonoAndroid10/_._",
76+
"ref/MonoTouch10/_._",
7177
"ref/net46/_._",
78+
"ref/xamarinios10/_._",
79+
"ref/xamarinmac20/_._",
7280
"runtimes/win8-aot/lib/netcore50/System.Runtime.dll"
7381
]
7482
},
75-
"System.Runtime.Extensions/4.0.10-beta-23024": {
83+
"System.Runtime.Extensions/4.0.10": {
7684
"serviceable": true,
77-
"sha512": "Cj6RMtpMINFjTBHeClYAWk3SvDTdmo6c3rHIGwzn0R0P5B7wt0YclQibiZnjRzN/00XQ44067E6ZvRU/Z6AWgA==",
85+
"sha512": "5dsEwf3Iml7d5OZeT20iyOjT+r+okWpN7xI2v+R4cgd3WSj4DeRPTvPFjDpacbVW4skCAZ8B9hxXJYgkCFKJ1A==",
7886
"files": [
79-
"System.Runtime.Extensions.4.0.10-beta-23024.nupkg",
80-
"System.Runtime.Extensions.4.0.10-beta-23024.nupkg.sha512",
87+
"System.Runtime.Extensions.4.0.10.nupkg",
88+
"System.Runtime.Extensions.4.0.10.nupkg.sha512",
8189
"System.Runtime.Extensions.nuspec",
8290
"lib/DNXCore50/System.Runtime.Extensions.dll",
91+
"lib/MonoAndroid10/_._",
92+
"lib/MonoTouch10/_._",
8393
"lib/net46/_._",
8494
"lib/netcore50/System.Runtime.Extensions.dll",
95+
"lib/xamarinios10/_._",
96+
"lib/xamarinmac20/_._",
8597
"ref/dotnet/System.Runtime.Extensions.dll",
8698
"ref/dotnet/System.Runtime.Extensions.xml",
8799
"ref/dotnet/de/System.Runtime.Extensions.xml",
@@ -93,15 +105,19 @@
93105
"ref/dotnet/ru/System.Runtime.Extensions.xml",
94106
"ref/dotnet/zh-hans/System.Runtime.Extensions.xml",
95107
"ref/dotnet/zh-hant/System.Runtime.Extensions.xml",
108+
"ref/MonoAndroid10/_._",
109+
"ref/MonoTouch10/_._",
96110
"ref/net46/_._",
111+
"ref/xamarinios10/_._",
112+
"ref/xamarinmac20/_._",
97113
"runtimes/win8-aot/lib/netcore50/System.Runtime.Extensions.dll"
98114
]
99115
}
100116
},
101117
"projectFileDependencyGroups": {
102118
"": [
103-
"System.Runtime >= 4.0.20-beta-*",
104-
"System.Runtime.Extensions >= 4.0.10-beta-*"
119+
"System.Runtime >= 4.0.20",
120+
"System.Runtime.Extensions >= 4.0.10"
105121
],
106122
"DNXCore,Version=v5.0": []
107123
}

‎src/Common/tests/SystemXml/ModuleCore/project.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"dependencies": {
3-
"System.Runtime": "4.0.20-beta-*",
4-
"System.Runtime.Extensions": "4.0.10-beta-*",
5-
"System.Collections": "4.0.10-beta-*",
6-
"System.Xml.ReaderWriter": "4.0.10-beta-*",
7-
"System.Text.Encoding": "4.0.10-beta-*",
8-
"System.IO": "4.0.10-beta-*",
3+
"System.Runtime": "4.0.20",
4+
"System.Runtime.Extensions": "4.0.10",
5+
"System.Collections": "4.0.10",
6+
"System.Xml.ReaderWriter": "4.0.10",
7+
"System.Text.Encoding": "4.0.10",
8+
"System.IO": "4.0.10",
99
"System.Console": "4.0.0-beta-*",
10-
"System.Diagnostics.Debug": "4.0.10-beta-*"
10+
"System.Diagnostics.Debug": "4.0.10"
1111
},
1212
"frameworks": {
1313
"dnxcore50": {}

0 commit comments

Comments
 (0)