Merge remote-tracking branch 'origin/release/2.2'

src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj

-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>

src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj

@@ -12,5 +12,10 @@
     <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
+  <Target Name="InstallPuppeteer" BeforeTargets="Restore">
+    <!-- Explicitly install puppeteer. This will install the bundled Chromium as part of restore instead of as part of execution -->
+    <Exec Command="npm install puppeteer" />
+  </Target>
+
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Directory.Build.targets))\Directory.Build.targets" />
 </Project>

src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs

@@ -8,6 +8,7 @@ using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.AspNetCore.Testing;
+using Microsoft.AspNetCore.Testing.xunit;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Testing;
 using Xunit;
@@ -25,7 +26,8 @@ namespace FunctionalTests
 
         public ITestOutputHelper Output { get; }
 
-        [Theory]
+        [ConditionalTheory]
+        [OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Disabling this test on OSX until we have a resolution for https://github.com/aspnet/AspNetCore-Internal/issues/1619")]
         [InlineData("Startup")]
         [InlineData("StartupWithoutEndpointRouting")]
         public async Task RunClientTests(string startup)
@@ -50,6 +52,8 @@ namespace FunctionalTests
                         Arguments = "test --no-watchman",
                     };
                 }
+                // Disallow the test from downloading \ installing chromium.
+                processStartInfo.Environment["PUPPETEER_SKIP_CHROMIUM_DOWNLOAD"] = "true";
 
                 // Act
                 var result = await ProcessManager.RunProcessAsync(processStartInfo, loggerFactory.CreateLogger("ProcessManager"));