Update playwright to 191.1

Author: HaoK

eng/Versions.props

@@ -244,7 +244,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>

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();

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>

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";

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"

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"

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>
 

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>