Merged PR 765049: DScript spec cleanup wave 2

* Removed now unnecessary 'dependentPackageIdsToSkip'
* Removed remaining unnecessary 'withQualifier' and the general netstandard2.0 forcing that happened on cache specs side
* Reorganized asptnetcore assembly references. This could be simplified further in the future, but now it is more self-contained.
* Some other minor cleanups

Next step is trying to make sure dependency versions are the right ones and try to turn on the flag that enforces this from the nuget resolver.

Public/Sdk/SelfHost/BuildXL/BuildXLSdk.Packages.dsc

@@ -5,11 +5,9 @@ import * as Managed from "Sdk.Managed";
 
 @@public
 export const systemThreadingChannelsPackages : Managed.ManagedNugetPackage[] = 
-    // System.Threading.Channels comes bundled with .NET Core, so we don't need to provide it. If we do,
-    // the version we provide will likely conflict with the official one
+    // System.Threading.Channels comes bundled with .NET Core, so we don't need to provide it for that case.
     isFullFramework || !isDotNetCore
-        // Needed because net472 -> netstandard2.0 translation is not yet supported by the NuGet resolver.    
-        ? [importFrom("System.Threading.Channels").withQualifier({ targetFramework: "netstandard2.0" }).pkg]
+        ? [importFrom("System.Threading.Channels").pkg]
         : [];
 
 @@public

Public/Sdk/SelfHost/BuildXL/BuildXLSdk.dsc

@@ -590,7 +590,7 @@ export function cacheBindingRedirects() {
                 publicKeyToken: "cc7b13ffcd2ddd51",
                 culture: "neutral",
                 oldVersion: "0.0.0.0-4.0.1.2",
-                newVersion: "4.0.1.2", // Corresponds to: { id: "System.Memory", version: "4.5.5", dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe", "System.Numerics.Vectors"] },
+                newVersion: "4.0.1.2", // Corresponds to: { id: "System.Memory", version: "4.5.5" },
             },
             {
                 name: "System.Interactive.Async",

Public/Src/Cache/ContentStore/BuildXL.Cache.ContentStore.dsc

@@ -114,18 +114,42 @@ export function getGrpcAspNetCorePackages() : (Managed.ManagedNugetPackage | Man
                   importFrom("Grpc.AspNetCore.Server").pkg,
                   
                   importFrom("System.Security.Cryptography.ProtectedData").pkg,
-
-                  // AspNetCore assemblies
-                  Managed.Factory.filterRuntimeSpecificBinaries(BuildXLSdk.WebFramework.getFrameworkPackage(), [
-                    importFrom("System.IO.Pipelines").pkg,
-                    importFrom("System.Diagnostics.EventLog").pkg,
-                    importFrom("System.Security.Cryptography.Pkcs").pkg,
-                    importFrom("System.Security.Cryptography.Xml").pkg,
-                  ])
+                  
+                  ...getAsptNetCoreAssemblies(),
         ])
     ];
 }
 
