diff --git a/src/Build/Utilities/NuGetFrameworkWrapper.cs b/src/Build/Utilities/NuGetFrameworkWrapper.cs index 3bb52fd3d73..e60c3a07af2 100644 --- a/src/Build/Utilities/NuGetFrameworkWrapper.cs +++ b/src/Build/Utilities/NuGetFrameworkWrapper.cs @@ -32,7 +32,7 @@ public NuGetFrameworkWrapper() BuildEnvironmentHelper.Instance.CurrentMSBuildToolsDirectory; try { - var NuGetAssembly = Assembly.LoadFile(Path.Combine(assemblyDirectory, "NuGet.Frameworks.dll")); + var NuGetAssembly = Assembly.LoadFrom(Path.Combine(assemblyDirectory, "NuGet.Frameworks.dll")); var NuGetFramework = NuGetAssembly.GetType("NuGet.Frameworks.NuGetFramework"); var NuGetFrameworkCompatibilityProvider = NuGetAssembly.GetType("NuGet.Frameworks.CompatibilityProvider"); var NuGetFrameworkDefaultCompatibilityProvider = NuGetAssembly.GetType("NuGet.Frameworks.DefaultCompatibilityProvider"); diff --git a/src/Shared/MSBuildLoadContext.cs b/src/Shared/MSBuildLoadContext.cs index f080c2e05a9..d44b57480d4 100644 --- a/src/Shared/MSBuildLoadContext.cs +++ b/src/Shared/MSBuildLoadContext.cs @@ -25,8 +25,20 @@ internal class MSBuildLoadContext : AssemblyLoadContext "MSBuild", "Microsoft.Build", "Microsoft.Build.Framework", + "Microsoft.Build.NuGetSdkResolver", "Microsoft.Build.Tasks.Core", "Microsoft.Build.Utilities.Core", + "NuGet.Build.Tasks", + "NuGet.Common", + "NuGet.Configuration", + "NuGet.Credentials", + "NuGet.DependencyResolver.Core", + "NuGet.Frameworks", + "NuGet.LibraryModel", + "NuGet.Packaging", + "NuGet.Protocol", + "NuGet.ProjectModel", + "NuGet.Versioning", }.ToImmutableHashSet(); internal static readonly string[] Extensions = new[] { "ni.dll", "ni.exe", "dll", "exe" };