diff --git a/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc b/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc
index 2e3899605..97df9362e 100644
--- a/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc
+++ b/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc
@@ -15,7 +15,11 @@ namespace Nuget {
         references: [
             ...addIf(BuildXLSdk.isFullFramework,
                 NetFx.System.Xml.dll,
-                NetFx.System.Xml.Linq.dll
+                NetFx.System.Xml.Linq.dll,
+                NetFx.Netstandard.dll
+            ),
+            ...addIf(BuildXLSdk.isFullFramework,
+                importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg
             ),
 
             Sdk.dll,
diff --git a/Public/Src/FrontEnd/Nuget/NugetAnalyzedPackage.cs b/Public/Src/FrontEnd/Nuget/NugetAnalyzedPackage.cs
index 9497cd164..eac16b3ec 100644
--- a/Public/Src/FrontEnd/Nuget/NugetAnalyzedPackage.cs
+++ b/Public/Src/FrontEnd/Nuget/NugetAnalyzedPackage.cs
@@ -179,7 +179,29 @@ namespace BuildXL.FrontEnd.Nuget
             foreach (var relativePath in PackageOnDisk.Contents.OrderBy(path => path.ToString(stringTable)))
             {
                 // This is a dll. Check if it is in a lib folder or ref folder.
-                var atoms = relativePath.GetAtoms();
+
+                // This code handles two layouts
+                // Case 1: /runtimes/{targetRuntime}/[lib|ref]/{targetFramework}/{fileName}
+                // Case 2: /[lib|ref]/{targetFramework}/{fileName}
+
+                // In case 1, /runtimes/{targetRuntime} is removed and then rest of string is processed as in
+                // case 2.
+                // Case 2 treats files under 'lib' folder as runtime dependencies (and optionally compile-time
+                // references if missing a corresponding set of compile-time references for the target framework
+                // under the 'ref' folder). Files under 'ref' folder are treated strictly as compile-time only references.
+
+                var atoms = new ReadOnlySpan<PathAtom>(relativePath.GetAtoms());
+                if (atoms.Length == 5)
+                {
+                    var isRuntime = NugetFrameworkMonikers.RuntimesFolderName.CaseInsensitiveEquals(stringTable, atoms[0])
+                        && NugetFrameworkMonikers.SupportedTargetRuntimeAtoms.Contains(atoms[1].StringId);
+
+                    if (isRuntime)
+                    {
+                        atoms = atoms.Slice(2);
+                    }
+                }
+
                 if (atoms.Length == 3)
                 {
                     var libOrRef = atoms[0];
diff --git a/Public/Src/FrontEnd/Nuget/NugetFrameworkMonikers.cs b/Public/Src/FrontEnd/Nuget/NugetFrameworkMonikers.cs
index 658c2f5ba..3746bb617 100644
--- a/Public/Src/FrontEnd/Nuget/NugetFrameworkMonikers.cs
+++ b/Public/Src/FrontEnd/Nuget/NugetFrameworkMonikers.cs
@@ -4,6 +4,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Collections.Specialized;
+using System.Linq;
 using BuildXL.Utilities;
 using BuildXL.Utilities.Collections;
 
@@ -104,6 +105,9 @@ namespace BuildXL.FrontEnd.Nuget
         /// <nodoc />
         public PathAtom RefFolderName { get; }
 
+        /// <nodoc />
+        public PathAtom RuntimesFolderName { get; }
+
         /// <nodoc />
         public HashSet<PathAtom> WellknownMonikers { get; }
 
@@ -126,13 +130,17 @@ namespace BuildXL.FrontEnd.Nuget
         public bool IsFullFrameworkMoniker(PathAtom moniker) => FullFrameworkVersionHistory.Contains(moniker);
 
         /// <nodoc />
-        public string[] SupportedTargetRuntimes {get;}
+        public string[] SupportedTargetRuntimes { get; }
+
+        /// <nodoc />
+        public HashSet<StringId> SupportedTargetRuntimeAtoms { get; }
 
         /// <nodoc />
         public NugetFrameworkMonikers(StringTable stringTable)
         {
             LibFolderName = PathAtom.Create(stringTable, "lib");
             RefFolderName = PathAtom.Create(stringTable, "ref");
+            RuntimesFolderName = PathAtom.Create(stringTable, "runtimes");
 
             WellknownMonikers = new HashSet<PathAtom>();
             TargetFrameworkNameToMoniker = new Dictionary<string, PathAtom>();
@@ -179,6 +187,8 @@ namespace BuildXL.FrontEnd.Nuget
                 "osx-x64",
                 "linux-x64"
             };
+
+            SupportedTargetRuntimeAtoms = new HashSet<StringId>(SupportedTargetRuntimes.Select(s => PathAtom.Create(stringTable, s).StringId));
         }
 
         private PathAtom Register(StringTable stringTable, string smallMoniker, string largeMoniker, List<PathAtom> versions)
diff --git a/Public/Src/FrontEnd/Nuget/NugetSpecGenerator.cs b/Public/Src/FrontEnd/Nuget/NugetSpecGenerator.cs
index 2d2dfcbce..fd9a85d69 100644
--- a/Public/Src/FrontEnd/Nuget/NugetSpecGenerator.cs
+++ b/Public/Src/FrontEnd/Nuget/NugetSpecGenerator.cs
@@ -32,7 +32,7 @@ namespace BuildXL.FrontEnd.Nuget
         private readonly PathAtom m_pdbExtension;
 
         /// <summary>Current spec generation format version</summary>
-        public const int SpecGenerationFormatVersion = 7;
+        public const int SpecGenerationFormatVersion = 8;
 
         /// <nodoc />
         public NugetSpecGenerator(PathTable pathTable, NugetAnalyzedPackage analyzedPackage)
@@ -185,7 +185,7 @@ namespace BuildXL.FrontEnd.Nuget
                         new CaseClause(
                             new LiteralExpression(monikers.Last().ToString(m_pathTable.StringTable)),
                             new ReturnStatement(
-                                new CallExpression(
+                                Call(
                                     PropertyAccess("Managed", "Factory", "createNugetPackage"),
                                     new LiteralExpression(analyzedPackage.Id),
                                     new LiteralExpression(analyzedPackage.Version),
@@ -386,7 +386,7 @@ namespace BuildXL.FrontEnd.Nuget
             var pdbPath = binaryFile.ChangeExtension(m_pathTable.StringTable, m_pdbExtension);
             var xmlPath = binaryFile.ChangeExtension(m_pathTable.StringTable, m_xmlExtension);
 
-            return new CallExpression(
+            return Call(
                 PropertyAccess("Managed", "Factory", "createBinaryFromFiles"),
                 GetFileExpressionForPath(binaryFile),
                 m_packageOnDisk.Contents.Contains(pdbPath) ? GetFileExpressionForPath(pdbPath) : null,
diff --git a/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/DScript/SyntaxFactories/SyntaxFactory.cs b/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/DScript/SyntaxFactories/SyntaxFactory.cs
index 66f8119fb..d906e5ed3 100644
--- a/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/DScript/SyntaxFactories/SyntaxFactory.cs
+++ b/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/DScript/SyntaxFactories/SyntaxFactory.cs
@@ -51,7 +51,7 @@ namespace TypeScript.Net.DScript
         {
             return new TaggedTemplateExpression(kind.GetIdentifierName(), literalText);
         }
-        
+
         /// <summary>
         /// Creates a path-like expression with a given kind and text.
         /// </summary>
@@ -117,6 +117,44 @@ namespace TypeScript.Net.DScript
             return new ArrayLiteralExpression(elements);
         }
 
+        /// <summary>
+        /// Creates an 'undefined' identifier
+        /// </summary>
+        public static IIdentifier Undefined()
+        {
+            return TypeScript.Net.Types.Identifier.CreateUndefined();
+        }
+
+        /// <summary>
+        /// Creates a call expression. 
+        /// NOTE: Preprocesses arguments to remove trailing nulls and replace non-trailing nulls with 'undefined' identifier.
+        /// </summary>
+        public static ICallExpression Call(ILeftHandSideExpression methodReference, params IExpression[] arguments)
+        {
+            var argumentsList = arguments.ToList();
+            bool encounteredNonNull = false;
+            for (int i = argumentsList.Count - 1; i >= 0; i--)
+            {
+                if (argumentsList[i] == null)
+                {
+                    if (encounteredNonNull)
+                    {
+                        argumentsList[i] = Undefined();
+                    }
+                    else
+                    {
+                        argumentsList.RemoveAt(i);
+                    }
+                }
+                else
+                {
+                    encounteredNonNull = true;
+                }
+            }
+
+            return new CallExpression(methodReference, argumentsList);
+        }
+
         /// <summary>
         /// Creates a type assertion like 'x : YourType'.
         /// </summary>
@@ -165,7 +203,7 @@ namespace TypeScript.Net.DScript
             Contract.Requires(members.Length > 0);
 
             return new TypeLiteralNode(
-                members.Select(member => 
+                members.Select(member =>
                     new PropertySignature(
                         member.propertyName,
                         new UnionOrIntersectionTypeNode()
diff --git a/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/Types/Nodes/NodeImplementations.cs b/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/Types/Nodes/NodeImplementations.cs
index a9c0b15e2..cb2ca8588 100644
--- a/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/Types/Nodes/NodeImplementations.cs
+++ b/Public/Src/FrontEnd/TypeScript.Net/TypeScript.Net/Types/Nodes/NodeImplementations.cs
@@ -1376,6 +1376,13 @@ namespace TypeScript.Net.Types
         {
         }
 
+        /// <nodoc/>
+        public CallExpression(ILeftHandSideExpression expression, List<IExpression> arguments)
+        {
+            Expression = expression;
+            Arguments = new NodeArray<IExpression>(arguments);
+        }
+
         /// <nodoc/>
         public CallExpression(ILeftHandSideExpression expression, params IExpression[] arguments)
         {
diff --git a/cg/nuget/cgmanifest.json b/cg/nuget/cgmanifest.json
index ae2dfd446..a6e8a68e8 100644
--- a/cg/nuget/cgmanifest.json
+++ b/cg/nuget/cgmanifest.json
@@ -307,33 +307,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Grpc.AspNetCore",
-          "Version": "2.26.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Grpc.AspNetCore.Server",
-          "Version": "2.26.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Grpc.AspNetCore.Server.ClientFactory",
-          "Version": "2.26.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -361,15 +334,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Grpc.Net.ClientFactory",
-          "Version": "2.26.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -518,8 +482,8 @@
       "Component": {
         "Type": "NuGet",
         "NuGet": {
-          "Name": "Microsoft.AspNetCore",
-          "Version": "2.2.0"
+          "Name": "Microsoft.AspNetCore.App.Ref",
+          "Version": "3.1.3"
         }
       }
     },
@@ -527,485 +491,8 @@
       "Component": {
         "Type": "NuGet",
         "NuGet": {
-          "Name": "Microsoft.AspNetCore.Antiforgery",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Authentication.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Authentication.Core",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Authorization",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Authorization.Policy",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Connections.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Cors",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Cryptography.Internal",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.DataProtection",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.DataProtection.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Diagnostics",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Diagnostics.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.HostFiltering",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Hosting",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Hosting.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Hosting.Server.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Html.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Http",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Http.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Http.Extensions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Http.Features",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.HttpOverrides",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.HttpsPolicy",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.JsonPatch",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Localization",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.Analyzers",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.ApiExplorer",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.Core",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.Cors",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.DataAnnotations",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.Formatters.Json",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.Localization",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.Razor",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.Razor.Extensions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.RazorPages",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.TagHelpers",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Mvc.ViewFeatures",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Razor",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Razor.Design",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Razor.Language",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Razor.Runtime",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.ResponseCaching.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Routing",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Routing.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Server.IIS",
-          "Version": "2.2.6"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Server.IISIntegration",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Server.Kestrel",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Server.Kestrel.Core",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Server.Kestrel.Https",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.AspNetCore.WebUtilities",
-          "Version": "2.2.0"
+          "Name": "Microsoft.AspNetCore.App.Runtime.win-x64",
+          "Version": "3.1.5"
         }
       }
     },
@@ -1549,15 +1036,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.CodeAnalysis.Razor",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1648,15 +1126,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.DiaSymReader.Native",
-          "Version": "1.7.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1675,33 +1144,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.DotNet.PlatformAbstractions",
-          "Version": "2.1.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Caching.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Caching.Memory",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1729,60 +1171,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Configuration.CommandLine",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Configuration.EnvironmentVariables",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Configuration.FileExtensions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Configuration.Json",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Configuration.UserSecrets",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.DependencyInjection",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1792,51 +1180,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.DependencyModel",
-          "Version": "2.1.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.FileProviders.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.FileProviders.Composite",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.FileProviders.Physical",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.FileSystemGlobbing",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1846,15 +1189,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Hosting.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1864,24 +1198,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Localization",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Localization.Abstractions",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1900,42 +1216,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Logging.Configuration",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Logging.Console",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Logging.Debug",
-          "Version": "2.2.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Logging.EventSource",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1945,15 +1225,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.ObjectPool",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1963,15 +1234,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.Options.ConfigurationExtensions",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -1990,15 +1252,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Extensions.WebEncoders",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -2242,15 +1495,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Net.Http.Headers",
-          "Version": "2.2.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
diff --git a/config.nuget.aspNetCore.dsc b/config.nuget.aspNetCore.dsc
index e9f7b4291..6f66040a6 100644
--- a/config.nuget.aspNetCore.dsc
+++ b/config.nuget.aspNetCore.dsc
@@ -10,96 +10,17 @@ export const pkgs = [
     { id: "Microsoft.AspNet.WebApi.WebHost", version: "5.2.2" },
 
     // aspnet core
-    { id: "Microsoft.AspNetCore.Antiforgery", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Authentication.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Authentication.Core", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Authorization.Policy", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Authorization", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Connections.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Cors", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Cryptography.Internal", version: aspVersion },
-    { id: "Microsoft.AspNetCore.DataProtection.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.DataProtection", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Diagnostics.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Diagnostics", version: aspVersion },
-    { id: "Microsoft.AspNetCore.HostFiltering", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Hosting.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Hosting.Server.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Hosting", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Html.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Http.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Http.Extensions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Http.Features", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Http", version: aspVersion },
-    { id: "Microsoft.AspNetCore.HttpOverrides", version: aspVersion },
-    { id: "Microsoft.AspNetCore.HttpsPolicy", version: aspVersion },
-    { id: "Microsoft.AspNetCore.JsonPatch", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Localization", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.Analyzers", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.ApiExplorer", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.Core", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.Cors", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.DataAnnotations", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.Formatters.Json", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.Localization", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.Razor.Extensions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.Razor", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.RazorPages", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.TagHelpers", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Mvc.ViewFeatures", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Razor.Design", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Razor.Language", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Razor.Runtime", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Razor", version: aspVersion },
-    { id: "Microsoft.AspNetCore.ResponseCaching.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Routing.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Routing", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Server.IIS", version: "2.2.6" },
-    { id: "Microsoft.AspNetCore.Server.IISIntegration", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Server.Kestrel.Core", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Server.Kestrel.Https", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Server.Kestrel.Transport.Abstractions", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets", version: aspVersion },
-    { id: "Microsoft.AspNetCore.Server.Kestrel", version: aspVersion },
-    { id: "Microsoft.AspNetCore.WebUtilities", version: aspVersion },
-    { id: "Microsoft.AspNetCore", version: aspVersion },
-    { id: "Microsoft.CodeAnalysis.Razor", version: aspVersion },
-    { id: "Microsoft.DiaSymReader.Native", version: "1.7.0" },
-    { id: "Microsoft.DotNet.PlatformAbstractions", version: "2.1.0" },
-    { id: "Microsoft.Extensions.Caching.Abstractions", version:  aspVersion },
-    { id: "Microsoft.Extensions.Caching.Memory", version:  aspVersion },
     { id: "Microsoft.Extensions.Configuration.Abstractions", version: aspVersion },
     { id: "Microsoft.Extensions.Configuration.Binder", version: aspVersion },
-    { id: "Microsoft.Extensions.Configuration.CommandLine", version: aspVersion },
-    { id: "Microsoft.Extensions.Configuration.EnvironmentVariables", version: aspVersion },
-    { id: "Microsoft.Extensions.Configuration.FileExtensions", version: aspVersion },
-    { id: "Microsoft.Extensions.Configuration.Json", version: aspVersion },
-    { id: "Microsoft.Extensions.Configuration.UserSecrets", version: aspVersion },
     { id: "Microsoft.Extensions.Configuration", version: aspVersion },
     { id: "Microsoft.Extensions.DependencyInjection.Abstractions", version: aspVersion },
-    { id: "Microsoft.Extensions.DependencyInjection", version: aspVersion },
-    { id: "Microsoft.Extensions.DependencyModel", version: "2.1.0" },
-    { id: "Microsoft.Extensions.FileProviders.Abstractions", version: aspVersion },
-    { id: "Microsoft.Extensions.FileProviders.Composite", version: aspVersion },
-    { id: "Microsoft.Extensions.FileProviders.Physical", version: aspVersion },
-    { id: "Microsoft.Extensions.FileSystemGlobbing", version: aspVersion },
-    { id: "Microsoft.Extensions.Hosting.Abstractions", version: aspVersion },
-    { id: "Microsoft.Extensions.Localization.Abstractions", version: aspVersion },
-    { id: "Microsoft.Extensions.Localization", version: aspVersion },
     { id: "Microsoft.Extensions.Logging.Abstractions", version: aspVersion },
-    { id: "Microsoft.Extensions.Logging.Configuration", version: aspVersion },
-    { id: "Microsoft.Extensions.Logging.Console", version: aspVersion },
-    { id: "Microsoft.Extensions.Logging.Debug", version: aspVersion },
-    { id: "Microsoft.Extensions.Logging.EventSource", version: aspVersion },
     { id: "Microsoft.Extensions.Logging", version: aspVersion },
-    { id: "Microsoft.Extensions.ObjectPool", version: aspVersion },
-    { id: "Microsoft.Extensions.Options.ConfigurationExtensions", version: aspVersion },
     { id: "Microsoft.Extensions.Options", version: aspVersion },
     { id: "Microsoft.Extensions.Primitives", version: aspVersion },
-    { id: "Microsoft.Extensions.WebEncoders", version: aspVersion },
 
     { id: "Microsoft.Net.Http", version: "2.2.29" },
-    { id: "Microsoft.Net.Http.Headers", version: aspVersion },
+
+    { id: "Microsoft.AspNetCore.App.Ref", version: "3.1.3" },
+    { id: "Microsoft.AspNetCore.App.Runtime.win-x64", version: "3.1.5" },
 ];
diff --git a/config.nuget.grpc.dsc b/config.nuget.grpc.dsc
index bb3eb6090..1099e35eb 100644
--- a/config.nuget.grpc.dsc
+++ b/config.nuget.grpc.dsc
@@ -6,10 +6,6 @@ const grpcVersion = "2.26.0";
 
 export const pkgs = [
     // grpc
-    { id: "Grpc.AspNetCore", version: grpcVersion},
-    { id: "Grpc.AspNetCore.Server", version: grpcVersion },
-    { id: "Grpc.AspNetCore.Server.ClientFactory", version: grpcVersion },
-    { id: "Grpc.Net.ClientFactory", version: grpcVersion },
     { id: "Grpc.Net.Client", version: grpcVersion },
     { id: "Grpc.Net.Common", version: grpcVersion },
     { id: "Grpc.Core", version: grpcVersion, dependentPackageIdsToSkip: [ "System.Memory" ] },