[automated] Merge branch 'release/9.0.1xx' => 'release/9.0.3xx'

NuGet.config

@@ -24,21 +24,26 @@
     <!--  Begin: Package sources from dotnet-aspire -->
     <!--  End: Package sources from dotnet-aspire -->
     <!--  Begin: Package sources from dotnet-emsdk -->
+    <add key="darc-pub-dotnet-emsdk-8e475db" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-8e475db5/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <add key="darc-pub-dotnet-aspnetcore-3c5c32a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-3c5c32a7/nuget/v3/index.json" />
+    <add key="darc-int-dotnet-aspnetcore-a95d659" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-a95d6599/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-aspnetcore -->
+    <!--  Begin: Package sources from dotnet-emsdk -->
+    <!--  End: Package sources from dotnet-emsdk -->
     <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <add key="darc-pub-DotNet-msbuild-Trusted-07da1b9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-07da1b9a/nuget/v3/index.json" />
+    <add key="darc-pub-DotNet-msbuild-Trusted-25f168c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-25f168ce/nuget/v3/index.json" />
     <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-roslyn-analyzers -->
     <!--  End: Package sources from dotnet-roslyn-analyzers -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-d839c41" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d839c41c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-templating -->
-    <add key="darc-pub-dotnet-templating-f5f6eb5" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-f5f6eb54/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-templating-2bd479c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-2bd479cb/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-889bd3c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-889bd3cf/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" />
@@ -62,15 +67,18 @@
   </packageSources>
   <disabledPackageSources>
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
+    <!--  End: Package sources from DotNet-msbuild-Trusted -->
     <!--  Begin: Package sources from dotnet-templating -->
     <!--  End: Package sources from dotnet-templating -->
     <!--  Begin: Package sources from dotnet-aspnetcore -->
-    <!--  Begin: Package sources from DotNet-msbuild-Trusted -->
-    <!--  End: Package sources from DotNet-msbuild-Trusted -->
+    <add key="darc-int-dotnet-aspnetcore-a95d659" value="true" />
     <!--  End: Package sources from dotnet-aspnetcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-d839c41" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-windowsdesktop -->
+    <add key="darc-int-dotnet-windowsdesktop-889bd3c" value="true" />
     <!--  End: Package sources from dotnet-windowsdesktop -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>

THIRD-PARTY-NOTICES.TXT

@@ -8,4 +8,4 @@ bring it to our attention. Post an issue or email us:
 
 The attached notices are provided for information only.
 
-No notices are provided at this time.
+No notices are provided at this time.

eng/pipelines/templates/jobs/vmr-build.yml

@@ -180,6 +180,26 @@ jobs:
 
     # Synchronize new content in the VMR during PRs (we expect this to come
     - ${{ if eq(variables['Build.Reason'], 'PullRequest') }}:
+      - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+        - task: AzureCLI@2
+          displayName: 'Mint AzDO token for VMR push'
+          inputs:
+            azureSubscription: 'dnceng-build-rw-code-rw-wif'
+            scriptType: 'pscore'
+            scriptLocation: 'inlineScript'
+            inlineScript: |
+              $token = az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query accessToken -o tsv
+              if ($LASTEXITCODE -ne 0) {
+                Write-Error "Failed to acquire Azure DevOps access token via 'az account get-access-token'. Exit code: $LASTEXITCODE"
+                exit 1
+              }
+              $token = $token.Trim()
+              if ([string]::IsNullOrWhiteSpace($token)) {
+                Write-Error "Received an empty or whitespace Azure DevOps access token from 'az account get-access-token'."
+                exit 1
+              }
+              Write-Host "##vso[task.setvariable variable=AzdoToken;issecret=true]$token"        
+
       - template: ../steps/vmr-pull-updates.yml@self
         parameters:
           vmrPath: $(vmrPath)
@@ -397,23 +417,6 @@ jobs:
         - script: cp "$(sourcesPath)/src/sdk/NuGet.config" "$(sourcesPath)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config"
           displayName: Copy Test NuGet Config for Smoke Tests
 
-      - ${{ else }}:
-        - task: Bash@3
-          displayName: Add aspnetcore public feed for smoke tests
-          inputs:
-            targetType: inline
-            script: |
-              set -euo pipefail
-
-              ONLINE_CONFIG="$(sourcesPath)/test/Microsoft.DotNet.SourceBuild.SmokeTests/assets/online.NuGet.Config"
-              FEED_KEY="darc-pub-dotnet-aspnetcore-3c5c32a7"
-              FEED_URL="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-aspnetcore-3c5c32a7/nuget/v3/index.json"
-
-              # Add only if missing. Do not touch disabledPackageSources.
-              if ! grep -qi "<add key=\"$FEED_KEY\"" "$ONLINE_CONFIG"; then
-                sed -i.bak "s|</packageSources>|    <add key=\"$FEED_KEY\" value=\"$FEED_URL\" />\n  </packageSources>|" "$ONLINE_CONFIG"
-              fi
-
       - script: |
           set -ex
 

