Merge branch 'main' into update-dotnet-sdk-9.0.100-preview.4.24208.2

Author: MattyLeslie

.azure/pipelines/ci-public.yml

@@ -50,36 +50,10 @@ variables:
     value: true
 - name: _UseHelixOpenQueues
   value: ${{ ne(variables['System.TeamProject'], 'internal') }}
-- ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
-  - name: _BuildArgs
-    value: /p:TeamName=$(_TeamName)
-           /p:OfficialBuildId=$(Build.BuildNumber)
-           /p:SkipTestBuild=true
-           /p:PostBuildSign=$(PostBuildSign)
-  # Publish-Build-Assets provides: MaestroAccessToken, BotAccount-dotnet-maestro-bot-PAT
-  - group: Publish-Build-Assets
-  # The following extra properties are not set when testing. Use with final build.[cmd,sh] of asset-producing jobs.
-  - name: _PublishArgs
-    value: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines)
-  - ${{ if ne(parameters.produceBinlogs, 'true') }}:
-    # Do not log most Windows steps in official builds; this is the slowest job. Site extensions step always logs.
-    - name: WindowsArm64LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: Windows64LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: Windows86LogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsSignLogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsInstallersLogArgs
-      value: -ExcludeCIBinaryLog
-    - name: WindowsArm64InstallersLogArgs
-      value: -ExcludeCIBinaryLog
-- ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
-  - name: _BuildArgs
-    value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
-  - name: _PublishArgs
-    value: ''
+- name: _BuildArgs
+  value: '/p:SkipTestBuild=true /p:PostBuildSign=$(PostBuildSign)'
+- name: _PublishArgs
+  value: ''
 # Write binary logs for all main Windows build steps except the x86 one in public and PR builds.
 - name: WindowsArm64LogArgs
   value: /bl:artifacts/log/Release/Build.arm64.binlog
@@ -99,6 +73,10 @@ variables:
   value: ''
 - name: _InternalRuntimeDownloadCodeSignArgs
   value: ''
+- name: Codeql.Enabled
+  value: false
+- name: Codeql.SkipTaskAutoInjection
+  value: true
 - template: /eng/common/templates/variables/pool-providers.yml
 
 resources:
@@ -503,7 +481,7 @@ stages:
       jobDisplayName: "Build: Linux Musl ARM"
       agentOs: Linux
       useHostedUbuntu: false
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
       buildArgs:
         --arch arm
         --os-name linux-musl
@@ -536,7 +514,7 @@ stages:
       jobDisplayName: "Build: Linux Musl ARM64"
       agentOs: Linux
       useHostedUbuntu: false
-      container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm64-alpine
+      container: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
       buildArgs:
         --arch arm64
         --os-name linux-musl
@@ -671,4 +649,4 @@ stages:
           timeoutInMinutes: 120
           variables:
             # Log environment variables in binary logs to ease debugging
-            MSBUILDLOGALLENVIRONMENTVARIABLES: true
+            MSBUILDLOGALLENVIRONMENTVARIABLES: true

.azure/pipelines/ci.yml

@@ -141,10 +141,10 @@ extends:
     containers:
       alpine319WithNode:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
-      ubuntu2204CrossArmAlpine:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine
-      ubuntu2204CrossArm64Alpine:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm64-alpine
+      mariner20CrossArmAlpine:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine
+      mariner20CrossArm64Alpine:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm64-alpine
     stages:
     - stage: build
       displayName: Build
@@ -540,7 +540,7 @@ extends:
           jobDisplayName: "Build: Linux Musl ARM"
           agentOs: Linux
           useHostedUbuntu: false
-          container: ubuntu2204CrossArmAlpine
+          container: mariner20CrossArmAlpine
           buildArgs:
             --arch arm
             --os-name linux-musl
@@ -573,7 +573,7 @@ extends:
           jobDisplayName: "Build: Linux Musl ARM64"
           agentOs: Linux
           useHostedUbuntu: false
-          container: ubuntu2204CrossArm64Alpine
+          container: mariner20CrossArm64Alpine
           buildArgs:
             --arch arm64
             --os-name linux-musl

.azure/pipelines/helix-matrix.yml

@@ -29,7 +29,7 @@ jobs:
     jobName: Helix_matrix_x64
     jobDisplayName: 'Tests: Helix full matrix x64'
     agentOs: Windows
-    timeoutInMinutes: 480
+    timeoutInMinutes: 300
     steps:
     # Build the shared framework
     - script: ./eng/build.cmd -ci -prepareMachine -nativeToolsOnMachine -nobl -all -pack -arch x64

