Merge branch 'users/vseanreeser/fix-more-errors-22-01-13' into users/vseanreeser/unsquash-merge

vseanreesermsft · vseanreesermsft · commit c987494ffc89 · 2022-01-13T12:16:09.000-08:00
diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -658,7 +658,7 @@ stages:
       parameters:
         condition: ne(variables['SkipTests'], 'true')
         jobName: MacOS_Test
-        jobDisplayName: "Test: macOS 10.14"
+        jobDisplayName: "Test: macOS x64"
         agentOs: macOS
         timeoutInMinutes: 240
         isTestingJob: true
diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml
@@ -95,7 +95,7 @@ jobs:
 - template: jobs/default-build.yml
   parameters:
     jobName: MacOS_Quarantined_Test
-    jobDisplayName: "Tests: macOS 10.14"
+    jobDisplayName: "Tests: macOS x64"
     agentOs: macOS
     timeoutInMinutes: 120
     isTestingJob: true
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -313,17 +313,17 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>f431858f8b1f1510723ace6343786c9194dbd7fc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21552.7">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21565.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
+      <Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21552.7">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21565.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
+      <Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21552.7">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21565.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>03adeadd89875039da245253a3f6038874e2fa88</Sha>
+      <Sha>2f5d6d594674c80c57048dd9ba8b4f6ee9297171</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
@@ -9,7 +9,7 @@
     <AspNetCoreMajorVersion>5</AspNetCoreMajorVersion>
     <AspNetCoreMinorVersion>0</AspNetCoreMinorVersion>
     <AspNetCorePatchVersion>14</AspNetCorePatchVersion>
-    <ValidateBaseline>false</ValidateBaseline>
+    <ValidateBaseline>true</ValidateBaseline>
     <!--
         When StabilizePackageVersion is set to 'true', this branch will produce stable outputs for 'Shipping' packages
     -->
@@ -136,7 +136,7 @@
     <MicrosoftEntityFrameworkCorePackageVersion>5.0.14</MicrosoftEntityFrameworkCorePackageVersion>
     <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.14</MicrosoftEntityFrameworkCoreDesignPackageVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21552.7</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21565.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <!--
 
@@ -238,7 +238,7 @@
     <!-- Packages from 2.1, 2.2, and 3.1 branches used for site extension build. -->
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>2.1.1</MicrosoftAspNetCoreAzureAppServicesSiteExtension21PackageVersion>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>2.2.0</MicrosoftAspNetCoreAzureAppServicesSiteExtension22PackageVersion>
-    <MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.21-servicing-21523-9</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
+    <MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>3.1.22-servicing-21579-4</MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x64PackageVersion>
     <MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>$(MicrosoftAspNetCoreAzureAppServicesSiteExtension31PackageVersion)</MicrosoftAspNetCoreAzureAppServicesSiteExtension31x86PackageVersion>
     <!-- 3rd party dependencies -->
@@ -267,9 +267,9 @@
     <NewtonsoftJsonBsonPackageVersion>1.0.2</NewtonsoftJsonBsonPackageVersion>
     <NewtonsoftJsonPackageVersion>12.0.2</NewtonsoftJsonPackageVersion>
     <NSwagApiDescriptionClientPackageVersion>13.0.4</NSwagApiDescriptionClientPackageVersion>
-    <SeleniumSupportPackageVersion>4.0.0</SeleniumSupportPackageVersion>
-    <SeleniumWebDriverChromeDriverPackageVersion>95.0.4638.1700</SeleniumWebDriverChromeDriverPackageVersion>
-    <SeleniumWebDriverPackageVersion>4.0.0</SeleniumWebDriverPackageVersion>
+    <SeleniumSupportPackageVersion>4.1.0</SeleniumSupportPackageVersion>
+    <SeleniumWebDriverChromeDriverPackageVersion>97.0.4692.7100</SeleniumWebDriverChromeDriverPackageVersion>
+    <SeleniumWebDriverPackageVersion>4.1.0</SeleniumWebDriverPackageVersion>
     <SerilogExtensionsLoggingPackageVersion>1.4.0</SerilogExtensionsLoggingPackageVersion>
     <SerilogSinksFilePackageVersion>4.0.0</SerilogSinksFilePackageVersion>
     <StackExchangeRedisPackageVersion>2.0.593</StackExchangeRedisPackageVersion>
