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

Commit 5faaffe

Browse files
committed
Merge pull request #2826 from stephentoub/fix_jsons
Fix test project build warnings about dependency conflicts
2 parents 4d45934 + 2925df7 commit 5faaffe

File tree

6 files changed

+384
-428
lines changed

6 files changed

+384
-428
lines changed

src/System.Net.Primitives/tests/PalTests/project.json

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,27 @@
11
{
22
"dependencies": {
3-
"System.Collections": "4.0.0",
3+
"Microsoft.Win32.Primitives": "4.0.0",
4+
"System.Collections": "4.0.10",
5+
"System.Collections.NonGeneric": "4.0.0",
6+
"System.ComponentModel.EventBasedAsync": "4.0.10",
47
"System.Console": "4.0.0-beta-*",
58
"System.Diagnostics.Contracts": "4.0.0",
9+
"System.Diagnostics.Debug": "4.0.10",
610
"System.Diagnostics.Tracing": "4.0.20",
7-
"System.Runtime": "4.0.20",
8-
"System.Runtime.Extensions": "4.0.10",
9-
"System.Resources.ResourceManager": "4.0.0",
10-
"System.Threading": "4.0.0",
11-
"System.Threading.Tasks": "4.0.0",
12-
"System.Runtime.InteropServices": "4.0.20",
13-
"System.Runtime.Handles": "4.0.0",
11+
"System.Globalization": "4.0.10",
1412
"System.IO": "4.0.10",
1513
"System.IO.FileSystem": "4.0.0",
1614
"System.IO.FileSystem.Primitives": "4.0.0",
17-
"System.ComponentModel.EventBasedAsync": "4.0.10",
18-
"System.Globalization": "4.0.0",
19-
"System.Diagnostics.Debug": "4.0.10",
20-
"System.Collections.NonGeneric": "4.0.0",
15+
"System.Resources.ResourceManager": "4.0.0",
16+
"System.Runtime": "4.0.20",
17+
"System.Runtime.Extensions": "4.0.10",
18+
"System.Runtime.Handles": "4.0.0",
19+
"System.Runtime.InteropServices": "4.0.20",
2120
"System.Security.Claims": "4.0.0",
2221
"System.Security.SecureString": "4.0.0-beta-*",
23-
"Microsoft.Win32.Primitives": "4.0.0",
24-
"xunit": "2.0.0-beta5-build2785",
25-
"xunit.abstractions.netcore": "1.0.0-prerelease",
26-
"xunit.assert": "2.0.0-beta5-build2785",
27-
"xunit.core.netcore": "1.0.1-prerelease",
22+
"System.Threading": "4.0.10",
23+
"System.Threading.Tasks": "4.0.0",
24+
"xunit": "2.1.0-beta3-*",
2825
"xunit.netcore.extensions": "1.0.0-prerelease-*"
2926
},
3027
"frameworks": {

0 commit comments

Comments
 (0)