.azure/pipelines/jobs/default-build.yml

@@ -108,9 +108,9 @@ jobs:
         ${{ if eq(parameters.agentOs, 'macOS') }}:
           vmImage: macOS-12
         ${{ if eq(parameters.agentOs, 'Linux') }}:
-          ${{ if and(eq(parameters.useHostedUbuntu, true), in(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}:
+          ${{ if eq(parameters.useHostedUbuntu, true) }}:
             vmImage: ubuntu-20.04
-          ${{ if or(eq(parameters.useHostedUbuntu, false), notin(variables['Build.Reason'], 'Manual', 'PullRequest', 'Schedule')) }}:
+          ${{ else }}:
             name: $(DncEngPublicBuildPool)
             demands: ImageOverride -equals Build.Ubuntu.2004.Amd64.Open
         ${{ if eq(parameters.agentOs, 'Windows') }}:
@@ -352,7 +352,9 @@ jobs:
         - LC_ALL: 'en_US.UTF-8'
         - LANG: 'en_US.UTF-8'
         - LANGUAGE: 'en_US.UTF-8'
-      - ${{ if eq(parameters.codeSign, true) }}:
+      - ${{ if ne(parameters.codeSign, true) }}:
+        - _SignType: ''
+      - ${{ else }}:
         - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}:
           - _SignType: real
         - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:

.azure/pipelines/signalr-daily-tests.yml

@@ -8,19 +8,38 @@ variables:
   - ${{ if ne(variables['System.TeamProject'], 'public') }}:
     - group: DotNet-MSRC-Storage
     - group: AzureDevOps-Artifact-Feeds-Pats
-  - template: /eng/common/templates/variables/pool-providers.yml
+  - template: /eng/common/templates-official/variables/pool-providers.yml@self
 
-# The only Daily Tests we have run in Sauce Labs and only need to run on one machine (because they just trigger SauceLabs)
-# Hence we use the 'default-build.yml' template because it represents a single phase
-jobs:
-- template: jobs/default-build.yml
+resources:
+  repositories:
+  # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
+  - repository: 1esPipelines
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
   parameters:
-    buildDirectory: src/SignalR
-    buildArgs: "/p:DailyTests=true /p:SauceUser='$(asplab-sauce-labs-username)' /p:SauceKey='$(asplab-sauce-labs-access-key)' -t"
-    agentOs: Windows
-    jobName: SignalRDailyTests
-    jobDisplayName: "SignalR Daily Tests"
-    artifacts:
-    - name: Windows_Logs
-      path: artifacts/log/
-      publishOnError: true
+    sdl:
+      sourceAnalysisPool:
+        name: NetCore1ESPool-Svc-Internal
+        image: 1es-windows-2022-pt
+        os: windows
+    stages:
+    - stage: build
+      displayName: Build
+      # The only Daily Tests we have run in Sauce Labs and only need to run on one machine (because they just trigger SauceLabs)
+      # Hence we use the 'default-build.yml' template because it represents a single phase
+      jobs:
+      - template: .azure/pipelines/jobs/default-build.yml@self
+        parameters:
+          buildDirectory: src/SignalR
+          buildArgs: "/p:DailyTests=true /p:SauceUser='$(asplab-sauce-labs-username)' /p:SauceKey='$(asplab-sauce-labs-access-key)' -t"
+          agentOs: Windows
+          jobName: SignalRDailyTests
+          jobDisplayName: "SignalR Daily Tests"
+          artifacts:
+          - name: Windows_Logs
+            path: artifacts/log/
+            publishOnError: true

.config/1espt/PipelineAutobaseliningConfig.yml

@@ -0,0 +1,21 @@
+## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.
+
+pipelines:
+  21:
+    retail:
+      source:
+        credscan:
+          lastModifiedDate: 2024-03-22
+        eslint:
+          lastModifiedDate: 2024-03-22
+        psscriptanalyzer:
+          lastModifiedDate: 2024-03-22
+        armory:
+          lastModifiedDate: 2024-03-22
+      binary:
+        credscan:
+          lastModifiedDate: 2024-03-22
+        binskim:
+          lastModifiedDate: 2024-03-22
+        spotbugs:
+          lastModifiedDate: 2024-03-22

.config/guardian/.gdnbaselines

@@ -0,0 +1,60 @@
+{
+  "properties": {
+    "helpUri": "https://eng.ms/docs/microsoft-security/security/azure-security/cloudai-security-fundamentals-engineering/security-integration/guardian-wiki/microsoft-guardian/general/baselines"
+  },
+  "version": "1.0.0",
+  "baselines": {
+    "default": {
+      "name": "default",
+      "createdDate": "2024-03-22 19:39:15Z",
+      "lastUpdatedDate": "2024-03-22 19:39:15Z"
+    }
+  },
+  "results": {
+    "b225abd0112d9acb60d51b4140e53f850d297b6fbf8a8a16c2bbcbf74e8117ec": {
+      "signature": "b225abd0112d9acb60d51b4140e53f850d297b6fbf8a8a16c2bbcbf74e8117ec",
+      "alternativeSignatures": [
+        "7428887e9b12f8bfcd82f7a3c558516c0ff010dca528c6e14c651e483e481c3e"
+      ],
+      "target": "src/DataProtection/CreateTestCert.ps1",
+      "line": 11,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "psscriptanalyzer",
+      "ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
+      "createdDate": "2024-03-22 19:39:15Z",
+      "expirationDate": "2024-09-08 20:36:51Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-03-22 20:36:51Z"
+    },
+    "4b9e42233bd060f0007b20cdd0d0cade4dc4e67780b5f5b62b0355e96a610dd2": {
+      "signature": "4b9e42233bd060f0007b20cdd0d0cade4dc4e67780b5f5b62b0355e96a610dd2",
+      "alternativeSignatures": [
+        "e2a5a619bd7c6d200340a7d986cd01fec9427c65df0eef321fc8c853f00c8632"
+      ],
+      "target": "src/Hosting/Server.IntegrationTesting/src/Deployers/RemoteWindowsDeployer/RemotePSSessionHelper.ps1",
+      "line": 40,
+      "memberOf": [
+        "default"
+      ],
+      "tool": "psscriptanalyzer",
+      "ruleId": "PSAvoidUsingConvertToSecureStringWithPlainText",
+      "createdDate": "2024-03-22 19:39:15Z",
+      "expirationDate": "2024-09-08 20:36:51Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-03-22 20:36:51Z"
+    },
+    "b3736a918ff8d688843a2c76bfce1661c484e260144140c9df23f1147da102c0": {
+      "signature": "b3736a918ff8d688843a2c76bfce1661c484e260144140c9df23f1147da102c0",
+      "alternativeSignatures": [],
+      "target": "spotbugs.xml",
+      "memberOf": [
+        "default"
+      ],
+      "tool": "spotbugs",
+      "ruleId": "gdn.unknownFormatResult",
+      "createdDate": "2024-03-22 20:06:23Z",
+      "expirationDate": "2024-09-08 20:36:51Z",
+      "justification": "This error is baselined with an expiration date of 180 days from 2024-03-22 20:36:51Z"
+    }
+  }
+}

.editorconfig

@@ -254,6 +254,9 @@ dotnet_diagnostic.CA2014.severity = warning
 # CA2016: Forward the 'CancellationToken' parameter to methods that take one
 dotnet_diagnostic.CA2016.severity = warning
 
+# CA2022: Avoid inexact read with `Stream.Read`
+dotnet_diagnostic.CA2022.severity = warning
+
 # CA2200: Rethrow to preserve stack details
 dotnet_diagnostic.CA2200.severity = warning
 
@@ -407,6 +410,8 @@ dotnet_diagnostic.CA2007.severity = suggestion
 dotnet_diagnostic.CA2008.severity = suggestion
 # CA2012: Use ValueTask correctly
 dotnet_diagnostic.CA2012.severity = suggestion
+# CA2022: Avoid inexact read with `Stream.Read`
+dotnet_diagnostic.CA2022.severity = suggestion
 # CA2201: Do not raise reserved exception types
 dotnet_diagnostic.CA2201.severity = suggestion
 # CA2249: Use string.Contains instead of string.IndexOf to improve readability.

.github/dependabot.yml

@@ -47,7 +47,7 @@ updates:
       include: scope
     ignore:
       # Don't auto-update the Node-Externals submodule
-      - dependency-name: "Node-Externals*"
+      - dependency-name: "src/submodules/Node-Externals"
     labels:
       - area-infrastructure
 

.github/policies/resourceManagement.yml

@@ -685,7 +685,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 6.0.29
+          milestone: 6.0.30
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/6.0 branch'
     - if:
       - payloadType: Pull_Request
@@ -696,7 +696,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 7.0.18
+          milestone: 7.0.19
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/7.0 branch'
     - if:
       - payloadType: Pull_Request
@@ -707,7 +707,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 8.0.4
+          milestone: 8.0.5
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues