Merge branch 'fix-45654' into fix-58815

Author: ilonatommy

src/Mvc/Mvc.TagHelpers/test/ComponentTagHelperTest.cs

@@ -77,9 +77,6 @@ private static TagHelperOutput GetTagHelperOutput()
 
     private ViewContext GetViewContext()
     {
-        var navManager = new Mock<NavigationManager>();
-        navManager.As<IHostEnvironmentNavigationManager>();
-
         var httpContext = new DefaultHttpContext
         {
             RequestServices = new ServiceCollection()
@@ -89,7 +86,7 @@ private ViewContext GetViewContext()
                     x => x.CreateProtector(It.IsAny<string>()) == Mock.Of<IDataProtector>()))
                 .AddLogging()
                 .AddScoped<ComponentStatePersistenceManager>()
-                .AddScoped(_ => navManager.Object)
+                .AddScoped<NavigationManager, MockNavigationManager>()
                 .AddScoped<HttpContextFormDataProvider>()
                 .BuildServiceProvider(),
         };
@@ -104,4 +101,16 @@ protected override void BuildRenderTree(RenderTreeBuilder builder)
             builder.AddContent(0, "Hello from the component");
         }
     }
+
+    class MockNavigationManager : NavigationManager, IHostEnvironmentNavigationManager
+    {
+        public MockNavigationManager()
+        {
+           Initialize("https://localhost:85/subdir/", "https://localhost:85/subdir/path?query=value#hash");
+        }
+
+        void IHostEnvironmentNavigationManager.Initialize(string baseUri, string uri)
+        {
+        }
+    }
 }