diff --git a/Public/Sdk/Public/DScript/TestRunner/TestRunner.dsc b/Public/Sdk/Public/DScript/TestRunner/TestRunner.dsc
index aba3515d6..405db8214 100644
--- a/Public/Sdk/Public/DScript/TestRunner/TestRunner.dsc
+++ b/Public/Sdk/Public/DScript/TestRunner/TestRunner.dsc
@@ -85,7 +85,7 @@ export function test(args: TestArguments): Managed.TestResult {
         skipTestRun: !BuildXLSdk.targetFrameworkMatchesCurrentHost,
         references: [
             SdkTesting.Helper.dll,
-            importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
             ...importFrom("Sdk.Managed.Testing.XUnit").xunitReferences
         ],
         tools: {
diff --git a/Public/Sdk/Public/Managed/Frameworks/helpers.dsc b/Public/Sdk/Public/Managed/Frameworks/helpers.dsc
index 255d03aa8..ce95f9075 100644
--- a/Public/Sdk/Public/Managed/Frameworks/helpers.dsc
+++ b/Public/Sdk/Public/Managed/Frameworks/helpers.dsc
@@ -4,10 +4,9 @@ import {DotNetCoreVersion, Assembly, Factory} from "Sdk.Managed.Shared";
 namespace Helpers {
     export declare const qualifier : {};
 
+    // For now there are no assemblies to skip, leave this infra in place just in case we need
+    // this again.
     const assemblyNamesToExclude = Set.create(
-        a`System.IO.FileSystem.AccessControl`,
-        a`System.Security.AccessControl`,
-        a`System.Security.Principal.Windows`
     );
 
     // We skip deploying those files from the .NET Core package as we need those very assemblies from their dedicated package
diff --git a/Public/Sdk/Public/Managed/Frameworks/net6/net6.0.dsc b/Public/Sdk/Public/Managed/Frameworks/net6/net6.0.dsc
index 3c7bad041..976ef6141 100644
--- a/Public/Sdk/Public/Managed/Frameworks/net6/net6.0.dsc
+++ b/Public/Sdk/Public/Managed/Frameworks/net6/net6.0.dsc
@@ -102,5 +102,5 @@ export const framework : Shared.Framework = {
 
 function createDefaultAssemblies() : Shared.Assembly[] {
     const pkgContents = importFrom("Microsoft.NETCore.App.Ref60").Contents.all;
-    return Helpers.createDefaultAssemblies(pkgContents, "net6.0", /*includeAllAssemblies*/ false);
+    return Helpers.createDefaultAssemblies(pkgContents, "net6.0", /*includeAllAssemblies*/ true);
 }
diff --git a/Public/Sdk/Public/Managed/Testing/XUnit/xunitframework.dsc b/Public/Sdk/Public/Managed/Testing/XUnit/xunitframework.dsc
index 14619b32b..1d6ca243b 100644
--- a/Public/Sdk/Public/Managed/Testing/XUnit/xunitframework.dsc
+++ b/Public/Sdk/Public/Managed/Testing/XUnit/xunitframework.dsc
@@ -69,7 +69,7 @@ const additionalNetCoreRuntimeContent = isDotNetCore(qualifier.targetFramework)
         // into a self-contained deployment or treat it as a framework-dependent deployment as intended, let's do the latter
         ...(getXunitConsoleRuntimeConfigNetCoreAppFiles()),
         xunitConsolePackage.getFile(r`/tools/netcoreapp2.0/xunit.runner.utility.netcoreapp10.dll`),
-
+        
         // Note that below we are using different console runner due to this bug https://github.com/xunit/xunit/pull/1846
         // that the xunit maintainer does not want to fix. Let's consider removing this patch when we upgrade to xunit 3.0.
         xunitNetCoreConsolePackage.getFile(r`/lib/netcoreapp2.0/xunit.console.dll`)
diff --git a/Public/Sdk/SelfHost/BuildXL/BuildXLSdk.Packages.dsc b/Public/Sdk/SelfHost/BuildXL/BuildXLSdk.Packages.dsc
index 047b5475f..2324893ba 100644
--- a/Public/Sdk/SelfHost/BuildXL/BuildXLSdk.Packages.dsc
+++ b/Public/Sdk/SelfHost/BuildXL/BuildXLSdk.Packages.dsc
@@ -44,10 +44,10 @@ export function getSystemMemoryPackages(includeNetStandard: boolean) : (Managed.
 export function getSystemMemoryPackagesWithoutNetStandard() : Managed.ManagedNugetPackage[] {
     return [
         ...(isDotNetCore ? [] : [
-            importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("System.Buffers").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("System.Numerics.Vectors").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("System.Memory").pkg,
+            importFrom("System.Buffers").pkg,
+            importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
+            importFrom("System.Numerics.Vectors").pkg,
         ]
         ),
     ];
diff --git a/Public/Sdk/SelfHost/BuildXL/BuildXLSdk.dsc b/Public/Sdk/SelfHost/BuildXL/BuildXLSdk.dsc
index fafa77a82..c980da2ab 100644
--- a/Public/Sdk/SelfHost/BuildXL/BuildXLSdk.dsc
+++ b/Public/Sdk/SelfHost/BuildXL/BuildXLSdk.dsc
@@ -539,8 +539,8 @@ export function bxlBindingRedirects() {
                 name: "System.Runtime.CompilerServices.Unsafe",
                 publicKeyToken: "b03f5f7f11d50a3a",
                 culture: "neutral",
-                oldVersion: "0.0.0.0-5.0.0.0",
-                newVersion: "5.0.0.0",  // Corresponds to: { id: "System.Runtime.CompilerServices.Unsafe", version: "5.0.0" },
+                oldVersion: "0.0.0.0-6.0.0.0",
+                newVersion: "6.0.0.0",  // Corresponds to: { id: "System.Runtime.CompilerServices.Unsafe", version: "6.0.0" },
             },
         ];
 }
diff --git a/Public/Sdk/SelfHost/BuildXL/Qualifiers.dsc b/Public/Sdk/SelfHost/BuildXL/Qualifiers.dsc
index 96d1f7810..54ea9b6ff 100644
--- a/Public/Sdk/SelfHost/BuildXL/Qualifiers.dsc
+++ b/Public/Sdk/SelfHost/BuildXL/Qualifiers.dsc
@@ -100,6 +100,18 @@ export interface Net7Qualifier extends Qualifier {
     targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
 }
 
+/**
+ * Having a net7 specific qualifier (without net 6) for some specific tests that only
+ * work in net 7.
+ * TODO: This should be consolidated with DefaultQualifier when we stop compiling for net6
+ */
+@@public
+export interface Net7QualifierWithNet472 extends Qualifier {
+    configuration: "debug" | "release";
+    targetFramework: "net7.0" | "net472";
+    targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
+}
+
 /**
  * LatestFullFrameworkQualifier, used to pin tool execution to a specific .NET Framework version
  */
diff --git a/Public/Sdk/SelfHost/Libraries/MSBuild/msbuild.dsc b/Public/Sdk/SelfHost/Libraries/MSBuild/msbuild.dsc
index 99d42951d..df7fd764f 100644
--- a/Public/Sdk/SelfHost/Libraries/MSBuild/msbuild.dsc
+++ b/Public/Sdk/SelfHost/Libraries/MSBuild/msbuild.dsc
@@ -4,7 +4,7 @@
 import * as Managed from "Sdk.Managed";
 import * as BuildXLSdk from "Sdk.BuildXL";
 
-export declare const qualifier: BuildXLSdk.DefaultQualifierWithNet472;
+export declare const qualifier: BuildXLSdk.Net7QualifierWithNet472;
 
 @@public
 export const msbuildReferences: Managed.ManagedNugetPackage[] = [
@@ -13,24 +13,28 @@ export const msbuildReferences: Managed.ManagedNugetPackage[] = [
     importFrom("Microsoft.Build").pkg,
     importFrom("Microsoft.Build.Tasks.Core").pkg,
     importFrom("Microsoft.NET.StringTools").pkg,
-    ...addIf(BuildXLSdk.isFullFramework, importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({targetFramework: "netstandard2.0"}).pkg),
+    ...addIf(BuildXLSdk.isFullFramework, importFrom("System.Runtime.CompilerServices.Unsafe").pkg),
 ];
 
-/** Runtime content for tests */
+/** 
+ * Runtime content for tests 
+ * Observe that we use a net7-specific version of msbuild.
+ **/
 @@public
 export const msbuildRuntimeContent = [
-    importFrom("Microsoft.Build.Runtime").pkg,
-    importFrom("System.MemoryForVBCS").pkg,
-    importFrom("System.Numerics.Vectors").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-    importFrom("System.Collections.Immutable.ForVBCS").pkg,
+    importFrom("System.Memory").pkg,
+    importFrom("System.Numerics.Vectors").pkg,
+    importFrom("System.Collections.Immutable").pkg,
     importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
     importFrom("System.Threading.Tasks.Dataflow").pkg,
-    
+    importFrom("System.Threading.Tasks.Extensions").pkg,
+    importFrom("Microsoft.Bcl.AsyncInterfaces").pkg,
+
     ...BuildXLSdk.isDotNetCoreOrStandard ? [
         importFrom("System.Text.Encoding.CodePages").pkg,
         importFrom("Microsoft.Build.Tasks.Core").pkg,
-        importFrom("Microsoft.Build.Runtime").Contents.all.getFile(r`contentFiles/any/net6.0/MSBuild.dll`),
-        importFrom("Microsoft.Build.Runtime").Contents.all.getFile(r`contentFiles/any/net6.0/MSBuild.runtimeconfig.json`),
+        importFrom("Microsoft.Build.Runtime").Contents.all.getFile(r`contentFiles/any/net7.0/MSBuild.dll`),
+        importFrom("Microsoft.Build.Runtime").Contents.all.getFile(r`contentFiles/any/net7.0/MSBuild.runtimeconfig.json`),
         importFrom("Microsoft.NET.StringTools").pkg
     ]
     : [
diff --git a/Public/Src/Cache/ContentStore/BuildXL.Cache.ContentStore.dsc b/Public/Src/Cache/ContentStore/BuildXL.Cache.ContentStore.dsc
index 401c5f15c..cd68490e2 100644
--- a/Public/Src/Cache/ContentStore/BuildXL.Cache.ContentStore.dsc
+++ b/Public/Src/Cache/ContentStore/BuildXL.Cache.ContentStore.dsc
@@ -17,7 +17,7 @@ export const NetFx = BuildXLSdk.NetFx;
 @@public
 export function getSerializationPackages(includeNetStandard: boolean) : (Managed.ManagedNugetPackage | Managed.Assembly)[] {
     return [
-        importFrom("System.Memory.Data").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+        importFrom("System.Memory.Data").pkg,
         ...getSystemTextJson(includeNetStandard),
         ...getSerializationPackagesWithoutNetStandard()
     ];
@@ -27,13 +27,13 @@ export function getSerializationPackages(includeNetStandard: boolean) : (Managed
 export function getSerializationPackagesWithoutNetStandard() : (Managed.ManagedNugetPackage)[] {
     return [
         ...(BuildXLSdk.isFullFramework ? [
-            importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+            importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
         ] : []),
         ...(BuildXLSdk.isFullFramework || qualifier.targetFramework === "netstandard2.0" ? [
-            importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("System.Memory").pkg,
         ] : []),
-        importFrom("System.Text.Encodings.Web").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-        importFrom("System.Numerics.Vectors").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+        importFrom("System.Text.Encodings.Web").pkg,
+        importFrom("System.Numerics.Vectors").pkg,
     ];
 }
 
@@ -53,20 +53,15 @@ export function getSystemTextJsonWithoutNetStandard() : Managed.ManagedNugetPack
     return [
         ...addIf(
             !BuildXLSdk.isDotNetCore,
-            importFrom("System.Text.Json").withQualifier({targetFramework: "netstandard2.0"}).pkg),
+            importFrom("System.Text.Json").pkg),
     ];
 }
 
 @@public
 export function getProtobufPackages() : Managed.ManagedNugetPackage[] {
     return [
-       BuildXLSdk.isFullFramework || qualifier.targetFramework === "netstandard2.0" ?
-            importFrom("System.Memory").withQualifier({ targetFramework: "netstandard2.0" }).pkg 
-            : importFrom("System.Memory").pkg,
-        BuildXLSdk.isFullFramework || qualifier.targetFramework === "netstandard2.0" ?
-            importFrom("System.Buffers").withQualifier({ targetFramework: "netstandard2.0" }).pkg 
-            : importFrom("System.Buffers").pkg,
-
+        importFrom("System.Buffers").pkg,
+        importFrom("System.Memory").pkg,
         importFrom("Google.Protobuf").pkg, 
     ];
 }
@@ -118,11 +113,14 @@ export function getGrpcAspNetCorePackages() : (Managed.ManagedNugetPackage | Man
                   importFrom("Grpc.AspNetCore.Server.ClientFactory").pkg,
                   importFrom("Grpc.AspNetCore.Server").pkg,
                   
-                  BuildXLSdk.withWinRuntime(importFrom("System.Security.Cryptography.ProtectedData").pkg, r`runtimes/win/lib/netstandard2.0`),
-                  
+                  importFrom("System.Security.Cryptography.ProtectedData").pkg,
+
                   // AspNetCore assemblies
                   Managed.Factory.filterRuntimeSpecificBinaries(BuildXLSdk.WebFramework.getFrameworkPackage(), [
-                    importFrom("System.IO.Pipelines").pkg
+                    importFrom("System.IO.Pipelines").pkg,
+                    importFrom("System.Diagnostics.EventLog").pkg,
+                    importFrom("System.Security.Cryptography.Pkcs").pkg,
+                    importFrom("System.Security.Cryptography.Xml").pkg,
                   ])
         ])
     ];
diff --git a/Public/Src/Cache/ContentStore/Distributed/BuildXL.Cache.ContentStore.Distributed.dsc b/Public/Src/Cache/ContentStore/Distributed/BuildXL.Cache.ContentStore.Distributed.dsc
index 73d76e7e6..b14ac4c92 100644
--- a/Public/Src/Cache/ContentStore/Distributed/BuildXL.Cache.ContentStore.Distributed.dsc
+++ b/Public/Src/Cache/ContentStore/Distributed/BuildXL.Cache.ContentStore.Distributed.dsc
@@ -20,8 +20,8 @@ namespace Distributed {
             : []),
         importFrom("Azure.Core.Amqp").pkg,
         importFrom("Microsoft.Azure.Amqp").pkg,
-        importFrom("System.Memory.Data").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-        BuildXLSdk.withWinRuntime(importFrom("System.Security.Cryptography.ProtectedData").pkg, r`runtimes/win/lib/netstandard2.0`),
+        importFrom("System.Memory.Data").pkg,
+        importFrom("System.Security.Cryptography.ProtectedData").pkg,
     ];
 
     @@public
@@ -74,8 +74,8 @@ namespace Distributed {
             ...(BuildXLSdk.isFullFramework 
                 ? [ 
                     // Needed because net472 -> netstandard2.0 translation is not yet supported by the NuGet resolver.
-                    importFrom("System.IO.Pipelines").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
-                    importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+                    importFrom("System.IO.Pipelines").pkg,
+                    importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
                     importFrom("Pipelines.Sockets.Unofficial").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
                 ] 
                 : [
diff --git a/Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc b/Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc
index 32dc5f912..19bbb707e 100644
--- a/Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc
+++ b/Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc
@@ -107,8 +107,8 @@ namespace DistributedTest {
             ...(BuildXLSdk.isFullFramework 
                 ? [ 
                     // Needed because net472 -> netstandard2.0 translation is not yet supported by the NuGet resolver.
-                    importFrom("System.IO.Pipelines").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
-                    importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+                    importFrom("System.IO.Pipelines").pkg,
+                    importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
                     importFrom("Pipelines.Sockets.Unofficial").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
                 ] 
                 : [
diff --git a/Public/Src/Cache/ContentStore/Grpc/BuildXL.Cache.ContentStore.Grpc.dsc b/Public/Src/Cache/ContentStore/Grpc/BuildXL.Cache.ContentStore.Grpc.dsc
index f0f3fa9fa..29dc261f8 100644
--- a/Public/Src/Cache/ContentStore/Grpc/BuildXL.Cache.ContentStore.Grpc.dsc
+++ b/Public/Src/Cache/ContentStore/Grpc/BuildXL.Cache.ContentStore.Grpc.dsc
@@ -14,13 +14,11 @@ namespace Grpc {
         references: [
             ...getGrpcPackages(true),
             ...BuildXLSdk.bclAsyncPackages,
-            ...addIfLazy(BuildXLSdk.isDotNetCoreOrStandard, () => [
-                  BuildXLSdk.withWinRuntime(importFrom("System.Security.Cryptography.ProtectedData").pkg, r`runtimes/win/lib/netstandard2.0`),
-            ]),
+            importFrom("System.Security.Cryptography.ProtectedData").pkg,
 
             ...addIfLazy(qualifier.targetFramework === "netstandard2.0", () => [
                 // Don't need adding the following package for net6+
-                BuildXLSdk.withWinRuntime(importFrom("System.Security.Cryptography.Cng").pkg, r`runtimes/win/lib/netstandard2.0`),
+                importFrom("System.Security.Cryptography.Cng").pkg
           ]),
 
             ...addIf(!BuildXLSdk.isDotNetCoreOrStandard, NetFx.System.Security.dll),
diff --git a/Public/Src/Cache/ContentStore/Library/BuildXL.Cache.ContentStore.Library.dsc b/Public/Src/Cache/ContentStore/Library/BuildXL.Cache.ContentStore.Library.dsc
index a41647a24..baa3b1b25 100644
--- a/Public/Src/Cache/ContentStore/Library/BuildXL.Cache.ContentStore.Library.dsc
+++ b/Public/Src/Cache/ContentStore/Library/BuildXL.Cache.ContentStore.Library.dsc
@@ -5,10 +5,6 @@ namespace Library {
 
     export declare const qualifier : BuildXLSdk.AllSupportedQualifiers;
 
-    @@public
-    export const systemMemoryPackage = 
-        BuildXLSdk.isFullFramework  ? importFrom("System.Memory").withQualifier({ targetFramework: "netstandard2.0" }).pkg : importFrom("System.Memory").pkg;
-
     @@public
     export const dll = BuildXLSdk.library({
         assemblyName: "BuildXL.Cache.ContentStore",
@@ -22,7 +18,7 @@ namespace Library {
             ),
 
             ...BuildXLSdk.systemThreadingTasksDataflowPackageReference,
-            systemMemoryPackage,
+            importFrom("System.Memory").pkg,
             
             ...importFrom("BuildXL.Utilities").Native.securityDlls,
             UtilitiesCore.dll,
diff --git a/Public/Src/Cache/ContentStore/Test/BuildXL.Cache.ContentStore.Test.dsc b/Public/Src/Cache/ContentStore/Test/BuildXL.Cache.ContentStore.Test.dsc
index 2fde75851..67b48cda2 100644
--- a/Public/Src/Cache/ContentStore/Test/BuildXL.Cache.ContentStore.Test.dsc
+++ b/Public/Src/Cache/ContentStore/Test/BuildXL.Cache.ContentStore.Test.dsc
@@ -21,7 +21,7 @@ namespace Test {
             ),
 
             ...addIf(BuildXLSdk.isFullFramework,
-                importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg
+                importFrom("System.Memory").pkg
             ),
             // TODO: This needs to be renamed to just utilities... but it is in a package in public/src
             importFrom("BuildXL.Utilities").dll,
diff --git a/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc b/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc
index c2fac8151..14af1fc47 100644
--- a/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc
+++ b/Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc
@@ -40,7 +40,10 @@ namespace LauncherServer {
 
             // AspNetCore assemblies
             Managed.Factory.filterRuntimeSpecificBinaries(BuildXLSdk.WebFramework.getFrameworkPackage(), [
-                importFrom("System.IO.Pipelines").pkg
+                importFrom("System.IO.Pipelines").pkg,
+                importFrom("System.Diagnostics.EventLog").pkg,
+                importFrom("System.Security.Cryptography.Pkcs").pkg,
+                importFrom("System.Security.Cryptography.Xml").pkg,
             ])
         ],
         assemblyBindingRedirects: [
diff --git a/Public/Src/Cache/Logging/Library/BuildXL.Cache.Logging.Library.dsc b/Public/Src/Cache/Logging/Library/BuildXL.Cache.Logging.Library.dsc
index 06f560c12..db7e67f8a 100644
--- a/Public/Src/Cache/Logging/Library/BuildXL.Cache.Logging.Library.dsc
+++ b/Public/Src/Cache/Logging/Library/BuildXL.Cache.Logging.Library.dsc
@@ -16,7 +16,7 @@ namespace Library {
             importFrom("Microsoft.Bcl.AsyncInterfaces").pkg,
             ...importFrom("BuildXL.Cache.ContentStore").getAzureBlobStorageSdkPackages(true),
             importFrom("Microsoft.IdentityModel.Abstractions").pkg,
-            importFrom("System.Memory.Data").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("System.Memory.Data").pkg,
             importFrom("NLog").pkg,
             importFrom("BuildXL.Cache.ContentStore").Hashing.dll,
             importFrom("BuildXL.Cache.ContentStore").Interfaces.dll,
diff --git a/Public/Src/Engine/ProcessPipExecutor/BuildXL.ProcessPipExecutor.dsc b/Public/Src/Engine/ProcessPipExecutor/BuildXL.ProcessPipExecutor.dsc
index 168e03f28..b80f7016f 100644
--- a/Public/Src/Engine/ProcessPipExecutor/BuildXL.ProcessPipExecutor.dsc
+++ b/Public/Src/Engine/ProcessPipExecutor/BuildXL.ProcessPipExecutor.dsc
@@ -10,7 +10,7 @@ namespace ProcessPipExecutor {
         allowUnsafeBlocks: true,
         references: [
             ...addIfLazy(!BuildXLSdk.isDotNetCore, () => [
-                importFrom("System.Memory").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+                importFrom("System.Memory").pkg,
             ]),
 
             Processes.dll,
diff --git a/Public/Src/Engine/Processes.External/BuildXL.Processes.External.dsc b/Public/Src/Engine/Processes.External/BuildXL.Processes.External.dsc
index d79db67b0..f091cefa8 100644
--- a/Public/Src/Engine/Processes.External/BuildXL.Processes.External.dsc
+++ b/Public/Src/Engine/Processes.External/BuildXL.Processes.External.dsc
@@ -16,8 +16,8 @@ namespace Processes.External {
             ],
         references: [
             ...addIfLazy(!BuildXLSdk.isDotNetCore, () => [
-                importFrom("System.Text.Json").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-                importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+                importFrom("System.Text.Json").pkg,
+                importFrom("System.Memory").pkg,
                 BuildXLSdk.NetFx.System.Net.Http.dll,
                 NetFx.Netstandard.dll
             ]),
diff --git a/Public/Src/Engine/Processes/BuildXL.Processes.dsc b/Public/Src/Engine/Processes/BuildXL.Processes.dsc
index d4af625ee..f3702a4e0 100644
--- a/Public/Src/Engine/Processes/BuildXL.Processes.dsc
+++ b/Public/Src/Engine/Processes/BuildXL.Processes.dsc
@@ -20,8 +20,8 @@ namespace Processes {
             //              should go to 'ProcessPipExecutor' instead.
 
             ...addIfLazy(!BuildXLSdk.isDotNetCore, () => [
-                importFrom("System.Text.Json").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-                importFrom("System.Memory").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+                importFrom("System.Text.Json").pkg,
+                importFrom("System.Memory").pkg,
             ]),
 
             ...addIf(BuildXLSdk.isFullFramework,
diff --git a/Public/Src/Engine/Scheduler/BuildXL.Scheduler.dsc b/Public/Src/Engine/Scheduler/BuildXL.Scheduler.dsc
index 406ae12ec..64ef9b7e3 100644
--- a/Public/Src/Engine/Scheduler/BuildXL.Scheduler.dsc
+++ b/Public/Src/Engine/Scheduler/BuildXL.Scheduler.dsc
@@ -15,7 +15,7 @@ namespace Scheduler {
                 NetFx.System.Runtime.Serialization.dll,
                 NetFx.System.Text.Encoding.dll,
                 NetFx.Netstandard.dll,
-                importFrom("System.Text.Json").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+                importFrom("System.Text.Json").pkg,
                 importFrom("System.Collections.Immutable").pkg
             ]),
             ...addIfLazy(BuildXLSdk.isDotNetCore, () => [
diff --git a/Public/Src/Engine/Scheduler/Tracing/DumpPipLiteAnalysisUtilities.cs b/Public/Src/Engine/Scheduler/Tracing/DumpPipLiteAnalysisUtilities.cs
index 25116747c..a860a1b07 100644
--- a/Public/Src/Engine/Scheduler/Tracing/DumpPipLiteAnalysisUtilities.cs
+++ b/Public/Src/Engine/Scheduler/Tracing/DumpPipLiteAnalysisUtilities.cs
@@ -60,12 +60,7 @@ namespace BuildXL.Scheduler.Tracing
             var serializerOptions = new JsonSerializerOptions
             {
                 WriteIndented = true,
-#if NET5_0_OR_GREATER
-// .NET 5 and 6 have a different way of dealing with null values
                 DefaultIgnoreCondition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull,
-#else
-                IgnoreNullValues = true,
-#endif
             };
 
             try
diff --git a/Public/Src/Engine/UnitTests/Distribution/Test.BuildXL.Distribution.dsc b/Public/Src/Engine/UnitTests/Distribution/Test.BuildXL.Distribution.dsc
index 669c8c114..8c25b3894 100644
--- a/Public/Src/Engine/UnitTests/Distribution/Test.BuildXL.Distribution.dsc
+++ b/Public/Src/Engine/UnitTests/Distribution/Test.BuildXL.Distribution.dsc
@@ -22,7 +22,9 @@ namespace Distribution {
             importFrom("BuildXL.Utilities").Configuration.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
             Managed.Factory.filterRuntimeSpecificBinaries(BuildXLSdk.WebFramework.getFrameworkPackage(), [
-                importFrom("System.IO.Pipelines").pkg
+                importFrom("System.IO.Pipelines").pkg,
+                importFrom("System.Diagnostics.EventLog").pkg,
+                importFrom("System.Security.Cryptography.Pkcs").pkg
             ]),
         ],
     });
diff --git a/Public/Src/Engine/UnitTests/Scheduler/Test.BuildXL.Scheduler.dsc b/Public/Src/Engine/UnitTests/Scheduler/Test.BuildXL.Scheduler.dsc
index f7c56594d..c31d243fc 100644
--- a/Public/Src/Engine/UnitTests/Scheduler/Test.BuildXL.Scheduler.dsc
+++ b/Public/Src/Engine/UnitTests/Scheduler/Test.BuildXL.Scheduler.dsc
@@ -36,7 +36,7 @@ namespace Scheduler {
                 BuildXLSdk.NetFx.Netstandard.dll
             ),
             ...addIfLazy(!BuildXLSdk.isDotNetCore, () => [
-                importFrom("System.Text.Json").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+                importFrom("System.Text.Json").pkg,
             ]),
             EngineTestUtilities.dll,
             importFrom("BuildXL.Cache.ContentStore").Hashing.dll,
diff --git a/Public/Src/FrontEnd/MsBuild/BuildXL.FrontEnd.MsBuild.dsc b/Public/Src/FrontEnd/MsBuild/BuildXL.FrontEnd.MsBuild.dsc
index c23f1d836..9adb57c28 100644
--- a/Public/Src/FrontEnd/MsBuild/BuildXL.FrontEnd.MsBuild.dsc
+++ b/Public/Src/FrontEnd/MsBuild/BuildXL.FrontEnd.MsBuild.dsc
@@ -52,7 +52,11 @@ namespace MsBuild {
             },
             {
                 subfolder: r`tools`,
-                contents: [importFrom("BuildXL.Tools").MsBuildGraphBuilder.deployment],
+                // For the dotnet case, we are only deploying the tool for net7
+                // TODO: Remove condition when we stop building for net6.0
+                contents: [qualifier.targetFramework === "net6.0" 
+                    ? importFrom("BuildXL.Tools").MsBuildGraphBuilder.withQualifier({targetFramework: Managed.TargetFrameworks.DefaultTargetFramework}).deployment
+                    : importFrom("BuildXL.Tools").MsBuildGraphBuilder.deployment],
             }
         ]
     });
diff --git a/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc b/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc
index 2b004705f..876319432 100644
--- a/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc
+++ b/Public/Src/FrontEnd/Nuget/BuildXL.FrontEnd.Nuget.dsc
@@ -22,7 +22,7 @@ namespace Nuget {
                 NetFx.System.Net.Http.dll
             ),
             ...addIf(BuildXLSdk.isFullFramework,
-                importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg
+                importFrom("System.Memory").pkg
             ),
 
             Sdk.dll,
@@ -45,12 +45,12 @@ namespace Nuget {
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
 
             importFrom("Newtonsoft.Json").pkg,
-            importFrom("NuGet.Versioning").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Protocol").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Configuration").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Common").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Frameworks").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Packaging").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("NuGet.Versioning").pkg,
+            importFrom("NuGet.Protocol").pkg,
+            importFrom("NuGet.Configuration").pkg,
+            importFrom("NuGet.Common").pkg,
+            importFrom("NuGet.Frameworks").pkg,
+            importFrom("NuGet.Packaging").pkg,
 
             ...BuildXLSdk.tplPackages,
         ],
diff --git a/Public/Src/FrontEnd/UnitTests/MsBuild/Test.BuildXL.FrontEnd.MsBuild.dsc b/Public/Src/FrontEnd/UnitTests/MsBuild/Test.BuildXL.FrontEnd.MsBuild.dsc
index b6e3c5a30..0b43ce2c9 100644
--- a/Public/Src/FrontEnd/UnitTests/MsBuild/Test.BuildXL.FrontEnd.MsBuild.dsc
+++ b/Public/Src/FrontEnd/UnitTests/MsBuild/Test.BuildXL.FrontEnd.MsBuild.dsc
@@ -49,14 +49,18 @@ namespace Test.MsBuild {
         runtimeContent: [
             // We need both the full framework and dotnet core versions of MSBuild, plus dotnet.exe for the dotnet core case
             ...importFrom("Sdk.Selfhost.MSBuild").withQualifier({targetFramework: "net472"}).deployment,
-            ...importFrom("Sdk.Selfhost.MSBuild").withQualifier({targetFramework: "net6.0"}).deployment,
+            ...importFrom("Sdk.Selfhost.MSBuild").withQualifier({targetFramework: Managed.TargetFrameworks.DefaultTargetFramework}).deployment,
             {
                 subfolder: "dotnet",
-                contents: Frameworks.Helpers.getDotNetToolTemplate('net6.0').dependencies
+                contents: Frameworks.Helpers.getDotNetToolTemplate('net7.0').dependencies
             },
             {
                 subfolder: a`tools`,
-                contents: [importFrom("BuildXL.Tools").MsBuildGraphBuilder.deployment]
+                // For the dotnet case, we are only deploying the tool for net7
+                // TODO: Remove condition when we stop building for net6.0
+                contents: [qualifier.targetFramework === "net6.0"
+                    ? importFrom("BuildXL.Tools").MsBuildGraphBuilder.withQualifier({targetFramework: Managed.TargetFrameworks.DefaultTargetFramework}).deployment
+                    : importFrom("BuildXL.Tools").MsBuildGraphBuilder.deployment]
             },
             {
                 subfolder: r`Sdk/Sdk.Managed.Tools.BinarySigner`,
diff --git a/Public/Src/IDE/LanguageServer/BuildXL.Ide.LanguageServer.dsc b/Public/Src/IDE/LanguageServer/BuildXL.Ide.LanguageServer.dsc
index f5c2c3e95..fe2897180 100644
--- a/Public/Src/IDE/LanguageServer/BuildXL.Ide.LanguageServer.dsc
+++ b/Public/Src/IDE/LanguageServer/BuildXL.Ide.LanguageServer.dsc
@@ -60,7 +60,7 @@ namespace LanguageService.Server {
         runtimeReferences: [
             importFrom("Nerdbank.Streams").pkg,
             importFrom("System.IO.Pipelines").pkg, 
-            importFrom("System.Collections.Immutable.ForVBCS").pkg, 
+            importFrom("System.Collections.Immutable").pkg, 
         ],
     });
 
diff --git a/Public/Src/IDE/VsIntegration/BuildXLVsPackage/BuildXL.Ide.Vs.Package.dsc b/Public/Src/IDE/VsIntegration/BuildXLVsPackage/BuildXL.Ide.Vs.Package.dsc
index f63f4751b..f0f6a3985 100644
--- a/Public/Src/IDE/VsIntegration/BuildXLVsPackage/BuildXL.Ide.Vs.Package.dsc
+++ b/Public/Src/IDE/VsIntegration/BuildXLVsPackage/BuildXL.Ide.Vs.Package.dsc
@@ -5,8 +5,7 @@ import * as Branding from "BuildXL.Branding";
 import * as Contracts from "Tse.RuntimeContracts";
 
 namespace BuildXLVsPackage {
-    @@public
-    export const dll = !BuildXLSdk.Flags.isMicrosoftInternal ? undefined : BuildXLSdk.library({
+    const dll = BuildXLSdk.library({
         assemblyName: "BuildXLVsPackage",
         rootNamespace: "BuildXL.VsPackage",
         skipDocumentationGeneration: false,
@@ -48,7 +47,7 @@ namespace BuildXLVsPackage {
             importFrom("Microsoft.VisualStudio.Threading").pkg,
             importFrom("Microsoft.VisualStudio.ProjectSystem").pkg,
             importFrom("Microsoft.VisualStudio.Composition").pkg,
-            importFrom("System.Collections.Immutable.ForVBCS").pkg,
+            importFrom("System.Collections.Immutable").pkg,
         ],
     });
 
@@ -66,7 +65,7 @@ namespace BuildXLVsPackage {
     };
 
     @@public
-    export const vsix = CreateZipPackage.zip({
+    export const vsix = !BuildXLSdk.Flags.isMicrosoftInternal ? undefined : CreateZipPackage.zip({
         outputFileName: "BuildXL.vs.vsix",
         useUriEncoding: true,
         inputDirectory: Deployment.deployToDisk({
diff --git a/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc b/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc
index a4fdb90ef..17598f4a4 100644
--- a/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc
+++ b/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc
@@ -54,8 +54,8 @@ export namespace DropDaemon {
         internalsVisibleTo: [
             "Test.Tool.DropDaemon",
         ],
+        // TODO: The SBOM package expects a netcore 7 JSON package, even for netcore 6. Remove when we stop supporting net6
         deploymentOptions: { ignoredSelfContainedRuntimeFilenames: [a`System.Text.Encodings.Web.dll`, a`System.Text.Json.dll`] },
-        runtimeContentToSkip: dropDaemonRuntimeContentToSkip()
     });
 
     const temporarySdkDropNextToEngineFolder = d`${Context.getBuildEngineDirectory()}/Sdk/Sdk.Drop/bin`;
@@ -148,14 +148,6 @@ export namespace DropDaemon {
         ];
     }
 
-    @@public
-    export function dropDaemonRuntimeContentToSkip() {
-        return [
-            importFrom("System.Text.Json").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
-            importFrom("System.Text.Encodings.Web").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
-        ];
-    }
-
     @@public
     export function dropDaemonSbomPackages() {
         // Any package needed for SBOM generation should
@@ -170,9 +162,9 @@ export namespace DropDaemon {
             importFrom("Microsoft.ComponentDetection.Contracts").pkg,
             importFrom("Microsoft.Sbom.Adapters").pkg,
             importFrom("packageurl-dotnet").pkg,
-            importFrom("System.Text.Json.v7.0.0").pkg,
+            importFrom("System.Text.Json").pkg,
             importFrom("Newtonsoft.Json").pkg,
-            importFrom("System.Text.Encodings.Web.v7.0.0").pkg,
+            importFrom("System.Text.Encodings.Web").pkg,
         ];
     }
 
diff --git a/Public/Src/Tools/DropDaemon/defaults.dsc b/Public/Src/Tools/DropDaemon/defaults.dsc
index 012c1c841..03d739b25 100644
--- a/Public/Src/Tools/DropDaemon/defaults.dsc
+++ b/Public/Src/Tools/DropDaemon/defaults.dsc
@@ -25,11 +25,6 @@ export function dropDaemonBindingRedirects() {
     return BuildXLSdk.isDropToolingEnabled ? DropDaemon.dropDaemonBindingRedirects() : undefined;
 } 
 
-@@public
-export function dropDaemonRuntimeContentToSkip() {
-    return BuildXLSdk.isDropToolingEnabled ? DropDaemon.dropDaemonRuntimeContentToSkip() : undefined;
-} 
-
 @@public
 export function dropDaemonSbomPackages() {
     return BuildXLSdk.isDropToolingEnabled ? DropDaemon.dropDaemonSbomPackages() : undefined;
diff --git a/Public/Src/Tools/Execution.Analyzer/BxlAnalyzer.dsc b/Public/Src/Tools/Execution.Analyzer/BxlAnalyzer.dsc
index 8f1b7a38d..7ba5bd794 100644
--- a/Public/Src/Tools/Execution.Analyzer/BxlAnalyzer.dsc
+++ b/Public/Src/Tools/Execution.Analyzer/BxlAnalyzer.dsc
@@ -28,7 +28,7 @@ namespace Execution.Analyzer {
                 NetFx.System.IO.Compression.dll,
                 NetFx.System.Net.Http.dll,
                 NetFx.System.Runtime.Serialization.dll,
-                importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg
+                importFrom("System.Memory").pkg
             ]),
             VSCode.DebugAdapter.dll,
             VSCode.DebugProtocol.dll,
diff --git a/Public/Src/Tools/NugetDownloader/Tool.NugetDownloader.dsc b/Public/Src/Tools/NugetDownloader/Tool.NugetDownloader.dsc
index 9ccf61b16..5a5ed61fd 100644
--- a/Public/Src/Tools/NugetDownloader/Tool.NugetDownloader.dsc
+++ b/Public/Src/Tools/NugetDownloader/Tool.NugetDownloader.dsc
@@ -43,15 +43,13 @@ namespace NugetDownloader {
             importFrom("BuildXL.Utilities").dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
 
-            importFrom("NuGet.Versioning").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Protocol").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Configuration").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Common").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Frameworks").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Packaging").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-        ],
-        runtimeContentToSkip:[
-            importFrom("Newtonsoft.Json").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("NuGet.Versioning").pkg,
+            importFrom("NuGet.Protocol").pkg,
+            importFrom("NuGet.Configuration").pkg,
+            importFrom("NuGet.Common").pkg,
+            importFrom("NuGet.Frameworks").pkg,
+            importFrom("NuGet.Packaging").pkg,
+            importFrom("System.Security.Cryptography.Pkcs").pkg
         ],
         runtimeContent: [
             f`App.config`,
diff --git a/Public/Src/Tools/Tool.MsBuildGraphBuilder/Tool.MsBuildGraphBuilder.dsc b/Public/Src/Tools/Tool.MsBuildGraphBuilder/Tool.MsBuildGraphBuilder.dsc
index a2deb7f4d..7bc432941 100644
--- a/Public/Src/Tools/Tool.MsBuildGraphBuilder/Tool.MsBuildGraphBuilder.dsc
+++ b/Public/Src/Tools/Tool.MsBuildGraphBuilder/Tool.MsBuildGraphBuilder.dsc
@@ -11,6 +11,8 @@ import * as Shared from "Sdk.Managed.Shared";
 
 namespace MsBuildGraphBuilder {
 
+    export declare const qualifier: BuildXLSdk.Net7QualifierWithNet472;
+
     @@public
     export const exe = BuildXLSdk.executable({
         assemblyName: "ProjectGraphBuilder",
@@ -23,7 +25,7 @@ namespace MsBuildGraphBuilder {
             importFrom("BuildXL.Utilities").dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
             importFrom("BuildXL.Utilities").Native.dll,
-            ...addIf(BuildXLSdk.isFullFramework, importFrom("System.Collections.Immutable.ForVBCS").pkg),
+            ...addIf(BuildXLSdk.isFullFramework, importFrom("System.Collections.Immutable").pkg),
             ...addIf(BuildXLSdk.isFullFramework, importFrom("System.Threading.Tasks.Dataflow").pkg),
             importFrom("Microsoft.Build.Prediction").pkg,
             importFrom("Microsoft.Build.Locator").pkg,
@@ -37,8 +39,8 @@ namespace MsBuildGraphBuilder {
             // don't add msbuild dlls because assembly resolvers will resolve msbuild from other MSBuild installations
             ...MSBuild.msbuildReferences,
             importFrom("System.Collections.Immutable").pkg,
-            importFrom("System.Collections.Immutable.ForVBCS").pkg,
-            importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("System.Collections.Immutable").pkg,
+            importFrom("System.Memory").pkg,
             importFrom("System.Memory").pkg,
         ],
         internalsVisibleTo: [
@@ -63,7 +65,7 @@ namespace MsBuildGraphBuilder {
             {
                 subfolder: r`dotnetcore`,
                 contents: [
-                        $.withQualifier({ targetFramework: "net6.0" })
+                        $.withQualifier({ targetFramework: Managed.TargetFrameworks.DefaultTargetFramework })
                         .MsBuildGraphBuilder.exe
                     ]
             }
diff --git a/Public/Src/Tools/UnitTests/DropDaemon/Test.Tool.DropDaemon.dsc b/Public/Src/Tools/UnitTests/DropDaemon/Test.Tool.DropDaemon.dsc
index d833a9e44..a896d3ce3 100644
--- a/Public/Src/Tools/UnitTests/DropDaemon/Test.Tool.DropDaemon.dsc
+++ b/Public/Src/Tools/UnitTests/DropDaemon/Test.Tool.DropDaemon.dsc
@@ -38,7 +38,7 @@ namespace Test.Tool.DropDaemon {
             ...importFrom("BuildXL.Tools.DropDaemon").dropDaemonSbomPackages(),
         ],
 
+        // TODO: The SBOM package expects a netcore 7 JSON package, even for netcore 6. Remove when we stop supporting net6
         deploymentOptions: { ignoredSelfContainedRuntimeFilenames: [a`System.Text.Encodings.Web.dll`, a`System.Text.Json.dll`] },
-        runtimeContentToSkip: importFrom("BuildXL.Tools.DropDaemon").dropDaemonRuntimeContentToSkip(),
     });
 }
diff --git a/Public/Src/Tools/UnitTests/MsBuildGraphBuilder/Test.Tool.MsBuildGraphBuilder.dsc b/Public/Src/Tools/UnitTests/MsBuildGraphBuilder/Test.Tool.MsBuildGraphBuilder.dsc
index 91df44a54..4426e1183 100644
--- a/Public/Src/Tools/UnitTests/MsBuildGraphBuilder/Test.Tool.MsBuildGraphBuilder.dsc
+++ b/Public/Src/Tools/UnitTests/MsBuildGraphBuilder/Test.Tool.MsBuildGraphBuilder.dsc
@@ -6,7 +6,7 @@ import * as MSBuild from "Sdk.Selfhost.MSBuild";
 
 namespace Test.Tool.MsBuildGraphBuilder {
 
-    export declare const qualifier: BuildXLSdk.DefaultQualifierWithNet472;
+    export declare const qualifier: BuildXLSdk.Net7QualifierWithNet472;
 
     @@public
     export const dll = BuildXLSdk.test({
@@ -28,10 +28,5 @@ namespace Test.Tool.MsBuildGraphBuilder {
                     dep.name !== "System.Collections.Immutable.dll")),
             ...MSBuild.msbuildReferences,
         ],
-        runtimeContentToSkip: [
-            ...addIf(BuildXLSdk.isFullFramework, importFrom("System.Buffers").pkg),
-            ...addIf(BuildXLSdk.isFullFramework, importFrom("System.Memory").pkg),
-            ...addIf(BuildXLSdk.isFullFramework, importFrom("System.MemoryForVBCS").pkg)
-        ]
     });
 }
diff --git a/Public/Src/Tools/UnitTests/VBCSCompilerLogger/Test.Tool.VBCSCompilerLogger.dsc b/Public/Src/Tools/UnitTests/VBCSCompilerLogger/Test.Tool.VBCSCompilerLogger.dsc
index 508de6fd2..35b082b53 100644
--- a/Public/Src/Tools/UnitTests/VBCSCompilerLogger/Test.Tool.VBCSCompilerLogger.dsc
+++ b/Public/Src/Tools/UnitTests/VBCSCompilerLogger/Test.Tool.VBCSCompilerLogger.dsc
@@ -6,7 +6,7 @@ import * as MSBuild from "Sdk.Selfhost.MSBuild";
 
 namespace Test.Tool.VBCSCompilerLogger {
 
-    export declare const qualifier: BuildXLSdk.DefaultQualifier;
+    export declare const qualifier: BuildXLSdk.Net7Qualifier;
 
     @@public
     export const dll = BuildXLSdk.test({
diff --git a/Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc b/Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc
index 0193ca573..4bb68e3e3 100644
--- a/Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc
+++ b/Public/Src/Tools/VBCSCompilerLogger/VBCSCompilerLogger.dsc
@@ -6,6 +6,8 @@ import * as MSBuild from "Sdk.Selfhost.MSBuild";
 
 namespace VBCSCompilerLogger {
 
+    export declare const qualifier: BuildXLSdk.Net7QualifierWithNet472;
+
     @@public
     export const dll = BuildXLSdk.library({
         assemblyName: "VBCSCompilerLogger",
@@ -17,20 +19,20 @@ namespace VBCSCompilerLogger {
             importFrom("Microsoft.CodeAnalysis.CSharp.ForVBCS").pkg,
             importFrom("Microsoft.CodeAnalysis.VisualBasic.ForVBCS").pkg,
             importFrom("Microsoft.CodeAnalysis.Common.ForVBCS").pkg,
-            ...addIf(BuildXLSdk.isFullFramework, importFrom("System.Collections.Immutable.ForVBCS").pkg),
+            ...addIf(BuildXLSdk.isFullFramework, importFrom("System.Collections.Immutable").pkg),
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
             importFrom("BuildXL.Utilities").Native.dll,
             importFrom("BuildXL.Engine").Processes.dll,
             NetFx.Netstandard.dll, // due to issue https://github.com/dotnet/standard/issues/542
         ],
         runtimeContent:[
-            importFrom("System.Reflection.Metadata.ForVBCS").pkg,
-            importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("System.Numerics.Vectors").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("System.Reflection.Metadata").pkg,
+            importFrom("System.Memory").pkg,
+            importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
+            importFrom("System.Numerics.Vectors").pkg,
         ],
         runtimeContentToSkip: [
-            importFrom("System.Collections.Immutable").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("System.Collections.Immutable").pkg,
             importFrom("System.Memory").pkg,
         ],
         internalsVisibleTo: ["Test.Tool.VBCSCompilerLogger"]
diff --git a/Public/Src/Utilities/Instrumentation/LogGen.Core/BuildXL.LogGen.Core.dsc b/Public/Src/Utilities/Instrumentation/LogGen.Core/BuildXL.LogGen.Core.dsc
index 8cc01e646..0b8d7d3fe 100644
--- a/Public/Src/Utilities/Instrumentation/LogGen.Core/BuildXL.LogGen.Core.dsc
+++ b/Public/Src/Utilities/Instrumentation/LogGen.Core/BuildXL.LogGen.Core.dsc
@@ -14,7 +14,7 @@ namespace Core {
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
             importFrom("Microsoft.CodeAnalysis.CSharp").pkg,
             importFrom("Microsoft.CodeAnalysis.Common").pkg,
-            importFrom("System.Collections.Immutable.ForVBCS").pkg,
+            importFrom("System.Collections.Immutable").pkg,
         ],
     });
 }
\ No newline at end of file
diff --git a/Public/Src/Utilities/Instrumentation/LogGenerator/BuildXL.LogGenerator.dsc b/Public/Src/Utilities/Instrumentation/LogGenerator/BuildXL.LogGenerator.dsc
index d257997bc..f3013fdac 100644
--- a/Public/Src/Utilities/Instrumentation/LogGenerator/BuildXL.LogGenerator.dsc
+++ b/Public/Src/Utilities/Instrumentation/LogGenerator/BuildXL.LogGenerator.dsc
@@ -19,7 +19,7 @@ namespace LogGenerator {
 
             importFrom("Microsoft.CodeAnalysis.Common.ForVBCS").pkg,
             importFrom("Microsoft.CodeAnalysis.CSharp.ForVBCS").pkg,
-            importFrom("System.Collections.Immutable.ForVBCS").pkg,
+            importFrom("System.Collections.Immutable").pkg,
             importFrom("BuildXL.Utilities").CodeGenerationHelper.dll,
         ],
         analyzers: [importFrom("Microsoft.CodeAnalysis.Analyzers").pkg]
diff --git a/Public/Src/Utilities/Native/BuildXL.Native.dsc b/Public/Src/Utilities/Native/BuildXL.Native.dsc
index b3e3266fa..b2892c507 100644
--- a/Public/Src/Utilities/Native/BuildXL.Native.dsc
+++ b/Public/Src/Utilities/Native/BuildXL.Native.dsc
@@ -13,25 +13,17 @@ namespace Native {
     export const securityDlls = BuildXLSdk.isDotNetCoreOrStandard ? [
         // In netCoreApp2.2 accesscontrol is missing enum: System.Security.AccessControl.AccessControlType
         importFrom("System.IO.Pipes.AccessControl").pkg,
-        
-        BuildXLSdk.withWinRuntime(importFrom("System.Threading.AccessControl").pkg, r`runtimes/win/lib/netstandard2.0`),
+
+        importFrom("System.Threading.AccessControl").pkg,
 
         ...addIf(!BuildXLSdk.isDotNetCore,
-            BuildXLSdk.withWinRuntime(importFrom("System.Security.AccessControl").pkg, r`runtimes/win/lib/netcoreapp2.0`),
-            BuildXLSdk.withWinRuntime(importFrom("System.IO.FileSystem.AccessControl").pkg, r`runtimes/win/lib/netstandard2.0`)
+            importFrom("System.Security.AccessControl").pkg,
+            importFrom("System.IO.FileSystem.AccessControl").pkg
         ),
 
-        // Don't need to exclude assemblies for net7 because they're higher versions.
-        ...addIf(qualifier.targetFramework === 'net6.0',
-            BuildXLSdk.withWinRuntime(importFrom("System.IO.FileSystem.AccessControl.v6.0.0").pkg, r`runtimes/win/lib/netstandard2.0`),
-            BuildXLSdk.withWinRuntime(importFrom("System.Security.AccessControl.v6.0.0").pkg, r`runtimes/win/lib/netstandard2.0`),
-            BuildXLSdk.withWinRuntime(importFrom("System.Security.Principal.Windows.v6.0.0").pkg, r`runtimes/win/lib/netstandard2.0`)
-        ),
         
         ...addIf(!BuildXLSdk.isDotNetCore,
-            BuildXLSdk.isTargetRuntimeOsx
-                ? Managed.Factory.createBinary(importFrom("System.Security.Principal.Windows").Contents.all, r`runtimes/unix/lib/netcoreapp2.0/System.Security.Principal.Windows.dll`)
-                : Managed.Factory.createBinary(importFrom("System.Security.Principal.Windows").Contents.all, r`runtimes/win/lib/netcoreapp2.0/System.Security.Principal.Windows.dll`))
+                importFrom("System.Security.Principal.Windows").pkg)
     ] : [];
 
     @@public
diff --git a/Public/Src/Utilities/UnitTests/Plugin/Test.BuildXL.Plugin.dsc b/Public/Src/Utilities/UnitTests/Plugin/Test.BuildXL.Plugin.dsc
index aa1f87770..46c1bdcaa 100644
--- a/Public/Src/Utilities/UnitTests/Plugin/Test.BuildXL.Plugin.dsc
+++ b/Public/Src/Utilities/UnitTests/Plugin/Test.BuildXL.Plugin.dsc
@@ -18,7 +18,7 @@ namespace Plugin {
             importFrom("BuildXL.Utilities").PluginGrpc.dll,
             importFrom("BuildXL.Utilities").Plugin.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
-            importFrom("System.Runtime.CompilerServices.Unsafe").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+            importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
             
             ...importFrom("BuildXL.Cache.ContentStore").getGrpcPackages(false),
         ],
diff --git a/Public/Src/Utilities/Utilities.Core/BuildXL.Utilities.Core.dsc b/Public/Src/Utilities/Utilities.Core/BuildXL.Utilities.Core.dsc
index 030cf6977..92c216388 100644
--- a/Public/Src/Utilities/Utilities.Core/BuildXL.Utilities.Core.dsc
+++ b/Public/Src/Utilities/Utilities.Core/BuildXL.Utilities.Core.dsc
@@ -19,7 +19,7 @@ namespace Utilities.Core {
                 NetFx.System.Xml.dll,
                 NetFx.Netstandard.dll,
                 importFrom("System.Threading.Channels").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
-                importFrom("System.Memory").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+                importFrom("System.Memory").pkg,
                 importFrom("System.Threading.Tasks.Extensions").pkg,
             ]),
         ],
diff --git a/Public/Src/Utilities/VstsAuthentication/BuildXL.Utilties.VstsAuthentication.dsc b/Public/Src/Utilities/VstsAuthentication/BuildXL.Utilties.VstsAuthentication.dsc
index cafa35828..0838ceb9a 100644
--- a/Public/Src/Utilities/VstsAuthentication/BuildXL.Utilties.VstsAuthentication.dsc
+++ b/Public/Src/Utilities/VstsAuthentication/BuildXL.Utilties.VstsAuthentication.dsc
@@ -11,12 +11,12 @@ namespace VstsAuthentication {
             Native.dll,
             Utilities.Core.dll,
             importFrom("Newtonsoft.Json").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Versioning").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Protocol").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Configuration").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Common").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Frameworks").withQualifier({targetFramework: "netstandard2.0"}).pkg,
-            importFrom("NuGet.Packaging").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("NuGet.Versioning").pkg,
+            importFrom("NuGet.Protocol").pkg,
+            importFrom("NuGet.Configuration").pkg,
+            importFrom("NuGet.Common").pkg,
+            importFrom("NuGet.Frameworks").pkg,
+            importFrom("NuGet.Packaging").pkg,
             ...addIfLazy(BuildXLSdk.isFullFramework, () => [
                 NetFx.System.Net.Http.dll,
                 NetFx.Netstandard.dll,
diff --git a/Shared/Scripts/BuildDistributedTest.cmd b/Shared/Scripts/BuildDistributedTest.cmd
index e333b6650..6eab70523 100644
--- a/Shared/Scripts/BuildDistributedTest.cmd
+++ b/Shared/Scripts/BuildDistributedTest.cmd
@@ -18,7 +18,7 @@ if NOT DEFINED DBD_TESTGEN_COUNT (
 )
 
 if NOT DEFINED TEST_COMMITID (
-    set TEST_COMMITID=dcdc8f8bbb0cd83c38dc827c19c3c44b7f195b9c
+    set TEST_COMMITID=98214d145b8dfcd1fbb2c2d46ff5a473cafbd023
 )
 
 set TEST_SOLUTION_ROOT=%ENLISTMENTROOT%\Out\Tests\SMDB
diff --git a/cg/nuget/cgmanifest.json b/cg/nuget/cgmanifest.json
index 4693d18a0..39b9fb25f 100644
--- a/cg/nuget/cgmanifest.json
+++ b/cg/nuget/cgmanifest.json
@@ -735,7 +735,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Bcl.AsyncInterfaces",
-          "Version": "6.0.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -762,7 +762,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Build",
-          "Version": "17.0.0"
+          "Version": "17.7.2"
         }
       }
     },
@@ -771,7 +771,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Build.Framework",
-          "Version": "17.0.0"
+          "Version": "17.7.2"
         }
       }
     },
@@ -798,7 +798,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Build.Runtime",
-          "Version": "17.0.0"
+          "Version": "17.7.2"
         }
       }
     },
@@ -807,7 +807,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Build.Tasks.Core",
-          "Version": "17.0.0"
+          "Version": "17.7.2"
         }
       }
     },
@@ -1554,16 +1554,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.NETCore.Platforms",
-          "Version": "3.1.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.NETCore.Platforms",
-          "Version": "6.0.11"
+          "Version": "5.0.0"
         }
       }
     },
@@ -2013,7 +2004,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.VisualStudio.Setup.Configuration.Interop",
-          "Version": "1.16.30"
+          "Version": "3.2.2146"
         }
       }
     },
@@ -2296,6 +2287,15 @@
         }
       }
     },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "Microsoft.Win32.SystemEvents",
+          "Version": "7.0.0"
+        }
+      }
+    },
     {
       "Component": {
         "Type": "NuGet",
@@ -2652,16 +2652,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Collections.Immutable",
-          "Version": "1.5.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Collections.Immutable",
-          "Version": "5.0.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -2787,7 +2778,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Configuration.ConfigurationManager",
-          "Version": "4.4.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -2845,6 +2836,15 @@
         }
       }
     },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "System.Diagnostics.EventLog",
+          "Version": "7.0.0"
+        }
+      }
+    },
     {
       "Component": {
         "Type": "NuGet",
@@ -2917,6 +2917,15 @@
         }
       }
     },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "System.Drawing.Common",
