Merge pull request #7918 from dotnet-maestro-bot/merge/release/3.0-preview3-to-master

[automated] Merge branch 'release/3.0-preview3' => 'master'

src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/_ViewImports.cshtml

@@ -1,4 +1,5 @@
 @using System.Net.Http
+@using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Layouts
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop

src/Components/Blazor/Templates/src/content/BlazorHosted-CSharp/BlazorHosted-CSharp.Client/wwwroot/css/site.css

@@ -84,6 +84,18 @@ app {
     background-color: rgba(255, 255, 255, 0.1);
 }
 
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
+}
+
+.invalid {
+    outline: 1px solid red;
+}
+
+.validation-message {
+    color: red;
+}
+
 @media (max-width: 767.98px) {
     .main .top-row {
         display: none;

src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/_ViewImports.cshtml

@@ -1,4 +1,5 @@
 @using System.Net.Http
+@using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Layouts
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop

src/Components/Blazor/Templates/src/content/BlazorStandalone-CSharp/wwwroot/css/site.css

@@ -84,6 +84,18 @@ app {
     background-color: rgba(255, 255, 255, 0.1);
 }
 
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
+}
+
+.invalid {
+    outline: 1px solid red;
+}
+
+.validation-message {
+    color: red;
+}
+
 @media (max-width: 767.98px) {
     .main .top-row {
         display: none;

src/Components/Blazor/testassets/StandaloneApp/wwwroot/css/site.css

@@ -84,6 +84,18 @@ app {
     background-color: rgba(255, 255, 255, 0.1);
 }
 
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
+}
+
+.invalid {
+    outline: 1px solid red;
+}
+
+.validation-message {
+    color: red;
+}
+
 @media (max-width: 767.98px) {
     .main .top-row {
         display: none;

src/Components/Components/src/Forms/InputComponents/InputBase.cs

@@ -42,7 +42,7 @@ namespace Microsoft.AspNetCore.Components.Forms
         /// <summary>
         /// Gets or sets a callback that updates the bound value.
         /// </summary>
-        [Parameter] Action<T> ValueChanged { get; set; }
+        [Parameter] EventCallback<T> ValueChanged { get; set; }
 
         /// <summary>
         /// Gets or sets an expression that identifies the bound value.
@@ -71,7 +71,7 @@ namespace Microsoft.AspNetCore.Components.Forms
                 if (hasChanged)
                 {
                     Value = value;
-                    ValueChanged?.Invoke(value);
+                    _ = ValueChanged.InvokeAsync(value);
                     EditContext.NotifyFieldChanged(FieldIdentifier);
                 }
             }

src/Components/Components/test/Forms/InputBaseTest.cs

@@ -459,7 +459,8 @@ namespace Microsoft.AspNetCore.Components.Forms
                 {
                     childBuilder.OpenComponent<TComponent>(0);
                     childBuilder.AddAttribute(0, "Value", Value);
-                    childBuilder.AddAttribute(1, "ValueChanged", ValueChanged);
+                    childBuilder.AddAttribute(1, "ValueChanged",
+                        EventCallback.Factory.Create(this, ValueChanged));
                     childBuilder.AddAttribute(2, "ValueExpression", ValueExpression);
                     childBuilder.AddAttribute(3, nameof(Id), Id);
                     childBuilder.AddAttribute(4, nameof(Class), Class);

src/Components/test/E2ETest/Tests/FormsTest.cs

@@ -316,6 +316,27 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
             WaitAssert.Empty(emailMessagesAccessor);
         }
 
+        [Fact]
+        public void InputComponentsCauseContainerToRerenderOnChange()
+        {
+            var appElement = MountTestComponent<TypicalValidationComponent>();
+            var ticketClassInput = new SelectElement(appElement.FindElement(By.ClassName("ticket-class")).FindElement(By.TagName("select")));
+            var selectedTicketClassDisplay = appElement.FindElement(By.Id("selected-ticket-class"));
+            var messagesAccessor = CreateValidationMessagesAccessor(appElement);
+
+            // Shows initial state
+            WaitAssert.Equal("Economy", () => selectedTicketClassDisplay.Text);
+
+            // Refreshes on edit
+            ticketClassInput.SelectByValue("Premium");
+            WaitAssert.Equal("Premium", () => selectedTicketClassDisplay.Text);
+
+            // Leaves previous value unchanged if new entry is unparseable
+            ticketClassInput.SelectByText("(select)");
+            WaitAssert.Equal(new[] { "The TicketClass field is not valid." }, messagesAccessor);
+            WaitAssert.Equal("Premium", () => selectedTicketClassDisplay.Text);
+        }
+
         private Func<string[]> CreateValidationMessagesAccessor(IWebElement appElement)
         {
             return () => appElement.FindElements(By.ClassName("validation-message"))

src/Components/test/testassets/BasicTestApp/FormsTest/TypicalValidationComponent.cshtml

@@ -34,6 +34,7 @@
             <option value="@TicketClass.Premium">Premium class</option>
             <option value="@TicketClass.First">First class</option>
         </InputSelect>
+        <span id="selected-ticket-class">@person.TicketClass</span>
     </p>
     <p class="accepts-terms">
         Accepts terms: <InputCheckbox bind-Value="@person.AcceptsTerms" />

src/Components/test/testassets/BasicTestApp/wwwroot/style.css

@@ -1,9 +1,9 @@
-.modified.valid {
-    box-shadow: 0px 0px 0px 2px rgb(78, 203, 37);
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
 }
 
 .invalid {
-    box-shadow: 0px 0px 0px 2px rgb(255, 0, 0);
+    outline: 1px solid red;
 }
 
 .validation-message {

src/Components/test/testassets/ComponentsApp.Server/wwwroot/css/site.css

@@ -84,6 +84,18 @@ app {
     background-color: rgba(255, 255, 255, 0.1);
 }
 
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
+}
+
+.invalid {
+    outline: 1px solid red;
+}
+
+.validation-message {
+    color: red;
+}
+
 @media (max-width: 767.98px) {
     .main .top-row {
         display: none;

src/Hosting/Abstractions/ref/Microsoft.AspNetCore.Hosting.Abstractions.netcoreapp3.0.cs

@@ -3,6 +3,7 @@
 
 namespace Microsoft.AspNetCore.Hosting
 {
+    [System.ObsoleteAttribute("This type is obsolete and will be removed in a future version. The recommended alternative is Microsoft.Extensions.Hosting.Environments.", false)]
     public static partial class EnvironmentName
     {
         public static readonly string Development;

src/Hosting/Abstractions/src/EnvironmentName.cs

@@ -6,10 +6,11 @@ namespace Microsoft.AspNetCore.Hosting
     /// <summary>
     /// Commonly used environment names.
     /// </summary>
+    [System.Obsolete("This type is obsolete and will be removed in a future version. The recommended alternative is Microsoft.Extensions.Hosting.Environments.", error: false)]
     public static class EnvironmentName
     {
         public static readonly string Development = "Development";
         public static readonly string Staging = "Staging";
         public static readonly string Production = "Production";
     }
-}
+}

src/Hosting/Hosting/src/Internal/HostingEnvironment.cs

@@ -9,7 +9,7 @@ namespace Microsoft.AspNetCore.Hosting.Internal
     public class HostingEnvironment : IHostingEnvironment, Extensions.Hosting.IHostingEnvironment, IWebHostEnvironment
 #pragma warning restore CS0618 // Type or member is obsolete
     {
-        public string EnvironmentName { get; set; } = Hosting.EnvironmentName.Production;
+        public string EnvironmentName { get; set; } = Extensions.Hosting.Environments.Production;
 
         public string ApplicationName { get; set; }
 

src/Hosting/Hosting/test/StartupManagerTests.cs

@@ -11,6 +11,7 @@ using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.AspNetCore.Hosting.Tests.Internal;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Options;
 using Xunit;
 
@@ -510,7 +511,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
             serviceCollection.AddSingleton<IServiceProviderFactory<MyContainer>, MyContainerFactory>();
             var services = serviceCollection.BuildServiceProvider();
 
-            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartup), EnvironmentName.Development);
+            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartup), Environments.Development);
 
             var app = new ApplicationBuilder(services);
             app.ApplicationServices = startup.ConfigureServicesDelegate(serviceCollection);
@@ -526,7 +527,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
             serviceCollection.AddSingleton<IServiceProviderFactory<MyContainer>, MyContainerFactory>();
             var services = serviceCollection.BuildServiceProvider();
 
-            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartupBaseClass), EnvironmentName.Development);
+            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartupBaseClass), Environments.Development);
 
             var app = new ApplicationBuilder(services);
             app.ApplicationServices = startup.ConfigureServicesDelegate(serviceCollection);
@@ -542,13 +543,13 @@ namespace Microsoft.AspNetCore.Hosting.Tests
             serviceCollection.AddSingleton<IServiceProviderFactory<MyContainer>, MyContainerFactory>();
             var services = serviceCollection.BuildServiceProvider();
 
-            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartupEnvironmentBased), EnvironmentName.Production);
+            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartupEnvironmentBased), Environments.Production);
 
             var app = new ApplicationBuilder(services);
             app.ApplicationServices = startup.ConfigureServicesDelegate(serviceCollection);
 
             Assert.IsType<MyContainer>(app.ApplicationServices);
-            Assert.Equal(((MyContainer)app.ApplicationServices).Environment, EnvironmentName.Production);
+            Assert.Equal(((MyContainer)app.ApplicationServices).Environment, Environments.Production);
         }
 
         [Fact]
@@ -557,7 +558,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
             var serviceCollection = new ServiceCollection();
             var services = serviceCollection.BuildServiceProvider();
 
-            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartup), EnvironmentName.Development);
+            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartup), Environments.Development);
 
             Assert.Throws<InvalidOperationException>(() => startup.ConfigureServicesDelegate(serviceCollection));
         }
@@ -568,7 +569,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
             var serviceCollection = new ServiceCollection();
             var services = serviceCollection.BuildServiceProvider();
 
