Merge release/3.1

.github/CODEOWNERS

@@ -19,4 +19,4 @@
 /src/Servers/                   @tratcher @jkotalik @anurse @halter73
 /src/Middleware/Rewrite         @jkotalik @anurse
 /src/Middleware/HttpsPolicy     @jkotalik @anurse
-/src/SignalR/                   @mikaelm12 @BrennanConroy @halter73 @anurse
+/src/SignalR/                   @BrennanConroy @halter73 @anurse

eng/ProjectReferences.props

@@ -15,6 +15,7 @@
     <ProjectReferenceProvider Include="GetDocument.Insider" ProjectPath="$(RepoRoot)src\Tools\GetDocumentInsider\src\GetDocumentInsider.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.SignalR.Specification.Tests" ProjectPath="$(RepoRoot)src\SignalR\server\Specification.Tests\src\Microsoft.AspNetCore.SignalR.Specification.Tests.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.Build" ProjectPath="$(RepoRoot)src\Components\Blazor\Build\src\Microsoft.AspNetCore.Blazor.Build.csproj"  />
+    <ProjectReferenceProvider Include="Microsoft.AspNetCore.Blazor.DataAnnotations.Validation" ProjectPath="$(RepoRoot)src\Components\Blazor\Validation\src\Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj"  />
     <ProjectReferenceProvider Include="Ignitor" ProjectPath="$(RepoRoot)src\Components\Ignitor\src\Ignitor.csproj"  />
     <ProjectReferenceProvider Include="BlazorServerApp" ProjectPath="$(RepoRoot)src\Components\Samples\BlazorServerApp\BlazorServerApp.csproj"  />
     <ProjectReferenceProvider Include="Microsoft.AspNetCore" ProjectPath="$(RepoRoot)src\DefaultBuilder\src\Microsoft.AspNetCore.csproj" RefProjectPath="$(RepoRoot)src\DefaultBuilder\ref\Microsoft.AspNetCore.csproj" />

src/Components/Blazor/Server/src/MonoDebugProxy/BlazorMonoDebugProxyAppBuilderExtensions.cs

