Merge branch 'release' into dev

2016-04-14 13:54:23 -07:00 · 2016-04-14 13:54:23 -07:00 · 28faeed097
--- a/src/Microsoft.Extensions.Configuration.Json/project.json
+++ b/src/Microsoft.Extensions.Configuration.Json/project.json
@ -20,7 +20,8 @@
  "dependencies": {
    "Microsoft.Extensions.Configuration": "1.0.0-*",
    "Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-*",
-    "Newtonsoft.Json": "8.0.3"
+    "Newtonsoft.Json": "8.0.3",
+    "System.Runtime.Serialization.Primitives": "4.1.1-*"
  },
  "frameworks": {
    "net451": {
--- a/test/Microsoft.Extensions.Configuration.Binder.Test/ConfigurationBinderTests.cs
+++ b/test/Microsoft.Extensions.Configuration.Binder.Test/ConfigurationBinderTests.cs
@ -212,7 +212,7 @@ namespace Microsoft.Extensions.Configuration.Binder.Test
            Assert.Same(config.GetValue("Object", foo), foo);
        }

-#if !NETSTANDARDAPP1_5 // TypeConverter doesn't support this on DNXCORE
+#if !NETCOREAPP1_0 // TypeConverter doesn't support this on DNXCORE
        [Fact]
        public void GetUri()
        {
@ -247,7 +247,7 @@ namespace Microsoft.Extensions.Configuration.Binder.Test
        [InlineData("2015-12-24T07:34:42-5:00", typeof(DateTime))]
        [InlineData("12/24/2015 13:44:55 +4", typeof(DateTimeOffset))]
        [InlineData("99.22:22:22.1234567", typeof(TimeSpan))]
-#if !NETSTANDARDAPP1_5 // TypeConverter doesn't support this on DNXCORE
+#if !NETCOREAPP1_0 // TypeConverter doesn't support this on DNXCORE
        [InlineData("http://www.bing.com", typeof(Uri))]
 #endif
        // enum test
--- a/test/Microsoft.Extensions.Configuration.Binder.Test/project.json
+++ b/test/Microsoft.Extensions.Configuration.Binder.Test/project.json
@ -9,10 +9,13 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
        "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
        "System.Diagnostics.Process": "4.1.0-*"
      },
      "imports": [
@ -22,8 +25,12 @@
    },
    "net451": {
      "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" },
-        "System.Threading.Tasks": { "type": "build" }
+        "System.Runtime": {
+          "type": "build"
+        },
+        "System.Threading.Tasks": {
+          "type": "build"
+        }
      }
    }
  },
