From 6d797aa88f6031cf438d137d2307e5510b119a27 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 4 Mar 2021 17:13:20 -0800
Subject: [PATCH 01/53] Update playwright to 191.1

---
 eng/Versions.props                                  |  2 +-
 eng/helix/content/RunTests/Program.cs               |  2 ++
 eng/helix/content/RunTests/RunTests.csproj          |  2 +-
 eng/helix/content/RunTests/TestRunner.cs            | 13 ++++++++-----
 eng/helix/content/runtests.ps1                      |  2 +-
 eng/helix/content/runtests.sh                       |  5 ++++-
 eng/targets/Helix.targets                           |  2 +-
 .../BlazorTemplates.Tests.csproj                    | 12 +++++++++++-
 8 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 81c4f0323e83..de322f639029 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -245,7 +245,7 @@
     <NewtonsoftJsonBsonVersion>1.0.2</NewtonsoftJsonBsonVersion>
     <NewtonsoftJsonVersion>12.0.2</NewtonsoftJsonVersion>
     <NSwagApiDescriptionClientVersion>13.0.4</NSwagApiDescriptionClientVersion>
-    <PlaywrightSharpVersion>0.180.0</PlaywrightSharpVersion>
+    <PlaywrightSharpVersion>0.191.1</PlaywrightSharpVersion>
     <PollyExtensionsHttpVersion>3.0.0</PollyExtensionsHttpVersion>
     <PollyVersion>7.1.0</PollyVersion>
     <SeleniumSupportVersion>4.0.0-beta1</SeleniumSupportVersion>
diff --git a/eng/helix/content/RunTests/Program.cs b/eng/helix/content/RunTests/Program.cs
index 4de3d6537319..62f04432ac4c 100644
--- a/eng/helix/content/RunTests/Program.cs
+++ b/eng/helix/content/RunTests/Program.cs
@@ -32,6 +32,8 @@ static async Task Main(string[] args)
                 {
                     keepGoing = await runner.InstallPlaywrightAsync();
                 }
+#else                
+                Console.WriteLine("Playwright install skipped.");
 #endif
 
                 runner.DisplayContents();
diff --git a/eng/helix/content/RunTests/RunTests.csproj b/eng/helix/content/RunTests/RunTests.csproj
index 948c3b72dce6..479a28eac6c3 100644
--- a/eng/helix/content/RunTests/RunTests.csproj
+++ b/eng/helix/content/RunTests/RunTests.csproj
@@ -8,6 +8,6 @@
 
   <ItemGroup>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta1.20158.1" />
-    <PackageReference Condition=" '$(InstallPlaywright)' == 'true' " Include="PlaywrightSharp" Version="0.180.0" />
+    <PackageReference Condition=" '$(InstallPlaywright)' == 'true' " Include="PlaywrightSharp" Version="0.191.1" />
   </ItemGroup>
 </Project>
diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index 2a48452d7356..43b8893533aa 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -48,8 +48,10 @@ public bool SetupEnvironment()
                 var playwrightBrowsers = Path.Combine(helixDir, "ms-playwright");
                 Console.WriteLine($"Setting PLAYWRIGHT_BROWSERS_PATH: {playwrightBrowsers}");
                 EnvironmentVariables.Add("PLAYWRIGHT_BROWSERS_PATH", playwrightBrowsers);
+#else
+                Console.WriteLine($"Skipping setting PLAYWRIGHT_BROWSERS_PATH");
 #endif
-    
+
                 Console.WriteLine($"Creating nuget restore directory: {nugetRestore}");
                 Directory.CreateDirectory(nugetRestore);
 
@@ -95,8 +97,9 @@ public async Task<bool> InstallPlaywrightAsync()
         {
             try
             {
-                Console.WriteLine($"Installing Playwright to {EnvironmentVariables["PLAYWRIGHT_BROWSERS_PATH"]}");
-                await Playwright.InstallAsync(EnvironmentVariables["PLAYWRIGHT_BROWSERS_PATH"]);
+                Console.WriteLine($"Installing Playwright to Browsers: {EnvironmentVariables["PLAYWRIGHT_BROWSERS_PATH"]} Driver: {EnvironmentVariables["PLAYWRIGHT_DRIVER_PATH"]}");
+                await Playwright.InstallAsync(EnvironmentVariables["PLAYWRIGHT_BROWSERS_PATH"], EnvironmentVariables["PLAYWRIGHT_DRIVER_PATH"]);
+                DisplayContents(EnvironmentVariables["PLAYWRIGHT_BROWSERS_PATH"]);
                 return true;
             }
             catch (Exception e)
@@ -106,7 +109,7 @@ public async Task<bool> InstallPlaywrightAsync()
             }
         }
 #endif