@@ -287,7 +287,7 @@
   <!-- Restore feeds -->
   <PropertyGroup Label="Restore feeds">
     <!-- In an orchestrated build, this may be overridden to other Azure feeds. -->
-    <DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetcli.blob.core.windows.net/dotnet/</DotNetAssetRootUrl>
+    <DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">https://dotnetcli.azureedge.net/dotnet/</DotNetAssetRootUrl>
     <DotNetPrivateAssetRootUrl Condition="'$(DotNetPrivateAssetRootUrl)'==''">https://dotnetclimsrc.blob.core.windows.net/dotnet/</DotNetPrivateAssetRootUrl>
   </PropertyGroup>
 </Project>
diff --git a/eng/scripts/RunHelix.ps1 b/eng/scripts/RunHelix.ps1
@@ -14,7 +14,7 @@
     Windows.10.Amd64.Server20H2.Open
     Windows.81.Amd64.Open
     Windows.7.Amd64.Open
-    OSX.1014.Amd64.Open
+    OSX.1015.Amd64.Open
     Debian.9.Amd64.Open
     Redhat.7.Amd64.Open
 .PARAMETER RunQuarantinedTests
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
@@ -22,7 +22,7 @@
   <ItemGroup Condition="'$(IsRequiredCheck)' == 'true' AND '$(TargetArchitecture)' == 'x64'">
     <HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
     <HelixAvailableTargetQueue Include="Windows.10.Amd64.Open" Platform="Windows" />
-    <HelixAvailableTargetQueue Include="OSX.1014.Amd64.Open" Platform="OSX" />
+    <HelixAvailableTargetQueue Include="OSX.1015.Amd64.Open" Platform="OSX" />
   </ItemGroup>
 
   <!-- queues for helix-matrix.yml pipeline -->
diff --git a/eng/tools/RepoTasks/DownloadFile.cs b/eng/tools/RepoTasks/DownloadFile.cs
@@ -100,7 +100,7 @@ private async System.Threading.Tasks.Task<bool> ExecuteAsync()
 
             Log.LogMessage(MessageImportance.High, $"Attempting download '{source}' to '{target}'");
 
-            using (var httpClient = new HttpClient { Timeout = TimeSpan.FromMinutes(5) })
+            using (var httpClient = new HttpClient { Timeout = TimeSpan.FromMinutes(7.5) })
             {
                 for (int retryNumber = 0; retryNumber < MaxRetries; retryNumber++)
                 {
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "5.0.403"
+    "version": "5.0.404"
   },
   "tools": {
-    "dotnet": "5.0.403",
+    "dotnet": "5.0.404",
     "runtimes": {
       "dotnet/x64": [
         "2.1.30",
@@ -13,7 +13,7 @@
         "$(MicrosoftNETCoreAppInternalPackageVersion)"
       ],
       "aspnetcore/x64": [
-        "3.1.21"
+        "3.1.22"
       ]
     },
     "Git": "2.22.0",
@@ -30,7 +30,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21552.7",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21552.7"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21565.1",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21565.1"
   }
 }
diff --git a/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs b/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
@@ -115,7 +115,7 @@ public void System_UsesProvidedDirectory_WithConfigurationCallback()
 
         [ConditionalFact]
         [X509StoreIsAvailable(StoreName.My, StoreLocation.CurrentUser)]