-            Assert.Throws<InvalidOperationException>(() => StartupLoader.LoadMethods(services, typeof(MyContainerStartupBaseClass), EnvironmentName.Development));
+            Assert.Throws<InvalidOperationException>(() => StartupLoader.LoadMethods(services, typeof(MyContainerStartupBaseClass), Environments.Development));
         }
 
         [Fact]
@@ -578,7 +579,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
             serviceCollection.AddSingleton<IServiceProviderFactory<MyContainer>, MyContainerFactory>();
             var services = serviceCollection.BuildServiceProvider();
 
-            Assert.Throws<InvalidOperationException>(() => StartupLoader.LoadMethods(services, typeof(MyContainerStartupWithOverloads), EnvironmentName.Development));
+            Assert.Throws<InvalidOperationException>(() => StartupLoader.LoadMethods(services, typeof(MyContainerStartupWithOverloads), Environments.Development));
         }
 
         [Fact]
@@ -588,7 +589,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
             serviceCollection.AddSingleton<IServiceProviderFactory<MyContainer>, MyBadContainerFactory>();
             var services = serviceCollection.BuildServiceProvider();
 
-            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartup), EnvironmentName.Development);
+            var startup = StartupLoader.LoadMethods(services, typeof(MyContainerStartup), Environments.Development);
 
             var app = new ApplicationBuilder(services);
             app.ApplicationServices = startup.ConfigureServicesDelegate(serviceCollection);
@@ -629,12 +630,12 @@ namespace Microsoft.AspNetCore.Hosting.Tests
 
             public void ConfigureDevelopmentContainer(MyContainer container)
             {
-                container.Environment = EnvironmentName.Development;
+                container.Environment = Environments.Development;
             }
 
             public void ConfigureProductionContainer(MyContainer container)
             {
-                container.Environment = EnvironmentName.Production;
+                container.Environment = Environments.Production;
             }
 
             public void Configure(IApplicationBuilder app)

src/Hosting/Hosting/test/WebHostConfigurationsTests.cs

@@ -4,6 +4,7 @@
 using System.Collections.Generic;
 using Microsoft.AspNetCore.Hosting.Internal;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Hosting;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Hosting.Tests
@@ -18,7 +19,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
                 { WebHostDefaults.WebRootKey, "wwwroot"},
                 { WebHostDefaults.ApplicationKey, "MyProjectReference"},
                 { WebHostDefaults.StartupAssemblyKey, "MyProjectReference" },
-                { WebHostDefaults.EnvironmentKey, EnvironmentName.Development},
+                { WebHostDefaults.EnvironmentKey, Environments.Development},
                 { WebHostDefaults.DetailedErrorsKey, "true"},
                 { WebHostDefaults.CaptureStartupErrorsKey, "true" },
                 { WebHostDefaults.SuppressStatusMessagesKey, "true" }
@@ -29,7 +30,7 @@ namespace Microsoft.AspNetCore.Hosting.Tests
             Assert.Equal("wwwroot", config.WebRoot);
             Assert.Equal("MyProjectReference", config.ApplicationName);
             Assert.Equal("MyProjectReference", config.StartupAssembly);
-            Assert.Equal(EnvironmentName.Development, config.Environment);
+            Assert.Equal(Environments.Development, config.Environment);
             Assert.True(config.CaptureStartupErrors);
             Assert.True(config.DetailedErrors);
             Assert.True(config.SuppressStatusMessages);
@@ -38,10 +39,10 @@ namespace Microsoft.AspNetCore.Hosting.Tests
         [Fact]
         public void ReadsOldEnvKey()
         {
-            var parameters = new Dictionary<string, string>() { { "ENVIRONMENT", EnvironmentName.Development } };
+            var parameters = new Dictionary<string, string>() { { "ENVIRONMENT", Environments.Development } };
             var config = new WebHostOptions(new ConfigurationBuilder().AddInMemoryCollection(parameters).Build());
 
-            Assert.Equal(EnvironmentName.Development, config.Environment);
+            Assert.Equal(Environments.Development, config.Environment);
         }
 
         [Theory]

