Fix up the project.json files for CoreFX build rc2-23922.

- ProjectModel uses AssemblyLoadContext which is only available in netstandard1.5. Moving ProjectModel and all its dependencies up to netstandard1.5. - Work around our dependencies still being on old CoreFX builds by hoisting System.Runtime.Serialization.Primitives, System.Private.DataContractSerialization, System.Linq.Expressions, and System.Xml.XmlSerializer references to the current version.
2016-03-22 15:19:54 -05:00 · 2016-03-22 15:19:54 -05:00 · 3186432ebd
commit 3186432ebd
parent 9bc478660a
25 changed files with 28 additions and 12 deletions
--- a/TestAssets/TestProjects/ProjectWithTests/project.json
+++ b/TestAssets/TestProjects/ProjectWithTests/project.json
@ -2,6 +2,8 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Linq.Expressions": "4.0.11-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "xunit": "2.1.0",
    "dotnet-test-xunit": "1.0.0-dev-91790-12"
  },
--- a/scripts/dotnet-cli-build/project.json
+++ b/scripts/dotnet-cli-build/project.json
@ -6,6 +6,8 @@
  },
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
+    "System.Xml.XmlSerializer": "4.0.11-rc2-23922",
    "Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
    "WindowsAzure.Storage": "6.2.2-preview",
    "System.Reflection.Metadata": "1.2.0"
--- a/src/Microsoft.DotNet.Cli.Utils/project.json
+++ b/src/Microsoft.DotNet.Cli.Utils/project.json
@ -20,7 +20,7 @@
        }
      }
    },
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": "dnxcore50",
      "dependencies": {
        "NETStandard.Library": "1.5.0-rc2-23922",
--- a/src/Microsoft.DotNet.Compiler.Common/project.json
+++ b/src/Microsoft.DotNet.Compiler.Common/project.json
@ -12,7 +12,7 @@
    "Microsoft.DotNet.Files": "1.0.0-*"
  },
  "frameworks": {
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
        "dnxcore50",
        "portable-net45+win8"
--- a/src/Microsoft.DotNet.Files/project.json
+++ b/src/Microsoft.DotNet.Files/project.json
@ -12,7 +12,7 @@
    "Microsoft.DotNet.ProjectModel": "1.0.0-*"
  },
  "frameworks": {
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": "dnxcore50"
    }
  },
--- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json
+++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json
@ -9,7 +9,7 @@
    "System.Runtime.Loader": "4.0.0-rc2-23922"
  },
  "frameworks": {
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": "dnxcore50"
    }
  }
--- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
+++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
@ -10,7 +10,7 @@
    "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160202-02"
  },
  "frameworks": {
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": [
        "dnxcore50",
        "portable-net45+win8"
--- a/src/Microsoft.DotNet.ProjectModel/project.json
+++ b/src/Microsoft.DotNet.ProjectModel/project.json
@ -32,7 +32,7 @@
        }
      }
    },
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": "dnxcore50",
      "dependencies": {
        "NETStandard.Library": "1.5.0-rc2-23922",
--- a/src/Microsoft.DotNet.TestFramework/project.json
+++ b/src/Microsoft.DotNet.TestFramework/project.json
@ -14,7 +14,7 @@
    "NETStandard.Library": "1.5.0-rc2-23922"
  },
  "frameworks": {
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": "dnxcore50"
    }
  }
--- a/src/Microsoft.Extensions.DependencyModel/project.json
+++ b/src/Microsoft.Extensions.DependencyModel/project.json
@ -26,10 +26,7 @@
    "netstandard1.3": {
      "imports": "dnxcore50",
      "dependencies": {
-        "System.IO.FileSystem": "4.0.1-rc2-23922",
-        "System.Linq": "4.1.0-rc2-23922",
-        "System.Runtime": "4.1.0-rc2-23922",
-        "System.Reflection": "4.1.0-rc2-23922",
+        "NETStandard.Library": "1.5.0-rc2-23922",
        "System.Dynamic.Runtime": "4.0.11-rc2-23922"
      }
    }