-        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
         public void System_UsesProvidedDirectoryAndCertificate()
         {
             var filePath = Path.Combine(GetTestFilesPath(), "TestCert.pfx");
diff --git a/src/Framework/test/TargetingPackTests.cs b/src/Framework/test/TargetingPackTests.cs
@@ -109,22 +109,17 @@ public void RefAssemblyReferencesHaveExpectedAssemblyVersions()
 
             Assert.All(dlls, path =>
             {
-                // Skip netstandard2.0 System.IO.Pipelines assembly. References have old versions.
-                var filename = Path.GetFileName(path);
-                if (!string.Equals("System.IO.Pipelines.dll", filename, StringComparison.OrdinalIgnoreCase))
-                {
-                    using var fileStream = File.OpenRead(path);
-                    using var peReader = new PEReader(fileStream, PEStreamOptions.Default);
-                    var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default);
+            using var fileStream = File.OpenRead(path);
+            using var peReader = new PEReader(fileStream, PEStreamOptions.Default);
+            var reader = peReader.GetMetadataReader(MetadataReaderOptions.Default);
 
-                    Assert.All(reader.AssemblyReferences, handle =>
-                    {
-                        var reference = reader.GetAssemblyReference(handle);
-                        var result = 0 == reference.Version.Revision;
+            Assert.All(reader.AssemblyReferences, handle =>
+            {
+                var reference = reader.GetAssemblyReference(handle);
+                var result = (0 == reference.Version.Revision && 0 == reference.Version.Build);
 
-                        Assert.True(result, $"In {filename}, {reference.GetAssemblyName()} has unexpected version {reference.Version}.");
-                    });
-                }
+                Assert.True(result, $"In {Path.GetFileName(path)}, {reference.GetAssemblyName()} has unexpected version {reference.Version}.");
+            });
             });
         }
 
diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs
@@ -99,7 +99,7 @@ public void Configure_AddsDevelopmentKeyFromConfiguration()
         }
 
         [ConditionalFact]
-        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
         public void Configure_LoadsPfxCertificateCredentialFromConfiguration()
         {
             // Arrange
@@ -129,7 +129,7 @@ public void Configure_LoadsPfxCertificateCredentialFromConfiguration()
         }
 
         [ConditionalFact]
-        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
         public void Configure_LoadsCertificateStoreCertificateCredentialFromConfiguration()
         {
             try
diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs
@@ -59,7 +59,7 @@ public static void LoadFromStoreCert_ThrowsIfThereIsNoCertificateAvailable()
         }
 
         [ConditionalFact]
-        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
         public static void LoadFromStoreCert_SkipsCertificatesNotYetValid()
         {
             try
@@ -82,7 +82,7 @@ public static void LoadFromStoreCert_SkipsCertificatesNotYetValid()
         }
 
         [ConditionalFact]
-        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
         public static void LoadFromStoreCert_PrefersCertificatesCloserToExpirationDate()
         {
             try
@@ -105,7 +105,7 @@ public static void LoadFromStoreCert_PrefersCertificatesCloserToExpirationDate()
         }
 
         [ConditionalFact]
-        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
         public static void LoadFromStoreCert_SkipsExpiredCertificates()
         {
             try
diff --git a/src/ProjectTemplates/test/EmptyWebTemplateTest.cs b/src/ProjectTemplates/test/EmptyWebTemplateTest.cs
@@ -32,7 +32,7 @@ public ITestOutputHelper Output
         }
 
         [ConditionalFact]