eng/pipelines/templates/jobs/vmr-synchronization.yml

@@ -1,93 +1,111 @@
-### This job synchronizes code from product repositories into the VMR (https://github.com/dotnet/dotnet)
-### It synchronizes the content of the VMR to this new commit and pushes the changes
-
-parameters:
-- name: targetRef
-  displayName: Target revision of dotnet/sdk to synchronize
-  type: string
-  default: $(Build.SourceVersion)
-
-- name: vmrBranch
-  displayName: dotnet/dotnet branch to use
-  type: string
-  default: $(Build.SourceBranch)
-
-- name: noPush
-  displayName: Don't push changes to dotnet/dotnet
-  type: boolean
-  default: false
-
-jobs:
-- job: Synchronize_VMR
-  displayName: Synchronize VMR's ${{ parameters.vmrBranch }}
-  timeoutInMinutes: 120
-  variables:
-  - ${{ if eq(variables['System.TeamProject'], 'public') }}:
-    - template: /eng/common/templates/variables/pool-providers.yml
-  - ${{ else }}:
-    - template: /eng/common/templates-official/variables/pool-providers.yml
-  - name: vmrPath
-    value: $(Agent.BuildDirectory)/vmr
-  - ${{ if not(parameters.noPush) }}:
-    - ${{ if and( eq(variables['System.TeamProject'], 'internal'), or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
-      - group: DotNetBot-GitHub
-      - group: DotNetBot-GitHub-No-Scopes
-      - name: vmrPublicUrl
-        value: https://github.com/dotnet/dotnet
-    - ${{ if and( eq(variables['System.TeamProject'], 'internal'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}:
-      - name: vmrInternalUrl
-        value: https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-dotnet
-
-  pool:
-    ${{ if eq(variables['System.TeamProject'], 'public') }}:
-      name: $(DncEngPublicBuildPool)
-      image: build.azurelinux.3.amd64.open
-      os: linux
-    ${{ else }}:
-      name: $(DncEngInternalBuildPool)
-      demands: ImageOverride -equals build.azurelinux.3.amd64
-      os: linux
-
-  steps:
-  - template: ../steps/vmr-prepare.yml
-    parameters:
-      vmrBranch: ${{ parameters.vmrBranch }}
-
-  - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
-    - template: /eng/common/templates-official/steps/get-federated-access-token.yml
-      parameters:
-        federatedServiceConnection: VmrSyncPipeline
-        outputVariableName: AzdoToken
-
-  - template: ../steps/vmr-pull-updates.yml
-    parameters:
-      vmrPath: $(vmrPath)
-      vmrBranch: ${{ parameters.vmrBranch }}
-      targetRef: ${{ parameters.targetRef }}
-
-  - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}:
-    # Push main and release branches to the public VMR
-    - ${{ if or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')) }}:
-      - script: >
-          ./.dotnet/dotnet darc vmr push
-          --vmr '$(vmrPath)'
-          --commit-verification-pat '$(BotAccount-dotnet-maestro-bot-no-scopes-PAT)'
-          --branch '${{ parameters.vmrBranch }}'
-          --remote-url '$(vmrPublicUrl)'
-          --github-pat '$(BotAccount-dotnet-bot-repo-PAT)'
-          --verbose
-        displayName: Push changes to dotnet/dotnet (public)
-        workingDirectory: $(Agent.BuildDirectory)/sdk
-
-    # Push internal/release branches to the internal VMR
-    - ${{ if startsWith(parameters.vmrBranch, 'internal/release/') }}:
-      - script: >
-          ./.dotnet/dotnet darc vmr push
-          --vmr '$(vmrPath)'
-          --skip-commit-verification
-          --branch '${{ parameters.vmrBranch }}'
-          --remote-url '$(vmrInternalUrl)'
-          --azdev-pat '$(AzdoToken)'
-          --verbose
-        displayName: Push changes to dotnet-dotnet (internal)
-        workingDirectory: $(Agent.BuildDirectory)/sdk
+### This job synchronizes code from product repositories into the VMR (https://github.com/dotnet/dotnet)
+### It synchronizes the content of the VMR to this new commit and pushes the changes
+
+parameters:
+- name: targetRef
+  displayName: Target revision of dotnet/sdk to synchronize
+  type: string
+  default: $(Build.SourceVersion)
+
+- name: vmrBranch
+  displayName: dotnet/dotnet branch to use
+  type: string
+  default: $(Build.SourceBranch)
+
+- name: noPush
+  displayName: Don't push changes to dotnet/dotnet
+  type: boolean
+  default: false
+
+jobs:
+- job: Synchronize_VMR
+  displayName: Synchronize VMR's ${{ parameters.vmrBranch }}
+  timeoutInMinutes: 120
+  variables:
+  - ${{ if eq(variables['System.TeamProject'], 'public') }}:
+    - template: /eng/common/templates/variables/pool-providers.yml
+  - ${{ else }}:
+    - template: /eng/common/templates-official/variables/pool-providers.yml
+  - name: vmrPath
+    value: $(Agent.BuildDirectory)/vmr
+  - ${{ if not(parameters.noPush) }}:
+    - ${{ if and( eq(variables['System.TeamProject'], 'internal'), or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}:
+      - group: DotNetBot-GitHub
+      - group: DotNetBot-GitHub-No-Scopes
+      - name: vmrPublicUrl
+        value: https://github.com/dotnet/dotnet
+    - ${{ if and( eq(variables['System.TeamProject'], 'internal'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/')) }}:
+      - name: vmrInternalUrl
+        value: https://dnceng@dev.azure.com/dnceng/internal/_git/dotnet-dotnet
+
+  pool:
+    ${{ if eq(variables['System.TeamProject'], 'public') }}:
+      name: $(DncEngPublicBuildPool)
+      image: build.azurelinux.3.amd64.open
+      os: linux
+    ${{ else }}:
+      name: $(DncEngInternalBuildPool)
+      demands: ImageOverride -equals build.azurelinux.3.amd64
+      os: linux
+
+  steps:
+  - template: ../steps/vmr-prepare.yml
+    parameters:
+      vmrBranch: ${{ parameters.vmrBranch }}
+
+  - ${{ if eq(variables['System.TeamProject'], 'internal') }}:
+    - template: /eng/common/templates-official/steps/get-federated-access-token.yml
+      parameters:
+        federatedServiceConnection: VmrSyncPipeline
+        outputVariableName: AzdoToken
+
+  - template: ../steps/vmr-pull-updates.yml
+    parameters:
+      vmrPath: $(vmrPath)
+      vmrBranch: ${{ parameters.vmrBranch }}
+      targetRef: ${{ parameters.targetRef }}
+
+  - ${{ if and(not(parameters.noPush), not(in(variables['Build.Reason'], 'PullRequest')), eq(variables['System.TeamProject'], 'internal')) }}:
+    # Push main and release branches to the public VMR
+    - ${{ if or(eq(parameters.vmrBranch, 'main'), startsWith(parameters.vmrBranch, 'release/')) }}:
+      - script: >
+          ./.dotnet/dotnet darc vmr push
+          --vmr '$(vmrPath)'
+          --commit-verification-pat '$(BotAccount-dotnet-maestro-bot-no-scopes-PAT)'
+          --branch '${{ parameters.vmrBranch }}'
+          --remote-url '$(vmrPublicUrl)'
+          --github-pat '$(BotAccount-dotnet-bot-repo-PAT)'
+          --verbose
+        displayName: Push changes to dotnet/dotnet (public)
+        workingDirectory: $(Agent.BuildDirectory)/sdk
+
+    # Push internal/release branches to the internal VMR
+    - ${{ if startsWith(parameters.vmrBranch, 'internal/release/') }}:
+      - task: AzureCLI@2
+        displayName: Mint AzDO token via WIF
+        inputs:
+          azureSubscription: 'dnceng-build-rw-code-rw-wif'
+          scriptType: 'pscore'
+          scriptLocation: 'inlineScript'
+          inlineScript: |
+            $token = az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query accessToken -o tsv
+            if ($LASTEXITCODE -ne 0) {
+              Write-Error "Failed to acquire Azure DevOps access token via 'az account get-access-token'. Exit code: $LASTEXITCODE"
+              exit 1
+            }
+            $token = $token.Trim()
+            if ([string]::IsNullOrWhiteSpace($token)) {
+              Write-Error "Received an empty or whitespace Azure DevOps access token from 'az account get-access-token'."
+              exit 1
+            }
+            Write-Host "##vso[task.setvariable variable=WifAzdoToken;issecret=true]$token"
+      - script: >
+          ./.dotnet/dotnet darc vmr push
+          --vmr '$(vmrPath)'
+          --skip-commit-verification
+          --branch '${{ parameters.vmrBranch }}'
+          --remote-url '$(vmrInternalUrl)'
+          --azdev-pat '$(WifAzdoToken)'
+          --verbose
+        displayName: Push changes to dotnet-dotnet (internal)
+        workingDirectory: $(Agent.BuildDirectory)/sdk

eng/pipelines/templates/steps/vmr-prepare.yml

@@ -1,4 +1,4 @@
-### These steps clone the VMR (https://github.com/dotnet/dotnet) into $(Agent.BuildDirectory)/vmr for installer
+### These steps clone the VMR (https://github.com/dotnet/dotnet) into $(Agent.BuildDirectory)/vmr for sdk
 
 parameters:
 - name: vmrBranch

global.json

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "9.0.115",
+    "dotnet": "9.0.116",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
     "cmake": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26220.3",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26220.3",
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26301.4",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26301.4",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
   }