[automated] Merge branch 'release/3.1' => 'master'

NuGet.config

@@ -2,9 +2,6 @@
 <configuration>
   <packageSources>
     <clear />
-    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
-    <add key="darc-pub-dotnet-corefx-4ac4c03" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-corefx-4ac4c036/nuget/v3/index.json" />
-    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
     <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
     <add key="aspnet-blazor" value="https://dotnetfeed.blob.core.windows.net/aspnet-blazor/index.json" />

src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/wwwroot/index.html

@@ -15,7 +15,7 @@
 
     <div id="blazor-error-ui">
         An unhandled error has occurred.
-        <a href class="reload">Reload</a>
+        <a href="" class="reload">Reload</a>
         <a class="dismiss">🗙</a>
     </div>
     <script src="_framework/blazor.webassembly.js"></script>

src/Middleware/HttpsPolicy/src/HttpsRedirectionMiddleware.cs

@@ -122,8 +122,9 @@ private int TryGetHttpsPort()
             // 1. Set in the HttpsRedirectionOptions
             // 2. HTTPS_PORT environment variable
             // 3. IServerAddressesFeature
-            // 4. Fail if not set
-            var nullablePort = _config.GetValue<int?>("HTTPS_PORT");
+            // 4. Fail if not sets
+
+            var nullablePort = _config.GetValue<int?>("HTTPS_PORT") ?? _config.GetValue<int?>("ANCM_HTTPS_PORT");
             if (nullablePort.HasValue)
             {
                 var port = nullablePort.Value;

src/Mvc/Mvc.Core/src/Infrastructure/ContentResultExecutor.cs

@@ -55,7 +55,7 @@ public virtual async Task ExecuteAsync(ActionContext context, ContentResult resu
             {
                 response.ContentLength = resolvedContentTypeEncoding.GetByteCount(result.Content);
 
-                using (var textWriter = _httpResponseStreamWriterFactory.CreateWriter(response.Body, resolvedContentTypeEncoding))
+                await using (var textWriter = _httpResponseStreamWriterFactory.CreateWriter(response.Body, resolvedContentTypeEncoding))
                 {
                     await textWriter.WriteAsync(result.Content);
 

src/Mvc/Mvc.Razor/src/RazorView.cs

@@ -286,7 +286,7 @@ private async Task RenderLayoutAsync(
             {
                 // This means we're writing to a 'real' writer, probably to the actual output stream.
                 // We're using PagedBufferedTextWriter here to 'smooth' synchronous writes of IHtmlContent values.
-                using (var writer = _bufferScope.CreateWriter(context.Writer))
+                await using (var writer = _bufferScope.CreateWriter(context.Writer))
                 {
                     await bodyWriter.Buffer.WriteToAsync(writer, _htmlEncoder);
                     await writer.FlushAsync();

src/Mvc/Mvc.ViewFeatures/src/ViewComponentResultExecutor.cs

@@ -123,7 +123,7 @@ public virtual async Task ExecuteAsync(ActionContext context, ViewComponentResul
 
             _writerFactory ??= context.HttpContext.RequestServices.GetRequiredService<IHttpResponseStreamWriterFactory>();
 
-            using (var writer = _writerFactory.CreateWriter(response.Body, resolvedContentTypeEncoding))
+            await using (var writer = _writerFactory.CreateWriter(response.Body, resolvedContentTypeEncoding))
             {
                 var viewContext = new ViewContext(
                     context,
@@ -149,8 +149,8 @@ public virtual async Task ExecuteAsync(ActionContext context, ViewComponentResul
                 }
                 else
                 {
-                    using var bufferingStream = new FileBufferingWriteStream();
-                    using (var intermediateWriter = _writerFactory.CreateWriter(bufferingStream, resolvedContentTypeEncoding))
+                    await using var bufferingStream = new FileBufferingWriteStream();
+                    await using (var intermediateWriter = _writerFactory.CreateWriter(bufferingStream, resolvedContentTypeEncoding))
                     {
                         viewComponentResult.WriteTo(intermediateWriter, _htmlEncoder);
                     }

src/Mvc/Mvc.ViewFeatures/src/ViewExecutor.cs

@@ -233,7 +233,7 @@ protected async Task ExecuteAsync(
 
             OnExecuting(viewContext);
 
-            using (var writer = WriterFactory.CreateWriter(response.Body, resolvedContentTypeEncoding))
+            await using (var writer = WriterFactory.CreateWriter(response.Body, resolvedContentTypeEncoding))
             {
                 var view = viewContext.View;
 

src/Mvc/Mvc.ViewFeatures/test/ViewExecutorTest.cs

@@ -83,6 +83,44 @@ public static TheoryData<MediaTypeHeaderValue, string, string> ViewExecutorSetsC
             }
         }
 
+        [Fact]
+        public async Task ExecuteAsync_ExceptionInSyncContext()
+        {
+            // Arrange
+            var view = CreateView((v) =>
+            {
+                v.Writer.Write("xyz");
+                throw new NotImplementedException("This should be raw!");
+            });
+
+            var context = new DefaultHttpContext();
+            var stream = new Mock<Stream>();
+            stream.Setup(s => s.CanWrite).Returns(true);
+
+            context.Response.Body = stream.Object;
+            var actionContext = new ActionContext(
+                context,
+                new RouteData(),
+                new ActionDescriptor());
+            var viewData = new ViewDataDictionary(new EmptyModelMetadataProvider());
+
+            var viewExecutor = CreateViewExecutor();
+
+            // Act
+            var exception = await Assert.ThrowsAsync<NotImplementedException>(async () => await viewExecutor.ExecuteAsync(
+                actionContext,
+                view,
+                viewData,
+                Mock.Of<ITempDataDictionary>(),
+                contentType: null,
+                statusCode: null)
+            );
+
+            // Assert
+            Assert.Equal("This should be raw!", exception.Message);
+            stream.Verify(s => s.Write(It.IsAny<byte[]>(), It.IsAny<int>(), It.IsAny<int>()), Times.Never);
+        }
+
         [Theory]
         [MemberData(nameof(ViewExecutorSetsContentTypeAndEncodingData))]
         public async Task ExecuteAsync_SetsContentTypeAndEncoding(

src/Mvc/test/Mvc.FunctionalTests/TagHelpersTest.cs

@@ -64,6 +64,17 @@ public async Task CanRenderViewsWithTagHelpers(string action)
 #endif
         }
 
+        [Fact]
+        public async Task GivesCorrectCallstackForSyncronousCalls()
+        {
+            // Regression test for https://github.com/aspnet/AspNetCore/issues/15367
+            // Arrange
+            var exception = await Assert.ThrowsAsync<HttpRequestException>(async () => await Client.GetAsync("http://localhost/Home/MyHtml"));
+
+            // Assert
+            Assert.Equal("Should be visible", exception.InnerException.InnerException.Message);
+        }
+
         [Fact]
         public async Task CanRenderViewsWithTagHelpersAndUnboundDynamicAttributes_Encoded()
         {
@@ -318,4 +329,4 @@ public async Task EncodersPages_ReturnExpectedContent(string actionName)
 #endif
         }
     }
-}
+}

src/Mvc/test/WebSites/TagHelpersWebSite/Controllers/HomeController.cs

@@ -35,6 +35,11 @@ public IActionResult Help()
             return View();
         }
 
+        public IActionResult MyHtml()
+        {
+            return View();
+        }
+
         public IActionResult ViewComponentTagHelpers()
         {
             return View();

src/Mvc/test/WebSites/TagHelpersWebSite/MyHtmlContent.cs

@@ -0,0 +1,27 @@
+// Copyright (c) .NET Foundation. All rights reserved.
+// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
+
+using System.IO;
+using System.Text.Encodings.Web;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace TagHelpersWebSite
+{
+    public class MyHtmlContent : IHtmlContent
+    {
+        private IHtmlHelper Html { get; }
+
+        public MyHtmlContent(IHtmlHelper html)
+        {
+            Html = html;
+        }
+
+        public void WriteTo(TextWriter writer, HtmlEncoder encoder)
+        {
+#pragma warning disable MVC1000 // Use of IHtmlHelper.{0} should be avoided.
+            Html.Partial("_Test").WriteTo(writer, encoder);
+#pragma warning restore MVC1000 // Use of IHtmlHelper.{0} should be avoided.
+        }
+    }
+}

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

@@ -3,6 +3,7 @@
 
 using System.IO;
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;

src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj

@@ -9,7 +9,7 @@
   <ItemGroup>
     <ProjectReference Include="..\RazorPagesClassLibrary\RazorPagesClassLibrary.csproj" />
   </ItemGroup>
-  
+
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc" />
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />

src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/MyHtml.cshtml

@@ -0,0 +1 @@
+@(new TagHelpersWebSite.MyHtmlContent(Html))

src/Mvc/test/WebSites/TagHelpersWebSite/Views/Home/_Test.cshtml

@@ -0,0 +1,3 @@
+@{
+    throw new Exception("Should be visible");
+}

src/ProjectTemplates/Web.ProjectTemplates/content/BlazorServerWeb-CSharp/Pages/_Host.cshtml

@@ -1,7 +1,7 @@
 @page "/"
 @namespace BlazorServerWeb_CSharp.Pages
 @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
-@{ 
+@{
     Layout = null;
 }
 
@@ -27,7 +27,7 @@
         <environment include="Development">
             An unhandled exception has occurred. See browser dev tools for details.
         </environment>
-        <a href class="reload">Reload</a>
+        <a href="" class="reload">Reload</a>
         <a class="dismiss">🗙</a>
     </div>
 

src/ProjectTemplates/scripts/.gitignore

@@ -3,6 +3,7 @@ tmp/
 CustomHive/
 angular/
 blazorserver/
+blazorwasm/
 mvc/
 razor/
 react/

src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1

@@ -0,0 +1,13 @@
+#!/usr/bin/env pwsh
+#requires -version 4
+
+# This script packages, installs and creates a template to help with rapid iteration in the templating area.
+[CmdletBinding(PositionalBinding = $false)]
+param()
+
+Set-StrictMode -Version 2
+$ErrorActionPreference = 'Stop'
+
+. $PSScriptRoot\Test-Template.ps1
+
+Test-Template "blazorwasm" "blazorwasm" "Microsoft.AspnetCore.Blazor.Templates.3.1.0-dev.nupkg" $false

src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp

@@ -13,7 +13,6 @@
 
 #define STARTUP_TIME_LIMIT_INCREMENT_IN_MILLISECONDS 5000
 
-
 HRESULT
 SERVER_PROCESS::Initialize(
     PROCESS_MANAGER      *pProcessManager,

src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehash.h

@@ -8,7 +8,7 @@
 #define ASPNETCORE_IIS_AUTH_ENV_STR                 L"ASPNETCORE_IIS_HTTPAUTH"
 #define ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED_ENV_STR L"ASPNETCORE_IIS_WEBSOCKETS_SUPPORTED"
 #define ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR        L"ASPNETCORE_IIS_PHYSICAL_PATH"
-#define ASPNETCORE_HTTPS_PORT_ENV_STR               L"ASPNETCORE_HTTPS_PORT"
+#define ASPNETCORE_ANCM_HTTPS_PORT_ENV_STR          L"ASPNETCORE_ANCM_HTTPS_PORT"
 #define ASPNETCORE_IIS_AUTH_WINDOWS                 L"windows;"
 #define ASPNETCORE_IIS_AUTH_BASIC                   L"basic;"
 #define ASPNETCORE_IIS_AUTH_ANONYMOUS               L"anonymous;"

src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/environmentvariablehelpers.h

@@ -43,7 +43,7 @@ class ENVIRONMENT_VAR_HELPERS
         environmentVariables.insert_or_assign(ASPNETCORE_IIS_PHYSICAL_PATH_ENV_STR, pApplicationPhysicalPath);
         if (pHttpsPort)
         {
-            environmentVariables.try_emplace(ASPNETCORE_HTTPS_PORT_ENV_STR, pHttpsPort);
+            environmentVariables.try_emplace(ASPNETCORE_ANCM_HTTPS_PORT_ENV_STR, pHttpsPort);
         }
 
         std::wstring strIisAuthEnvValue;

src/Servers/IIS/IIS/test/Common.FunctionalTests/HttpsTests.cs

@@ -57,14 +57,14 @@ public async Task HttpsHelloWorld(TestVariant variant)
             if (DeployerSelector.HasNewHandler &&
                 DeployerSelector.HasNewShim)
             {
-                // We expect ServerAddress to be set for InProcess and HTTPS_PORT for OutOfProcess
+                // We expect ServerAddress to be set for InProcess and ANCM_HTTPS_PORT for OutOfProcess
                 if (variant.HostingModel == HostingModel.InProcess)
                 {
                     Assert.Equal(deploymentParameters.ApplicationBaseUriHint, await client.GetStringAsync("/ServerAddresses"));
                 }
                 else
                 {
-                    Assert.Equal(port.ToString(), await client.GetStringAsync("/HTTPS_PORT"));
+                    Assert.Equal(port.ToString(), await client.GetStringAsync("/ANCM_HTTPS_PORT"));
                 }
             }
         }
@@ -113,7 +113,7 @@ public async Task CheckProtocolIsHttp2()
         [ConditionalFact]
         [RequiresNewHandler]
         [RequiresNewShim]
-        public async Task HttpsPortCanBeOverriden()
+        public async Task AncmHttpsPortCanBeOverriden()
         {
             var deploymentParameters = Fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess);
 
@@ -125,12 +125,57 @@ public async Task HttpsPortCanBeOverriden()
                         .SetAttributeValue("bindingInformation", $":{TestPortHelper.GetNextSSLPort()}:localhost");
                 });
 
-            deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_HTTPS_PORT"] = "123";
+            deploymentParameters.WebConfigBasedEnvironmentVariables["ASPNETCORE_ANCM_HTTPS_PORT"] = "123";
 
             var deploymentResult = await DeployAsync(deploymentParameters);
             var client = CreateNonValidatingClient(deploymentResult);
 
-            Assert.Equal("123", await client.GetStringAsync("/HTTPS_PORT"));
+            Assert.Equal("123", await client.GetStringAsync("/ANCM_HTTPS_PORT"));
+            Assert.Equal("NOVALUE", await client.GetStringAsync("/HTTPS_PORT"));
+        }
+
+        [ConditionalFact]
+        [RequiresNewShim]
+        public async Task HttpsRedirectionWorksIn30AndNot22()
+        {
+            var port = TestPortHelper.GetNextSSLPort();
+            var deploymentParameters = Fixture.GetBaseDeploymentParameters(HostingModel.OutOfProcess);
+            deploymentParameters.WebConfigBasedEnvironmentVariables["ENABLE_HTTPS_REDIRECTION"] = "true";
+            deploymentParameters.ApplicationBaseUriHint = $"http://localhost:{TestPortHelper.GetNextPort()}/";
+
+            deploymentParameters.AddServerConfigAction(
+                element => {
+                    element.Descendants("bindings")
+                        .Single()
+                        .AddAndGetInnerElement("binding", "protocol", "https")
+                        .SetAttributeValue("bindingInformation", $":{port}:localhost");
+
+                    element.Descendants("access")
+                        .Single()
+                        .SetAttributeValue("sslFlags", "None");
+                });
+
+            var deploymentResult = await DeployAsync(deploymentParameters);
+            var handler = new HttpClientHandler
+            {
+                ServerCertificateCustomValidationCallback = (a, b, c, d) => true,
+                AllowAutoRedirect = false
+            };
+            var client = new HttpClient(handler)
+            {
+                BaseAddress = new Uri(deploymentParameters.ApplicationBaseUriHint)
+            };
+
+            if (DeployerSelector.HasNewHandler)
+            {
+                var response = await client.GetAsync("/ANCM_HTTPS_PORT");
+                Assert.Equal(307, (int)response.StatusCode);
+            }
+            else
+            {
+                var response = await client.GetAsync("/ANCM_HTTPS_PORT");
+                Assert.Equal(200, (int)response.StatusCode);
+            }
         }
 
         [ConditionalFact]
@@ -159,7 +204,7 @@ public async Task MultipleHttpsPortsProduceNoEnvVar()
             var deploymentResult = await DeployAsync(deploymentParameters);
             var client = CreateNonValidatingClient(deploymentResult);
 
-            Assert.Equal("NOVALUE", await client.GetStringAsync("/HTTPS_PORT"));
+            Assert.Equal("NOVALUE", await client.GetStringAsync("/ANCM_HTTPS_PORT"));
         }
 
         [ConditionalFact]

src/Servers/IIS/IIS/test/testassets/InProcessNewShimWebSite/InProcessNewShimWebSite.csproj

@@ -42,6 +42,9 @@
     <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" >
       <AllowExplicitReference>true</AllowExplicitReference>
     </PackageReference>
+    <PackageReference Include="Microsoft.AspNetCore.HttpsPolicy" Version="2.2.0" >
+      <AllowExplicitReference>true</AllowExplicitReference>
+    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.2.0" >
       <AllowExplicitReference>true</AllowExplicitReference>
     </PackageReference>

src/Servers/IIS/IIS/test/testassets/InProcessWebSite/InProcessWebSite.csproj

@@ -23,6 +23,7 @@
     <Reference Include="Microsoft.AspNetCore.Server.IIS" />
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
+    <Reference Include="Microsoft.AspNetCore.HttpsPolicy" />
     <Reference Include="Microsoft.AspNetCore.WebUtilities" />
     <Reference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />