Update SDK to bring unified assembly changes (#31039)

* Update SDK to bring unified assembly changes

* Update SDK to pick up Razor pages fix

* Fixup test

Co-authored-by: Pranav K <[email protected]>

Author: captainsafia

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.3.21160.5"
+    "version": "6.0.100-preview.3.21168.19"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.3.21160.5",
+    "dotnet": "6.0.100-preview.3.21168.19",
     "runtimes": {
       "dotnet/x64": [
         "2.1.25",

src/Azure/AzureAD/Authentication.AzureAD.UI/src/AzureADAuthenticationBuilderExtensions.cs

@@ -198,34 +198,12 @@ void TryAddMapping(AzureADSchemeOptions o)
 
         private static void AddAdditionalMvcApplicationParts(IServiceCollection services)
         {
-            var additionalParts = GetAdditionalParts();
             var mvcBuilder = services
                 .AddMvc()
                 .ConfigureApplicationPartManager(apm =>
                 {
-                    foreach (var part in additionalParts)
-                    {
-                        if (!apm.ApplicationParts.Any(ap => HasSameName(ap.Name, part.Name)))
-                        {
-                            apm.ApplicationParts.Add(part);
-                        }
-                    }
-
                     apm.FeatureProviders.Add(new AzureADAccountControllerFeatureProvider());
                 });
-
-            bool HasSameName(string left, string right) => string.Equals(left, right, StringComparison.Ordinal);
-        }
-
-        private static IEnumerable<ApplicationPart> GetAdditionalParts()
-        {
-            var thisAssembly = typeof(AzureADAuthenticationBuilderExtensions).Assembly;
-            var relatedAssemblies = RelatedAssemblyAttribute.GetRelatedAssemblies(thisAssembly, throwOnError: true);
-
-            foreach (var reference in relatedAssemblies)
-            {
-                yield return new CompiledRazorAssemblyPart(reference);
-            }
         }
     }
 }

src/Azure/AzureAD/Authentication.AzureAD.UI/src/Microsoft.AspNetCore.Authentication.AzureAD.UI.csproj

@@ -6,7 +6,6 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <PackageTags>aspnetcore;authentication;AzureAD</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 

src/Azure/AzureAD/Authentication.AzureADB2C.UI/src/Microsoft.AspNetCore.Authentication.AzureADB2C.UI.csproj

@@ -6,7 +6,6 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <PackageTags>aspnetcore;authentication;AzureADB2C</PackageTags>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
   </PropertyGroup>
 

src/Azure/AzureAD/test/FunctionalTests/WebAuthenticationTests.cs

@@ -31,14 +31,8 @@ public WebAuthenticationTests(WebApplicationFactory<Startup> fixture)
         public static TheoryData<string> NotAddedEndpoints =>
             new TheoryData<string>()
             {
-                "/AzureAD/Account/AccessDenied",
-                "/AzureAD/Account/Error",
-                "/AzureAD/Account/SignedOut",
                 "/AzureAD/Account/SignIn",
                 "/AzureAD/Account/SignOut",
-                "/AzureADB2C/Account/AccessDenied",
-                "/AzureADB2C/Account/Error",
-                "/AzureADB2C/Account/SignedOut",
                 "/AzureADB2C/Account/SignIn",
                 "/AzureADB2C/Account/ResetPassword",
                 "/AzureADB2C/Account/EditProfile",

src/Identity/UI/src/IdentityBuilderUIExtensions.cs

@@ -34,7 +34,7 @@ public static class IdentityBuilderUIExtensions
         public static IdentityBuilder AddDefaultUI(this IdentityBuilder builder)
         {
             builder.AddSignInManager();
-            AddRelatedParts(builder);
+            builder.Services.AddMvc();
 
             builder.Services.ConfigureOptions(
                 typeof(IdentityDefaultUIConfigureOptions<>)
@@ -44,87 +44,6 @@ public static IdentityBuilder AddDefaultUI(this IdentityBuilder builder)
             return builder;
         }
 
-        private static readonly IDictionary<UIFramework, string> _assemblyMap =
-            new Dictionary<UIFramework, string>()
-            {
-                [UIFramework.Bootstrap4] = "Microsoft.AspNetCore.Identity.UI.Views.V4",
-            };
-
-        private static void AddRelatedParts(IdentityBuilder builder)
-        {
-            var mvcBuilder = builder.Services
-                .AddMvc()
-                .ConfigureApplicationPartManager(partManager =>
-                {
-                    // We try to resolve the UI framework that was used by looking at the entry assembly.
-                    // When an app runs, the entry assembly will point to the built app. In some rare cases
-                    // (functional testing) the app assembly will be different, and we'll try to locate it through
-                    // the same mechanism that MVC uses today.
-                    // Finally, if for some reason we aren't able to find the assembly, we'll use our default value
-                    // (Bootstrap4)
-                    if (!TryResolveUIFramework(Assembly.GetEntryAssembly(), out var framework) &&
-                        !TryResolveUIFramework(GetApplicationAssembly(builder), out framework))
-                    {
-                        framework = default;
-                    }
-
-                    var thisAssembly = typeof(IdentityBuilderUIExtensions).Assembly;
-                    var relatedAssemblies = RelatedAssemblyAttribute.GetRelatedAssemblies(thisAssembly, throwOnError: true);
-                    var relatedParts = relatedAssemblies.ToDictionary(
-                        ra => ra,
-                        CompiledRazorAssemblyApplicationPartFactory.GetDefaultApplicationParts);
-
-                    var selectedFrameworkAssembly = _assemblyMap[framework];
-
-                    foreach (var kvp in relatedParts)
-                    {
-                        var assemblyName = kvp.Key.GetName().Name;
-                        if (!IsAssemblyForFramework(selectedFrameworkAssembly, assemblyName))
-                        {
-                            RemoveParts(partManager, kvp.Value);
-                        }
-                        else
-                        {
-                            AddParts(partManager, kvp.Value);
-                        }
-                    }
-
-                    bool IsAssemblyForFramework(string frameworkAssembly, string assemblyName) =>
-                        string.Equals(assemblyName, frameworkAssembly, StringComparison.OrdinalIgnoreCase);
-
-                    void RemoveParts(
-                        ApplicationPartManager manager,
-                        IEnumerable<ApplicationPart> partsToRemove)
-                    {
-                        for (var i = 0; i < manager.ApplicationParts.Count; i++)
-                        {
-                            var part = manager.ApplicationParts[i];
-                            if (partsToRemove.Any(p => string.Equals(
-                                    p.Name,
-                                    part.Name,
-                                    StringComparison.OrdinalIgnoreCase)))
-                            {
-                                manager.ApplicationParts.Remove(part);
-                            }
-                        }
-                    }
-
-                    void AddParts(
-                        ApplicationPartManager manager,
-                        IEnumerable<ApplicationPart> partsToAdd)
-                    {
-                        foreach (var part in partsToAdd)
-                        {
-                            if (!manager.ApplicationParts.Any(p => p.GetType() == part.GetType() &&
-                                string.Equals(p.Name, part.Name, StringComparison.OrdinalIgnoreCase)))
-                            {
-                                manager.ApplicationParts.Add(part);
-                            }
-                        }
-                    }
-                });
-        }
-
         private static Assembly GetApplicationAssembly(IdentityBuilder builder)
         {
             // Whis is the same logic that MVC follows to find the application assembly.

src/Identity/UI/src/Microsoft.AspNetCore.Identity.UI.csproj

@@ -6,10 +6,8 @@
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;identity;membership;razorpages</PackageTags>
-    <ProvideApplicationPartFactoryAttributeTypeName>Microsoft.AspNetCore.Mvc.ApplicationParts.NullApplicationPartFactory, Microsoft.AspNetCore.Mvc.Core</ProvideApplicationPartFactoryAttributeTypeName>
     <EnableDefaultRazorGenerateItems>false</EnableDefaultRazorGenerateItems>
     <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <RazorTargetName>Microsoft.AspNetCore.Identity.UI.Views.V4</RazorTargetName>
 
     <DisableStaticWebAssetsBuildPropsFileGeneration>true</DisableStaticWebAssetsBuildPropsFileGeneration>
     <StaticWebAssetsDisableProjectBuildPropsFileGeneration>true</StaticWebAssetsDisableProjectBuildPropsFileGeneration>

src/Identity/UI/src/Properties/AssemblyInfo.ApplicationParts.cs

@@ -62,7 +62,7 @@ protected override void ConfigureWebHost(IWebHostBuilder builder)
         }
 
         private void UpdateApplicationParts(IWebHostBuilder builder) =>
-            builder.ConfigureServices(services => AddRelatedParts(services, BootstrapFrameworkVersion));
+            builder.ConfigureServices(services => services.AddMvc());
 
         private void UpdateStaticAssets(IWebHostBuilder builder)
         {
@@ -150,75 +150,5 @@ protected override void Dispose(bool disposing)
 
             base.Dispose(disposing);
         }
-
-        private static void AddRelatedParts(IServiceCollection services, string framework)
-        {
-            var _assemblyMap =
-                new Dictionary<UIFramework, string>()
-                {
-                    [UIFramework.Bootstrap4] = "Microsoft.AspNetCore.Identity.UI.Views.V4",
-                };
-
-            var mvcBuilder = services
-                .AddMvc()
-                .ConfigureApplicationPartManager(partManager =>
-                {
-                    var thisAssembly = typeof(IdentityBuilderUIExtensions).Assembly;
-                    var relatedAssemblies = RelatedAssemblyAttribute.GetRelatedAssemblies(thisAssembly, throwOnError: true);
-                    var relatedParts = relatedAssemblies.ToDictionary(
-                        ra => ra,
-                        CompiledRazorAssemblyApplicationPartFactory.GetDefaultApplicationParts);
-
-                    var selectedFrameworkAssembly = _assemblyMap[UIFramework.Bootstrap4];
-
-                    foreach (var kvp in relatedParts)
-                    {
-                        var assemblyName = kvp.Key.GetName().Name;
-                        if (!IsAssemblyForFramework(selectedFrameworkAssembly, assemblyName))
-                        {
-                            RemoveParts(partManager, kvp.Value);
-                        }
-                        else
-                        {
-                            AddParts(partManager, kvp.Value);
-                        }
-                    }
-
-                    bool IsAssemblyForFramework(string frameworkAssembly, string assemblyName) =>
-                        string.Equals(assemblyName, frameworkAssembly, StringComparison.OrdinalIgnoreCase);
-
-                    void RemoveParts(
-                        ApplicationPartManager manager,
-                        IEnumerable<ApplicationPart> partsToRemove)
-                    {
-                        for (var i = 0; i < manager.ApplicationParts.Count; i++)
-                        {
-                            var part = manager.ApplicationParts[i];
-                            if (partsToRemove.Any(p => string.Equals(
-                                    p.Name,
-                                    part.Name,
-                                    StringComparison.OrdinalIgnoreCase)))
-                            {
-                                manager.ApplicationParts.Remove(part);
-                            }
-                        }
-                    }
-
-                    void AddParts(
-                        ApplicationPartManager manager,
-                        IEnumerable<ApplicationPart> partsToAdd)
-                    {
-                        foreach (var part in partsToAdd)
-                        {
-                            if (!manager.ApplicationParts.Any(p => p.GetType() == part.GetType() &&
-                                string.Equals(p.Name, part.Name, StringComparison.OrdinalIgnoreCase)))
-                            {
-                                manager.ApplicationParts.Add(part);
-                            }
-                        }
-                    }
-                });
-        }
-
     }
 }

src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs

@@ -29,9 +29,9 @@ public async Task Page_DefaultNamespace_IfUnset()
             var content = await Client.GetStringAsync("http://localhost/DefaultNamespace");
 
             // Assert
-            Assert.Equal("AspNetCore", content.Trim());
+            Assert.Equal("AspNetCoreGeneratedDocument", content.Trim());
         }
-        
+
         [Fact]
         public async Task Page_ImportedNamespace_UsedFromViewImports()
         {
@@ -41,7 +41,7 @@ public async Task Page_ImportedNamespace_UsedFromViewImports()
             // Assert
             Assert.Equal("CustomNamespace.Nested.Folder", content.Trim());
         }
-        
+
         [Fact]
         public async Task Page_OverrideNamespace_SetByPage()
         {

src/Mvc/test/Mvc.FunctionalTests/RazorPagesNamespaceTest.cs

@@ -932,8 +932,8 @@ public async Task PagePropertiesAreInjected()
             // Arrange
             var expected =
 @"Microsoft.AspNetCore.Mvc.Routing.UrlHelper
-Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper`1[AspNetCore.InjectedPageProperties]
-Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary`1[AspNetCore.InjectedPageProperties]";
+Microsoft.AspNetCore.Mvc.ViewFeatures.HtmlHelper`1[AspNetCoreGeneratedDocument.InjectedPageProperties]
+Microsoft.AspNetCore.Mvc.ViewFeatures.ViewDataDictionary`1[AspNetCoreGeneratedDocument.InjectedPageProperties]";
 
             // Act
             var response = await Client.GetStringAsync("InjectedPageProperties");

src/Mvc/test/Mvc.FunctionalTests/RazorPagesTest.cs

@@ -32,10 +32,7 @@ public void ConfigureServices(IServiceCollection services)
                       typeof(ComponentFromServicesViewComponent),
                       typeof(InServicesTagHelper)));
 
-                    var relatedAssenbly = RelatedAssemblyAttribute
-                        .GetRelatedAssemblies(GetType().Assembly, throwOnError: true)
-                        .SingleOrDefault();
-                    foreach (var part in CompiledRazorAssemblyApplicationPartFactory.GetDefaultApplicationParts(relatedAssenbly))
+                    foreach (var part in CompiledRazorAssemblyApplicationPartFactory.GetDefaultApplicationParts(Assembly.GetExecutingAssembly()))
                     {
                         manager.ApplicationParts.Add(part);
                     }

src/Mvc/test/WebSites/ControllersFromServicesWebSite/Startup.cs

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+