src/Hosting/Hosting/test/WebHostTests.cs

@@ -812,8 +812,8 @@ namespace Microsoft.AspNetCore.Hosting
 #pragma warning disable CS0618 // Type or member is obsolete
                 var env2 = host.Services.GetService<AspNetCore.Hosting.IHostingEnvironment>();
 #pragma warning restore CS0618 // Type or member is obsolete
-                Assert.Equal(EnvironmentName.Production, env.EnvironmentName);
-                Assert.Equal(EnvironmentName.Production, env2.EnvironmentName);
+                Assert.Equal(Environments.Production, env.EnvironmentName);
+                Assert.Equal(Environments.Production, env2.EnvironmentName);
             }
         }
 
@@ -822,7 +822,7 @@ namespace Microsoft.AspNetCore.Hosting
         {
             var vals = new Dictionary<string, string>
             {
-                { "Environment", EnvironmentName.Staging }
+                { "Environment", Environments.Staging }
             };
 
             var builder = new ConfigurationBuilder()
@@ -835,8 +835,8 @@ namespace Microsoft.AspNetCore.Hosting
 #pragma warning disable CS0618 // Type or member is obsolete
                 var env2 = host.Services.GetService<AspNetCore.Hosting.IHostingEnvironment>();
 #pragma warning restore CS0618 // Type or member is obsolete
-                Assert.Equal(EnvironmentName.Staging, env.EnvironmentName);
-                Assert.Equal(EnvironmentName.Staging, env.EnvironmentName);
+                Assert.Equal(Environments.Staging, env.EnvironmentName);
+                Assert.Equal(Environments.Staging, env.EnvironmentName);
             }
         }
 
@@ -873,7 +873,7 @@ namespace Microsoft.AspNetCore.Hosting
             {
                 await host.StartAsync();
                 var env = host.Services.GetRequiredService<IHostEnvironment>();
-                Assert.True(env.IsEnvironment(EnvironmentName.Production));
+                Assert.True(env.IsEnvironment(Environments.Production));
                 Assert.True(env.IsEnvironment("producTion"));
             }
         }

src/Hosting/samples/SampleStartups/StartupFullControl.cs

@@ -4,6 +4,7 @@ using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 
 // Note that this sample will not run. It is only here to illustrate usage patterns.
@@ -25,7 +26,7 @@ namespace SampleStartups
                 .UseKestrel()
                 .UseContentRoot(Directory.GetCurrentDirectory()) // Override the content root with the current directory
                 .UseUrls("http://*:1000", "https://*:902")
-                .UseEnvironment(EnvironmentName.Development)
+                .UseEnvironment(Environments.Development)
                 .UseWebRoot("public")
                 .ConfigureServices(services =>
                 {

src/Mvc/Mvc.Testing/src/WebApplicationFactory.cs

@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyModel;
 using Microsoft.Extensions.Hosting;
-using EnvironmentName = Microsoft.Extensions.Hosting.EnvironmentName;
 
 namespace Microsoft.AspNetCore.Mvc.Testing
 {
@@ -307,7 +306,7 @@ namespace Microsoft.AspNetCore.Mvc.Testing
             var hostBuilder = HostFactoryResolver.ResolveHostBuilderFactory<IHostBuilder>(typeof(TEntryPoint).Assembly)?.Invoke(Array.Empty<string>());
             if (hostBuilder != null)
             {
-                hostBuilder.UseEnvironment(EnvironmentName.Development);
+                hostBuilder.UseEnvironment(Environments.Development);
             }
             return hostBuilder;
         }
@@ -336,7 +335,7 @@ namespace Microsoft.AspNetCore.Mvc.Testing
             }
             else
             {
-                return builder.UseEnvironment(EnvironmentName.Development);
+                return builder.UseEnvironment(Environments.Development);
             }
         }
 

src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/Components/_ViewImports.cshtml

@@ -1,4 +1,5 @@
 @using System.Net.Http
+@using Microsoft.AspNetCore.Components.Forms
 @using Microsoft.AspNetCore.Components.Layouts
 @using Microsoft.AspNetCore.Components.Routing
 @using Microsoft.JSInterop

src/ProjectTemplates/Web.ProjectTemplates/content/RazorComponentsWeb-CSharp/wwwroot/css/site.css

@@ -84,6 +84,18 @@ app {
     background-color: rgba(255, 255, 255, 0.1);
 }
 
+.valid.modified:not([type=checkbox]) {
+    outline: 1px solid #26b050;
+}
+
+.invalid {
+    outline: 1px solid red;
+}
+
+.validation-message {
+    color: red;
+}
+
 @media (max-width: 767.98px) {
     .main .top-row {
         display: none;