+@@public
+export function getAsptNetCoreAssemblies() : Managed.ManagedNugetPackage[] {
+    return [
+        // The ASPNet web framework package comes with some DLLs that we also import individually.
+        // We prefer the one individually imported, so remove the overlapping DLLs from the web framework
+        // package and add the individually imported ones.
+        // If you ever get a double deployment issue coming from this package, just add the conflicting DLL
+        // under getWebFrameworkExclusions()
+        Managed.Factory.filterRuntimeSpecificBinaries(
+                BuildXLSdk.WebFramework.getFrameworkPackage(), 
+                getWebFrameworkExclusions()),
+            ...getWebFrameworkExclusions()
+    ];
+}
+
+function getWebFrameworkExclusions(): Managed.ManagedNugetPackage[] {
+    return [
+        importFrom("System.IO.Pipelines").pkg,
+        importFrom("System.Diagnostics.EventLog").pkg,
+        importFrom("System.Security.Cryptography.Pkcs").pkg,
+        importFrom("System.Security.Cryptography.Xml").pkg,
+        importFrom("Microsoft.Extensions.DependencyInjection").pkg,
+        importFrom("Microsoft.Extensions.DependencyInjection.Abstractions").pkg,
+        importFrom("Microsoft.Extensions.Http").pkg,
+        importFrom("Microsoft.Extensions.Logging").pkg,
+        importFrom("Microsoft.Extensions.Options").pkg,
+        importFrom("Microsoft.Extensions.Primitives").pkg
+    ];
+}
+
 @@public
 export function getProtobufNetPackages(includeNetStandard: boolean) : (Managed.ManagedNugetPackage | Managed.Assembly)[] {
     return [

Public/Src/Cache/ContentStore/Distributed/BuildXL.Cache.ContentStore.Distributed.dsc

@@ -73,10 +73,9 @@ namespace Distributed {
 
             ...(BuildXLSdk.isFullFramework 
                 ? [ 
-                    // Needed because net472 -> netstandard2.0 translation is not yet supported by the NuGet resolver.
                     importFrom("System.IO.Pipelines").pkg,
                     importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
-                    importFrom("Pipelines.Sockets.Unofficial").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+                    importFrom("Pipelines.Sockets.Unofficial").pkg,
                 ] 
                 : [
                     importFrom("System.IO.Pipelines").pkg,            

Public/Src/Cache/ContentStore/DistributedTest/BuildXL.Cache.ContentStore.Distributed.Test.dsc

@@ -106,10 +106,9 @@ namespace DistributedTest {
 
             ...(BuildXLSdk.isFullFramework 
                 ? [ 
-                    // Needed because net472 -> netstandard2.0 translation is not yet supported by the NuGet resolver.
                     importFrom("System.IO.Pipelines").pkg,
                     importFrom("System.Runtime.CompilerServices.Unsafe").pkg,
-                    importFrom("Pipelines.Sockets.Unofficial").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+                    importFrom("Pipelines.Sockets.Unofficial").pkg,
                 ] 
                 : [
                     importFrom("System.IO.Pipelines").pkg,            

Public/Src/Cache/DistributedCache.Host/LauncherServer/BuildXL.Launcher.Server.dsc

@@ -38,13 +38,7 @@ namespace LauncherServer {
             ...importFrom("BuildXL.Cache.ContentStore").getProtobufNetPackages(true),
             importFrom("protobuf-net.Grpc.AspNetCore").pkg,
 
-            // AspNetCore assemblies
-            Managed.Factory.filterRuntimeSpecificBinaries(BuildXLSdk.WebFramework.getFrameworkPackage(), [
-                importFrom("System.IO.Pipelines").pkg,
-                importFrom("System.Diagnostics.EventLog").pkg,
-                importFrom("System.Security.Cryptography.Pkcs").pkg,
-                importFrom("System.Security.Cryptography.Xml").pkg,
-            ])
+            ...importFrom("BuildXL.Cache.ContentStore").getAsptNetCoreAssemblies(),
         ],
         assemblyBindingRedirects: [
             {

Public/Src/Engine/UnitTests/Distribution/Test.BuildXL.Distribution.dsc

@@ -21,11 +21,7 @@ namespace Distribution {
             importFrom("BuildXL.Utilities").dll,
             importFrom("BuildXL.Utilities").Configuration.dll,
             importFrom("BuildXL.Utilities").Utilities.Core.dll,
-            Managed.Factory.filterRuntimeSpecificBinaries(BuildXLSdk.WebFramework.getFrameworkPackage(), [
-                importFrom("System.IO.Pipelines").pkg,
-                importFrom("System.Diagnostics.EventLog").pkg,
-                importFrom("System.Security.Cryptography.Pkcs").pkg
-            ]),
+            ...importFrom("BuildXL.Cache.ContentStore").getAsptNetCoreAssemblies(),
         ],
     });
 }

Public/Src/FrontEnd/SdkTesting/TestGenerator/BuildXL.FrontEnd.Script.Testing.TestGenerator.dsc

@@ -56,11 +56,14 @@ namespace TestGenerator {
             importFrom("BuildXL.FrontEnd").Sdk.dll,
             importFrom("BuildXL.FrontEnd").TypeScript.Net.dll,
         ],
+        runtimeContent:
+        [
+            Helper.dll,
+        ]
     });
 
     @@public
     export const deploymentContents: Deployment.DeployableItem[] = [
         exe,
-        Helper.dll,
     ];
 }

Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc

@@ -129,7 +129,7 @@ export namespace DropDaemon {
                 publicKeyToken: "30ad4fe6b2a6aeed",
                 culture: "neutral",
                 oldVersion: "0.0.0.0-13.0.0.0",
-                newVersion: "13.0.0.0", // Corresponds to { id: "Newtonsoft.Json", version: "13.0.1", alias: "Newtonsoft.Json.v13.0.1" }
+                newVersion: "13.0.0.0", // Corresponds to { id: "Newtonsoft.Json", version: "13.0.1" }
             },
             {
                 name: "System.Text.Json",

Public/Src/Tools/NugetDownloader/Tool.NugetDownloader.dsc

@@ -55,7 +55,6 @@ namespace NugetDownloader {
             f`App.config`,
             specDeployment
         ],
-        deploymentOptions: { ignoredSelfContainedRuntimeFilenames: [a`System.Collections.Immutable.dll`] }, 
     });
 }
 

Public/Src/Utilities/Utilities.Core/BuildXL.Utilities.Core.dsc

@@ -18,7 +18,7 @@ namespace Utilities.Core {
             ...addIfLazy(!BuildXLSdk.isDotNetCore, () => [
                 NetFx.System.Xml.dll,
                 NetFx.Netstandard.dll,
-                importFrom("System.Threading.Channels").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+                importFrom("System.Threading.Channels").pkg,
                 importFrom("System.Memory").pkg,
                 importFrom("System.Threading.Tasks.Extensions").pkg,
             ]),

Public/Src/Utilities/VstsAuthentication/BuildXL.Utilties.VstsAuthentication.dsc

@@ -10,7 +10,7 @@ namespace VstsAuthentication {
             $.dll,
             Native.dll,
             Utilities.Core.dll,
-            importFrom("Newtonsoft.Json").withQualifier({targetFramework: "netstandard2.0"}).pkg,
+            importFrom("Newtonsoft.Json").pkg,
             importFrom("NuGet.Versioning").pkg,
             importFrom("NuGet.Protocol").pkg,
             importFrom("NuGet.Configuration").pkg,

cg/nuget/cgmanifest.json

@@ -1077,7 +1077,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Extensions.Configuration",
-          "Version": "2.2.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -1086,7 +1086,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Extensions.Configuration.Abstractions",
-          "Version": "2.2.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -1095,7 +1095,16 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Extensions.Configuration.Binder",
-          "Version": "2.2.0"
+          "Version": "7.0.0"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "Microsoft.Extensions.DependencyInjection",
+          "Version": "7.0.0"
         }
       }
     },
@@ -1104,7 +1113,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Extensions.DependencyInjection.Abstractions",
-          "Version": "2.2.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -1149,7 +1158,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Extensions.Logging",
-          "Version": "2.2.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -1185,7 +1194,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Extensions.Options",
-          "Version": "2.2.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -1203,7 +1212,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.Extensions.Primitives",
-          "Version": "2.2.0"
+          "Version": "7.0.0"
         }
       }
     },
