Merge remote-tracking branch 'origin/main' into mbuck/passkey-api-follow-ups

Author: MackinnonBuck

.azure/pipelines/ci-public.yml

@@ -47,6 +47,8 @@ parameters:
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
+- name: GRADLE_USER_HOME
+  value: $(Build.SourcesDirectory)/.gradle
 - name: _TeamName
   value:  AspNetCore
 - name: _PublishUsingPipelines

.azure/pipelines/ci.yml

@@ -31,6 +31,8 @@ parameters:
 variables:
 - name: DOTNET_SKIP_FIRST_TIME_EXPERIENCE
   value: true
+- name: GRADLE_USER_HOME
+  value: $(Build.SourcesDirectory)/.gradle
 - name: _TeamName
   value:  AspNetCore
 - name: _PublishUsingPipelines

.azure/pipelines/template-tests-pr.yml

@@ -17,6 +17,8 @@ pr:
   paths:
     include:
     - src/ProjectTemplates/*
+    - src/Components/*
+    - src/Mvc/*
 
 variables:
 - name: _UseHelixOpenQueues
@@ -45,6 +47,8 @@ jobs:
               /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
               /p:VsTestUseMSBuildOutput=false /p:OnlyTestProjectTemplates=true
       displayName: Run build.cmd helix target
+      env:
+        SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
     artifacts:
     - name: Helix_logs
       path: artifacts/log/

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@0e335649fe2d2f98ea51e55cc1a0899af3617eba # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@aea743edf7c9345cfdbdf9593756973baadc6b37 # 2025-01-13
     with:
       pr_description_template: |
         Backport of #%source_pr_number% to %target_branch%

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

@@ -10,4 +10,4 @@ permissions:
 
 jobs:
   Merge:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@0e335649fe2d2f98ea51e55cc1a0899af3617eba # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@aea743edf7c9345cfdbdf9593756973baadc6b37 # 2024-06-24

.gitignore

@@ -3,6 +3,7 @@ artifacts/
 bin/
 obj/
 .dotnet/
+.gradle/
 .nuget/
 .packages/
 .tools/
@@ -13,6 +14,7 @@ BenchmarkDotNet.Artifacts/
 src/SignalR/clients/**/dist/
 modules/
 .ionide/
+TestResults/
 
 # File extensions
 *.aps
@@ -33,6 +35,7 @@ modules/
 *.suo
 *.svclog
 *.tlog
+*.trx
 *.user
 *.userprefs
 *.vspx

activate.sh

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