Merge branch 'release/9.0.1xx' into marcpopMSFT-automateimplicitversion

Author: marcpopMSFT

.vsts-ci.yml

@@ -30,6 +30,7 @@ variables:
 # Helix testing requires a token when internally run.
 # Variables used: HelixApiAccessToken
 - group: DotNet-HelixApi-Access
+- group: AzureDevOps-Artifact-Feeds-Pats
 # Allows Arcade to run a signed build by disabling post-build signing for release-branch builds or manual builds that are not running tests.
 - ${{ if and(eq(parameters.runTestBuild, false), or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual'))) }}:
   - name: PostBuildSign
@@ -68,12 +69,10 @@ extends:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm
       centosStream9:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
-      debian11Amd64:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
+      debian12Amd64:
+        image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
       fedora39:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
-      ubuntu2204:
-        image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
       mariner20CrossArm:
         image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm
       ubuntu2204DebPkg:
@@ -296,6 +295,7 @@ extends:
       ############### SOURCE BUILD ###############
       - template: /eng/common/templates-official/job/source-build.yml@self
         parameters:
+          enableInternalSources: true
           platform:
             name: Managed
             container: centosStream9
@@ -308,6 +308,7 @@ extends:
           parameters:
             oneESCompat:
               publishTaskPrefix: 1ES.
+            runtimeSourceProperties: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64)
 
     ############### PUBLISH STAGE ###############
     - ${{ if and(eq(parameters.runTestBuild, false), ne(variables['Build.Reason'], 'PullRequest')) }}:

.vsts-pr.yml

@@ -20,12 +20,12 @@ resources:
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode
   - container: centosStream9
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream9
-  - container: debian11Amd64
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64
+  - container: debian12Amd64
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-12-gcc14-amd64
   - container: fedora39
     image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39
-  - container: ubuntu2204
-    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04
+  - container: ubuntu2204DebPkg
+    image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg
 
 stages:
 ############### BUILD STAGE ###############
@@ -62,6 +62,7 @@ stages:
   ############### SOURCE BUILD ###############
   - template: /eng/common/templates/job/source-build.yml
     parameters:
+      enableInternalSources: true
       platform:
         name: Managed
         container: centosStream9

eng/Version.Details.xml

@@ -900,7 +900,7 @@ function IsWindowsPlatform() {
 }
 
 function Get-Darc($version) {
-  $darcPath  = "$TempDir\darc\$(New-Guid)"
+  $darcPath  = "$TempDir\darc\$([guid]::NewGuid())"
   if ($version -ne $null) {
     & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host
   } else {

eng/Versions.props

@@ -60,6 +60,9 @@ parameters:
 - name: timeoutInMinutes
   type: number
   default: 90
+- name: runtimeSourceProperties
+  type: string
+  default: ''
 
 jobs:
 - job: Formatting_Check
@@ -74,11 +77,13 @@ jobs:
       os: windows
   timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
   steps:
-  - script: .\restore.cmd
+  - template: /eng/common/templates/steps/enable-internal-runtimes.yml
+  - template: /eng/common/templates/steps/enable-internal-sources.yml
+  - script: .\restore.cmd ${{ parameters.runtimeSourceProperties }}
     displayName: Restore dependencies
   - script: |
       .\artifacts\sdk-build-env.bat
-        dotnet run --project .\src\BuiltInTools\dotnet-format\dotnet-format.csproj -c Release -- @eng\dotnet-format\validate.rsp
+        dotnet run --project .\src\BuiltInTools\dotnet-format\dotnet-format.csproj -c Release  -- @eng\dotnet-format\validate.rsp
     displayName: Run dotnet-format
   - task: ${{ parameters.oneESCompat.publishTaskPrefix }}PublishBuildArtifacts@1
     displayName: Publish Logs
@@ -101,7 +106,9 @@ jobs:
         os: windows
     timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
     steps:
-    - script: eng\dotnet-format\integration-test.cmd -repo '${{ testArgs._repo }}' -branchName '${{ testArgs._branchName }}' -sha '${{ testArgs._sha }}' -targetSolution '${{ testArgs._targetSolution }}' -useParentSdk ${{ testArgs._useParentSdk }} -testPath '$(Agent.TempDirectory)\temp' -stage 'prepare'
+    - template: /eng/common/templates/steps/enable-internal-runtimes.yml
+    - template: /eng/common/templates/steps/enable-internal-sources.yml
+    - script: eng\dotnet-format\integration-test.cmd -repo '${{ testArgs._repo }}' -branchName '${{ testArgs._branchName }}' -sha '${{ testArgs._sha }}' -targetSolution '${{ testArgs._targetSolution }}' -useParentSdk ${{ testArgs._useParentSdk }} -testPath '$(Agent.TempDirectory)\temp' -stage 'prepare' -runtimeSourceProperties '${{ parameters.runtimeSourceProperties }}'
       displayName: Prepare ${{ testArgs._repoName }} for formatting
 
     - script: eng\dotnet-format\integration-test.cmd -repo '${{ testArgs._repo }}' -branchName '${{ testArgs._branchName }}' -sha '${{ testArgs._sha }}' -targetSolution '${{ testArgs._targetSolution }}' -useParentSdk ${{ testArgs._useParentSdk }} -testPath '$(Agent.TempDirectory)\temp' -stage 'format-workspace'

eng/common/tools.ps1

@@ -4,14 +4,15 @@ Param(
     [string]$sha,
     [string]$branchName,
     [string]$targetSolution,
+    [string]$runtimeSourceProperties,
     [bool]$useParentSdk,
     [string]$testPath,
     [string]$stage  # Valid values are "prepare", "format-workspace", "format-folder"
 )
 
 if ($stage -eq "prepare") {
     Write-Output "$(Get-Date) - Building dotnet-format."
-    .\build.cmd -c Release
+    .\build.cmd -c Release $runtimeSourceProperties
 }
 
 $currentLocation = Get-Location

eng/dotnet-format/dotnet-format-integration.yml

@@ -62,6 +62,9 @@ jobs:
           artifactName: BuildConfiguration
 
     # Populate internal runtime variables.
+    - template: /eng/common/templates/steps/enable-internal-sources.yml
+      parameters:
+        legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
     - template: /eng/common/templates/steps/enable-internal-runtimes.yml
 
     ############### BUILDING ###############

eng/dotnet-format/format-verifier.ps1

@@ -28,7 +28,7 @@ parameters:
     # Don't run the tests on arm64. Only perform the build itself.
     runTests: false
   - categoryName: ContainerBased
-    container: ubuntu2204
+    container: ubuntu2204DebPkg
     helixTargetContainer: $(helixTargetContainerPrefix)ubuntu-22.04-helix-amd64
     osProperties: $(linuxOsPortableProperties)
     # Skipping all container-based testing for now.
@@ -50,7 +50,7 @@ parameters:
     # See: https://github.com/dotnet/sdk/issues/40935
     runTests: false
   - categoryName: ContainerBased
-    container: debian11Amd64
+    container: debian12Amd64
     helixTargetContainer: $(helixTargetContainerPrefix)debian-11-helix-amd64
     osProperties: /p:OSName=linux /p:BuildSdkDeb=true
     # Skipping all container-based testing for now.

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

@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "9.0.100-rc.1.24452.12",
+    "dotnet": "9.0.100-rc.2.24474.11",
     "runtimes": {
       "dotnet": [
         "$(VSRedistCommonNetCoreSharedFrameworkx6490PackageVersion)"
@@ -17,8 +17,8 @@
     "cmake": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24503.2",
-    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24503.2",
+    "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24509.3",
+    "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24509.3",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
   }