--- a/test/Microsoft.Extensions.Configuration.CommandLine.Test/project.json
+++ b/test/Microsoft.Extensions.Configuration.CommandLine.Test/project.json
@ -9,10 +9,13 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
        "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
        "System.Diagnostics.Process": "4.1.0-*"
      },
      "imports": [
--- a/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/project.json
+++ b/test/Microsoft.Extensions.Configuration.EnvironmentVariables.Test/project.json
@ -9,11 +9,14 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
        "dotnet-test-xunit": "1.0.0-dev-*",
        "System.Collections.NonGeneric": "4.0.1-*",
-        "NETStandard.Library": "1.5.0-*",
        "System.Diagnostics.Process": "4.1.0-*"
      },
      "imports": [
--- a/test/Microsoft.Extensions.Configuration.FileExtensions.Test/FileConfigurationBuilderExtensionsTest.cs
+++ b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/FileConfigurationBuilderExtensionsTest.cs
@ -44,7 +44,7 @@ namespace Microsoft.Extensions.Configuration.Json

            string expectedPath;

-#if NETSTANDARDAPP1_5
+#if NETCOREAPP1_0
            expectedPath = AppContext.BaseDirectory;
 #else
            expectedPath = Path.GetFullPath(AppDomain.CurrentDomain.GetData("APP_CONTEXT_BASE_DIRECTORY") as string ?? 
--- a/test/Microsoft.Extensions.Configuration.FileExtensions.Test/project.json
+++ b/test/Microsoft.Extensions.Configuration.FileExtensions.Test/project.json
@ -9,10 +9,13 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
        "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
        "System.Diagnostics.Process": "4.1.0-*"
      },
      "imports": [
--- a/test/Microsoft.Extensions.Configuration.FunctionalTests/ConfigurationTests.cs
+++ b/test/Microsoft.Extensions.Configuration.FunctionalTests/ConfigurationTests.cs
@ -351,7 +351,7 @@ CommonKey3:CommonKey4=IniValue6";
            var builder = new ConfigurationBuilder();
            string filePath;

-#if NETSTANDARDAPP1_5
+#if NETCOREAPP1_0
            filePath = AppContext.BaseDirectory;
 #else
            filePath = Path.GetFullPath(AppDomain.CurrentDomain.GetData("APP_CONTEXT_BASE_DIRECTORY") as string ??
--- a/test/Microsoft.Extensions.Configuration.FunctionalTests/project.json
+++ b/test/Microsoft.Extensions.Configuration.FunctionalTests/project.json
@ -7,10 +7,13 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
        "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
        "System.Diagnostics.Process": "4.1.0-*"
      },
      "imports": [
--- a/test/Microsoft.Extensions.Configuration.Ini.Test/project.json
+++ b/test/Microsoft.Extensions.Configuration.Ini.Test/project.json
@ -9,10 +9,13 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
        "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
        "System.Diagnostics.Process": "4.1.0-*"
      },
      "imports": [
--- a/test/Microsoft.Extensions.Configuration.Json.Test/project.json
+++ b/test/Microsoft.Extensions.Configuration.Json.Test/project.json
@ -9,10 +9,13 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
        "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
        "System.Diagnostics.Process": "4.1.0-*"
      },
      "imports": [
--- a/test/Microsoft.Extensions.Configuration.Test.Common/project.json
+++ b/test/Microsoft.Extensions.Configuration.Test.Common/project.json
@ -8,11 +8,12 @@
    "Microsoft.Extensions.FileProviders.Physical": "1.0.0-*"
  },
  "frameworks": {
-    "net451": { },
-    "netstandard1.3": {
+    "net451": {},
+    "netstandard1.5": {
      "imports": [
        "dotnet5.4"
-      ]
+      ],
+      "dependencies": {}
    }
  }
 }
--- a/test/Microsoft.Extensions.Configuration.Test/project.json
+++ b/test/Microsoft.Extensions.Configuration.Test/project.json
@ -10,10 +10,13 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
        "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
        "System.Diagnostics.Process": "4.1.0-*"
      },
      "imports": [
--- a/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNet50.cs
+++ b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNet50.cs
@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

-#if !NETSTANDARDAPP1_5
+#if !NETCOREAPP1_0
 // These tests only run on desktop CLR.

 using System;
--- a/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNetCore50.cs
+++ b/test/Microsoft.Extensions.Configuration.Xml.Test/XmlConfigurationTest.AspNetCore50.cs
@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

-#if NETSTANDARDAPP1_5
+#if NETCOREAPP1_0
 // These tests only run on Core CLR.

 using System;
--- a/test/Microsoft.Extensions.Configuration.Xml.Test/project.json
+++ b/test/Microsoft.Extensions.Configuration.Xml.Test/project.json
@ -10,10 +10,13 @@
    "xunit": "2.1.0"
  },
  "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
      "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
        "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
        "System.Diagnostics.Process": "4.1.0-*"
      },
      "imports": [
@ -22,11 +25,19 @@
      ]
    },
    "net451": {
-       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" },
-        "System.Security": { "type": "build" },
-        "System.Threading.Tasks": { "type": "build" },
-        "System.Xml": { "type": "build" }
+      "frameworkAssemblies": {
+        "System.Runtime": {
+          "type": "build"
+        },
+        "System.Security": {
+          "type": "build"
+        },
+        "System.Threading.Tasks": {
+          "type": "build"
+        },
+        "System.Xml": {
+          "type": "build"
+        }
      },
      "dependencies": {
        "xunit.runner.console": "2.1.0"