diff --git a/build/common.props b/build/common.props
index 8fef632523..f3f7aa312e 100644
--- a/build/common.props
+++ b/build/common.props
@@ -155,6 +155,8 @@
     <FullMetaPackagePackageReference Include="Microsoft.CodeAnalysis.Razor" />
     <FullMetaPackagePackageReference Include="Microsoft.Data.Sqlite" />
     <FullMetaPackagePackageReference Include="Microsoft.Data.Sqlite.Core" />
+     <!-- workaround for https://github.com/dotnet/sdk/issues/1166 and https://github.com/ericsink/SQLitePCL.raw/issues/157 -->
+    <FullMetaPackagePackageReference Include="SQLitePCLRaw.bundle_green" Version="$(SQLitePCLRawVersion)" PrivateAssets="Build" />
     <FullMetaPackagePackageReference Include="Microsoft.EntityFrameworkCore" />
     <FullMetaPackagePackageReference Include="Microsoft.EntityFrameworkCore.Design" />
     <FullMetaPackagePackageReference Include="Microsoft.EntityFrameworkCore.InMemory" />
@@ -172,6 +174,7 @@
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Caching.SqlServer" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Abstractions" />
+    <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.AzureKeyVault" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Binder" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.DockerSecrets" />
     <FullMetaPackagePackageReference Include="Microsoft.Extensions.Configuration.Ini" />
diff --git a/build/dependencies.props b/build/dependencies.props
index e8660d68c4..d3e2ca5336 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -8,6 +8,7 @@
     <MoqVersion>4.7.1</MoqVersion>
     <NETStandardImplicitPackageVersion>$(BundledNETStandardPackageVersion)</NETStandardImplicitPackageVersion>
     <NewtonsoftJsonVersion>10.0.1</NewtonsoftJsonVersion>
+    <SQLitePCLRawVersion>1.1.5</SQLitePCLRawVersion>
     <TestSdkVersion>15.0.0</TestSdkVersion>
     <XunitVersion>2.2.0</XunitVersion>
   </PropertyGroup>
diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
index c003ee5ef0..a6e47077d0 100644
--- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
+++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
    <PackageReference Include="@(FullMetaPackagePackageReference)" />
    <PackageReference Include="@(FullMetaPackagePackageNoRuntimeStoreReference)" />
-   <ProjectReference Include="@(FullMetaPackageProjectReference)" />
+   <ProjectReference Include="@(FullMetaPackageProjectReference)" PrivateAssets="None" />
   </ItemGroup>
 
   <ItemGroup>
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
+}