@@ -3025,15 +3034,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "System.IO.FileSystem.AccessControl",
-          "Version": "6.0.0-preview.5.21301.5"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",

config.dsc

@@ -72,8 +72,7 @@ config({
 
                 { id: "Microsoft.NETFramework.ReferenceAssemblies.net472", version: "1.0.0" },
 
-                { id: "System.Diagnostics.DiagnosticSource", version: "7.0.2",
-                    dependentPackageIdsToSkip: ["System.Memory"] },
+                { id: "System.Diagnostics.DiagnosticSource", version: "7.0.2" },
 
                 // Roslyn
                 // The old compiler used by integration tests only.
@@ -143,7 +142,7 @@ config({
                 { id: "Microsoft.Extensions.Globalization.CultureInfoCache", version: "1.0.0-rc1-final" },
                 { id: "Microsoft.Extensions.MemoryPool", version: "1.0.0-rc1-final" },
                 { id: "Microsoft.Extensions.PlatformAbstractions", version: "1.1.0" },
-                { id: "Microsoft.Extensions.Http", version: "7.0.0", dependentPackageIdsToSkip: ["Microsoft.Extensions.DependencyInjection.Abstractions"]},
+                { id: "Microsoft.Extensions.Http", version: "7.0.0" },
 
                 { id: "Microsoft.Tpl.Dataflow", version: "4.5.24" },
                 { id: "Microsoft.TypeScript.Compiler", version: "1.8" },
@@ -166,10 +165,7 @@ config({
                 { id: "Microsoft.Windows.ProjFS", version: "1.2.19351.1" },
 
                 // RocksDb
-                { id: "RocksDbSharp", version: "8.1.1-20230829.3", alias: "RocksDbSharpSigned", 
-                    dependentPackageIdsToSkip: [ "System.Memory" ],
-                    dependentPackageIdsToIgnore: [ "System.Memory" ]
-                },
+                { id: "RocksDbSharp", version: "8.1.1-20230829.3", alias: "RocksDbSharpSigned" },
                 { id: "RocksDbNative", version: "8.1.1-20230829.3" },
 
                 { id: "JsonDiffPatch.Net", version: "2.1.0" },
@@ -177,17 +173,12 @@ config({
                 // Event hubs
                 { id: "Microsoft.Azure.Amqp", version: "2.6.1" },
                 { id: "Azure.Core.Amqp", version: "1.3.0"},
-                { id: "Azure.Messaging.EventHubs", version: "5.9.0",
-                    dependentPackageIdsToSkip: ["System.Net.Http", "System.Reflection.TypeExtensions", "System.Runtime.Serialization.Primitives", "Newtonsoft.Json", "System.Diagnostics.DiagnosticSource"],
-                },
+                { id: "Azure.Messaging.EventHubs", version: "5.9.0" },
                 { id: "Microsoft.Azure.KeyVault.Core", version: "1.0.0" },
                 { id: "Microsoft.IdentityModel.Logging", version: "7.2.0" },
-                { id: "Microsoft.IdentityModel.Tokens", version: "7.2.0",
-                    dependentPackageIdsToSkip: ["System.Memory", "System.Text.Encodings.Web", "System.Text.Json"] },
+                { id: "Microsoft.IdentityModel.Tokens", version: "7.2.0" },
                 { id: "System.IdentityModel.Tokens.Jwt", version: "7.2.0"},
-                    //dependentPackageIdsToSkip: ["Newtonsoft.Json"] },
-                { id: "Microsoft.IdentityModel.JsonWebTokens", version: "7.2.0",
-                    dependentPackageIdsToSkip: ["System.Text.Encodings.Web", "System.Text.Json"] },
+                { id: "Microsoft.IdentityModel.JsonWebTokens", version: "7.2.0" },
 
                 // Key Vault
                 { id: "Azure.Security.KeyVault.Secrets", version: "4.5.0" },
@@ -196,10 +187,8 @@ config({
                 { id: "Microsoft.Identity.Client", version: "4.56.0" },
                 { id: "Microsoft.IdentityModel.Abstractions", version: "7.2.0" },
                 { id: "Microsoft.Identity.Client.Extensions.Msal", version: "4.56.0" },
-                { id: "Azure.Core", version: "1.36.0", 
-                    dependentPackageIdsToSkip: ["System.Buffers", "System.Text.Encodings.Web", "System.Text.Json", "System.Memory", "System.Memory.Data", "System.Numerics.Vectors", "Microsoft.Bcl.AsyncInterfaces" ] },
-                { id: "System.Memory.Data", version: "1.0.2",
-                    dependentPackageIdsToSkip: [ "System.Memory", "System.Text.Json" ] },
+                { id: "Azure.Core", version: "1.36.0" },
+                { id: "System.Memory.Data", version: "1.0.2" },
 
                 // Authentication
                 { id: "Microsoft.Identity.Client.Broker", version: "4.55.0" },
@@ -213,14 +202,11 @@ config({
                 ...importFile(f`config.microsoftInternal.dsc`).pkgs,
 
                 // Azure Blob Storage SDK V12
-                { id: "Azure.Storage.Blobs", version: "12.16.0",
-                    dependentPackageIdsToSkip: [ "System.Text.Json" ] },
+                { id: "Azure.Storage.Blobs", version: "12.16.0" },
                 { id: "Azure.Storage.Common", version: "12.15.0" },
-                { id: "System.IO.Hashing", version: "6.0.0",
-                    dependentPackageIdsToSkip: [ "System.Buffers", "System.Memory" ] },
+                { id: "System.IO.Hashing", version: "6.0.0" },
                 { id: "Azure.Storage.Blobs.Batch", version: "12.10.0" },
-                { id: "Azure.Storage.Blobs.ChangeFeed", version: "12.0.0-preview.34",
-                    dependentPackageIdsToSkip: [ "System.Text.Json" ] },
+                { id: "Azure.Storage.Blobs.ChangeFeed", version: "12.0.0-preview.34" },
 
                 // xUnit
                 { id: "xunit.abstractions", version: "2.0.3" },
@@ -245,13 +231,12 @@ 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: "7.0.0", dependentPackageIdsToSkip: ["System.Threading.Tasks.Extensions"] },
+                { id: "Microsoft.Bcl.AsyncInterfaces", version: "7.0.0" },
                 { id: "Microsoft.Bcl.Build", version: "1.0.14" },
                 
-                { id: "Pipelines.Sockets.Unofficial", version: "2.2.0",
-                    dependentPackageIdsToSkip: ["System.IO.Pipelines", "System.Runtime.CompilerServices.Unsafe", "Microsoft.Bcl.AsyncInterfaces"] },
+                { id: "Pipelines.Sockets.Unofficial", version: "2.2.0" },
                 { id: "System.Diagnostics.PerformanceCounter", version: "5.0.0" },
-                { id: "System.Threading.Channels", version: "7.0.0", dependentPackageIdsToSkip: ["System.Threading.Tasks.Extensions"] },
+                { id: "System.Threading.Channels", version: "7.0.0" },
 
                 { id: "System.Linq.Async", version: "4.0.0"},
                 { id: "Polly", version: "7.2.1" },
@@ -266,8 +251,7 @@ config({
                 { 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"] },
+                { id: "FluentAssertions", version: "5.3.0" },
 
                 { id: "DotNet.Glob", version: "2.0.3" },
                 { id: "Minimatch", version: "1.1.0.0" },
@@ -300,14 +284,12 @@ 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.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", version: "17.7.2" },
                 { 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.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.Utilities.Core", version: "17.0.0" },
+                { id: "Microsoft.Build.Framework", version: "17.7.2" },
+                { id: "Microsoft.NET.StringTools", version: "1.0.0" },
                 { id: "Microsoft.Build.Locator", version: "1.5.5" },
                 { id: "System.Reflection.MetadataLoadContext", version: "7.0.0"},    
 
@@ -318,14 +300,13 @@ config({
                 { 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" }, /* 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.IO.Pipelines", version: "7.0.0-rc.1.22426.10" },
                 { 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: "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.Text.Encoding.CodePages", version: "4.5.1" },
 
                 // Used for MSBuild input/output prediction
                 { id: "Microsoft.Build.Prediction", version: "0.3.0" },
@@ -355,7 +336,7 @@ config({
                 { id: "boost", version: "1.71.0.0" },
 
                 // Needed for SBOM Generation
-                { id: "Microsoft.Extensions.Logging.Abstractions", version: "7.0.0", dependentPackageIdsToSkip: ["System.Buffers", "System.Memory"] },
+                { id: "Microsoft.Extensions.Logging.Abstractions", version: "7.0.0" },
                 { id: "packageurl-dotnet", version: "1.1.0" },
                 { id: "System.Reactive", version: "4.4.1" },
 

config.microsoftInternal.dsc

@@ -77,7 +77,7 @@ export const pkgs = isMicrosoftInternal ? [
     { id: "Microsoft.Sbom.Adapters", version: "2.2.3" },
     { id: "Microsoft.ComponentDetection.Contracts", version: "4.2.0" },
     { id: "Microsoft.Sbom.Contracts", version: "2.2.3" },
-    { id: "Microsoft.Sbom.Extensions", version: "2.2.3", dependentPackageIdsToSkip: ["System.Text.Json"] },
+    { id: "Microsoft.Sbom.Extensions", version: "2.2.3" },
     { id: "Microsoft.Bcl.HashCode", version: "1.1.1" },
 
     // Process remoting
@@ -93,11 +93,11 @@ export const pkgs = isMicrosoftInternal ? [
     // CredScan
     { id: "Strings.Interop", version: "1.10.0" },
     { id: "RE2.Managed", version: "1.10.0" },
-    { id: "Microsoft.Automata.SRM", version: "2.0.0-alpha3", dependentPackageIdsToSkip: ["System.Collections.Immutable"] },
+    { id: "Microsoft.Automata.SRM", version: "2.0.0-alpha3" },
     { id: "Crc32.NET", version: "1.2.0" },
-    { id: "Microsoft.Security.RegularExpressions", version: "1.7.1.6", dependentPackageIdsToSkip: ["System.Numerics.Vectors"] } ,
+    { id: "Microsoft.Security.RegularExpressions", version: "1.7.1.6" } ,
     { id: "Microsoft.Security.CredScan.KnowledgeBase.SharedDomains", version: "1.7.1.6" },
-    { id: "Microsoft.Security.CredScan.KnowledgeBase", version: "1.7.1.6", dependentPackageIdsToSkip: ["System.Text.Json"] },
+    { id: "Microsoft.Security.CredScan.KnowledgeBase", version: "1.7.1.6" },
     { id: "Microsoft.Security.CredScan.KnowledgeBase.Client", version: "1.7.1.6" },
     { id: "Microsoft.Security.CredScan.KnowledgeBase.Ruleset", version: "1.7.1.6" },
 

config.nuget.aspNetCore.dsc

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-const aspVersion = "2.2.0";
+const aspVersion = "7.0.0";
 
 // Versions used by framework reference packages for reference assemblies
 // and runtime assemblies respectively
@@ -23,6 +23,7 @@ export const pkgs = [
     { id: "Microsoft.Extensions.Configuration", version: aspVersion },
     { id: "Microsoft.Extensions.DependencyInjection.Abstractions", version: aspVersion },
     { id: "Microsoft.Extensions.Logging", version: aspVersion },
+    { id: "Microsoft.Extensions.DependencyInjection", version: aspVersion },
     { id: "Microsoft.Extensions.Options", version: aspVersion },
     { id: "Microsoft.Extensions.Primitives", version: aspVersion },
 

config.nuget.dotnetcore.dsc

@@ -242,16 +242,10 @@ export const pkgs = [
     { 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" },
-
     // Non-standard version ones
     { id: "Microsoft.NETCore.Targets", version: "2.0.0" },
     
-    // NOTE(jubayard): If you depend on this package and need to build for Net472, you will need to add the
-    // dependency manually, using netstandard2.0 targetFramework qualifier. Dependency clipped because it 
-    // causes a deployment conflict for the cache.
-    { id: "System.Threading.Tasks.Extensions", version: "4.5.4", // If you change this version, please change cacheBindingRedirects in BuildXLSdk.dsc
-        dependentPackageIdsToSkip: ["System.Runtime.CompilerServices.Unsafe"] },
+    { id: "System.Threading.Tasks.Extensions", version: "4.5.4" }, // If you change this version, please change cacheBindingRedirects in BuildXLSdk.dsc
 
     { id: "System.Security.Cryptography.OpenSsl", version: "4.4.0" },
     { id: "System.Collections.Immutable", version: "7.0.0" },

config.nuget.grpc.dsc

@@ -12,31 +12,26 @@ export const pkgs = [
     // grpc
     { id: "Grpc.Net.Client", version: grpcNetVersion }, 
     { id: "Grpc.Net.Client.Web", version: grpcNetVersion},  
-    { id: "Grpc.Net.ClientFactory", version: grpcNetVersion, dependentPackageIdsToSkip: [ "Microsoft.Extensions.Http" ]},  
+    { id: "Grpc.Net.ClientFactory", version: grpcNetVersion },  
     { id: "Grpc.Net.Common", version: grpcNetVersion},
     { id: "Grpc.AspNetCore.Server.ClientFactory", version: grpcNetVersion},
     { id: "Grpc.AspNetCore.Server", version: grpcNetVersion},
     { id: "Grpc.AspNetCore", version: grpcNetVersion},  
 
-    { id: "Grpc.Core", version: "2.46.3", dependentPackageIdsToSkip: [ "System.Memory" ] },
-    { id: "Grpc.Core.Api", version: grpcCoreVersion, dependentPackageIdsToSkip: [ "System.Memory" ] },
+    { id: "Grpc.Core", version: "2.46.3" },
+    { id: "Grpc.Core.Api", version: grpcCoreVersion },
     { id: "Grpc.Tools", version: grpcCoreVersion },
 
     // protobuf
-    { id: "Google.Protobuf", version: protoVersion, dependentPackageIdsToSkip: [ "System.Memory" ] },
+    { id: "Google.Protobuf", version: protoVersion },
     { id: "Google.Protobuf.Tools", version: protoToolsVersion },
 
     // protobuf-net
-    { id: "protobuf-net.Core", version: "3.0.101",
-        dependentPackageIdsToSkip: [ "System.Memory" ] },
-    { id: "protobuf-net", version: "3.0.101",
-        dependentPackageIdsToSkip: [ "System.Memory" ] },
-    { id: "protobuf-net.Grpc", version: "1.0.152",
-        dependentPackageIdsToSkip: [ "System.Memory", "System.Threading.Channels", "Grpc.Core.Api" ] },
-    { id: "protobuf-net.Grpc.Native", version: "1.0.152",
-        dependentPackageIdsToSkip: [ "System.Memory", "System.Threading.Channels", "Grpc.Core" ] },
-    { id: "protobuf-net.Grpc.AspNetCore", version: "1.0.152",
-        dependentPackageIdsToSkip: [ "System.Memory", "System.Threading.Channels", "Grpc.Core" ] },
+    { id: "protobuf-net.Core", version: "3.0.101" },
+    { id: "protobuf-net", version: "3.0.101" },
+    { id: "protobuf-net.Grpc", version: "1.0.152" },
+    { id: "protobuf-net.Grpc.Native", version: "1.0.152" },
+    { id: "protobuf-net.Grpc.AspNetCore", version: "1.0.152" },
 
     { id: "System.ServiceModel.Http", version: "4.10.0" },
     { id: "System.ServiceModel.Primitives", version: "4.10.0" },

config.nuget.vssdk.dsc

@@ -36,14 +36,14 @@ export const pkgs = [
     { id: "Microsoft.VisualStudio.TextManager.Interop.8.0", version: "8.0.50728" },
     { id: "Microsoft.VisualStudio.TextManager.Interop.9.0", version: "9.0.30730" },
     { id: "Microsoft.VisualStudio.TextManager.Interop", version: "7.10.6071" },
-    { id: "Microsoft.VisualStudio.Threading", version: "17.0.32-alpha", dependentPackageIdsToSkip: ["Microsoft.Bcl.AsyncInterfaces"] },
+    { id: "Microsoft.VisualStudio.Threading", version: "17.0.32-alpha" },
     { id: "Microsoft.VisualStudio.Utilities", version: "15.8.28010" },
     { id: "Microsoft.VisualStudio.Validation", version: "16.10.35" },
     { id: "stdole", version: "7.0.3303" },
     { id: "StreamJsonRpc", version: "2.8.28" },
     { id: "MessagePack", version: "2.2.85" },
     { id: "MessagePack.Annotations", version: "2.2.85" },
-    { id: "Nerdbank.Streams", version: "2.6.81", dependentPackageIdsToSkip: ["Microsoft.Bcl.AsyncInterfaces"] },
+    { id: "Nerdbank.Streams", version: "2.6.81" },
     { id: "Microsoft.IO.Redist", version: "4.7.1" },
     { id: "Microsoft.VisualStudio.SDK.Analyzers", version: "16.10.10" },
     { id: "Microsoft.VisualStudio.GraphModel", version: "17.0.0-previews-3-31605-261" },