From 8e9dd56851ef34f52bee8372bdc7b08e3baea315 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 27 Mar 2018 15:16:33 -0700
Subject: [PATCH] Merge release/2.1 -> dev (#1007)

* Updating submodule(s)

Diagnostics => db1bdc7ede8cbb946f57e44a4c82891e7b16cc18
IISIntegration => 2233dcf509bc3d21b4abe2c6a52074b0d10241fb
MetaPackages => 0e7f12bfb3a05ece7e73aceedb985e38023bdba1

[auto-updated: submodules]

* Update universe for DockerSecrets rename (#1004)

* Update Configuration to latest version

* Update artifacts for docker rename and now ship

* Update configuration sub
---
 build/artifacts.props | 2 +-
 modules/Configuration | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/artifacts.props b/build/artifacts.props
index 90989ec22c..907d5f3a27 100644
--- a/build/artifacts.props
+++ b/build/artifacts.props
@@ -236,11 +236,11 @@
     <PackageArtifact Include="Microsoft.Extensions.Configuration.AzureKeyVault" Category="ship" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.Extensions.Configuration.Binder" Category="ship" AppMetapackage="true" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.Extensions.Configuration.CommandLine" Category="ship" AppMetapackage="true" AllMetapackage="true" />
-    <PackageArtifact Include="Microsoft.Extensions.Configuration.DockerSecrets" Category="noship" />
     <PackageArtifact Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Category="ship" AppMetapackage="true" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.Extensions.Configuration.FileExtensions" Category="ship" AppMetapackage="true" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.Extensions.Configuration.Ini" Category="ship" AppMetapackage="true" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.Extensions.Configuration.Json" Category="ship" AppMetapackage="true" AllMetapackage="true" />
+    <PackageArtifact Include="Microsoft.Extensions.Configuration.KeyPerFile" Category="ship" AppMetapackage="true" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.Extensions.Configuration.UserSecrets" Category="ship" AppMetapackage="true" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.Extensions.Configuration.Xml" Category="ship" AppMetapackage="true" AllMetapackage="true" />
     <PackageArtifact Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" Category="noship" />
diff --git a/modules/Configuration b/modules/Configuration
index b2fe022dc5..7ec5cce8d6 160000
--- a/modules/Configuration
+++ b/modules/Configuration
@@ -1 +1 @@
-Subproject commit b2fe022dc522ce4279cbfdc1fc7e4606f69ba9ac
+Subproject commit 7ec5cce8d66e1a5fe0403fc87c7e9dd34f34b6d8