From 51ec523d9ef9e7dc1380a452611d6fc7c6c1d895 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 31 Jan 2019 14:09:34 -0800
Subject: [PATCH] Attempt to install chromium as part of restore instead of
 running the CORS tests

One more go at https://github.com/aspnet/AspNetCore-Internal/issues/1619
---
 .../CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj   | 5 +++++
 .../test/FunctionalTests/CorsMiddlewareFunctionalTest.cs     | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj b/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj
index 87da25f520..4581b617fc 100644
--- a/src/Middleware/CORS/test/FunctionalTests/CORS.FunctionalTests.npmproj
+++ b/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>
diff --git a/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs
index b5b5ece9eb..6a874e0b80 100644
--- a/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs
+++ b/src/Middleware/CORS/test/FunctionalTests/CorsMiddlewareFunctionalTest.cs
@@ -48,6 +48,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"));