From 214de568a92d279eff6a4bed16f3d8cb61ecd756 Mon Sep 17 00:00:00 2001
From: John Luo <jt.luo@mail.utoronto.ca>
Date: Wed, 3 May 2017 10:49:52 -0700
Subject: [PATCH 1/2] Add Mcrosoft.Extensions.Configuration.AzureKeyVault to
 the .All metapackage

---
 build/common.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build/common.props b/build/common.props
index c10a7c58f5..970baed21c 100644
--- a/build/common.props
+++ b/build/common.props
@@ -146,6 +146,7 @@
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Caching.SqlServer" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
+    <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.DockerSecrets" Version="$(AspNetCoreVersion)" PrivateAssets="None" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="$(AspNetCoreVersion)" PrivateAssets="None" />

From caaae2003e5206622e96e5b7d469a0cd7e72c50a Mon Sep 17 00:00:00 2001
From: Pavel Krymets <pavel@krymets.com>
Date: Fri, 5 May 2017 13:34:58 -0700
Subject: [PATCH 2/2] Fix deps trimming (#107)

---
 tools/TrimDeps/Program.cs | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/tools/TrimDeps/Program.cs b/tools/TrimDeps/Program.cs
index 639c620f52..f318230425 100644
--- a/tools/TrimDeps/Program.cs
+++ b/tools/TrimDeps/Program.cs
@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
 using System.IO;
 using System.Linq;
 using Newtonsoft.Json;
@@ -10,6 +11,7 @@ public class Program
 {
     public static void Main(string[] args)
     {
+        Console.WriteLine("Trimming main library from " +args[0]);
         ChangeEntryPointLibraryName(args[0]);
     }
 
@@ -22,7 +24,6 @@ public class Program
             deps = JObject.ReadFrom(reader);
         }
 
-        string version = null;
         foreach (JProperty target in deps["targets"])
         {
             var targetLibrary = target.Value.Children<JProperty>().FirstOrDefault();
@@ -33,16 +34,14 @@ public class Program
 
             targetLibrary.Remove();
         }
-        if (version != null)
-        {
-            var library = deps["libraries"].Children<JProperty>().First();
-            library.Remove();
 
-            using (var file = File.CreateText(depsFile))
-            using (var writer = new JsonTextWriter(file) { Formatting = Formatting.Indented })
-            {
-                deps.WriteTo(writer);
-            }
+        var library = deps["libraries"].Children<JProperty>().First();
+        library.Remove();
+
+        using (var file = File.CreateText(depsFile))
+        using (var writer = new JsonTextWriter(file) { Formatting = Formatting.Indented })
+        {
+            deps.WriteTo(writer);
         }
     }
-}
\ No newline at end of file
+}