diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dd3ad6cfb5ea..f358cd7ecd42 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -79,34 +79,34 @@
eda92c290b08a2be0fcb8e79ac07ebc94dffb2a3
-
+
https://github.com/dotnet/roslyn
- 237fb52c683601ed639f1fdeaf38ceef0c768fbc
+ 514b5364881b9a36a2630ab7c0160f8e642fc1b3
-
+
https://github.com/dotnet/roslyn
- 237fb52c683601ed639f1fdeaf38ceef0c768fbc
+ 514b5364881b9a36a2630ab7c0160f8e642fc1b3
-
+
https://github.com/dotnet/roslyn
- 237fb52c683601ed639f1fdeaf38ceef0c768fbc
+ 514b5364881b9a36a2630ab7c0160f8e642fc1b3
-
+
https://github.com/dotnet/roslyn
- 237fb52c683601ed639f1fdeaf38ceef0c768fbc
+ 514b5364881b9a36a2630ab7c0160f8e642fc1b3
-
+
https://github.com/dotnet/roslyn
- 237fb52c683601ed639f1fdeaf38ceef0c768fbc
+ 514b5364881b9a36a2630ab7c0160f8e642fc1b3
-
+
https://github.com/dotnet/roslyn
- 237fb52c683601ed639f1fdeaf38ceef0c768fbc
+ 514b5364881b9a36a2630ab7c0160f8e642fc1b3
-
+
https://github.com/dotnet/roslyn
- 237fb52c683601ed639f1fdeaf38ceef0c768fbc
+ 514b5364881b9a36a2630ab7c0160f8e642fc1b3
https://github.com/dotnet/aspnetcore
diff --git a/eng/Versions.props b/eng/Versions.props
index 4bb5e5951acc..b2d39dd3f000 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -31,9 +31,9 @@
2.0.1-servicing-26011-01
13.0.3
1.2.0-beta.435
- 7.0.0
+ 8.0.0
4.0.0
- 7.0.0
+ 8.0.0
9.0.0-alpha.1.24061.26
4.3.0
4.3.0
@@ -137,13 +137,13 @@
- 4.9.0-3.24053.1
- 4.9.0-3.24053.1
- 4.9.0-3.24053.1
- 4.9.0-3.24053.1
- 4.9.0-3.24053.1
- 4.9.0-3.24053.1
- 4.9.0-3.24053.1
+ 4.10.0-1.24061.4
+ 4.10.0-1.24061.4
+ 4.10.0-1.24061.4
+ 4.10.0-1.24061.4
+ 4.10.0-1.24061.4
+ 4.10.0-1.24061.4
+ 4.10.0-1.24061.4
$(MicrosoftNetCompilersToolsetPackageVersion)
diff --git a/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj b/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
index 498769b1e1bb..90c58bd4e530 100644
--- a/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
+++ b/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompat.Task/Microsoft.DotNet.ApiCompat.Task.csproj
@@ -37,7 +37,8 @@
-
+
+
diff --git a/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj b/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
index 27d5b585b476..8047890c8b47 100644
--- a/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
+++ b/src/Compatibility/ApiCompat/Microsoft.DotNet.ApiCompatibility/Microsoft.DotNet.ApiCompatibility.csproj
@@ -11,6 +11,8 @@
+
+
diff --git a/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj b/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj
index 1100858a68cd..2d9186876b85 100644
--- a/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj
+++ b/src/Compatibility/Microsoft.DotNet.ApiSymbolExtensions/Microsoft.DotNet.ApiSymbolExtensions.csproj
@@ -4,13 +4,13 @@
$(NetToolCurrent);$(NetFrameworkToolCurrent)
-
+
$(DefaultItemExcludes);Logging\MSBuildLog.cs
-
+
diff --git a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
index d5d75689a876..e5e8ff7f3bc6 100644
--- a/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
+++ b/src/Resolvers/Microsoft.DotNet.MSBuildSdkResolver/Microsoft.DotNet.MSBuildSdkResolver.csproj
@@ -141,7 +141,7 @@
-
+
diff --git a/src/Tasks/Common/ConflictResolution/ResolvePackageFileConflicts.cs b/src/Tasks/Common/ConflictResolution/ResolvePackageFileConflicts.cs
index c85c13ab0ceb..5d25cae5a7ca 100644
--- a/src/Tasks/Common/ConflictResolution/ResolvePackageFileConflicts.cs
+++ b/src/Tasks/Common/ConflictResolution/ResolvePackageFileConflicts.cs
@@ -11,7 +11,7 @@
namespace Microsoft.NET.Build.Tasks.ConflictResolution
{
- public class ResolvePackageFileConflicts : TaskWithAssemblyResolveHooks
+ public class ResolvePackageFileConflicts : TaskBase
{
private HashSet referenceConflicts = new();
private HashSet analyzerConflicts = new();
diff --git a/src/Tasks/Common/TaskWithAssemblyResolveHooks.cs b/src/Tasks/Common/TaskWithAssemblyResolveHooks.cs
deleted file mode 100644
index c7fddb85d8ce..000000000000
--- a/src/Tasks/Common/TaskWithAssemblyResolveHooks.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-//Microsoft.NET.Build.Extensions.Tasks (net7.0) has nullables disabled
-#pragma warning disable IDE0240 // Remove redundant nullable directive
-#nullable disable
-#pragma warning restore IDE0240 // Remove redundant nullable directive
-
-using System.Reflection;
-
-namespace Microsoft.NET.Build.Tasks
-{
- ///
- /// Inherit from this task instead of if your task needs "binding redirects"
- /// to the latest versions of assemblies that ship as part of the SDK.
- ///
- public abstract class TaskWithAssemblyResolveHooks : TaskBase
- {
-#if NET472
- ///
- /// AssemblyResolve event handler that will bind to the System.Reflection.Metadata that ships with the SDK.
- ///
- ///
- /// This should not be necessary, but the current version of Microsoft.NET.HostModel predates .NET 5.0
- /// and thus has a dependency on System.Reflection.Metadata 1.4.5.0 and System.Collections.Immutable 1.2.5.0,
- /// while the SDK ships with 5.0.0.0 versions. This will fail to resolve SRM/SCI at runtime. We can add this
- /// hook to load whatever version is shipping with the SDK, which should always be higher than the HostModel
- /// reference.
- ///
- /// DELETE THIS when/if HostModel is updated to have an SRM dependency that's coherent with .NET.
- ///
- private static Assembly ResolverForBindingRedirects(object sender, ResolveEventArgs args)
- {
- AssemblyName name = new(args.Name);
- return name.Name switch
- {
- "System.Reflection.Metadata" or "System.Collections.Immutable" =>
- Assembly.LoadFrom(Path.Combine(Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), $"{name.Name}.dll")),
- _ => null,
- };
- }
-
- public override bool Execute()
- {
- AppDomain.CurrentDomain.AssemblyResolve += ResolverForBindingRedirects;
-
- try
- {
- return base.Execute();
- }
- finally
- {
- AppDomain.CurrentDomain.AssemblyResolve -= ResolverForBindingRedirects;
- }
- }
-#endif
- }
-}
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/CreateComHost.cs b/src/Tasks/Microsoft.NET.Build.Tasks/CreateComHost.cs
index 63666ba7b95a..ce9a3a65f9a3 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/CreateComHost.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/CreateComHost.cs
@@ -6,7 +6,7 @@
namespace Microsoft.NET.Build.Tasks
{
- public class CreateComHost : TaskWithAssemblyResolveHooks
+ public class CreateComHost : TaskBase
{
[Required]
public string ComHostSourcePath { get; set; }
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs
index 956cf075a3d9..83d69d24c374 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateBundle.cs
@@ -6,7 +6,7 @@
namespace Microsoft.NET.Build.Tasks
{
- public class GenerateBundle : TaskWithAssemblyResolveHooks
+ public class GenerateBundle : TaskBase
{
[Required]
public ITaskItem[] FilesToBundle { get; set; }
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateClsidMap.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateClsidMap.cs
index d34844455790..df4e2e0239b3 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateClsidMap.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateClsidMap.cs
@@ -8,7 +8,7 @@
namespace Microsoft.NET.Build.Tasks
{
- public class GenerateClsidMap : TaskWithAssemblyResolveHooks
+ public class GenerateClsidMap : TaskBase
{
[Required]
public string IntermediateAssembly { get; set; }
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs
index aeb94d96f20b..fc4cc2a2d429 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateDepsFile.cs
@@ -14,7 +14,7 @@ namespace Microsoft.NET.Build.Tasks
///
/// Generates the $(project).deps.json file.
///
- public class GenerateDepsFile : TaskWithAssemblyResolveHooks
+ public class GenerateDepsFile : TaskBase
{
[Required]
public string ProjectPath { get; set; }
@@ -198,15 +198,15 @@ bool ShouldIncludeRuntimeAsset(ITaskItem item)
{
// Generate the RID-fallback for self-contained builds.
//
- // In order to support loading components with RID-specific assets,
+ // In order to support loading components with RID-specific assets,
// the AssemblyDependencyResolver requires a RID fallback graph.
// The component itself should not carry the RID fallback graph with it, because
// it would need to carry graph of all the RIDs and needs updates for newer RIDs.
- // For framework dependent apps, the RID fallback graph comes from the core framework Microsoft.NETCore.App,
+ // For framework dependent apps, the RID fallback graph comes from the core framework Microsoft.NETCore.App,
// so there is no need to write it into the app.
// If self-contained apps, the (applicable subset of) RID fallback graph needs to be written to the deps.json manifest.
//
- // If a RID-graph is provided to the DependencyContextBuilder, it generates a RID-fallback
+ // If a RID-graph is provided to the DependencyContextBuilder, it generates a RID-fallback
// graph with respect to the target RuntimeIdentifier.
RuntimeGraph runtimeGraph =
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRegFreeComManifest.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRegFreeComManifest.cs
index 2138720b29f5..5ff79c2950fa 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRegFreeComManifest.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateRegFreeComManifest.cs
@@ -6,7 +6,7 @@
namespace Microsoft.NET.Build.Tasks
{
- public class GenerateRegFreeComManifest : TaskWithAssemblyResolveHooks
+ public class GenerateRegFreeComManifest : TaskBase
{
[Required]
public string IntermediateAssembly { get; set; }
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateShims.cs b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateShims.cs
index 1326df309e99..e16d5e3a9ef9 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/GenerateShims.cs
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/GenerateShims.cs
@@ -8,7 +8,7 @@
namespace Microsoft.NET.Build.Tasks
{
- public sealed class GenerateShims : TaskWithAssemblyResolveHooks
+ public sealed class GenerateShims : TaskBase
{
///
/// Relative paths for Apphost for different ShimRuntimeIdentifiers with RuntimeIdentifier as meta data
diff --git a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
index ffeac4d31dcd..078b79192b43 100644
--- a/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
+++ b/src/Tasks/Microsoft.NET.Build.Tasks/Microsoft.NET.Build.Tasks.csproj
@@ -71,9 +71,9 @@
the same System.Reflection.Metadata assembly and their types can unify. See the following link for the MSBuild binding redirect config.
https://github.com/dotnet/msbuild/blob/5d102ae37163fc1f22610bb433c3ab9a2fff91f0/src/MSBuild/app.config#L59
-->
-
-
-
+
+
+