+          "Version": "7.0.0"
+        }
+      }
+    },
     {
       "Component": {
         "Type": "NuGet",
@@ -2935,6 +2944,15 @@
         }
       }
     },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "System.Formats.Asn1",
+          "Version": "7.0.0"
+        }
+      }
+    },
     {
       "Component": {
         "Type": "NuGet",
@@ -3169,15 +3187,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Memory",
-          "Version": "4.5.4"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -3295,15 +3304,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Numerics.Vectors",
-          "Version": "4.4.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -3417,7 +3417,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Reflection.Metadata",
-          "Version": "1.6.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -3425,8 +3425,8 @@
       "Component": {
         "Type": "NuGet",
         "NuGet": {
-          "Name": "System.Reflection.Metadata",
-          "Version": "5.0.0"
+          "Name": "System.Reflection.MetadataLoadContext",
+          "Version": "7.0.0"
         }
       }
     },
@@ -3507,7 +3507,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Runtime.CompilerServices.Unsafe",
-          "Version": "5.0.0"
+          "Version": "6.0.0"
         }
       }
     },
@@ -3637,15 +3637,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Security.AccessControl",
-          "Version": "4.7.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -3678,7 +3669,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Security.Cryptography.Cng",
-          "Version": "4.3.0"
+          "Version": "5.0.0"
         }
       }
     },
