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

Commit 81ab210

Browse files
stephentoubstephentoub
committed
Merge pull request #2250 from dotnet-bot/from-tfs
Merge changes from TFS
2 parents 595a468 + ecb59b7 commit 81ab210

File tree

4 files changed

+32
-46
lines changed

4 files changed

+32
-46
lines changed

‎src/Microsoft.CSharp/src/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"System.Runtime.Handles": "4.0.0-beta-*",
2020
"System.Runtime.InteropServices": "4.0.20-beta-*",
2121
"System.Text.Encoding": "4.0.10-beta-*",
22-
"System.Threading": "4.0.0-beta-*",
22+
"System.Threading": "4.0.10-beta-*",
2323
"System.Threading.Tasks": "4.0.10-beta-*"
2424
},
2525
"frameworks": {

‎src/Microsoft.CSharp/src/project.lock.json

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -234,13 +234,16 @@
234234
"lib/DNXCore50/System.Text.Encoding.dll": {}
235235
}
236236
},
237-
"System.Threading/4.0.0-beta-23024": {
237+
"System.Threading/4.0.10-beta-23024": {
238238
"dependencies": {
239239
"System.Runtime": "4.0.0-beta-23024",
240240
"System.Threading.Tasks": "4.0.0-beta-23024"
241241
},
242242
"compile": {
243243
"ref/dotnet/System.Threading.dll": {}
244+
},
245+
"runtime": {
246+
"lib/DNXCore50/System.Threading.dll": {}
244247
}
245248
},
246249
"System.Threading.Tasks/4.0.10-beta-23024": {
@@ -780,15 +783,16 @@
780783
"runtimes/win8-aot/lib/netcore50/System.Text.Encoding.dll"
781784
]
782785
},
783-
"System.Threading/4.0.0-beta-23024": {
784-
"sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
786+
"System.Threading/4.0.10-beta-23024": {
787+
"serviceable": true,
788+
"sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
785789
"files": [
786-
"License.rtf",
787-
"System.Threading.4.0.0-beta-23024.nupkg",
788-
"System.Threading.4.0.0-beta-23024.nupkg.sha512",
790+
"System.Threading.4.0.10-beta-23024.nupkg",
791+
"System.Threading.4.0.10-beta-23024.nupkg.sha512",
789792
"System.Threading.nuspec",
790-
"lib/net45/_._",
791-
"lib/win8/_._",
793+
"lib/DNXCore50/System.Threading.dll",
794+
"lib/net46/_._",
795+
"lib/netcore50/System.Threading.dll",
792796
"ref/dotnet/System.Threading.dll",
793797
"ref/dotnet/System.Threading.xml",
794798
"ref/dotnet/de/System.Threading.xml",
@@ -800,19 +804,8 @@
800804
"ref/dotnet/ru/System.Threading.xml",
801805
"ref/dotnet/zh-hans/System.Threading.xml",
802806
"ref/dotnet/zh-hant/System.Threading.xml",
803-
"ref/net45/_._",
804-
"ref/netcore50/System.Threading.dll",
805-
"ref/netcore50/System.Threading.xml",
806-
"ref/netcore50/de/System.Threading.xml",
807-
"ref/netcore50/es/System.Threading.xml",
808-
"ref/netcore50/fr/System.Threading.xml",
809-
"ref/netcore50/it/System.Threading.xml",
810-
"ref/netcore50/ja/System.Threading.xml",
811-
"ref/netcore50/ko/System.Threading.xml",
812-
"ref/netcore50/ru/System.Threading.xml",
813-
"ref/netcore50/zh-hans/System.Threading.xml",
814-
"ref/netcore50/zh-hant/System.Threading.xml",
815-
"ref/win8/_._"
807+
"ref/net46/_._",
808+
"runtimes/win8-aot/lib/netcore50/System.Threading.dll"
816809
]
817810
},
818811
"System.Threading.Tasks/4.0.10-beta-23024": {
@@ -862,7 +855,7 @@
862855
"System.Runtime.Handles >= 4.0.0-beta-*",
863856
"System.Runtime.InteropServices >= 4.0.20-beta-*",
864857
"System.Text.Encoding >= 4.0.10-beta-*",
865-
"System.Threading >= 4.0.0-beta-*",
858+
"System.Threading >= 4.0.10-beta-*",
866859
"System.Threading.Tasks >= 4.0.10-beta-*"
867860
],
868861
"DNXCore,Version=v5.0": []

‎src/System.IO.FileSystem.Watcher/src/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"System.Runtime.Handles": "4.0.0-beta-*",
1717
"System.Runtime.InteropServices": "4.0.20-beta-*",
1818
"System.Text.Encoding": "4.0.10-beta-*",
19-
"System.Threading": "4.0.0-beta-*",
19+
"System.Threading": "4.0.10-beta-*",
2020
"System.Threading.Overlapped": "4.0.0-beta-*",
2121
"System.Threading.Tasks": "4.0.10-beta-*",
2222
"System.Threading.Thread": "4.0.0-beta-*",

‎src/System.IO.FileSystem.Watcher/src/project.lock.json

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -218,13 +218,16 @@
218218
"lib/DNXCore50/System.Text.Encoding.Extensions.dll": {}
219219
}
220220
},
221-
"System.Threading/4.0.0-beta-23024": {
221+
"System.Threading/4.0.10-beta-23024": {
222222
"dependencies": {
223223
"System.Runtime": "4.0.0-beta-23024",
224224
"System.Threading.Tasks": "4.0.0-beta-23024"
225225
},
226226
"compile": {
227227
"ref/dotnet/System.Threading.dll": {}
228+
},
229+
"runtime": {
230+
"lib/DNXCore50/System.Threading.dll": {}
228231
}
229232
},
230233
"System.Threading.Overlapped/4.0.0-beta-23024": {
@@ -718,15 +721,16 @@
718721
"runtimes/win8-aot/lib/netcore50/System.Text.Encoding.Extensions.dll"
719722
]
720723
},
721-
"System.Threading/4.0.0-beta-23024": {
722-
"sha512": "d8tInqC0ux1JH918eIoffKi9+Wc0AkxUrhUDbQkLgNz8V7uBbu5WUaDJaTblAwgwwG50GzefXCweZP5NcVd0Lw==",
724+
"System.Threading/4.0.10-beta-23024": {
725+
"serviceable": true,
726+
"sha512": "uoRg44bzPk9KE9Sg6rLZmGfUmFZBDc7y25692VYna/WW3Smip/aGX0ESXyuNvWA8k8oXdV4Z/M4ZKdB3ahtdDw==",
723727
"files": [
724-
"License.rtf",
725-
"System.Threading.4.0.0-beta-23024.nupkg",
726-
"System.Threading.4.0.0-beta-23024.nupkg.sha512",
728+
"System.Threading.4.0.10-beta-23024.nupkg",
729+
"System.Threading.4.0.10-beta-23024.nupkg.sha512",
727730
"System.Threading.nuspec",
728-
"lib/net45/_._",
729-
"lib/win8/_._",
731+
"lib/DNXCore50/System.Threading.dll",
732+
"lib/net46/_._",
733+
"lib/netcore50/System.Threading.dll",
730734
"ref/dotnet/System.Threading.dll",
731735
"ref/dotnet/System.Threading.xml",
732736
"ref/dotnet/de/System.Threading.xml",
@@ -738,19 +742,8 @@
738742
"ref/dotnet/ru/System.Threading.xml",
739743
"ref/dotnet/zh-hans/System.Threading.xml",
740744
"ref/dotnet/zh-hant/System.Threading.xml",
741-
"ref/net45/_._",
742-
"ref/netcore50/System.Threading.dll",
743-
"ref/netcore50/System.Threading.xml",
744-
"ref/netcore50/de/System.Threading.xml",
745-
"ref/netcore50/es/System.Threading.xml",
746-
"ref/netcore50/fr/System.Threading.xml",
747-
"ref/netcore50/it/System.Threading.xml",
748-
"ref/netcore50/ja/System.Threading.xml",
749-
"ref/netcore50/ko/System.Threading.xml",
750-
"ref/netcore50/ru/System.Threading.xml",
751-
"ref/netcore50/zh-hans/System.Threading.xml",
752-
"ref/netcore50/zh-hant/System.Threading.xml",
753-
"ref/win8/_._"
745+
"ref/net46/_._",
746+
"runtimes/win8-aot/lib/netcore50/System.Threading.dll"
754747
]
755748
},
756749
"System.Threading.Overlapped/4.0.0-beta-23024": {
@@ -865,7 +858,7 @@
865858
"System.Runtime.Handles >= 4.0.0-beta-*",
866859
"System.Runtime.InteropServices >= 4.0.20-beta-*",
867860
"System.Text.Encoding >= 4.0.10-beta-*",
868-
"System.Threading >= 4.0.0-beta-*",
861+
"System.Threading >= 4.0.10-beta-*",
869862
"System.Threading.Overlapped >= 4.0.0-beta-*",
870863
"System.Threading.Tasks >= 4.0.10-beta-*",
871864
"System.Threading.Thread >= 4.0.0-beta-*",

0 commit comments

Comments
 (0)