Merge pull request dotnet#1540 from rainersigwald/no-1.1-for-core

Avoid .NET Core 1.1 dependencies for Core
cdmihai · Jan 11, 2017 · b32957b · b32957b
2 parents 40cd4d0 + 16e8cce
commit b32957b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/src/Utilities/project.json b/src/Utilities/project.json
@@ -14,7 +14,7 @@
         "System.Reflection.TypeExtensions": "4.1.0",
         "System.Runtime.Serialization.Primitives": "4.1.1",
         "System.Runtime.Serialization.Xml": "4.1.1",
-        "System.Security.Cryptography.X509Certificates": "4.3.0",
+        "System.Security.Cryptography.X509Certificates": "4.1.0",
         "System.Threading.Thread": "4.0.0",
         "System.Xml.XmlDocument": "4.0.1"
       }

diff --git a/src/XMakeBuildEngine/UnitTestsPublicOM/project.json b/src/XMakeBuildEngine/UnitTestsPublicOM/project.json
@@ -5,25 +5,26 @@
     "xunit.extensibility.core": "2.1.0",
     "xunit.assert": "2.1.0",
     "xunit.abstractions": "2.0.0",
-    "microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00629-09",
-    "System.Collections.Immutable": "1.3.1"
+    "microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00629-09"
   },
   "frameworks": {
     "net46": {
       "dependencies": {
-        "xunit.runner.visualstudio": "2.1.0"
+        "xunit.runner.visualstudio": "2.1.0",
+        "System.Collections.Immutable": "1.3.1"
       }
     },
     "netstandard1.3": {
       "dependencies": {
         "System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
         "Microsoft.NETCore": "5.0.1",
         "Microsoft.NETCore.Portable.Compatibility": "1.0.1",
+        "System.Collections.Immutable": "1.2.0",
         "System.Collections.NonGeneric": "4.0.1",
         "System.Console": "4.0.0",
         "System.Diagnostics.Process": "4.1.0",
         "System.Diagnostics.TraceSource": "4.0.0",
-        "System.Security.Cryptography.X509Certificates": "4.3.0",
+        "System.Security.Cryptography.X509Certificates": "4.1.0",
         "System.Threading.Thread": "4.0.0",
         "System.Threading.ThreadPool": "4.0.10",
         "System.Xml.XmlDocument": "4.0.1",

diff --git a/src/XMakeBuildEngine/project.json b/src/XMakeBuildEngine/project.json
@@ -1,16 +1,17 @@
 {
   "dependencies": {
-    "System.Collections.Immutable": "1.3.1"
   },
   "frameworks": {
     "net46": {
       "dependencies": {
-        "Microsoft.VisualStudio.Setup.Configuration.Interop":  "1.2.304-preview5"
+        "Microsoft.VisualStudio.Setup.Configuration.Interop": "1.2.304-preview5",
+        "System.Collections.Immutable": "1.3.1"
       }
     },
     "netstandard1.5": {
       "dependencies": {
         "NETStandard.Library": "1.6.0",
+        "System.Collections.Immutable": "1.2.0",
         "System.Collections.NonGeneric": "4.0.1",
         "System.Diagnostics.Contracts": "4.0.1",
         "System.Diagnostics.FileVersionInfo": "4.0.0",

diff --git a/src/XMakeTasks/project.json b/src/XMakeTasks/project.json
@@ -1,17 +1,16 @@
 {
-  "dependencies": {
-    "System.Collections.Immutable": "1.3.1"
-  },
   "frameworks": {
     "net46": {
       "dependencies": {
-        "Microsoft.VisualStudio.Setup.Configuration.Interop":  "1.2.304-preview5",
-        "System.Reflection.Metadata":   "1.3.0"
+        "Microsoft.VisualStudio.Setup.Configuration.Interop": "1.2.304-preview5",
+        "System.Collections.Immutable": "1.3.1",
+        "System.Reflection.Metadata": "1.3.0"
       }
     },
     "netstandard1.3": {
       "dependencies": {
         "NETStandard.Library": "1.6.0",
+        "System.Collections.Immutable": "1.2.0",
         "System.Collections.NonGeneric": "4.0.1",
         "System.Diagnostics.Process": "4.1.0",
         "System.Diagnostics.TraceSource": "4.0.0",
@@ -21,7 +20,7 @@
         "System.Resources.Writer": "4.0.0",
         "System.Runtime.Serialization.Primitives": "4.1.1",
         "System.Runtime.Serialization.Xml": "4.1.1",
-        "System.Security.Cryptography.Algorithms" : "4.3.0",
+        "System.Security.Cryptography.Algorithms": "4.2.0",
         "System.Threading.Thread": "4.0.0",
         "System.Xml.XmlDocument": "4.0.1"
       }

diff --git a/targets/runtimeDependencies/project.json b/targets/runtimeDependencies/project.json
@@ -10,21 +10,21 @@
     "xunit": "2.1.0",
     "microsoft.xunit.netcore.extensions": "1.0.0-prerelease-00629-09",
     "System.IO.FileSystem": "4.0.1",
-    "System.IO.Compression": "4.1.0",
-    "System.Collections.Immutable": "1.3.1"
+    "System.IO.Compression": "4.1.0"
   },
   "frameworks": {
     "net46": {
       "dependencies": {
         "xunit.runner.visualstudio": "2.1.0",
+        "System.Collections.Immutable": "1.3.1",
         "System.Runtime.InteropServices.RuntimeInformation": "4.0.0",
         "System.Threading.Tasks.Dataflow": "4.6.0",
         "Microsoft.DotNet.BuildTools.TestSuite": "1.0.0-prerelease-00508-01"
       }
     },
     "netcoreapp1.0": {
       "dependencies": {
-        "System.Security.Cryptography.X509Certificates": "4.3.0",
+        "System.Security.Cryptography.X509Certificates": "4.1.0",
         "System.Net.NetworkInformation": "4.1.0",
         "Microsoft.NETCore": "5.0.1",
         "Microsoft.NETCore.Portable.Compatibility": "1.0.1",