@@ -3723,7 +3714,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Security.Cryptography.Pkcs",
-          "Version": "4.5.0"
+          "Version": "7.0.2"
         }
       }
     },
@@ -3741,7 +3732,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Security.Cryptography.ProtectedData",
-          "Version": "5.0.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -3768,7 +3759,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Security.Permissions",
-          "Version": "4.5.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -3781,24 +3772,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Security.Principal.Windows",
-          "Version": "4.7.0"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Security.Principal.Windows",
-          "Version": "5.0.0"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -3862,15 +3835,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Text.Encodings.Web",
-          "Version": "4.7.2"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -3880,15 +3844,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.Text.Json",
-          "Version": "4.7.2"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -3957,7 +3912,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "System.Threading.Tasks.Dataflow",
-          "Version": "4.9.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -4015,6 +3970,15 @@
         }
       }
     },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "System.Windows.Extensions",
+          "Version": "7.0.0"
+        }
+      }
+    },
     {
       "Component": {
         "Type": "NuGet",
diff --git a/config.dsc b/config.dsc
index 6815b214f..36fdb20d2 100644
--- a/config.dsc
+++ b/config.dsc
@@ -150,13 +150,12 @@ config({
                 { id: "Microsoft.WindowsAzure.ConfigurationManager", version: "1.8.0.0" },
                 { id: "Newtonsoft.Json", version: "13.0.1" },
                 { id: "Newtonsoft.Json.Bson", version: "1.0.1" },
-                { id: "System.Reflection.Metadata", version: "1.6.0" },
-                { id: "System.Reflection.Metadata", version: "5.0.0", alias: "System.Reflection.Metadata.ForVBCS", dependentPackageIdsToSkip: ["System.Collections.Immutable"] },
-                { id: "System.Threading.Tasks.Dataflow", version: "4.9.0" },
+                { id: "System.Reflection.Metadata", version: "7.0.0" },
+                { id: "System.Threading.Tasks.Dataflow", version: "7.0.0" },
 
                 // Nuget
-                { id: "NuGet.Packaging", version: "5.11.5", dependentPackageIdsToSkip: ["System.Security.Cryptography.ProtectedData", "System.Security.Cryptography.Pkcs"] },
-                { id: "NuGet.Configuration", version: "5.11.5", dependentPackageIdsToSkip: ["System.Security.Cryptography.ProtectedData"] },
+                { id: "NuGet.Packaging", version: "5.11.5" },
+                { id: "NuGet.Configuration", version: "5.11.5" },
                 { id: "NuGet.Common", version: "5.11.5" },
                 { id: "NuGet.Protocol", version: "5.11.5" },
                 { id: "NuGet.Versioning", version: "5.11.5" }, 
@@ -246,7 +245,7 @@ config({
                 { id: "DeduplicationSigned", version: "1.0.14" },
                 { id: "Microsoft.Bcl", version: "1.1.10" },
                 { id: "Microsoft.Bcl.Async", version: "1.0.168" },
-                { id: "Microsoft.Bcl.AsyncInterfaces", version: "6.0.0", dependentPackageIdsToSkip: ["System.Threading.Tasks.Extensions"] },
+                { id: "Microsoft.Bcl.AsyncInterfaces", version: "7.0.0", dependentPackageIdsToSkip: ["System.Threading.Tasks.Extensions"] },
                 { id: "Microsoft.Bcl.Build", version: "1.0.14" },
                 
                 { id: "Pipelines.Sockets.Unofficial", version: "2.2.0",
@@ -264,8 +263,9 @@ config({
                 { id: "BuildXL.Azurite.Executables", version: "1.0.0-CI-20230614-171424" },
 
                 // Testing
-                { id: "System.Security.Cryptography.ProtectedData", version: "5.0.0"},
-                { id: "System.Configuration.ConfigurationManager", version: "4.4.0"},
+                { id: "System.Security.Cryptography.ProtectedData", version: "7.0.0"},
+                { id: "System.Configuration.ConfigurationManager", version: "7.0.0"},
+                { id: "System.Diagnostics.EventLog", version: "7.0.0" },
                 { id: "FluentAssertions", version: "5.3.0",
                     dependentPackageIdsToSkip: ["System.Reflection.Emit", "System.Reflection.Emit.Lightweight"] },
 
@@ -278,9 +278,12 @@ config({
                 { id: "Microsoft.ApplicationInsights.WindowsServer", version: "2.3.0" },
                 { id: "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel", version: "2.3.0" },
                 { id: "System.Security.Cryptography.Xml", version: "4.7.1" },
-                { id: "System.Text.Encodings.Web", version: "4.7.2" },
-                { id: "System.Security.Permissions", version: "4.5.0" },
-                { id: "System.Security.Cryptography.Pkcs", version: "4.5.0" },
+                { id: "System.Text.Encodings.Web", version: "7.0.0" },
+                { id: "System.Security.Permissions", version: "7.0.0" },
+                { id: "System.Windows.Extensions", version: "7.0.0" },
+                { id: "System.Drawing.Common", version: "7.0.0" },
+                { id: "Microsoft.Win32.SystemEvents", version: "7.0.0" },
+                { id: "System.Security.Cryptography.Pkcs", version: "7.0.2" },
 
                 { id: "ILRepack", version: "2.0.16" },
 
@@ -297,37 +300,32 @@ config({
                 { id: "Microsoft.TeamFoundation.DistributedTask.Common.Contracts", version: "16.170.0"},
 
                 // MSBuild. These should be used for compile references only, as at runtime one can only practically use MSBuilds from Visual Studio / dotnet CLI
-                { id: "Microsoft.Build", version: "17.0.0",
-                    dependentPackageIdsToSkip: ["System.Reflection.Metadata", "System.Memory", "System.Text.Json", "System.Collections.Immutable"], // These are overwritten in the deployment by DataflowForMSBuild and SystemMemoryForMSBuild since it doesn't work with the versions we use in larger buildxl.
-                },
-                { id: "Microsoft.Build.Runtime", version: "17.0.0",
-                    dependentPackageIdsToSkip: ["System.Memory"],
-                },
-                { id: "Microsoft.Build.Tasks.Core", version: "17.0.0",
-                    dependentPackageIdsToSkip: ["System.Memory", "System.Collections.Immutable"],
+                { id: "Microsoft.Build", version: "17.7.2",
+                    dependentPackageIdsToSkip: ["System.Reflection.Metadata", "System.Text.Json", "System.Collections.Immutable"], // These are overwritten in the deployment by DataflowForMSBuild and SystemMemoryForMSBuild since it doesn't work with the versions we use in larger buildxl.
                 },
+                { id: "Microsoft.Build.Runtime", version: "17.7.2" },
+                { id: "Microsoft.Build.Tasks.Core", version: "17.7.2" },
                 { id: "Microsoft.Build.Utilities.Core", version: "17.0.0", dependentPackageIdsToSkip: ["System.Memory", "System.Text.Json", "System.Collections.Immutable"]},
-                { id: "Microsoft.Build.Framework", version: "17.0.0", dependentPackageIdsToSkip: ["System.Memory", "System.Text.Json"]},
+                { id: "Microsoft.Build.Framework", version: "17.7.2", dependentPackageIdsToSkip: ["System.Memory", "System.Text.Json"]},
                 { id: "Microsoft.NET.StringTools", version: "1.0.0", dependentPackageIdsToSkip: ["System.Memory", "System.Text.Json"]},
                 { id: "Microsoft.Build.Locator", version: "1.5.5" },
+                { id: "System.Reflection.MetadataLoadContext", version: "7.0.0"},    
 
                 { id: "System.Resources.Extensions", version: "4.6.0-preview9.19411.4",
                     dependentPackageIdsToSkip: ["System.Memory"]},
 
                 // Buffers and Memory
                 { id: "System.Buffers", version: "4.5.1" }, /* Change Sync: BuildXLSdk.cacheBindingRedirects() */ // A different version, because StackExchange.Redis uses it.
-                { id: "System.Memory", version: "4.5.5", dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe", "System.Numerics.Vectors"] }, /* Change Sync: BuildXLSdk.cacheBindingRedirects() */
-                { id: "System.Memory", version: "4.5.4", alias: "System.MemoryForVBCS", dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe", "System.Numerics.Vectors"] },
-                { id: "System.Runtime.CompilerServices.Unsafe", version: "5.0.0" }, /* Change Sync: BuildXLSdk.cacheBindingRedirects() */
+                { id: "System.Memory", version: "4.5.5" }, /* Change Sync: BuildXLSdk.cacheBindingRedirects() */
+                { id: "System.Runtime.CompilerServices.Unsafe", version: "6.0.0" }, /* Change Sync: BuildXLSdk.cacheBindingRedirects() */
                 { id: "System.IO.Pipelines", version: "7.0.0-rc.1.22426.10", dependentPackageIdsToSkip: ["System.Threading.Tasks.Extensions"] },
                 { id: "System.Numerics.Vectors", version: "4.5.0" }, /* Change Sync: BuildXLSdk.cacheBindingRedirects() */
 
                 // Extra dependencies to make MSBuild work
-                { id: "Microsoft.VisualStudio.Setup.Configuration.Interop", version: "1.16.30"},
+                { id: "Microsoft.VisualStudio.Setup.Configuration.Interop", version: "3.2.2146"},
                 { id: "System.CodeDom", version: "4.4.0"},
                 { id: "System.Text.Encoding.CodePages", version: "4.5.1",
                     dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe"]},
-                { id: "System.Numerics.Vectors", version: "4.4.0", alias: "SystemNumericsVectorsForMSBuild"},
 
                 // Used for MSBuild input/output prediction
                 { id: "Microsoft.Build.Prediction", version: "0.3.0" },
@@ -358,7 +356,6 @@ config({
 
                 // Needed for SBOM Generation
                 { id: "Microsoft.Extensions.Logging.Abstractions", version: "7.0.0", dependentPackageIdsToSkip: ["System.Buffers", "System.Memory"] },
-                { id: "System.Text.Encodings.Web", version: "7.0.0", dependentPackageIdsToSkip: ["System.Buffers", "System.Memory"], alias: "System.Text.Encodings.Web.v7.0.0" },
                 { id: "packageurl-dotnet", version: "1.1.0" },
                 { id: "System.Reactive", version: "4.4.1" },
 
diff --git a/config.nuget.dotnetcore.dsc b/config.nuget.dotnetcore.dsc
index 2c79fb8e1..40fed739b 100644
--- a/config.nuget.dotnetcore.dsc
+++ b/config.nuget.dotnetcore.dsc
@@ -24,7 +24,7 @@ export const pkgs = [
     { id: "Microsoft.NETCore.App.Ref", version: coreVersion },
 
     { id: "NETStandard.Library", version: "2.0.3", tfm: ".NETStandard2.0" },
-    { id: "Microsoft.NETCore.Platforms", version: coreVersion },
+    { id: "Microsoft.NETCore.Platforms", version: core50Version },
     
     // .NET Core Self-Contained Deployment
     { id: "Microsoft.NETCore.DotNetHostResolver", version: coreVersion },
@@ -38,8 +38,7 @@ export const pkgs = [
     // .NET Core 6.0 Dependencies
     { id: "Microsoft.NETCore.App.Ref", version: core60Version, alias: "Microsoft.NETCore.App.Ref60" },
 
-    { id: "Microsoft.NETCore.Platforms", version: core60VersionPlatforms, alias: "Microsoft.NETCore.Platforms.6.0" },
-    
+   
     // .NET Core Self-Contained Deployment
     { id: "Microsoft.NETCore.DotNetHostResolver", version: core60Version, alias: "Microsoft.NETCore.DotNetHostResolver.6.0" },
 
@@ -205,7 +204,7 @@ export const pkgs = [
     { id: "System.Runtime.Serialization.Xml", version: pkgVersion },
     { id: "System.Runtime.WindowsRuntime", version: pkgVersion },
     { id: "System.Security.Cryptography.Algorithms", version: pkgVersion },
-    { id: "System.Security.Cryptography.Cng", version: pkgVersion },
+    { id: "System.Security.Cryptography.Cng", version: pkgVersion5 },
     { id: "System.Security.Cryptography.Csp", version: pkgVersion },
     { id: "System.Security.Cryptography.Encoding", version: pkgVersion },
     { id: "System.Security.Cryptography.Primitives", version: pkgVersion },
@@ -219,7 +218,8 @@ export const pkgs = [
     { id: "System.Threading", version: pkgVersion },
     { id: "System.Threading.Overlapped", version: pkgVersion },
     { id: "System.Threading.Tasks", version: pkgVersion },
-
+    { id: "System.Formats.Asn1", version: "7.0.0"},
+    
     { id: "System.Threading.Tasks.Parallel", version: pkgVersion },
     { id: "System.Threading.Thread", version: pkgVersion },
     { id: "System.Threading.ThreadPool", version: pkgVersion },
@@ -236,23 +236,13 @@ export const pkgs = [
     // Bumped version numbers
     { id: "System.IO.FileSystem.AccessControl", version: pkgVersionNext },
     { id: "System.Management", version: pkgVersionNext },
-    { id: "System.Security.AccessControl", version: pkgVersionNext,
-        dependentPackageIdsToSkip: ["System.Security.Principal.Windows"] },
-    { id: "System.Security.Principal.Windows", version: pkgVersionNext },
+    { id: "System.Security.AccessControl", version: pkgVersion6 },
+    { id: "System.Security.Principal.Windows", version: pkgVersion6Preview },
     
-    { id: "System.Security.Principal.Windows", version: pkgVersion5, alias: "System.Security.Principal.Windows.v5.0.0" },
-    { id: "System.Text.Json", version: "4.7.2",
-        dependentPackageIdsToSkip: ["System.Memory", "System.ValueTuple", "System.Runtime.CompilerServices.Unsafe", "System.Numerics.Vectors", "System.Threading.Tasks.Extensions", "Microsoft.Bcl.AsyncInterfaces"],
-    },
-    { id: "System.Text.Json", version: pkgVersion7,
-        dependentPackageIdsToSkip: ["System.Memory", "System.Buffers", "System.ValueTuple", "System.Runtime.CompilerServices.Unsafe", "System.Numerics.Vectors", "System.Threading.Tasks.Extensions", "Microsoft.Bcl.AsyncInterfaces", "System.Text.Encodings.Web"],
-        alias: "System.Text.Json.v7.0.0"
-    },
+    { id: "System.Text.Json", version: "7.0.0" },
     { id: "System.Threading.AccessControl", version: pkgVersionNext },
 
     { id: "System.IO.FileSystem.AccessControl", version: pkgVersion6Preview, alias: "System.IO.FileSystem.AccessControl.v6.0.0" },
-    { id: "System.Security.AccessControl", version: pkgVersion6, alias: "System.Security.AccessControl.v6.0.0" },
-    { id: "System.Security.Principal.Windows", version: pkgVersion6Preview, alias: "System.Security.Principal.Windows.v6.0.0" },
 
     // Non-standard version ones
     { id: "Microsoft.NETCore.Targets", version: "2.0.0" },
@@ -264,10 +254,7 @@ export const pkgs = [
         dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe"] },
 
     { id: "System.Security.Cryptography.OpenSsl", version: "4.4.0" },
-    { id: "System.Collections.Immutable", version: "1.5.0" },
-    // The next one is used only to run some tests in the IDE.
-    // { id: "System.Collections.Immutable", version: "1.7.1", dependentPackageIdsToSkip: ["System.Memory"] },
-    { id: "System.Collections.Immutable", version: "5.0.0", alias: "System.Collections.Immutable.ForVBCS", dependentPackageIdsToSkip: ["System.Memory"] },
+    { id: "System.Collections.Immutable", version: "7.0.0" },
 ];