Merge branch 'dotnet:main' into ladeak-canhavemessagebody

Author: ladeak

.azure/pipelines/ci-public.yml

@@ -582,10 +582,10 @@ stages:
                   /p:VsTestUseMSBuildOutput=false
           displayName: Build shared fx
         # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
-        - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
+        - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
                   -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
                   /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
-                  /p:VsTestUseMSBuildOutput=false
+                  /p:VsTestUseMSBuildOutput=false /p:RunTemplateTests=false
           displayName: Run build.cmd helix target
           env:
             HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

.azure/pipelines/ci.yml

@@ -634,9 +634,9 @@ extends:
                 MSBUILDUSESERVER: "1"
               displayName: Build shared fx
             # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
-            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -noBuildRepoTasks -noBuildNative -noBuild -test
+            - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
                       -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
-                      /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
+                      /p:CrossgenOutput=false /p:RunTemplateTests=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log $(_InternalRuntimeDownloadArgs)
               displayName: Run build.cmd helix target
               env:
                 HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

.azure/pipelines/identitymodel-helix-matrix.yml

@@ -37,6 +37,8 @@ extends:
         compiled:
           enabled: false
           justificationForDisabling: 'This is a test-only pipeline. The same product code is already scanned in the main pipeline (aspnetcore-ci)'
+    featureFlags:
+      autoEnablePREfastWithNewRuleset: false
 
     stages:
     - stage: build

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

@@ -0,0 +1,51 @@
+# Configure which branches trigger builds
+# We want to run template tests on release/8.0 and later as well as on certain PRs
+trigger:
+  batch: true
+  branches:
+    include:
+    - main
+    - release/*
+
+# Run PR validation on branches that include Helix tests
+pr:
+  autoCancel: true
+  branches:
+    include:
+    - main
+    - release/*
+  paths:
+    include:
+    - src/ProjectTemplates/*
+
+variables:
+- name: _UseHelixOpenQueues
+  value: ${{ ne(variables['System.TeamProject'], 'internal') }}
+- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+  - group: DotNet-HelixApi-Access
+- template: /eng/common/templates/variables/pool-providers.yml
+
+jobs:
+- template: jobs/default-build.yml
+  parameters:
+    jobName: Helix_templates_x64
+    jobDisplayName: 'Tests: Helix template tests x64'
+    agentOs: Windows
+    timeoutInMinutes: 180
+    steps:
+    - script: git submodule update --init
+      displayName: Update submodules
+    # Build the shared framework
+    - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64
+              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log /p:VsTestUseMSBuildOutput=false
+      displayName: Build shared fx
+    # -noBuildRepoTasks -noBuildNative -noBuild to avoid repeating work done in the previous step.
+    - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -all -noBuildRepoTasks -noBuildNative -noBuild -test
+              -projects eng\helix\helix.proj /p:IsHelixPRCheck=true /p:IsHelixJob=true
+              /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+              /p:VsTestUseMSBuildOutput=false /p:OnlyTestProjectTemplates=true
+      displayName: Run build.cmd helix target
+    artifacts:
+    - name: Helix_logs
+      path: artifacts/log/
+      publishOnError: true

.github/workflows/backport.yml

@@ -14,7 +14,7 @@ permissions:
 
 jobs:
   backport:
-    uses: dotnet/arcade/.github/workflows/backport-base.yml@7a09c1144283309440a7966c664199944198c920 # 2025-01-13
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@0e335649fe2d2f98ea51e55cc1a0899af3617eba # 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@7a09c1144283309440a7966c664199944198c920 # 2024-06-24
+    uses: dotnet/arcade/.github/workflows/backport-base.yml@0e335649fe2d2f98ea51e55cc1a0899af3617eba # 2024-06-24

.gitignore

@@ -36,6 +36,7 @@ modules/
 *.user
 *.userprefs
 *.vspx
+*.json.bak
 
 # Specific files, typically generated by tools
 .config/dotnet-tools.json

AspNetCore.slnx

@@ -409,6 +409,8 @@
   <Folder Name="/src/Identity/samples/">
     <Project Path="src/Identity/samples/IdentitySample.DefaultUI/IdentitySample.DefaultUI.csproj" />
     <Project Path="src/Identity/samples/IdentitySample.Mvc/IdentitySample.Mvc.csproj" />
+    <Project Path="src/Identity/samples/IdentitySample.PasskeyConformance/IdentitySample.PasskeyConformance.csproj" />
+    <Project Path="src/Identity/samples/IdentitySample.PasskeyUI/IdentitySample.PasskeyUI.csproj" />
   </Folder>
   <Folder Name="/src/Identity/Specification.Tests/">
     <Project Path="src/Identity/Specification.Tests/src/Microsoft.AspNetCore.Identity.Specification.Tests.csproj" />

eng/Build.props

@@ -9,7 +9,7 @@
     the format is correct) and undo any temporary changes. When complete, only BuildAfterTargetingPack.csproj and
     other @(RequiresDelayedBuild) projects should mention projects listed in RequiresDelayedBuildProjects.props.
   -->
-  <Import Project="RequiresDelayedBuildProjects.props" />
+  <Import Project="RequiresDelayedBuildProjects.props" Condition="'$(OnlyTestProjectTemplates)' != 'true'" />
 
   <!-- These projects are always excluded, even when -projects is specified on command line. -->
   <ItemGroup>

eng/Dependencies.props

@@ -83,6 +83,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="System.Diagnostics.DiagnosticSource" />
     <LatestPackageReference Include="System.Diagnostics.EventLog" />
     <LatestPackageReference Include="System.DirectoryServices.Protocols" />
+    <LatestPackageReference Include="System.Formats.Cbor" />
     <LatestPackageReference Include="System.IdentityModel.Tokens.Jwt" />
     <LatestPackageReference Include="System.IO.Pipelines" />
     <LatestPackageReference Include="System.Memory" />