@@ -3,6 +3,8 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -89,19 +91,26 @@ private static async Task DebugHome(HttpContext context)
             }
             catch (Exception ex)
             {
-
                 await context.Response.WriteAsync($@"
-    <h1>Unable to find debuggable browser tab</h1>
-    <p>
-        Could not get a list of browser tabs from <code>{debuggerTabsListUrl}</code>.
-        Ensure Chrome is running with debugging enabled.
-    </p>
-    <h2>Resolution</h2>
+<h1>Unable to find debuggable browser tab</h1>
+<p>
+    Could not get a list of browser tabs from <code>{debuggerTabsListUrl}</code>.
+    Ensure your browser is running with debugging enabled.
+</p>
+<h2>Resolution</h2>
+<p>
+    <h4>If you are using Google Chrome for your development, follow these instructions:</h4>
     {GetLaunchChromeInstructions(appRootUrl)}
-    <p>... then use that new tab for debugging.</p>
-    <h2>Underlying exception:</h2>
-    <pre>{ex}</pre>
-");
+</p>
+<p>
+    <h4>If you are using Microsoft Edge (Chromium) for your development, follow these instructions:</h4>
+    {GetLaunchEdgeInstructions(appRootUrl)}
+</p>
+<strong>This should launch a new browser window with debugging enabled..</p>
+<h2>Underlying exception:</h2>
+<pre>{ex}</pre>
+                ");
+
                 return;
             }
 
@@ -144,20 +153,42 @@ There is more than one browser tab at <code>{targetTabUrl}</code>.
 
         private static string GetLaunchChromeInstructions(string appRootUrl)
         {
+            var profilePath = Path.Combine(Path.GetTempPath(), "blazor-edge-debug");
+
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                return $@"<p>Close all Chrome instances, then press Win+R and enter the following:</p>
-                          <p><strong><code>""%programfiles(x86)%\Google\Chrome\Application\chrome.exe"" --remote-debugging-port=9222 {appRootUrl}</code></strong></p>";
+                return $@"<p>Press Win+R and enter the following:</p>
+                          <p><strong><code>chrome --remote-debugging-port=9222 --user-data-dir=""{profilePath}"" {appRootUrl}</code></strong></p>";
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
-                return $@"<p>Close all Chrome instances, then in a terminal window execute the following:</p>
-                          <p><strong><code>google-chrome --remote-debugging-port=9222 {appRootUrl}</code></strong></p>";
+                return $@"<p>In a terminal window execute the following:</p>
+                          <p><strong><code>google-chrome --remote-debugging-port=9222 --user-data-dir={profilePath} {appRootUrl}</code></strong></p>";
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                return $@"<p>Execute the following:</p>
+                          <p><strong><code>open /Applications/Google\ Chrome.app --args --remote-debugging-port=9222 --user-data-dir={profilePath} {appRootUrl}</code></strong></p>";
+            }
+            else
+            {
+                throw new InvalidOperationException("Unknown OS platform");
+            }
+        }
+
+        private static string GetLaunchEdgeInstructions(string appRootUrl)
+        {
+            var profilePath = Path.Combine(Path.GetTempPath(), "blazor-chrome-debug");
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                return $@"<p>Press Win+R and enter the following:</p>
+                          <p><strong><code>msedge --remote-debugging-port=9222 --user-data-dir=""{profilePath}"" {appRootUrl}</code></strong></p>";
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
             {
-                return $@"<p>Close all Chrome instances, then in a terminal window execute the following:</p>
-                          <p><strong><code>open /Applications/Google\ Chrome.app --args --remote-debugging-port=9222 {appRootUrl}</code></strong></p>";
+                return $@"<p>In a terminal window execute the following:</p>
+                          <p><strong><code>open /Applications/Microsoft\ Edge\ Dev.app --args --remote-debugging-port=9222 --user-data-dir={profilePath} {appRootUrl}</code></strong></p>";
             }
             else
             {

src/Components/Blazor/Templates/src/content/BlazorWasm-CSharp/Client/Shared/SurveyPrompt.razor

@@ -4,7 +4,7 @@
 
     <span class="text-nowrap">
         Please take our
-        <a target="_blank" class="font-weight-bold" href="https://go.microsoft.com/fwlink/?linkid=2100553">brief survey</a>
+        <a target="_blank" class="font-weight-bold" href="https://go.microsoft.com/fwlink/?linkid=2109206">brief survey</a>
     </span>
     and tell us what you think.
 </div>

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

@@ -4,6 +4,16 @@ html, body {
     font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif;
 }
 
+a, .btn-link {
+    color: #0366d6;
+}
+
+.btn-primary {
+    color: #fff;
+    background-color: #1b6ec2;
+    border-color: #1861ac;
+}
+
 app {
     position: relative;
     display: flex;
@@ -21,10 +31,21 @@ app {
 }
 
     .main .top-row {
-        background-color: #e6e6e6;
+        background-color: #f7f7f7;
         border-bottom: 1px solid #d6d5d5;
+        justify-content: flex-end;
     }
 
+        .main .top-row > a, .main .top-row .btn-link {
+            white-space: nowrap;
+            margin-left: 1.5rem;
+        }
+
+.main .top-row a:first-child {
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
 .sidebar {
     background-image: linear-gradient(180deg, rgb(5, 39, 103) 0%, #3a0647 70%);
 }
@@ -44,38 +65,38 @@ app {
         top: -2px;
     }
 
-.nav-item {
-    font-size: 0.9rem;
-    padding-bottom: 0.5rem;
-}
-
-    .nav-item:first-of-type {
-        padding-top: 1rem;
+    .sidebar .nav-item {
+        font-size: 0.9rem;
+        padding-bottom: 0.5rem;
     }
 
-    .nav-item:last-of-type {
-        padding-bottom: 1rem;
-    }
-
-    .nav-item a {
-        color: #d7d7d7;
-        border-radius: 4px;
-        height: 3rem;
-        display: flex;
-        align-items: center;
-        line-height: 3rem;
-    }
+        .sidebar .nav-item:first-of-type {
+            padding-top: 1rem;
+        }
 
-        .nav-item a.active {
-            background-color: rgba(255,255,255,0.25);
-            color: white;
+        .sidebar .nav-item:last-of-type {
+            padding-bottom: 1rem;
         }
 
-        .nav-item a:hover {
-            background-color: rgba(255,255,255,0.1);
-            color: white;
+        .sidebar .nav-item a {
+            color: #d7d7d7;
+            border-radius: 4px;
+            height: 3rem;
+            display: flex;
+            align-items: center;
+            line-height: 3rem;
         }
 
+            .sidebar .nav-item a.active {
+                background-color: rgba(255,255,255,0.25);
+                color: white;
+            }
+
+            .sidebar .nav-item a:hover {
+                background-color: rgba(255,255,255,0.1);
+                color: white;
+            }
+
 .content {
     padding-top: 1.1rem;
 }
@@ -116,9 +137,17 @@ app {
 }
 
 @media (max-width: 767.98px) {
-    .main .top-row {
+    .main .top-row:not(.auth) {
         display: none;
     }
+
+    .main .top-row.auth {
+        justify-content: space-between;
+    }
+
+    .main .top-row a, .main .top-row .btn-link {
+        margin-left: 0;
+    }
 }
 
 @media (min-width: 768px) {

src/Components/Blazor/Validation/src/ComparePropertyAttribute.cs

@@ -0,0 +1,34 @@
+// 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.
+
+namespace System.ComponentModel.DataAnnotations
+{
+    /// <summary>
+    /// A <see cref="ValidationAttribute"/> that compares two properties
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property, AllowMultiple = false)]
+    public sealed class ComparePropertyAttribute : CompareAttribute
+    {
+        /// <summary>
+        /// Initializes a new instance of <see cref="BlazorCompareAttribute"/>.
+        /// </summary>
+        /// <param name="otherProperty">The property to compare with the current property.</param>
+        public ComparePropertyAttribute(string otherProperty)
+            : base(otherProperty)
+        {
+        }
+
+        /// <inheritdoc />
+        protected override ValidationResult IsValid(object value, ValidationContext validationContext)
+        {
+            var validationResult = base.IsValid(value, validationContext);
+            if (validationResult == ValidationResult.Success)
+            {
+                return validationResult;
+            }
+
+            return new ValidationResult(validationResult.ErrorMessage, new[] { validationContext.MemberName });
+        }
+    }
+}
+

src/Components/Blazor/Validation/src/Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <Description>Provides experimental support for validation using DataAnnotations.</Description>
+    <IsShippingPackage>true</IsShippingPackage>
+    <HasReferenceAssembly>false</HasReferenceAssembly>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Components.Forms" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Blazor.DataAnnotations.Validation.Tests" />
+  </ItemGroup>
+
+</Project>