--- a/src/Microsoft.Extensions.Testing.Abstractions/project.json
+++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json
@ -16,7 +16,7 @@
  },
  "frameworks": {
    "net451": {},
-    "netstandard1.3": {
+    "netstandard1.5": {
      "imports": "dnxcore50",
      "dependencies": {
        "NETStandard.Library": "1.5.0-rc2-23922",
--- a/src/dotnet/project.json
+++ b/src/dotnet/project.json
@ -60,6 +60,8 @@
    "System.Resources.ReaderWriter": "4.0.0-rc2-23922",
    "System.Net.Sockets": "4.1.0-rc2-23922",
    "System.Threading.ThreadPool": "4.0.10-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
+    "System.Private.DataContractSerialization": "4.1.1-rc2-23922",
    "Microsoft.Win32.Registry": {
      "version": "4.0.0-rc2-23922",
      "exclude": "compile"
--- a/test/ArgumentForwardingTests/project.json
+++ b/test/ArgumentForwardingTests/project.json
@ -5,6 +5,7 @@
  },
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.ProjectModel": {
      "target": "project"
    },
--- a/test/EndToEnd/project.json
+++ b/test/EndToEnd/project.json
@ -5,6 +5,7 @@
  },
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.ProjectModel": {
      "target": "project"
    },
--- a/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
+++ b/test/Microsoft.DotNet.Cli.Utils.Tests/project.json
@ -5,6 +5,7 @@
  },
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "NuGet.Versioning": "3.5.0-beta-1068",
    "NuGet.Packaging": "3.5.0-beta-1068",
    "NuGet.Frameworks": "3.5.0-beta-1068",
--- a/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
+++ b/test/Microsoft.DotNet.Compiler.Common.Tests/project.json
@ -2,6 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.Tools.Tests.Utilities": {
      "target": "project"
    },
--- a/test/Microsoft.DotNet.ProjectModel.Tests/project.json
+++ b/test/Microsoft.DotNet.ProjectModel.Tests/project.json
@ -2,6 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.ProjectModel": {
      "target": "project"
    },
--- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
+++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
@ -6,6 +6,7 @@
  },
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "System.Collections.Immutable": "1.2.0-rc2-23922",
    "FluentAssertions": "4.0.0",
    "xunit": "2.1.0",
--- a/test/dotnet-build.Tests/project.json
+++ b/test/dotnet-build.Tests/project.json
@ -2,6 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.Tools.Tests.Utilities": {
      "target": "project"
    },
--- a/test/dotnet-compile.Tests/project.json
+++ b/test/dotnet-compile.Tests/project.json
@ -2,6 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.Tools.Tests.Utilities": {
      "target": "project"
    },
--- a/test/dotnet-pack.Tests/project.json
+++ b/test/dotnet-pack.Tests/project.json
@ -2,6 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "System.IO.Compression.ZipFile": "4.0.1-rc2-23922",
    "Microsoft.DotNet.Tools.Tests.Utilities": {
      "target": "project"
--- a/test/dotnet-publish.Tests/project.json
+++ b/test/dotnet-publish.Tests/project.json
@ -2,6 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.TestFramework": "1.0.0-*",
    "Microsoft.DotNet.Tools.Tests.Utilities": {
      "target": "project"
--- a/test/dotnet-resgen.Tests/project.json
+++ b/test/dotnet-resgen.Tests/project.json
@ -2,6 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.Tools.Tests.Utilities": {
      "target": "project"
    },
--- a/test/dotnet-run.Tests/project.json
+++ b/test/dotnet-run.Tests/project.json
@ -2,6 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.Tools.Tests.Utilities": {
      "target": "project"
    },
--- a/test/dotnet.Tests/project.json
+++ b/test/dotnet.Tests/project.json
@ -2,6 +2,7 @@
  "version": "1.0.0-*",
  "dependencies": {
    "NETStandard.Library": "1.5.0-rc2-23922",
+    "System.Runtime.Serialization.Primitives": "4.1.1-rc2-23922",
    "Microsoft.DotNet.Tools.Tests.Utilities": {
      "target": "project"
    },