Merge branch 'merge/release/3.1-to-master' of https://github.com/dotnet-maestro-bot/AspNetCore into merge/release/3.1-to-master

.azure/pipelines/ci.yml

@@ -703,7 +703,7 @@ stages:
       publishInstallersAndChecksums: true
       # This is to enable SDL runs part of Post-Build Validation Stage
       SDLValidationParameters:
-        enable: true
+        enable: false
         continueOnError: false
         params: ' -SourceToolsList @("policheck","credscan")
         -TsaInstanceURL $(_TsaInstanceURL)

.azure/pipelines/jobs/default-build.yml

@@ -58,7 +58,7 @@ parameters:
   installTar: true
   installNodeJs: true
   installJdk: true
-  timeoutInMinutes: 180
+  timeoutInMinutes: 270
 
   # We need longer than the default amount of 5 minutes to upload our logs/artifacts. (We currently take around 5 mins in the best case).
   # This makes sure we have time to upload everything in the case of a build timeout - really important for investigating a build

src/Components/test/testassets/BasicTestApp/ErrorComponent.razor

@@ -11,6 +11,6 @@
     void IncrementCount()
     {
         currentCount++;
-        throw new NotImplementedException("Doing crazy things!");
+        throw new NotImplementedException("Doing something that won't work!");
     }
 }

src/Features/JsonPatch/test/Internal/ObjectVisitorTest.cs

@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
         {
             public string Name { get; set; }
             public IList<string> States { get; set; } = new List<string>();
-            public IDictionary<string, string> Countries = new Dictionary<string, string>();
+            public IDictionary<string, string> CountriesAndRegions = new Dictionary<string, string>();
             public dynamic Items { get; set; } = new ExpandoObject();
         }
 
@@ -62,14 +62,14 @@ namespace Microsoft.AspNetCore.JsonPatch.Internal
             get
             {
                 var model = new Class1();
-                yield return new object[] { model, "/Countries/USA", model.Countries };
-                yield return new object[] { model.Countries, "/USA", model.Countries };
+                yield return new object[] { model, "/CountriesAndRegions/USA", model.CountriesAndRegions };
+                yield return new object[] { model.CountriesAndRegions, "/USA", model.CountriesAndRegions };
 
                 var nestedModel = new Class1Nested();
                 nestedModel.Customers.Add(new Class1());
-                yield return new object[] { nestedModel, "/Customers/0/Countries/USA", nestedModel.Customers[0].Countries };
-                yield return new object[] { nestedModel.Customers, "/0/Countries/USA", nestedModel.Customers[0].Countries };
-                yield return new object[] { nestedModel.Customers[0], "/Countries/USA", nestedModel.Customers[0].Countries };
+                yield return new object[] { nestedModel, "/Customers/0/CountriesAndRegions/USA", nestedModel.Customers[0].CountriesAndRegions };
+                yield return new object[] { nestedModel.Customers, "/0/CountriesAndRegions/USA", nestedModel.Customers[0].CountriesAndRegions };
+                yield return new object[] { nestedModel.Customers[0], "/CountriesAndRegions/USA", nestedModel.Customers[0].CountriesAndRegions };
             }
         }
 

src/ProjectTemplates/Web.Spa.ProjectTemplates/content/Angular-CSharp/ClientApp/angular.json

@@ -13,7 +13,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:browser",
           "options": {
-            "progress": true,
+            "progress": false,
             "extractCss": true,
             "outputPath": "dist",
             "index": "src/index.html",

src/Tools/dotnet-watch/test/Scenario/WatchableApp.cs

@@ -5,6 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Threading.Tasks;
 using Microsoft.Extensions.CommandLineUtils;
@@ -88,15 +89,19 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
             };
             args.AddRange(arguments);
 
+            var dotnetPath = typeof(WatchableApp).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
+                    .Single(s => s.Key == "DotnetPath").Value;
+            
             var spec = new ProcessSpec
             {
-                Executable = DotNetMuxer.MuxerPathOrDefault(),
+                Executable = dotnetPath,
                 Arguments = args,
                 WorkingDirectory = SourceDirectory,
                 EnvironmentVariables =
                 {
                     ["DOTNET_CLI_CONTEXT_VERBOSE"] = bool.TrueString,
                     ["DOTNET_USE_POLLING_FILE_WATCHER"] = UsePollingWatcher.ToString(),
+                    ["DOTNET_ROOT"] = Directory.GetParent(dotnetPath).FullName,
                 },
             };
 

src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj

@@ -17,6 +17,13 @@
     <ProjectReference Include="..\src\dotnet-watch.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute">
+      <_Parameter1>DotnetPath</_Parameter1>
+      <_Parameter2>$(DotNetTool)</_Parameter2>
+    </AssemblyAttribute>
+  </ItemGroup>
+
   <Target Name="CleanTestProjects" BeforeTargets="CoreCompile">
     <RemoveDir Directories="$(TargetDir)TestProjects" Condition="Exists('$(TargetDir)TestProjects')" />
   </Target>