diff --git a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs b/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs index 08149805ff..9b222e72b1 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/ApplicationParts/ApplicationAssembliesProvider.cs @@ -14,10 +14,10 @@ internal class ApplicationAssembliesProvider { internal static HashSet ReferenceAssemblies { get; } = new HashSet(StringComparer.OrdinalIgnoreCase) { - // The deps file for the Microsoft.AspNetCore.All shared runtime is authored in a way where it does not say + // The deps file for the Microsoft.AspNetCore.App shared runtime is authored in a way where it does not say // it depends on Microsoft.AspNetCore.Mvc even though it does. Explicitly list it so that referencing this runtime causes // assembly discovery to work correctly. - "Microsoft.AspNetCore.All", + "Microsoft.AspNetCore.App", "Microsoft.AspNetCore.Mvc", "Microsoft.AspNetCore.Mvc.Abstractions", "Microsoft.AspNetCore.Mvc.ApiExplorer", @@ -154,7 +154,7 @@ private AssemblyItem GetAssemblyItem(Assembly assembly) // Internal for unit testing internal static IEnumerable GetCandidateLibraries(DependencyContext dependencyContext) { - // When using Microsoft.AspNetCore.App \ Microsoft.AspNetCore.All shared runtimes, entries in the RuntimeLibraries + // When using the Microsoft.AspNetCore.App shared runtimes, entries in the RuntimeLibraries // get "erased" and it is no longer accurate to query to determine a library's dependency closure. // We'll use CompileLibraries to calculate the dependency graph and runtime library to resolve assemblies to inspect. var candidatesResolver = new CandidateResolver(dependencyContext.CompileLibraries, ReferenceAssemblies); diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs index c3f864b4d7..b7c040d42e 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs @@ -35,8 +35,8 @@ public void ResolveAssemblies_ReturnsCurrentAssembly_IfDepsFileDoesNotHaveAnyCom // Arrange var runtimeLibraries = new[] { - GetRuntimeLibrary("MyApp", "Microsoft.AspNetCore.All"), - GetRuntimeLibrary("Microsoft.AspNetCore.All", "Microsoft.NETCore.App"), + GetRuntimeLibrary("MyApp", "Microsoft.AspNetCore.App"), + GetRuntimeLibrary("Microsoft.AspNetCore.App", "Microsoft.NETCore.App"), GetRuntimeLibrary("Microsoft.NETCore.App"), GetRuntimeLibrary("ClassLibrary"), }; @@ -257,22 +257,22 @@ public void GetCandidateLibraries_IgnoresMvcAssemblies() public void GetCandidateLibraries_ReturnsRuntimeLibraries_IfCompileLibraryDependencyToMvcIsPresent() { // Arrange - // When an app is running against Microsoft.AspNetCore.All shared runtime or if the DependencyContext is queried + // When an app is running against Microsoft.AspNetCore.App shared runtime or if the DependencyContext is queried // from an app that's running on Microsoft.NETCore.App (e.g. in a unit testing scenario), the // runtime library does not state that the app references Mvc whereas the compile library does. This test validates // that we correctly recognize this scenario. - var expected = GetRuntimeLibrary("MyApp", "Microsoft.AspNetCore.All"); + var expected = GetRuntimeLibrary("MyApp", "Microsoft.AspNetCore.App"); var runtimeLibraries = new[] { expected, - GetRuntimeLibrary("Microsoft.AspNetCore.All", "Microsoft.NETCore.App"), + GetRuntimeLibrary("Microsoft.AspNetCore.App", "Microsoft.NETCore.App"), GetRuntimeLibrary("Microsoft.NETCore.App"), }; var compileLibraries = new[] { - GetCompileLibrary("MyApp", "Microsoft.AspNetCore.All"), - GetCompileLibrary("Microsoft.AspNetCore.All", "Microsoft.AspNetCore.Mvc", "Microsoft.NETCore.App"), + GetCompileLibrary("MyApp", "Microsoft.AspNetCore.App"), + GetCompileLibrary("Microsoft.AspNetCore.App", "Microsoft.AspNetCore.Mvc", "Microsoft.NETCore.App"), GetCompileLibrary("Microsoft.AspNetCore.Mvc"), GetCompileLibrary("Microsoft.NETCore.App"), }; diff --git a/test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs index 25f18d8cda..6bef5ad395 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Test/ApplicationParts/ApplicationAssembliesProviderTest.cs @@ -30,7 +30,7 @@ public void ReferenceAssemblies_ReturnsLoadableReferenceAssemblies() var additionalAssemblies = new[] { // The following assemblies are not reachable from Microsoft.AspNetCore.Mvc - "Microsoft.AspNetCore.All", + "Microsoft.AspNetCore.App", "Microsoft.AspNetCore.Mvc.Formatters.Xml", };