-        [SkipOnHelix("Cert failures", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("Cert failures", Queues = "All.OSX")]
         public async Task EmptyWebTemplateCSharp()
         {
             await EmtpyTemplateCore(languageOverride: null);
diff --git a/src/ProjectTemplates/test/GrpcTemplateTest.cs b/src/ProjectTemplates/test/GrpcTemplateTest.cs
@@ -33,7 +33,7 @@ public ITestOutputHelper Output
         }
 
         [ConditionalFact]
-        [SkipOnHelix("Not supported queues", Queues = "Windows.7.Amd64;Windows.7.Amd64.Open;Windows.81.Amd64.Open;OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("Not supported queues", Queues = "Windows.7.Amd64;Windows.7.Amd64.Open;Windows.81.Amd64.Open;All.OSX")]
         public async Task GrpcTemplate()
         {
             var project = await ProjectFactory.GetOrCreateProject("grpc", Output);
diff --git a/src/ProjectTemplates/test/IdentityUIPackageTest.cs b/src/ProjectTemplates/test/IdentityUIPackageTest.cs
@@ -74,7 +74,7 @@ public ITestOutputHelper Output
         };
 
         [ConditionalFact]
-        [SkipOnHelix("cert failure", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("cert failure", Queues = "All.OSX")]
         [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/19716")]
         public async Task IdentityUIPackage_WorksWithDifferentOptions()
         {
diff --git a/src/ProjectTemplates/test/MvcTemplateTest.cs b/src/ProjectTemplates/test/MvcTemplateTest.cs
@@ -40,7 +40,7 @@ public ITestOutputHelper Output
         public async Task MvcTemplate_NoAuthFSharp() => await MvcTemplateCore(languageOverride: "F#");
 
         [ConditionalFact]
-        [SkipOnHelix("cert failure", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("cert failure", Queues = "All.OSX")]
         public async Task MvcTemplate_NoAuthCSharp() => await MvcTemplateCore(languageOverride: null);
 
         private async Task MvcTemplateCore(string languageOverride)
@@ -118,7 +118,7 @@ private async Task MvcTemplateCore(string languageOverride)
         [ConditionalTheory]
         [InlineData(true)]
         [InlineData(false)]
-        [SkipOnHelix("cert failure", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("cert failure", Queues = "All.OSX")]
         public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
         {
             var project = await ProjectFactory.GetOrCreateProject("mvcindividual" + (useLocalDB ? "uld" : ""), Output);
@@ -234,7 +234,7 @@ public async Task MvcTemplate_IndividualAuth(bool useLocalDB)
         }
 
         [ConditionalFact(Skip = "https://github.com/dotnet/aspnetcore/issues/25103")]
-        [SkipOnHelix("cert failure", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("cert failure", Queues = "All.OSX")]
         public async Task MvcTemplate_SingleFileExe()
         {
             // This test verifies publishing an MVC app as a single file exe works. We'll limit testing
diff --git a/src/ProjectTemplates/test/RazorPagesTemplateTest.cs b/src/ProjectTemplates/test/RazorPagesTemplateTest.cs
@@ -35,7 +35,7 @@ public ITestOutputHelper Output
         }
 
         [ConditionalFact]
-        [SkipOnHelix("Cert failures", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("Cert failures", Queues = "All.OSX")]
         public async Task RazorPagesTemplate_NoAuth()
         {
             var project = await ProjectFactory.GetOrCreateProject("razorpagesnoauth", Output);
@@ -106,7 +106,7 @@ public async Task RazorPagesTemplate_NoAuth()
         [ConditionalTheory]
         [InlineData(false)]
         [InlineData(true)]
-        [SkipOnHelix("cert failure", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("cert failure", Queues = "All.OSX")]
         [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/19716")]
         public async Task RazorPagesTemplate_IndividualAuth(bool useLocalDB)
         {
diff --git a/src/ProjectTemplates/test/WebApiTemplateTest.cs b/src/ProjectTemplates/test/WebApiTemplateTest.cs
@@ -44,11 +44,11 @@ public ITestOutputHelper Output
         public Task WebApiTemplateFSharp() => WebApiTemplateCore(languageOverride: "F#");
 
         [ConditionalFact]
-        [SkipOnHelix("Cert failures", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("Cert failures", Queues = "All.OSX")]
         public Task WebApiTemplateCSharp() => WebApiTemplateCore(languageOverride: null);
 
         [ConditionalFact]
-        [SkipOnHelix("Cert failures", Queues = "OSX.1014.Amd64;OSX.1014.Amd64.Open")]
+        [SkipOnHelix("Cert failures", Queues = "All.OSX")]
         public async Task WebApiTemplateCSharp_WithoutOpenAPI()
         {
             var project = await FactoryFixture.GetOrCreateProject("webapinoopenapi", Output);
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs b/src/Razor/Microsoft.NET.Sdk.Razor/test/ConcatenateFilesTest.cs
@@ -323,8 +323,7 @@ public void BundlesScopedCssFiles_DoesNotOverrideBundleForSameContents()
             Assert.Equal(lastModified, File.GetLastWriteTimeUtc(expectedFile));
         }
 
-        [Fact]
-        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/25623")]
+        [Fact(Skip="https://github.com/dotnet/aspnetcore/issues/25623")]
         public void BundlesScopedCssFiles_UpdatesBundleWhenContentsChange()
         {
             // Arrange
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/Http2ConnectionTests.cs
@@ -241,7 +241,7 @@ await ExpectAsync(Http2FrameType.HEADERS,
                 withStreamId: 1);
 
             // TriggerTick will trigger the stream to be returned to the pool so we can assert it
-            TriggerTick();
+            TriggerTick(_serviceContext.MockSystemClock.UtcNow);
 
             // Stream has been returned to the pool
             Assert.Equal(1, _connection.StreamPool.Count);
@@ -259,7 +259,7 @@ await ExpectAsync(Http2FrameType.HEADERS,
                 withStreamId: 3);
 
             // TriggerTick will trigger the stream to be returned to the pool so we can assert it
-            TriggerTick();
+            TriggerTick(_serviceContext.MockSystemClock.UtcNow);
 
             // Stream has been returned to the pool
             Assert.Equal(1, _connection.StreamPool.Count);
diff --git a/src/Shared/E2ETesting/selenium-config.json b/src/Shared/E2ETesting/selenium-config.json
@@ -1,7 +1,7 @@
 {
   "drivers": {
     "chrome": {
-      "version" : "95.0.4638.54"
+      "version" : "97.0.4692.71"
     }
   },
   "ignoreExtraDrivers": true
diff --git a/src/Testing/src/xunit/SkipOnHelixAttribute.cs b/src/Testing/src/xunit/SkipOnHelixAttribute.cs
@@ -27,7 +27,7 @@ public bool IsMet
         {
             get
             {
-                var skip = OnHelix() && (Queues == null || Queues.ToLowerInvariant().Split(';').Contains(GetTargetHelixQueue().ToLowerInvariant()));
+                var skip = OnHelix() && ShouldSkip();
                 return !skip;
             }
         }
@@ -42,6 +42,21 @@ public string SkipReason
                 return $"This test is skipped on helix";
             }
         }
+        
+        private bool ShouldSkip()
+        {
+            if (Queues == null) 
+            {
+                return true;
+            }
+            
+            var targetQueue = GetTargetHelixQueue().ToLowerInvariant();
+            if (Queues.Contains("All.OSX") && targetQueue.StartsWith("osx")) 
+            {
+                return true;
+            }
+            return Queues.ToLowerInvariant().Split(';').Contains(targetQueue);
+        }
 
         public static bool OnHelix() => !string.IsNullOrEmpty(GetTargetHelixQueue());
 
diff --git a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
diff --git a/src/submodules/googletest b/src/submodules/googletest

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ private async System.Threading.Tasks.Task<bool> ExecuteAsync()`
`100`	`100`
`101`	`101`	`Log.LogMessage(MessageImportance.High, $"Attempting download '{source}' to '{target}'");`
`102`	`102`
`103`		`- using (var httpClient = new HttpClient { Timeout = TimeSpan.FromMinutes(5) })`
	`103`	`+ using (var httpClient = new HttpClient { Timeout = TimeSpan.FromMinutes(7.5) })`
`104`	`104`	`{`
`105`	`105`	`for (int retryNumber = 0; retryNumber < MaxRetries; retryNumber++)`
`106`	`106`	`{`