Merged PR 36652: [internal/release/7.0] Merge from public

Merge from public release/7.0 to internal/release/7.0 and resolve conflicts if necessary
dotnet · Jan 19, 2024 · 610fe43 · 610fe43
2 parents ba2ce58 + eb7591e
commit 610fe43
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -181,9 +181,9 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.22505.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-externals" Version="7.0.0-alpha.1.24059.2">
       <Uri>https://github.com/dotnet/source-build-externals</Uri>
-      <Sha>c47ba6c19d50081f90008da8bc61b3ac20348f20</Sha>
+      <Sha>4bed7bdd937666fac4c4f351b9b02adddf8d035b</Sha>
       <SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
     </Dependency>
     <Dependency Name="System.Configuration.ConfigurationManager" Version="7.0.0">

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -137,7 +137,7 @@
     <MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23564.5</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>7.0.0-beta.23564.5</MicrosoftDotNetBuildTasksTemplatingVersion>
     <!-- Packages from dotnet/source-build-externals -->
-    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.22505.1</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
+    <MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>7.0.0-alpha.1.24059.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
     <!-- Packages from dotnet/xdt -->
     <MicrosoftWebXdtVersion>7.0.0-preview.22423.2</MicrosoftWebXdtVersion>
   </PropertyGroup>

diff --git a/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj b/src/Components/WebView/WebView/src/Microsoft.AspNetCore.Components.WebView.csproj
@@ -34,6 +34,8 @@
 
   <ItemGroup>
     <None Include="buildTransitive\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
+    <None Include="buildMultiTargeting\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
+    <None Include="build\Microsoft.AspNetCore.Components.WebView.props" Pack="true" PackagePath="%(Identity)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/karma.local.conf.js b/src/SignalR/clients/ts/FunctionalTests/scripts/karma.local.conf.js
@@ -1,3 +1,5 @@
+const os = require('os');
+
 try {
     // Karma configuration for a local run (the default)
     const createKarmaConfig = require("./karma.base.conf");
@@ -45,8 +47,16 @@ try {
     // We use the launchers themselves to figure out if the browser exists. It's a bit sneaky, but it works.
     tryAddBrowser("ChromeHeadlessNoSandbox", ChromeHeadlessBrowser.prototype);
     tryAddBrowser("ChromiumHeadlessIgnoreCert", ChromiumHeadlessBrowser.prototype);
-    if (!tryAddBrowser("FirefoxHeadless", FirefoxHeadlessBrowser.prototype)) {
-      tryAddBrowser("FirefoxDeveloperHeadless", FirefoxDeveloperHeadlessBrowser.prototype);
+
+    if (os.platform() !== 'darwin') {
+      if (!tryAddBrowser("FirefoxHeadless", FirefoxHeadlessBrowser.prototype)) {
+        tryAddBrowser("FirefoxDeveloperHeadless", FirefoxDeveloperHeadlessBrowser.prototype);
+      }
+    } else {
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=1871366
+        // https://bugzilla.mozilla.org/show_bug.cgi?id=1871447
+        // It looks like some Entitlements issue with Firefox and macOS, additionally, it seems 'firefox-bin' is being removed which is what the karma firefox launcher uses by default
+        tryAddBrowser("FirefoxHeadlessMac", FirefoxHeadlessBrowser.prototype);
     }
 
     // We need to receive an argument from the caller, but globals don't seem to work, so we use an environment variable.
@@ -71,6 +81,11 @@ try {
 
           // Ignore cert errors to allow our test cert to work (NEVER do this outside of testing)
           flags: ["--allow-insecure-localhost", "--ignore-certificate-errors"]
+        },
+        FirefoxHeadlessMac: {
+          base: 'FirefoxHeadless',
+
+          command: '/Applications/FireFox.app/Contents/MacOS/firefox'
         }
       },
     });