Merge main into darc-main-39ce1e22-65a5-4162-a416-21e71641c0eb

Author: dotnet-maestro[bot]

.github/workflows/inter-branch-merge-flow.yml

@@ -7,7 +7,8 @@ on:
 permissions:
   contents: write
   pull-requests: write
+  issues: write
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@fac534d85b77789bd4daf2b4c916117f1ca381e7 # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/inter-branch-merge-base.yml@fac534d85b77789bd4daf2b4c916117f1ca381e7 # 2024-06-24

eng/Version.Details.props

@@ -7,13 +7,14 @@ Param(
   [switch] $restore,
   [switch] $prepareMachine,
   [switch][Alias('nobl')]$excludeCIBinaryLog,
+  [switch]$noWarnAsError,
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
 $ci = $true
 $binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
-$warnAsError = $true
+$warnAsError = if ($noWarnAsError) { $false } else { $true }
 
 . $PSScriptRoot\tools.ps1
 

eng/Version.Details.xml

@@ -10,6 +10,7 @@ show_usage() {
 
     echo "Advanced settings:"
     echo "  --excludeCIBinarylog     Don't output binary log (short: -nobl)"
+    echo "  --noWarnAsError          Do not warn as error
     echo ""
     echo "Command line arguments not listed above are passed thru to msbuild."
 }
@@ -52,6 +53,7 @@ exclude_ci_binary_log=false
 restore=false
 help=false
 properties=''
+warnAsError=true
 
 while (($# > 0)); do
   lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
@@ -73,6 +75,10 @@ while (($# > 0)); do
       exclude_ci_binary_log=true
       shift 1
       ;;
+    --noWarnAsError)
+      warnAsError=false
+      shift 1
+      ;;
     --help)
       help=true
       shift 1
@@ -85,7 +91,6 @@ while (($# > 0)); do
 done
 
 ci=true
-warnAsError=true
 
 if $help; then
   show_usage

eng/common/sdk-task.ps1

@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25418.105",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25418.105",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25418.105",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25419.104",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25419.104",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25419.104",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

eng/common/sdk-task.sh

@@ -1443,7 +1443,6 @@ public void RadioButtonGetsResetAfterSubmittingEnhancedForm()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60067")]
     public void SubmitButtonFormactionAttributeOverridesEnhancedFormAction()
     {
         GoTo("forms/form-submit-button-with-formaction");

global.json

@@ -35,7 +35,6 @@ protected override void InitializeAsyncCore()
     [InlineData("render-throw")]
     [InlineData("afterrender-sync-throw")]
     [InlineData("afterrender-async-throw")]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57588")]
     public void ComponentLifecycleMethodThrowsExceptionTerminatesTheCircuit(string id)
     {
         Browser.MountTestComponent<ReliabilityComponent>();
@@ -44,8 +43,7 @@ public void ComponentLifecycleMethodThrowsExceptionTerminatesTheCircuit(string i
         var targetButton = Browser.Exists(By.Id(id));
         targetButton.Click();
 
-        // Triggering an error will show the exception UI
-        Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: block;']"));
+        DismissBlazorErrorUI();
 
         // Clicking the button again will trigger a server disconnect
         targetButton.Click();
@@ -54,7 +52,6 @@ public void ComponentLifecycleMethodThrowsExceptionTerminatesTheCircuit(string i
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57588")]
     public void ComponentDisposeMethodThrowsExceptionTerminatesTheCircuit()
     {
         Browser.MountTestComponent<ReliabilityComponent>();
@@ -67,7 +64,8 @@ public void ComponentDisposeMethodThrowsExceptionTerminatesTheCircuit()
         targetButton.Click();
         // Clicking it again hides the component and invokes the rethrow which triggers the exception
         targetButton.Click();
-        Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: block;']"));
+
+        DismissBlazorErrorUI();
 
         // Clicking it again causes the circuit to disconnect
         targetButton.Click();
@@ -95,4 +93,17 @@ void AssertLogContains(params string[] messages)
             Assert.Contains(log, entry => entry.Message.Contains(message));
         }
     }
+
+    void DismissBlazorErrorUI()
+    {
+        // Triggering an error will show the exception UI
+        Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: block;']"));
+
+        // Dismiss the error UI by clicking the dismiss button
+        var dismissButton = Browser.Exists(By.CssSelector("#blazor-error-ui .dismiss"));
+        dismissButton.Click();
+
+        // Wait for error UI to be hidden
+        Browser.Exists(By.CssSelector("#blazor-error-ui[style='display: none;']"));
+    }
 }

package-lock.json

@@ -312,7 +312,7 @@ public static IDataProtectionBuilder ProtectKeysWithDpapi(this IDataProtectionBu
     /// </summary>
     /// <param name="builder">The <see cref="IDataProtectionBuilder"/>.</param>
     /// <param name="protectToLocalMachine">'true' if the key should be decryptable by any
-    /// use on the local machine, 'false' if the key should only be decryptable by the current
+    /// user on the local machine, 'false' if the key should only be decryptable by the current
     /// Windows user account.</param>
     /// <returns>A reference to the <see cref="IDataProtectionBuilder" /> after this operation has completed.</returns>
     /// <remarks>