-        
+
         public async Task<bool> InstallAspNetAppIfNeededAsync()
         {
             try
@@ -170,7 +173,7 @@ await ProcessUtil.RunAsync($"{Options.DotnetRoot}/dotnet",
                         errorDataReceived: Console.Error.WriteLine,
                         throwOnError: false,
                         cancellationToken: new CancellationTokenSource(TimeSpan.FromMinutes(2)).Token);
-                    
+
                     // ';' is the path separator on Windows, and ':' on Unix
                     Options.Path += OperatingSystem.IsWindows() ? ";" : ":";
                     Options.Path += $"{Environment.GetEnvironmentVariable("DOTNET_CLI_HOME")}/.dotnet/tools";
diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index 98c9f3c6e02e..c5479dfc886d 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -15,7 +15,7 @@ param(
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
 $env:DOTNET_MULTILEVEL_LOOKUP = 0
 $env:PLAYWRIGHT_BROWSERS_PATH = "$currentDirectory\ms-playwright"
-$env:InstallPlaywright = "$InstallPlaywright"
+$env:PLAYWRIGHT_DRIVER_PATH = "$currentDirectory\.playwright\win-x64\native\playwright.cmd"
 
 $currentDirectory = Get-Location
 $envPath = "$env:PATH;$env:HELIX_CORRELATION_PAYLOAD\node\bin"
diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index a388a6279c91..d28cef836b7a 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -2,6 +2,7 @@
 
 dotnet_sdk_version="$2"
 dotnet_runtime_version="$3"
+installPlaywright="${10}"
 
 RESET="\033[0m"
 RED="\033[0;31m"
@@ -25,8 +26,10 @@ export DOTNET_CLI_HOME="$DIR/.home$RANDOM"
 
 export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 
-# Set playwright browser path
+# Set playwright stuff
 export PLAYWRIGHT_BROWSERS_PATH="$DIR/ms-playwright"
+export PLAYWRIGHT_BROWSERS_PATH="$DIR/.playwright\unix\native\playwright.sh"
+export InstallPlaywright="$installPlaywright"
 
 RESET="\033[0m"
 RED="\033[0;31m"
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 9592591f1d87..bc6ab8d4c5df 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -8,7 +8,7 @@
     <HelixPreCommand Include="call RunPowershell.cmd mssql\InstallSqlServerLocalDB.ps1 || exit /b 1" />
   </ItemGroup>
 
-  <PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">
+  <PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
     <SkipHelixQueues>Windows.7.Amd64.Open;Windows.81.Amd64.Open</SkipHelixQueues>
   </PropertyGroup>
 
diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
index 8001d254d00c..db364525ca16 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
@@ -6,7 +6,6 @@
 
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
-    <IsWindowsOnlyTest>true</IsWindowsOnlyTest>
     <SkipHelixArm>true</SkipHelixArm>
     <BaseOutputPath />
     <OutputPath />
@@ -45,6 +44,8 @@
     <Reference Include="Microsoft.Extensions.Configuration" />
     <Reference Include="Microsoft.Extensions.Configuration.Json" />
     <Reference Include="Anglesharp" />
+    <Reference Include="PlaywrightSharp" Condition="'$(TargetOsName)' != 'linux-musl'" />
+    <Reference Include="PlaywrightSharp" ExcludeAssets="build" Condition="'$(TargetOsName)' == 'linux-musl'" />
     <ProjectReference Include="$(RepoRoot)src\Framework\App.Runtime\src\Microsoft.AspNetCore.App.Runtime.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
@@ -57,4 +58,13 @@
 
   <!-- Shared testing infrastructure for running E2E template tests -->
   <Import Project="..\TestInfrastructure\PrepareForTest.targets" />
+
+  <Target Name="PublishAssets" AfterTargets="Publish">
+    <ItemGroup>
+      <_PublishFiles Include="$(OutputPath).playwright\**\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(_PublishFiles)" DestinationFolder="$(PublishDir)\.playwright\%(_PublishFiles.RecursiveDir)\" />	
+  </Target>
+
+
 </Project>

From 7a009c54bbd11e83803377c8a5c5dd468ea8a296 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 4 Mar 2021 18:53:03 -0800
Subject: [PATCH 02/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index d28cef836b7a..c17034374ee0 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -28,7 +28,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 
 # Set playwright stuff
 export PLAYWRIGHT_BROWSERS_PATH="$DIR/ms-playwright"
-export PLAYWRIGHT_BROWSERS_PATH="$DIR/.playwright\unix\native\playwright.sh"
+export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright\unix\native\playwright.sh"
 export InstallPlaywright="$installPlaywright"
 
 RESET="\033[0m"

From 01c36c736e3873628e9f257313d8815238ffb8c2 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 4 Mar 2021 18:53:06 -0800
Subject: [PATCH 03/53] Update runtests.ps1

---
 eng/helix/content/runtests.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index c5479dfc886d..13ec9cccab34 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -14,6 +14,7 @@ param(
 
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
 $env:DOTNET_MULTILEVEL_LOOKUP = 0
+$env:InstallPlaywright = "$InstallPlaywright"
 $env:PLAYWRIGHT_BROWSERS_PATH = "$currentDirectory\ms-playwright"
 $env:PLAYWRIGHT_DRIVER_PATH = "$currentDirectory\.playwright\win-x64\native\playwright.cmd"
 

From 5e062e670d2a1a06899833148ab50b9feb9bfbcd Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 4 Mar 2021 18:56:25 -0800
Subject: [PATCH 04/53] Update ContextInformation.cs

---
 src/Shared/BrowserTesting/src/ContextInformation.cs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/Shared/BrowserTesting/src/ContextInformation.cs b/src/Shared/BrowserTesting/src/ContextInformation.cs
index f197dff80c7c..9b6d9525b82c 100644
--- a/src/Shared/BrowserTesting/src/ContextInformation.cs
+++ b/src/Shared/BrowserTesting/src/ContextInformation.cs
@@ -52,21 +52,18 @@ private void CleanupPage(object sender, EventArgs e)
 
         internal BrowserContextOptions ConfigureUniqueHarPath(BrowserContextOptions browserContextOptions)
         {
+            var uploadDir = Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT");
             if (browserContextOptions?.RecordHar?.Path != null)
             {
                 var identifier = Guid.NewGuid().ToString("N");
-                var harDirectory = Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT");
-                if (string.IsNullOrEmpty(harDirectory))
-                {
-                    harDirectory = browserContextOptions.RecordHar.Path;
-                }
-                browserContextOptions.RecordHar.Path = Path.Combine(harDirectory, $"{identifier}.har");
+                browserContextOptions.RecordHar.Path = Path.Combine(
+                    string.IsNullOrEmpty(uploadDir) ? browserContextOptions.RecordHar.Path : uploadDir, 
+                    $"{identifier}.har");
                 _harPath = browserContextOptions.RecordHar.Path;
             }
 
             if (browserContextOptions?.RecordVideo?.Dir != null)
             {
-                var uploadDir = Environment.GetEnvironmentVariable("HELIX_WORKITEM_UPLOAD_ROOT");
                 if (!string.IsNullOrEmpty(uploadDir))
                 {
                     browserContextOptions.RecordVideo.Dir = uploadDir;

From 5487e65205fdaa1837924476fa478f14f36d3767 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 00:51:31 -0800
Subject: [PATCH 05/53] Update TestRunner.cs

---
 eng/helix/content/RunTests/TestRunner.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index 43b8893533aa..972269735a41 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -97,9 +97,9 @@ public async Task<bool> InstallPlaywrightAsync()
         {
             try
             {
-                Console.WriteLine($"Installing Playwright to Browsers: {EnvironmentVariables["PLAYWRIGHT_BROWSERS_PATH"]} Driver: {EnvironmentVariables["PLAYWRIGHT_DRIVER_PATH"]}");
-                await Playwright.InstallAsync(EnvironmentVariables["PLAYWRIGHT_BROWSERS_PATH"], EnvironmentVariables["PLAYWRIGHT_DRIVER_PATH"]);
-                DisplayContents(EnvironmentVariables["PLAYWRIGHT_BROWSERS_PATH"]);
+                Console.WriteLine($"Installing Playwright to Browsers: {Environment.GetEnvironmentVariable("PLAYWRIGHT_BROWSERS_PATH")} Driver: {Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH")}");
+                await Playwright.InstallAsync(Environment.GetEnvironmentVariable("PLAYWRIGHT_BROWSERS_PATH"), Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH"));
+                DisplayContents(Environment.GetEnvironmentVariable("PLAYWRIGHT_BROWSERS_PATH"));
                 return true;
             }
             catch (Exception e)

From dfa2bb557181016f55c01f4ea94c829ac747f9c0 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 11:01:56 -0800
Subject: [PATCH 06/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index c17034374ee0..9d46eb20b563 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -28,7 +28,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 
 # Set playwright stuff
 export PLAYWRIGHT_BROWSERS_PATH="$DIR/ms-playwright"
-export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright\unix\native\playwright.sh"
+export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/unix/native/playwright.sh"
 export InstallPlaywright="$installPlaywright"
 
 RESET="\033[0m"

From 240fcd5546efa93b4fe70600aefe6f514ac0555a Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 11:05:49 -0800
Subject: [PATCH 07/53] Update runtests.ps1

---
 eng/helix/content/runtests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index 13ec9cccab34..20b892a88d34 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -15,10 +15,10 @@ param(
 $env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE = 1
 $env:DOTNET_MULTILEVEL_LOOKUP = 0
 $env:InstallPlaywright = "$InstallPlaywright"
+$currentDirectory = Get-Location
 $env:PLAYWRIGHT_BROWSERS_PATH = "$currentDirectory\ms-playwright"
 $env:PLAYWRIGHT_DRIVER_PATH = "$currentDirectory\.playwright\win-x64\native\playwright.cmd"
 
-$currentDirectory = Get-Location
 $envPath = "$env:PATH;$env:HELIX_CORRELATION_PAYLOAD\node\bin"
 
 function InvokeInstallDotnet([string]$command) {

From dcaee00e3e0a9a12fd608ca853a6ae08a3ed32bb Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 13:51:50 -0800
Subject: [PATCH 08/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 9d46eb20b563..94d21451b0ee 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -30,6 +30,10 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 export PLAYWRIGHT_BROWSERS_PATH="$DIR/ms-playwright"
 export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/unix/native/playwright.sh"
 export InstallPlaywright="$installPlaywright"
+if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
+    echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
+    chmod +x $PLAYWRIGHT_DRIVER_PATH
+fi
 
 RESET="\033[0m"
 RED="\033[0;31m"

From 851fe5a2335dd37256149ee85bfd5c11e63fe6dd Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 13:59:42 -0800
Subject: [PATCH 09/53] Update BrowserManager.cs

---
 src/Shared/BrowserTesting/src/BrowserManager.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Shared/BrowserTesting/src/BrowserManager.cs b/src/Shared/BrowserTesting/src/BrowserManager.cs
index 20f970736e27..07f00a0ea1aa 100644
--- a/src/Shared/BrowserTesting/src/BrowserManager.cs
+++ b/src/Shared/BrowserTesting/src/BrowserManager.cs
@@ -46,7 +46,10 @@ private async Task InitializeAsync()
 
             async Task InitializeCore()
             {
-                Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory/*, debug: "pw:api"*/);
+                // Work around weird driverExecutable lookup logic
+                var helixDirectory = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT")
+                var driverPath = string.isNullOrEmpty(helixDirectory) ? null : Path.Combine(helixDirectory, "runtests.sh");
+                Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, driverExecutablePath: driverPath /*, debug: "pw:api"*/);
                 foreach (var (browserName, options) in _browserManagerConfiguration.BrowserOptions)
                 {
                     if (!_launchBrowsers.ContainsKey(browserName))

From f205ae2da5812b8a3e91357c5bdfb3667b1252a5 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 14:30:20 -0800
Subject: [PATCH 10/53] Update BrowserManager.cs

---
 src/Shared/BrowserTesting/src/BrowserManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shared/BrowserTesting/src/BrowserManager.cs b/src/Shared/BrowserTesting/src/BrowserManager.cs
index 07f00a0ea1aa..1904418c3ad6 100644
--- a/src/Shared/BrowserTesting/src/BrowserManager.cs
+++ b/src/Shared/BrowserTesting/src/BrowserManager.cs
@@ -47,7 +47,7 @@ private async Task InitializeAsync()
             async Task InitializeCore()
             {
                 // Work around weird driverExecutable lookup logic
-                var helixDirectory = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT")
+                var helixDirectory = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT");
                 var driverPath = string.isNullOrEmpty(helixDirectory) ? null : Path.Combine(helixDirectory, "runtests.sh");
                 Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, driverExecutablePath: driverPath /*, debug: "pw:api"*/);
                 foreach (var (browserName, options) in _browserManagerConfiguration.BrowserOptions)

From 3338c202a7071969a6b3fa254f8ab4e1b558a15b Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 15:16:10 -0800
Subject: [PATCH 11/53] Update BrowserManager.cs

---
 src/Shared/BrowserTesting/src/BrowserManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shared/BrowserTesting/src/BrowserManager.cs b/src/Shared/BrowserTesting/src/BrowserManager.cs
index 1904418c3ad6..e016107f02ea 100644
--- a/src/Shared/BrowserTesting/src/BrowserManager.cs
+++ b/src/Shared/BrowserTesting/src/BrowserManager.cs
@@ -48,7 +48,7 @@ async Task InitializeCore()
             {
                 // Work around weird driverExecutable lookup logic
                 var helixDirectory = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT");
-                var driverPath = string.isNullOrEmpty(helixDirectory) ? null : Path.Combine(helixDirectory, "runtests.sh");
+                var driverPath = string.IsNullOrEmpty(helixDirectory) ? null : Path.Combine(helixDirectory, "runtests.sh");
                 Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, driverExecutablePath: driverPath /*, debug: "pw:api"*/);
                 foreach (var (browserName, options) in _browserManagerConfiguration.BrowserOptions)
                 {

From 130590ec5587d7b1da3c7c11b2b39bdb63f92e48 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 17:36:45 -0800
Subject: [PATCH 12/53] Update BrowserManager.cs

---
 src/Shared/BrowserTesting/src/BrowserManager.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Shared/BrowserTesting/src/BrowserManager.cs b/src/Shared/BrowserTesting/src/BrowserManager.cs
index e016107f02ea..02a018200649 100644
--- a/src/Shared/BrowserTesting/src/BrowserManager.cs
+++ b/src/Shared/BrowserTesting/src/BrowserManager.cs
@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;

From 14ff8f619ee8ccc759bb6cda753fb716b68d84b1 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 23:06:14 -0800
Subject: [PATCH 13/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 94d21451b0ee..def023740942 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -33,6 +33,8 @@ export InstallPlaywright="$installPlaywright"
 if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH
+    echo "chmod +x $DIR/.playwright/unix/native/node"
+    chmod +x $DIR/.playwright/unix/native/node
 fi
 
 RESET="\033[0m"

From e0f0762429fb1575f6dea302bc9dd71d5112396c Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 23:08:24 -0800
Subject: [PATCH 14/53] Update BrowserManager.cs

---
 src/Shared/BrowserTesting/src/BrowserManager.cs | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Shared/BrowserTesting/src/BrowserManager.cs b/src/Shared/BrowserTesting/src/BrowserManager.cs
index 02a018200649..296d7d44e776 100644
--- a/src/Shared/BrowserTesting/src/BrowserManager.cs
+++ b/src/Shared/BrowserTesting/src/BrowserManager.cs
@@ -49,8 +49,16 @@ async Task InitializeCore()
             {
                 // Work around weird driverExecutable lookup logic
                 var helixDirectory = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT");
-                var driverPath = string.IsNullOrEmpty(helixDirectory) ? null : Path.Combine(helixDirectory, "runtests.sh");
-                Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, driverExecutablePath: driverPath /*, debug: "pw:api"*/);
+                if (string.IsNullOrEmpty(helixDirectory)) 
+                {
+                    var driverPath = Path.Combine(helixDirectory,
+                        RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "playwright.sh" : "playwright.cmd");
+                    Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, driverExecutablePath: driverPath /*, debug: "pw:api"*/);
+                }
+                else
+                {
+                    Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory /*, debug: "pw:api"*/);
+                }
                 foreach (var (browserName, options) in _browserManagerConfiguration.BrowserOptions)
                 {
                     if (!_launchBrowsers.ContainsKey(browserName))

From 9337217180c94d84affb9211d362eb7694304021 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 5 Mar 2021 23:09:40 -0800
Subject: [PATCH 15/53] Update BrowserManager.cs

---
 src/Shared/BrowserTesting/src/BrowserManager.cs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Shared/BrowserTesting/src/BrowserManager.cs b/src/Shared/BrowserTesting/src/BrowserManager.cs
index 296d7d44e776..ba98c2ed0659 100644
--- a/src/Shared/BrowserTesting/src/BrowserManager.cs
+++ b/src/Shared/BrowserTesting/src/BrowserManager.cs
@@ -48,11 +48,9 @@ private async Task InitializeAsync()
             async Task InitializeCore()
             {
                 // Work around weird driverExecutable lookup logic
-                var helixDirectory = Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT");
-                if (string.IsNullOrEmpty(helixDirectory)) 
+                var driverPath = Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH");
+                if (string.IsNullOrEmpty(driverPath)) 
                 {
-                    var driverPath = Path.Combine(helixDirectory,
-                        RuntimeInformation.IsOSPlatform(OSPlatform.OSX) || RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "playwright.sh" : "playwright.cmd");
                     Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, driverExecutablePath: driverPath /*, debug: "pw:api"*/);
                 }
                 else

From ccf693b0046196ca1aa7fda26e5677eef873d73f Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sat, 6 Mar 2021 01:39:29 -0800
Subject: [PATCH 16/53] Update TestRunner.cs

---
 eng/helix/content/RunTests/TestRunner.cs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/eng/helix/content/RunTests/TestRunner.cs b/eng/helix/content/RunTests/TestRunner.cs
index 972269735a41..6e1fe013fce3 100644
--- a/eng/helix/content/RunTests/TestRunner.cs
+++ b/eng/helix/content/RunTests/TestRunner.cs
@@ -45,9 +45,12 @@ public bool SetupEnvironment()
 
 #if INSTALLPLAYWRIGHT
                 // Playwright will download and look for browsers to this directory
-                var playwrightBrowsers = Path.Combine(helixDir, "ms-playwright");
+                var playwrightBrowsers = Environment.GetEnvironmentVariable("PLAYWRIGHT_BROWSERS_PATH");
                 Console.WriteLine($"Setting PLAYWRIGHT_BROWSERS_PATH: {playwrightBrowsers}");
                 EnvironmentVariables.Add("PLAYWRIGHT_BROWSERS_PATH", playwrightBrowsers);
+                var playrightDriver = Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH");
+                Console.WriteLine($"Setting PLAYWRIGHT_DRIVER_PATH: {playrightDriver}");
+                EnvironmentVariables.Add("PLAYWRIGHT_DRIVER_PATH", playrightDriver);
 #else
                 Console.WriteLine($"Skipping setting PLAYWRIGHT_BROWSERS_PATH");
 #endif
@@ -344,9 +347,7 @@ public void UploadResults()
                     // Combine the directory name + log name for the copied log file name to avoid overwriting duplicate test names in different test projects
                     var logName = $"{Path.GetFileName(Path.GetDirectoryName(file))}_{Path.GetFileName(file)}";
                     Console.WriteLine($"Copying: {file} to {Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, logName)}");
-                    // Need to copy to HELIX_WORKITEM_UPLOAD_ROOT and HELIX_WORKITEM_UPLOAD_ROOT/../ in order for Azure Devops attachments to link properly and for Helix to store the logs
                     File.Copy(file, Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, logName));
-                    File.Copy(file, Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, "..", logName));
                 }
             }
             else
@@ -360,9 +361,7 @@ public void UploadResults()
                 {
                     var fileName = Path.GetFileName(file);
                     Console.WriteLine($"Copying: {file} to {Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, fileName)}");
-                    // Need to copy to HELIX_WORKITEM_UPLOAD_ROOT and HELIX_WORKITEM_UPLOAD_ROOT/../ in order for Azure Devops attachments to link properly and for Helix to store the logs
                     File.Copy(file, Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, fileName));
-                    File.Copy(file, Path.Combine(HELIX_WORKITEM_UPLOAD_ROOT, "..", fileName));
                 }
             }
             else

From 0780315d462465648ee46a1ad8b7e6f50a109db0 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sat, 6 Mar 2021 22:47:32 -0800
Subject: [PATCH 17/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index def023740942..5540a7d26f73 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -35,6 +35,8 @@ if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
     chmod +x $PLAYWRIGHT_DRIVER_PATH
     echo "chmod +x $DIR/.playwright/unix/native/node"
     chmod +x $DIR/.playwright/unix/native/node
+    echo "copying drivers to workitem root"
+    cp -r ./.playwright/unix/native/ .
 fi
 
 RESET="\033[0m"

From e9a3deef6860583fa77044938daab5fd3692f9a0 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sat, 6 Mar 2021 22:51:18 -0800
Subject: [PATCH 18/53] Update runtests.ps1

---
 eng/helix/content/runtests.ps1 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index 20b892a88d34..2bb2e84c479b 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -19,6 +19,11 @@ $currentDirectory = Get-Location
 $env:PLAYWRIGHT_BROWSERS_PATH = "$currentDirectory\ms-playwright"
 $env:PLAYWRIGHT_DRIVER_PATH = "$currentDirectory\.playwright\win-x64\native\playwright.cmd"
 
+if ($InstallPlaywright -eq "true") {
+    Write-Host "Copying playwright drivers: Copy-Item $currentDirectory\.playwright\win-x64\native $currentDIrectory -recurse"
+    Copy-Item $currentDirectory\.playwright\win-x64\native $currentDirectory -recurse
+}
+
 $envPath = "$env:PATH;$env:HELIX_CORRELATION_PAYLOAD\node\bin"
 
 function InvokeInstallDotnet([string]$command) {

From 4062e0d5864cfe64c116e990d8ae0eba938b531d Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 7 Mar 2021 20:56:40 -0800
Subject: [PATCH 19/53] Update runtests.ps1

---
 eng/helix/content/runtests.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index 2bb2e84c479b..3ed7a5cb4e05 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -19,7 +19,7 @@ $currentDirectory = Get-Location
 $env:PLAYWRIGHT_BROWSERS_PATH = "$currentDirectory\ms-playwright"
 $env:PLAYWRIGHT_DRIVER_PATH = "$currentDirectory\.playwright\win-x64\native\playwright.cmd"
 
-if ($InstallPlaywright -eq "true") {
+if ("$InstallPlaywright" -eq "true") {
     Write-Host "Copying playwright drivers: Copy-Item $currentDirectory\.playwright\win-x64\native $currentDIrectory -recurse"
     Copy-Item $currentDirectory\.playwright\win-x64\native $currentDirectory -recurse
 }

From c683be70f0339fde30ec18d1b754a1bbf8f5f8c7 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 7 Mar 2021 20:58:30 -0800
Subject: [PATCH 20/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 5540a7d26f73..20c3ee0d0482 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -36,7 +36,9 @@ if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
     echo "chmod +x $DIR/.playwright/unix/native/node"
     chmod +x $DIR/.playwright/unix/native/node
     echo "copying drivers to workitem root"
-    cp -r ./.playwright/unix/native/ .
+    cp -r $DIR/.playwright/unix/native/ .
+    cp $DIR/.playwright/unix/native/playwright.sh .
+    ls -la playwright*
 fi
 
 RESET="\033[0m"

From fb466913be160b2c5b57b6460bcf3665e3a39e60 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 9 Mar 2021 01:11:47 -0800
Subject: [PATCH 21/53] Update BrowserManager.cs

---
 src/Shared/BrowserTesting/src/BrowserManager.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Shared/BrowserTesting/src/BrowserManager.cs b/src/Shared/BrowserTesting/src/BrowserManager.cs
index ba98c2ed0659..f2dfaa7928d4 100644
--- a/src/Shared/BrowserTesting/src/BrowserManager.cs
+++ b/src/Shared/BrowserTesting/src/BrowserManager.cs
@@ -49,7 +49,7 @@ async Task InitializeCore()
             {
                 // Work around weird driverExecutable lookup logic
                 var driverPath = Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH");
-                if (string.IsNullOrEmpty(driverPath)) 
+                if (!string.IsNullOrEmpty(driverPath)) 
                 {
                     Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, driverExecutablePath: driverPath /*, debug: "pw:api"*/);
                 }

From 6f446b875eebb262adeea3a1ff681e1f93d69215 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 9 Mar 2021 08:51:42 -0800
Subject: [PATCH 22/53] Update Helix.Common.props

---
 eng/targets/Helix.Common.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
index c3fe23fb1241..c54123f03387 100644
--- a/eng/targets/Helix.Common.props
+++ b/eng/targets/Helix.Common.props
@@ -12,14 +12,14 @@
 
   <!-- PR(ci.yaml) required queues -->
   <ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64' AND '$(_UseHelixOpenQueues)' == 'true'">
-    <HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
+    <HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="Windows.10.Amd64.Server20H2.Open" Platform="Windows" />
     <HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="Linux" />
   </ItemGroup>
 
   <!-- queues for helix-matrix.yml pipeline -->
   <ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true' AND '$(_UseHelixOpenQueues)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
-    <HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
+    <HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="Ubuntu.2004.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="OSX.1100.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />

From 1bcdae4c4c857b272891f6552d7ea9944c9d0d52 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 9 Mar 2021 08:55:51 -0800
Subject: [PATCH 23/53] Use correct driver for osx

---
 eng/helix/content/runtests.sh | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 20c3ee0d0482..0f6efc7c4453 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -2,6 +2,7 @@
 
 dotnet_sdk_version="$2"
 dotnet_runtime_version="$3"
+helixQueue="$5"
 installPlaywright="${10}"
 
 RESET="\033[0m"
@@ -28,7 +29,11 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 
 # Set playwright stuff
 export PLAYWRIGHT_BROWSERS_PATH="$DIR/ms-playwright"
-export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/unix/native/playwright.sh"
+if [[ "$helixQueue" == *"OSX"* ]]; then
+    export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/osx/native/playwright.sh"
+else
+    export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/unix/native/playwright.sh"
+fi
 export InstallPlaywright="$installPlaywright"
 if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
@@ -96,8 +101,8 @@ exit_code=0
 echo "Restore: $DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --ignore-failed-sources"
 $DOTNET_ROOT/dotnet restore RunTests/RunTests.csproj --ignore-failed-sources
 
-echo "Running tests: $DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $5 --arch $6 --quarantined $7 --ef $8 --helixTimeout $9"
-$DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $5 --arch $6 --quarantined $7 --ef $8 --helixTimeout $9
+echo "Running tests: $DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9"
+$DOTNET_ROOT/dotnet run --no-restore --project RunTests/RunTests.csproj -- --target $1 --runtime $4 --queue $helixQueue --arch $6 --quarantined $7 --ef $8 --helixTimeout $9
 exit_code=$?
 echo "Finished tests...exit_code=$exit_code"
 

From 45dcdd2516aac3e566f38c60501ab662d50beaca Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 9 Mar 2021 08:56:16 -0800
Subject: [PATCH 24/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 0f6efc7c4453..c8b53b46737a 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -40,10 +40,6 @@ if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
     chmod +x $PLAYWRIGHT_DRIVER_PATH
     echo "chmod +x $DIR/.playwright/unix/native/node"
     chmod +x $DIR/.playwright/unix/native/node
-    echo "copying drivers to workitem root"
-    cp -r $DIR/.playwright/unix/native/ .
-    cp $DIR/.playwright/unix/native/playwright.sh .
-    ls -la playwright*
 fi
 
 RESET="\033[0m"

From ed2cd1dd811daafc0d694ce05c71ac250a31ed90 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 9 Mar 2021 14:19:19 -0800
Subject: [PATCH 25/53] Add apt-get packages for pw and set correct osx node
 path

---
 eng/helix/content/runtests.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index c8b53b46737a..c19bcea37475 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -31,15 +31,19 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 export PLAYWRIGHT_BROWSERS_PATH="$DIR/ms-playwright"
 if [[ "$helixQueue" == *"OSX"* ]]; then
     export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/osx/native/playwright.sh"
+    PLAYWRIGHT_NODE_PATH=$DIR/.playwright/osx/native/node
 else
     export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/unix/native/playwright.sh"
+    PLAYWRIGHT_NODE_PATH=$DIR/.playwright/unix/native/node"
 fi
 export InstallPlaywright="$installPlaywright"
 if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
+    echo "sudo apt-get install libdbus-glib-1-2 (for playwright)"
+    sudo apt-get install libdbus-glib-1-2
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH
-    echo "chmod +x $DIR/.playwright/unix/native/node"
-    chmod +x $DIR/.playwright/unix/native/node
+    echo "chmod +x $PLAYWRIGHT_NODE_PATH"
+    chmod +x PLAYWRIGHT_NODE_PATH
 fi
 
 RESET="\033[0m"

From 305e8ff0ff635bd9428b7318fb2dd781a28ba096 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 9 Mar 2021 14:20:10 -0800
Subject: [PATCH 26/53] Update BrowserManager.cs

---
 src/Shared/BrowserTesting/src/BrowserManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Shared/BrowserTesting/src/BrowserManager.cs b/src/Shared/BrowserTesting/src/BrowserManager.cs
index f2dfaa7928d4..5d15b580711a 100644
--- a/src/Shared/BrowserTesting/src/BrowserManager.cs
+++ b/src/Shared/BrowserTesting/src/BrowserManager.cs
@@ -47,7 +47,6 @@ private async Task InitializeAsync()
 
             async Task InitializeCore()
             {
-                // Work around weird driverExecutable lookup logic
                 var driverPath = Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH");
                 if (!string.IsNullOrEmpty(driverPath)) 
                 {

From 62f8545e3e1f5749e070738ff4969e1af04ca8f4 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Tue, 9 Mar 2021 18:11:19 -0800
Subject: [PATCH 27/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index c19bcea37475..cf8ae9a79753 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -38,7 +38,7 @@ else
 fi
 export InstallPlaywright="$installPlaywright"
 if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
-    echo "sudo apt-get install libdbus-glib-1-2 (for playwright)"
+    echo "sudo apt-get install libdbus-glib-1-2 for playwright"
     sudo apt-get install libdbus-glib-1-2
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH

From 9fd8c22a916ddd9131ca75e8cefa92c12bbb689f Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 10 Mar 2021 00:37:44 -0800
Subject: [PATCH 28/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index cf8ae9a79753..320c6e6a88e4 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -38,7 +38,7 @@ else
 fi
 export InstallPlaywright="$installPlaywright"
 if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
-    echo "sudo apt-get install libdbus-glib-1-2 for playwright"
+    echo "sudo apt-get install libdbus-glib-1-2"
     sudo apt-get install libdbus-glib-1-2
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH

From 455e86c5147ffb7d445afcc41a744f71e826886e Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 10 Mar 2021 08:51:51 -0800
Subject: [PATCH 29/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 320c6e6a88e4..f73eb5255d12 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -34,7 +34,7 @@ if [[ "$helixQueue" == *"OSX"* ]]; then
     PLAYWRIGHT_NODE_PATH=$DIR/.playwright/osx/native/node
 else
     export PLAYWRIGHT_DRIVER_PATH="$DIR/.playwright/unix/native/playwright.sh"
-    PLAYWRIGHT_NODE_PATH=$DIR/.playwright/unix/native/node"
+    PLAYWRIGHT_NODE_PATH=$DIR/.playwright/unix/native/node
 fi
 export InstallPlaywright="$installPlaywright"
 if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then

From 40d2ea9d7acc4959f96bb1d43a3209daf394b93a Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 10 Mar 2021 11:52:38 -0800
Subject: [PATCH 30/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index f73eb5255d12..943955b62be8 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -43,7 +43,7 @@ if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH
     echo "chmod +x $PLAYWRIGHT_NODE_PATH"
-    chmod +x PLAYWRIGHT_NODE_PATH
+    chmod +x $PLAYWRIGHT_NODE_PATH
 fi
 
 RESET="\033[0m"

From dbeadeae10e96ec92e26bd89d814848511be52a2 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 10 Mar 2021 16:13:26 -0800
Subject: [PATCH 31/53] Update BlazorServerTemplateTest.cs

---
 .../BlazorTemplates.Tests/BlazorServerTemplateTest.cs            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs
index db28e7fd65ba..eb7725e8358b 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorServerTemplateTest.cs
@@ -108,6 +108,7 @@ await Fixture.BrowserManager.GetBrowserInstance(browserKind, BrowserContextInfo)
         [Theory]
         [MemberData(nameof(BlazorServerTemplateWorks_IndividualAuthData))]
         [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30807")]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/30825", Queues = "All.OSX")]
         public async Task BlazorServerTemplateWorks_IndividualAuth(BrowserKind browserKind, bool useLocalDB)
         {
             // Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278

From 11e119c45301074797b31207fe8f5482562d944f Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 10 Mar 2021 16:15:00 -0800
Subject: [PATCH 32/53] Update BlazorWasmTemplateTest.cs

---
 .../BlazorTemplates.Tests/BlazorWasmTemplateTest.cs              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
index b5e1deedfb1a..75e62da2de47 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
@@ -289,6 +289,7 @@ public Task BlazorWasmHostedTemplate_IndividualAuth_Works_WithLocalDB(BrowserKin
         [Theory]
         [InlineData(BrowserKind.Chromium)]
         [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/30820")]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/30825", Queues = "All.OSX")]
         public Task BlazorWasmHostedTemplate_IndividualAuth_Works_WithOutLocalDB(BrowserKind browserKind)
         {
             return BlazorWasmHostedTemplate_IndividualAuth_Works(browserKind, false);

From 1903155a4f8e5135e3b50eacc05cae6076d1f309 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 10 Mar 2021 16:16:54 -0800
Subject: [PATCH 33/53] Skip libdus-glib on osx

---
 eng/helix/content/runtests.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 943955b62be8..0a584dca881a 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -38,8 +38,10 @@ else
 fi
 export InstallPlaywright="$installPlaywright"
 if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
-    echo "sudo apt-get install libdbus-glib-1-2"
-    sudo apt-get install libdbus-glib-1-2
+    if [[ "$helixQueue" != *"OSX"* ]]; then
+        echo "sudo apt-get install libdbus-glib-1-2"
+        sudo apt-get install libdbus-glib-1-2
+    fi
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH
     echo "chmod +x $PLAYWRIGHT_NODE_PATH"

From cab8111322ee033feb8c6ca6a1f946f15839cfbd Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Wed, 10 Mar 2021 16:18:46 -0800
Subject: [PATCH 34/53] Update BrowserManager.cs

---
 src/Shared/BrowserTesting/src/BrowserManager.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Shared/BrowserTesting/src/BrowserManager.cs b/src/Shared/BrowserTesting/src/BrowserManager.cs
index 5d15b580711a..1fa54b4da923 100644
--- a/src/Shared/BrowserTesting/src/BrowserManager.cs
+++ b/src/Shared/BrowserTesting/src/BrowserManager.cs
@@ -50,11 +50,11 @@ async Task InitializeCore()
                 var driverPath = Environment.GetEnvironmentVariable("PLAYWRIGHT_DRIVER_PATH");
                 if (!string.IsNullOrEmpty(driverPath)) 
                 {
-                    Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, driverExecutablePath: driverPath /*, debug: "pw:api"*/);
+                    Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, driverExecutablePath: driverPath, debug: "pw:api");
                 }
                 else
                 {
-                    Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory /*, debug: "pw:api"*/);
+                    Playwright = await PlaywrightSharp.Playwright.CreateAsync(_loggerFactory, debug: "pw:api");
                 }
                 foreach (var (browserName, options) in _browserManagerConfiguration.BrowserOptions)
                 {

From ad7ee3aecaf3ce04c74192d6f5ba9044308b6511 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 11 Mar 2021 10:16:15 -0800
Subject: [PATCH 35/53] Disable firefox for now

---
 .../BlazorTemplates.Tests/playwrightSettings.json               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json b/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json
index d5e34b4795f4..48f1423de9fb 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json
@@ -28,7 +28,7 @@
     },
     "Firefox": {
       "BrowserKind": "Firefox",
-      "IsEnabled": true
+      "IsEnabled": false
     },
     "Webkit": {
       "BrowserKind": "Webkit",

From 43a26117e773135fa18da5b7d003281ed38fa2c2 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 11 Mar 2021 13:09:52 -0800
Subject: [PATCH 36/53] Add more missing deps

---
 eng/helix/content/runtests.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 0a584dca881a..fa0d89b80a68 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -41,6 +41,24 @@ if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
     if [[ "$helixQueue" != *"OSX"* ]]; then
         echo "sudo apt-get install libdbus-glib-1-2"
         sudo apt-get install libdbus-glib-1-2
+        sudo apt-get install libbrotli1
+        sudo apt-get install libegl1
+        sudo apt-get install libnotify4
+        sudo apt-get install libvpx5
+        sudo apt-get install libopus0
+        sudo apt-get install libwoff1
+        sudo apt-get install libgstreamer-plugins-base1.0-0
+        sudo apt-get install libgstreamer1.0-0
+        sudo apt-get install libgstreamer-gl1.0-0
+        sudo apt-get install libgstreamer-plugins-bad1.0-0
+        sudo apt-get install libopenjp2-7
+        sudo apt-get install libwebpdemux2
+        sudo apt-get install libwebp6
+        sudo apt-get install libenchant1c2a
+        sudo apt-get install libsecret-1-0
+        sudo apt-get install libhyphen0
+        sudo apt-get install libgles2
+        sudo apt-get install gstreamer1.0-libav        
     fi
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH

From 6ecb555823cf780f67bb1ced10b0f8aba9bef6c4 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 11 Mar 2021 16:34:13 -0800
Subject: [PATCH 37/53] Assume yes for sudo apt-get

---
 eng/helix/content/runtests.sh | 40 +++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index fa0d89b80a68..28deecf32236 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -39,26 +39,26 @@ fi
 export InstallPlaywright="$installPlaywright"
 if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
     if [[ "$helixQueue" != *"OSX"* ]]; then
-        echo "sudo apt-get install libdbus-glib-1-2"
-        sudo apt-get install libdbus-glib-1-2
-        sudo apt-get install libbrotli1
-        sudo apt-get install libegl1
-        sudo apt-get install libnotify4
-        sudo apt-get install libvpx5
-        sudo apt-get install libopus0
-        sudo apt-get install libwoff1
-        sudo apt-get install libgstreamer-plugins-base1.0-0
-        sudo apt-get install libgstreamer1.0-0
-        sudo apt-get install libgstreamer-gl1.0-0
-        sudo apt-get install libgstreamer-plugins-bad1.0-0
-        sudo apt-get install libopenjp2-7
-        sudo apt-get install libwebpdemux2
-        sudo apt-get install libwebp6
-        sudo apt-get install libenchant1c2a
-        sudo apt-get install libsecret-1-0
-        sudo apt-get install libhyphen0
-        sudo apt-get install libgles2
-        sudo apt-get install gstreamer1.0-libav        
+        echo "Installing Playwright requirements..."
+        sudo apt-get install -y libdbus-glib-1-2
+        sudo apt-get install -y libbrotli1
+        sudo apt-get install -y libegl1
+        sudo apt-get install -y libnotify4
+        sudo apt-get install -y libvpx5
+        sudo apt-get install -y libopus0
+        sudo apt-get install -y libwoff1
+        sudo apt-get install -y libgstreamer-plugins-base1.0-0
+        sudo apt-get install -y libgstreamer1.0-0
+        sudo apt-get install -y libgstreamer-gl1.0-0
+        sudo apt-get install -y libgstreamer-plugins-bad1.0-0
+        sudo apt-get install -y libopenjp2-7
+        sudo apt-get install -y libwebpdemux2
+        sudo apt-get install -y libwebp6
+        sudo apt-get install -y libenchant1c2a
+        sudo apt-get install -y libsecret-1-0
+        sudo apt-get install -y libhyphen0
+        sudo apt-get install -y libgles2
+        sudo apt-get install -y gstreamer1.0-libav        
     fi
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH

From d8576eac58c05fa88d4ddd80663a12303b55f3ef Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Thu, 11 Mar 2021 23:18:33 -0800
Subject: [PATCH 38/53] Skipping more tests on mac

---
 .../BlazorTemplates.Tests/BlazorWasmTemplateTest.cs             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
index 75e62da2de47..7519f15ea191 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
@@ -42,6 +42,7 @@ public BlazorWasmTemplateTest(ProjectFactoryFixture projectFactory, PlaywrightFi
 
         [Theory]
         [InlineData(BrowserKind.Chromium)]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/30825", Queues = "All.OSX")]
         public async Task BlazorWasmStandaloneTemplate_Works(BrowserKind browserKind)
         {
             // Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278
@@ -149,6 +150,7 @@ private static async Task AssertCompressionFormat(AspNetProcess aspNetProcess, s
 
         [Theory]
         [InlineData(BrowserKind.Chromium)]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/30825", Queues = "All.OSX")]
         public async Task BlazorWasmStandalonePwaTemplate_Works(BrowserKind browserKind)
         {
             // Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278

From 88f6fbd8abdad82ad35b82cf339444dbf1aae0c3 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 12:52:22 -0800
Subject: [PATCH 39/53] Update BlazorWasmTemplateTest.cs

---
 .../BlazorTemplates.Tests/BlazorWasmTemplateTest.cs             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
index 7519f15ea191..a85edebeb205 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorWasmTemplateTest.cs
@@ -91,6 +91,7 @@ private async Task<IPage> NavigateToPage(IBrowserContext browser, string listeni
 
         [Theory]
         [InlineData(BrowserKind.Chromium)]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/30825", Queues = "All.OSX")]
         public async Task BlazorWasmHostedTemplate_Works(BrowserKind browserKind)
         {
             // Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278
@@ -198,6 +199,7 @@ public async Task BlazorWasmStandalonePwaTemplate_Works(BrowserKind browserKind)
 
         [Theory]
         [InlineData(BrowserKind.Chromium)]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/30825", Queues = "All.OSX")]
         public async Task BlazorWasmHostedPwaTemplate_Works(BrowserKind browserKind)
         {
             // Additional arguments are needed. See: https://github.com/dotnet/aspnetcore/issues/24278

From e6d587d20d111525237c58be6e3c91e209d3f1d7 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:08:11 -0800
Subject: [PATCH 40/53] Update runtests.ps1

---
 eng/helix/content/runtests.ps1 | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/eng/helix/content/runtests.ps1 b/eng/helix/content/runtests.ps1
index 3ed7a5cb4e05..20b892a88d34 100644
--- a/eng/helix/content/runtests.ps1
+++ b/eng/helix/content/runtests.ps1
@@ -19,11 +19,6 @@ $currentDirectory = Get-Location
 $env:PLAYWRIGHT_BROWSERS_PATH = "$currentDirectory\ms-playwright"
 $env:PLAYWRIGHT_DRIVER_PATH = "$currentDirectory\.playwright\win-x64\native\playwright.cmd"
 
-if ("$InstallPlaywright" -eq "true") {
-    Write-Host "Copying playwright drivers: Copy-Item $currentDirectory\.playwright\win-x64\native $currentDIrectory -recurse"
-    Copy-Item $currentDirectory\.playwright\win-x64\native $currentDirectory -recurse
-}
-
 $envPath = "$env:PATH;$env:HELIX_CORRELATION_PAYLOAD\node\bin"
 
 function InvokeInstallDotnet([string]$command) {

From 69c5c9477b8aa028f2a28b5a10c6f5492bd506ba Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:08:52 -0800
Subject: [PATCH 41/53] Update playwrightSettings.json

---
 .../BlazorTemplates.Tests/playwrightSettings.json               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json b/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json
index 48f1423de9fb..d5e34b4795f4 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json
@@ -28,7 +28,7 @@
     },
     "Firefox": {
       "BrowserKind": "Firefox",
-      "IsEnabled": false
+      "IsEnabled": true
     },
     "Webkit": {
       "BrowserKind": "Webkit",

From 14c0d187ae734c209d1d1b4acccedda3bbed3e70 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 15:10:02 -0800
Subject: [PATCH 42/53] Update helix-matrix.yml

---
 .azure/pipelines/helix-matrix.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
index de615d9e345c..97ce99e0a3d0 100644
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@@ -1,5 +1,9 @@
 # We only want to run full helix matrix on main
-pr: none
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - '*'
 trigger: none
 schedules:
 # Cron timezone is UTC.

From 803ee558287827a6b456cca8d9e3678d8e46fb03 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 17:58:15 -0800
Subject: [PATCH 43/53] Update playwrightSettings.json

---
 .../BlazorTemplates.Tests/playwrightSettings.json               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json b/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json
index d5e34b4795f4..48f1423de9fb 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/playwrightSettings.json
@@ -28,7 +28,7 @@
     },
     "Firefox": {
       "BrowserKind": "Firefox",
-      "IsEnabled": true
+      "IsEnabled": false
     },
     "Webkit": {
       "BrowserKind": "Webkit",

From 8d54adc627994cc6b0e555b9e17f2ef25d8b2724 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 18:02:25 -0800
Subject: [PATCH 44/53] Update BlazorTemplates.Tests.csproj

---
 .../BlazorTemplates.Tests/BlazorTemplates.Tests.csproj           | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
index db364525ca16..dda5b4fc7dee 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
@@ -7,6 +7,7 @@
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
     <SkipHelixArm>true</SkipHelixArm>
+    <SkipHelixQueues>Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64</<SkipHelixQueues>
     <BaseOutputPath />
     <OutputPath />
 

From f5916c667f4e81afda497e6701ffea51e25c30f1 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 18:07:06 -0800
Subject: [PATCH 45/53] Skip most of helix matrix for now

---
 .../BlazorTemplates.Tests/BlazorTemplates.Tests.csproj          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
index dda5b4fc7dee..cbd519d51819 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
@@ -7,7 +7,7 @@
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
     <SkipHelixArm>true</SkipHelixArm>
-    <SkipHelixQueues>Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64</<SkipHelixQueues>
+    <SkipHelixQueues>Alpine.312.Amd64.Open;Alpine.312.Amd64;Fedora.33.Amd64.Open;Fedora.33.Amd64;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64</<SkipHelixQueues>
     <BaseOutputPath />
     <OutputPath />
 

From 3f6d9c418f2a90980f3928196ea2d809a4727ec3 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 18:07:48 -0800
Subject: [PATCH 46/53] Update BlazorTemplates.Tests.csproj

---
 .../BlazorTemplates.Tests/BlazorTemplates.Tests.csproj          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
index cbd519d51819..1e46d2c72df7 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
@@ -7,7 +7,7 @@
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
     <SkipHelixArm>true</SkipHelixArm>
-    <SkipHelixQueues>Alpine.312.Amd64.Open;Alpine.312.Amd64;Fedora.33.Amd64.Open;Fedora.33.Amd64;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64</<SkipHelixQueues>
+    <SkipHelixQueues>Alpine.312.Amd64.Open;Alpine.312.Amd64;Fedora.33.Amd64.Open;Fedora.33.Amd64;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64</SkipHelixQueues>
     <BaseOutputPath />
     <OutputPath />
 

From a2efa5812676727756a77f1524d33a3932594e6e Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 18:09:28 -0800
Subject: [PATCH 47/53] Add ubuntu 2004 deps

---
 eng/helix/content/runtests.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 28deecf32236..60bd14fa0080 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -58,7 +58,9 @@ if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
         sudo apt-get install -y libsecret-1-0
         sudo apt-get install -y libhyphen0
         sudo apt-get install -y libgles2
-        sudo apt-get install -y gstreamer1.0-libav        
+        sudo apt-get install -y gstreamer1.0-libav
+        sudo apt-get install -y libxkbcommon0
+        sudo apt-get install -y libgtk-3-0
     fi
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH

From 3d013588cd4b39dee7a9d5ede5981213f35d0721 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 20:18:18 -0800
Subject: [PATCH 48/53] Update BlazorTemplates.Tests.csproj

---
 .../BlazorTemplates.Tests/BlazorTemplates.Tests.csproj           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
index 1e46d2c72df7..db364525ca16 100644
--- a/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
+++ b/src/ProjectTemplates/BlazorTemplates.Tests/BlazorTemplates.Tests.csproj
@@ -7,7 +7,6 @@
     <RunTemplateTests Condition="'$(RunTemplateTests)' == ''">true</RunTemplateTests>
     <SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
     <SkipHelixArm>true</SkipHelixArm>
-    <SkipHelixQueues>Alpine.312.Amd64.Open;Alpine.312.Amd64;Fedora.33.Amd64.Open;Fedora.33.Amd64;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64</SkipHelixQueues>
     <BaseOutputPath />
     <OutputPath />
 

From cdcca8b939d7db25a6c94057a3979e38c0057169 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Fri, 12 Mar 2021 20:19:05 -0800
Subject: [PATCH 49/53] Update Helix.targets

---
 eng/targets/Helix.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index bc6ab8d4c5df..36097d93a288 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
-    <SkipHelixQueues>Windows.7.Amd64.Open;Windows.81.Amd64.Open</SkipHelixQueues>
+    <SkipHelixQueues>Windows.7.Amd64.Open;Windows.81.Amd64.Open;Alpine.312.Amd64.Open;Alpine.312.Amd64;Fedora.33.Amd64.Open;Fedora.33.Amd64;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64</SkipHelixQueues>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TestDependsOnPlaywright)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">

From c3f8cc5749f9d09947771f5c0d2ef07dc50e999e Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sat, 13 Mar 2021 01:48:40 -0800
Subject: [PATCH 50/53] Update Helix.targets

---
 eng/targets/Helix.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 36097d93a288..89a23ea7d56a 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
-    <SkipHelixQueues>Windows.7.Amd64.Open;Windows.81.Amd64.Open;Alpine.312.Amd64.Open;Alpine.312.Amd64;Fedora.33.Amd64.Open;Fedora.33.Amd64;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64</SkipHelixQueues>
+    <SkipHelixQueues>Windows.7.Amd64.Open;Windows.81.Amd64.Open;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64;Alpine.312.Amd64.Open;(Alpine.312.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673;(Fedora.33.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267</SkipHelixQueues>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TestDependsOnPlaywright)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">

From b8e9f4c773677f2fc562d1b4b1de4a384cb112d3 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sat, 13 Mar 2021 01:52:18 -0800
Subject: [PATCH 51/53] Update runtests.sh

---
 eng/helix/content/runtests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
index 60bd14fa0080..357481f5eac3 100644
--- a/eng/helix/content/runtests.sh
+++ b/eng/helix/content/runtests.sh
@@ -61,6 +61,7 @@ if [ -f "$PLAYWRIGHT_DRIVER_PATH" ]; then
         sudo apt-get install -y gstreamer1.0-libav
         sudo apt-get install -y libxkbcommon0
         sudo apt-get install -y libgtk-3-0
+        sudo apt-get install -y libharfbuzz-icu0
     fi
     echo "chmod +x $PLAYWRIGHT_DRIVER_PATH"
     chmod +x $PLAYWRIGHT_DRIVER_PATH

From 1c278ddc92657e79ae80aee146c8fdf9d84bbeab Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sat, 13 Mar 2021 21:55:07 -0800
Subject: [PATCH 52/53] Update Helix.targets

---
 eng/targets/Helix.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
index 89a23ea7d56a..c8d332b9977a 100644
--- a/eng/targets/Helix.targets
+++ b/eng/targets/Helix.targets
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <PropertyGroup Condition="'$(TestDependsOnPlaywright)' == 'true'">
-    <SkipHelixQueues>Windows.7.Amd64.Open;Windows.81.Amd64.Open;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64;Alpine.312.Amd64.Open;(Alpine.312.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673;(Fedora.33.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267</SkipHelixQueues>
+    <SkipHelixQueues>Windows.7.Amd64.Open;Windows.81.Amd64.Open;Redhat.7.Amd64.Open;Redhat.7.Amd64;Debian.9.Amd64.Open;Debian.9.Amd64.Open;Ubuntu.2004.Amd64.Open;Ubuntu.2004.Amd64;Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64;Alpine.312.Amd64.Open;(Alpine.312.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-20200908125345-56c6673;(Fedora.33.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-33-helix-20210120000908-a9df267</SkipHelixQueues>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TestDependsOnPlaywright)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">

From 6f239c9a6bdf830914f2ff3f65515effa93964e5 Mon Sep 17 00:00:00 2001
From: Hao Kung <HaoK@users.noreply.github.com>
Date: Sun, 14 Mar 2021 03:42:52 -0700
Subject: [PATCH 53/53] Update helix-matrix.yml

---
 .azure/pipelines/helix-matrix.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.azure/pipelines/helix-matrix.yml b/.azure/pipelines/helix-matrix.yml
index 97ce99e0a3d0..de615d9e345c 100644
--- a/.azure/pipelines/helix-matrix.yml
+++ b/.azure/pipelines/helix-matrix.yml
@@ -1,9 +1,5 @@
 # We only want to run full helix matrix on main
-pr:
-  autoCancel: true
-  branches:
-    include:
-    - '*'
+pr: none
 trigger: none
 schedules:
 # Cron timezone is UTC.