From e09c7c2b3fa50234cad6dd631aa1bf9dac555c6c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Aug 2025 02:09:59 +0000 Subject: [PATCH 01/30] Update dependencies from https://github.com/dotnet/dotnet build 279432 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25414.103 -> 10.0.0-beta.25414.111) System.CommandLine (Version 2.0.0-rc.1.25414.103 -> 2.0.0-rc.1.25414.111) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 51857f70cc8..a2665ed89a9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,8 +7,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25414.103 - 2.0.0-rc.1.25414.103 + 10.0.0-beta.25414.111 + 2.0.0-rc.1.25414.111 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c87af9ba16..9e41848fa96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + f8a57b66e6466922534e8046b37a6503d9d39dab - + https://github.com/dotnet/dotnet - 5088919af0e4a144ce5b294542f472bf668c9cc8 + f8a57b66e6466922534e8046b37a6503d9d39dab diff --git a/global.json b/global.json index 6d97e567986..5500de52bb3 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25411.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25414.103" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25414.111" } } From 7231084a4eb333c5e8700f857cc2ced5af48fbf4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Aug 2025 02:22:48 +0000 Subject: [PATCH 02/30] Backflow from https://github.com/dotnet/dotnet / a01724d build 279606 [[ commit created by automation ]] --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1d4ca2b834c..df2ba4bc003 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -9,7 +9,7 @@ rc rtm servicing - 1 + 2 true true From 2b32759bcda3d27f5625326d16985c539a32510b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Aug 2025 02:22:49 +0000 Subject: [PATCH 03/30] Update dependencies from https://github.com/dotnet/dotnet build 279606 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25414.111 -> 10.0.0-beta.25416.105) System.CommandLine (Version 2.0.0-rc.1.25414.111 -> 2.0.0-rc.2.25416.105) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a2665ed89a9..d3a0c70a995 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,8 +7,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25414.111 - 2.0.0-rc.1.25414.111 + 10.0.0-beta.25416.105 + 2.0.0-rc.2.25416.105 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e41848fa96..8105c7adc09 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - f8a57b66e6466922534e8046b37a6503d9d39dab + a01724db6d16445177cb31c6f300d38b0af06290 - + https://github.com/dotnet/dotnet - f8a57b66e6466922534e8046b37a6503d9d39dab + a01724db6d16445177cb31c6f300d38b0af06290 diff --git a/global.json b/global.json index 5500de52bb3..e5e5ebfd345 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25411.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25414.111" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.105" } } From fedbf4c6285aaf50d4f4758338029a40580d44f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Aug 2025 04:25:26 +0000 Subject: [PATCH 04/30] Update dependencies from https://github.com/dotnet/dotnet build 279809 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25416.105 -> 10.0.0-beta.25416.109) System.CommandLine (Version 2.0.0-rc.2.25416.105 -> 2.0.0-rc.2.25416.109) --- eng/Version.Details.props | 4 +- eng/Version.Details.xml | 10 ++-- .../steps/install-microbuild.yml | 6 +-- eng/common/generate-locproject.ps1 | 49 ++++++++++++++++--- eng/common/tools.ps1 | 6 ++- global.json | 2 +- 6 files changed, 57 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d3a0c70a995..51cd275a5a9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,8 +7,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25416.105 - 2.0.0-rc.2.25416.105 + 10.0.0-beta.25416.109 + 2.0.0-rc.2.25416.109 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8105c7adc09..518cbb34ef3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e - + https://github.com/dotnet/dotnet - a01724db6d16445177cb31c6f300d38b0af06290 + 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index da30e67bc34..f614d1440ed 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -53,10 +53,8 @@ steps: zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json ${{ if eq(parameters.microbuildUseESRP, true) }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - azureSubscription: 'MicroBuild Signing Task (DevDiv)' - useEsrpCli: true - ${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea ${{ else }}: ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca diff --git a/eng/common/generate-locproject.ps1 b/eng/common/generate-locproject.ps1 index 524aaa57f2b..fa1cdc2b300 100644 --- a/eng/common/generate-locproject.ps1 +++ b/eng/common/generate-locproject.ps1 @@ -33,15 +33,27 @@ $jsonTemplateFiles | ForEach-Object { $jsonWinformsTemplateFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "en\\strings\.json" } # current winforms pattern +$wxlFilesV3 = @() +$wxlFilesV5 = @() $wxlFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\.+\.wxl" -And -Not( $_.Directory.Name -Match "\d{4}" ) } # localized files live in four digit lang ID directories; this excludes them if (-not $wxlFiles) { $wxlEnFiles = Get-ChildItem -Recurse -Path "$SourcesDirectory" | Where-Object { $_.FullName -Match "\\1033\\.+\.wxl" } # pick up en files (1033 = en) specifically so we can copy them to use as the neutral xlf files if ($wxlEnFiles) { - $wxlFiles = @() - $wxlEnFiles | ForEach-Object { - $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" - $wxlFiles += Copy-Item "$($_.FullName)" -Destination $destinationFile -PassThru - } + $wxlFiles = @() + $wxlEnFiles | ForEach-Object { + $destinationFile = "$($_.Directory.Parent.FullName)\$($_.Name)" + $content = Get-Content $_.FullName -Raw + + # Split files on schema to select different parser settings in the generated project. + if ($content -like "*http://wixtoolset.org/schemas/v4/wxl*") + { + $wxlFilesV5 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + elseif ($content -like "*http://schemas.microsoft.com/wix/2006/localization*") + { + $wxlFilesV3 += Copy-Item $_.FullName -Destination $destinationFile -PassThru + } + } } } @@ -114,7 +126,32 @@ $locJson = @{ CloneLanguageSet = "WiX_CloneLanguages" LssFiles = @( "wxl_loc.lss" ) LocItems = @( - $wxlFiles | ForEach-Object { + $wxlFilesV3 | ForEach-Object { + $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" + $continue = $true + foreach ($exclusion in $exclusions.Exclusions) { + if ($_.FullName.Contains($exclusion)) { + $continue = $false + } + } + $sourceFile = ($_.FullName | Resolve-Path -Relative) + if ($continue) + { + return @{ + SourceFile = $sourceFile + CopyOption = "LangIDOnPath" + OutputPath = $outputPath + } + } + } + ) + }, + @{ + LanguageSet = $LanguageSet + CloneLanguageSet = "WiX_CloneLanguages" + LssFiles = @( "P210WxlSchemaV4.lss" ) + LocItems = @( + $wxlFilesV5 | ForEach-Object { $outputPath = "$($_.Directory.FullName | Resolve-Path -Relative)\" $continue = $true foreach ($exclusion in $exclusions.Exclusions) { diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index d4cfd9ccd80..4920464cc4a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -544,7 +544,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (Get-Member -InputObject $GlobalJson.tools -Name 'vswhere') { $vswhereVersion = $GlobalJson.tools.vswhere } else { - $vswhereVersion = '2.5.2' + # keep this in sync with the VSWhereVersion in DefaultVersions.props + $vswhereVersion = '3.1.7' } $vsWhereDir = Join-Path $ToolsDir "vswhere\$vswhereVersion" @@ -552,7 +553,8 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir - Write-Host 'Downloading vswhere' + Write-Host 'Downloading vswhere $vswhereVersion' + $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe }) diff --git a/global.json b/global.json index e5e5ebfd345..a919d87549e 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25411.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.105" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.109" } } From 260c234fe378a34339734fdc91181cba0ed48e63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Aug 2025 02:21:59 +0000 Subject: [PATCH 05/30] Update dependencies from https://github.com/dotnet/dotnet build 279959 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25416.109 -> 10.0.0-beta.25418.119) System.CommandLine (Version 2.0.0-rc.2.25416.109 -> 2.0.0-rc.2.25418.119) --- eng/Version.Details.props | 4 +- eng/Version.Details.xml | 10 ++--- eng/common/SetupNugetSources.ps1 | 4 +- eng/common/SetupNugetSources.sh | 4 +- eng/common/core-templates/job/job.yml | 6 +-- eng/common/core-templates/job/onelocbuild.yml | 6 +-- .../job/publish-build-assets.yml | 10 +++-- .../core-templates/jobs/codeql-build.yml | 2 +- eng/common/core-templates/jobs/jobs.yml | 2 + .../core-templates/post-build/post-build.yml | 8 ++-- .../post-build/setup-maestro-vars.yml | 2 +- .../steps/enable-internal-sources.yml | 12 +++--- .../core-templates/steps/generate-sbom.yml | 2 +- .../steps/install-microbuild.yml | 41 ++++++++++++------- .../core-templates/steps/publish-logs.yml | 14 +++---- .../steps/source-index-stage1-publish.yml | 2 +- eng/common/template-guidance.md | 2 +- eng/common/templates-official/job/job.yml | 2 +- .../variables/sdl-variables.yml | 2 +- eng/common/templates/job/job.yml | 4 +- global.json | 2 +- 21 files changed, 79 insertions(+), 62 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 51cd275a5a9..604ac1baf91 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,8 +7,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25416.109 - 2.0.0-rc.2.25416.109 + 10.0.0-beta.25418.119 + 2.0.0-rc.2.25418.119 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 518cbb34ef3..b461f842491 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + ea90fea181ebdfa48b1c240085dcdc4ab5837ddb - + https://github.com/dotnet/dotnet - 7f2a07b481a3d24677ebcf6a45e7e27c8ff95a4e + ea90fea181ebdfa48b1c240085dcdc4ab5837ddb diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 5db4ad71ee2..792b60b49d4 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -10,8 +10,8 @@ # displayName: Setup Private Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 -# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 +# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token # env: # Token: $(dn-bot-dnceng-artifact-feeds-rw) # diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index 4604b61b032..facb415ca6f 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -11,8 +11,8 @@ # - task: Bash@3 # displayName: Setup Internal Feeds # inputs: -# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh -# arguments: $(Build.SourcesDirectory)/NuGet.config +# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.sh +# arguments: $(System.DefaultWorkingDirectory)/NuGet.config # condition: ne(variables['Agent.OS'], 'Windows_NT') # - task: NuGetAuthenticate@1 # diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index d9013251542..5ce51840619 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -163,7 +163,7 @@ jobs: inputs: testResultsFormat: 'xUnit' testResultsFiles: '*.xml' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -174,7 +174,7 @@ jobs: inputs: testResultsFormat: 'VSTest' testResultsFiles: '*.trx' - searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + searchFolder: '$(System.DefaultWorkingDirectory)/artifacts/TestResults/$(_BuildConfig)' testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx mergeTestResults: ${{ parameters.mergeTestResults }} continueOnError: true @@ -218,7 +218,7 @@ jobs: - task: CopyFiles@2 displayName: Gather buildconfiguration for build retry inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/common/BuildConfiguration' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/common/BuildConfiguration' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/eng/common/BuildConfiguration' continueOnError: true diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index 8bf7d23355b..c5788829a87 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -8,7 +8,7 @@ parameters: CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) - SourcesDirectory: $(Build.SourcesDirectory) + SourcesDirectory: $(System.DefaultWorkingDirectory) CreatePr: true AutoCompletePr: false ReusePr: true @@ -68,7 +68,7 @@ jobs: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: - task: Powershell@2 inputs: - filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/generate-locproject.ps1 arguments: $(_GenerateLocProjectArguments) displayName: Generate LocProject.json condition: ${{ parameters.condition }} @@ -103,7 +103,7 @@ jobs: - task: CopyFiles@2 displayName: Copy LocProject.json inputs: - SourceFolder: '$(Build.SourcesDirectory)/eng/Localize/' + SourceFolder: '$(System.DefaultWorkingDirectory)/eng/Localize/' Contents: 'LocProject.json' TargetFolder: '$(Build.ArtifactStagingDirectory)/loc' condition: ${{ parameters.condition }} diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index d5303229c97..348cd16376f 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -38,6 +38,8 @@ parameters: # Optional: A minimatch pattern for the asset manifests to publish to BAR assetManifestsPattern: '*/manifests/**/*.xml' + repositoryAlias: self + jobs: - job: Asset_Registry_Publish @@ -78,7 +80,7 @@ jobs: - 'Illegal entry point, is1ESPipeline is not defined. Repository yaml should not directly reference templates in core-templates folder.': error - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - checkout: self + - checkout: ${{ parameters.repositoryAlias }} fetchDepth: 3 clean: true @@ -117,7 +119,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/sdk-task.ps1 arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} @@ -137,7 +139,7 @@ jobs: Add-Content -Path $filePath -Value "$(DefaultChannels)" Add-Content -Path $filePath -Value $(IsStableBuild) - $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + $symbolExclusionfile = "$(System.DefaultWorkingDirectory)/eng/SymbolPublishingExclusionsFile.txt" if (Test-Path -Path $symbolExclusionfile) { Write-Host "SymbolExclusionFile exists" @@ -177,7 +179,7 @@ jobs: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion 3 diff --git a/eng/common/core-templates/jobs/codeql-build.yml b/eng/common/core-templates/jobs/codeql-build.yml index 693b00b3704..dbc14ac580a 100644 --- a/eng/common/core-templates/jobs/codeql-build.yml +++ b/eng/common/core-templates/jobs/codeql-build.yml @@ -24,7 +24,7 @@ jobs: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config - name: GuardianVersion value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 2f992b2c6ec..b637cb6e948 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -43,6 +43,7 @@ parameters: artifacts: {} is1ESPipeline: '' + repositoryAlias: self # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -114,3 +115,4 @@ jobs: enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} + repositoryAlias: ${{ parameters.repositoryAlias }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a151fd811e3..f6f87fe5c67 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -154,7 +154,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: @@ -208,7 +208,7 @@ stages: filePath: eng\common\sdk-task.ps1 arguments: -task SigningValidation -restore -msbuildEngine vs /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' - /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + /p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt' ${{ parameters.signingValidationAdditionalParameters }} - template: /eng/common/core-templates/steps/publish-logs.yml @@ -258,7 +258,7 @@ stages: - task: PowerShell@2 displayName: Validate inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/sourcelink-validation.ps1 arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ -ExtractPath $(Agent.BuildDirectory)/Extract/ -GHRepoName $(Build.Repository.Name) @@ -313,7 +313,7 @@ stages: azureSubscription: "Darc: Maestro Production" scriptType: ps scriptLocation: scriptPath - scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + scriptPath: $(System.DefaultWorkingDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: > -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} diff --git a/eng/common/core-templates/post-build/setup-maestro-vars.yml b/eng/common/core-templates/post-build/setup-maestro-vars.yml index f7602980dbe..a7abd58c4bb 100644 --- a/eng/common/core-templates/post-build/setup-maestro-vars.yml +++ b/eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -36,7 +36,7 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - . $(Build.SourcesDirectory)\eng\common\tools.ps1 + . $(System.DefaultWorkingDirectory)\eng\common\tools.ps1 $darc = Get-Darc $buildInfo = & $darc get-build ` --id ${{ parameters.BARBuildId }} ` diff --git a/eng/common/core-templates/steps/enable-internal-sources.yml b/eng/common/core-templates/steps/enable-internal-sources.yml index 64f881bffc3..4085512b690 100644 --- a/eng/common/core-templates/steps/enable-internal-sources.yml +++ b/eng/common/core-templates/steps/enable-internal-sources.yml @@ -17,8 +17,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token env: Token: ${{ parameters.legacyCredential }} # If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate. @@ -29,8 +29,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config - ${{ else }}: - template: /eng/common/templates/steps/get-federated-access-token.yml parameters: @@ -39,8 +39,8 @@ steps: - task: PowerShell@2 displayName: Setup Internal Feeds inputs: - filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1 - arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) + filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $(dnceng-artifacts-feeds-read-access-token) # This is required in certain scenarios to install the ADO credential provider. # It installed by default in some msbuild invocations (e.g. VS msbuild), but needs to be installed for others # (e.g. dotnet msbuild). diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml index 44a9636cdff..c05f6502797 100644 --- a/eng/common/core-templates/steps/generate-sbom.yml +++ b/eng/common/core-templates/steps/generate-sbom.yml @@ -6,7 +6,7 @@ parameters: PackageVersion: 10.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom IgnoreDirectories: '' diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index f614d1440ed..d6b9878f54d 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -12,6 +12,7 @@ parameters: # variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough. microbuildUseESRP: true # Location of the MicroBuild output folder + # NOTE: There's something that relies on this being in the "default" source directory for tasks such as Signing to work properly. microBuildOutputFolder: '$(Build.SourcesDirectory)' continueOnError: false @@ -46,8 +47,12 @@ steps: displayName: 'Validate ESRP usage (Non-Windows)' condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) + # Two different MB install steps. This is due to not being able to use the agent OS during + # YAML expansion, and Windows vs. Linux/Mac uses different service connections. However, + # we can avoid including the MB install step if not enabled at all. This avoids a bunch of + # extra pipeline authorizations, since most pipelines do not sign on non-Windows. - task: MicroBuildSigningPlugin@4 - displayName: Install MicroBuild plugin + displayName: Install MicroBuild plugin (Windows) inputs: signType: $(_SignType) zipSources: false @@ -63,16 +68,24 @@ steps: MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} SYSTEM_ACCESSTOKEN: $(System.AccessToken) continueOnError: ${{ parameters.continueOnError }} - condition: and( - succeeded(), - or( - and( - eq(variables['Agent.Os'], 'Windows_NT'), - in(variables['_SignType'], 'real', 'test') - ), - and( - ${{ eq(parameters.enableMicrobuildForMacAndLinux, true) }}, - ne(variables['Agent.Os'], 'Windows_NT'), - eq(variables['_SignType'], 'real') - ) - )) + condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'), in(variables['_SignType'], 'real', 'test')) + + - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, true) }}: + - task: MicroBuildSigningPlugin@4 + displayName: Install MicroBuild plugin (non-Windows) + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(parameters.microbuildUseESRP, true) }}: + ConnectedServiceName: 'MicroBuild Signing Task (DevDiv)' + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: beb8cb23-b303-4c95-ab26-9e44bc958d39 + ${{ else }}: + ConnectedPMEServiceName: c24de2a5-cc7a-493d-95e4-8e5ff5cad2bc + env: + TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'), eq(variables['_SignType'], 'real')) diff --git a/eng/common/core-templates/steps/publish-logs.yml b/eng/common/core-templates/steps/publish-logs.yml index de24d0087c5..10f825e270a 100644 --- a/eng/common/core-templates/steps/publish-logs.yml +++ b/eng/common/core-templates/steps/publish-logs.yml @@ -12,22 +12,22 @@ steps: inputs: targetType: inline script: | - New-Item -ItemType Directory $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ - Move-Item -Path $(Build.SourcesDirectory)/artifacts/log/Debug/* $(Build.SourcesDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + New-Item -ItemType Directory $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ + Move-Item -Path $(System.DefaultWorkingDirectory)/artifacts/log/Debug/* $(System.DefaultWorkingDirectory)/PostBuildLogs/${{parameters.StageLabel}}/${{parameters.JobLabel}}/ continueOnError: true condition: always() - task: PowerShell@2 displayName: Redact Logs inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/redact-logs.ps1 + filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/redact-logs.ps1 # For now this needs to have explicit list of all sensitive data. Taken from eng/publishing/v3/publish.yml - # Sensitive data can as well be added to $(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + # Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' # If the file exists - sensitive data for redaction will be sourced from it # (single entry per line, lines starting with '# ' are considered comments and skipped) - arguments: -InputPath '$(Build.SourcesDirectory)/PostBuildLogs' + arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs' -BinlogToolVersion ${{parameters.BinlogToolVersion}} - -TokensFilePath '$(Build.SourcesDirectory)/eng/BinlogSecretsRedactionFile.txt' + -TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt' '$(publishing-dnceng-devdiv-code-r-build-re)' '$(MaestroAccessToken)' '$(dn-bot-all-orgs-artifact-feeds-rw)' @@ -44,7 +44,7 @@ steps: - task: CopyFiles@2 displayName: Gather post build logs inputs: - SourceFolder: '$(Build.SourcesDirectory)/PostBuildLogs' + SourceFolder: '$(System.DefaultWorkingDirectory)/PostBuildLogs' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/PostBuildLogs' condition: always() diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index c2917c1efc1..75600735f17 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -20,7 +20,7 @@ steps: # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) -- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output +- script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i ${{parameters.BinlogPath}} -r $(System.DefaultWorkingDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output displayName: "Source Index: Process Binlog into indexable sln" - ${{ if and(ne(parameters.runAsPublic, 'true'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/template-guidance.md b/eng/common/template-guidance.md index 98bbc1ded0b..4bf4cf41bd7 100644 --- a/eng/common/template-guidance.md +++ b/eng/common/template-guidance.md @@ -50,7 +50,7 @@ extends: - task: CopyFiles@2 displayName: Gather build output inputs: - SourceFolder: '$(Build.SourcesDirectory)/artifacts/marvel' + SourceFolder: '$(System.DefaultWorkingDirectory)/artifacts/marvel' Contents: '**' TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/marvel' ``` diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a8a94328745..92a0664f564 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -3,7 +3,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml index dbdd66d4a4b..f1311bbb1b3 100644 --- a/eng/common/templates-official/variables/sdl-variables.yml +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -4,4 +4,4 @@ variables: - name: DefaultGuardianVersion value: 0.109.0 - name: GuardianPackagesConfigFile - value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file + value: $(System.DefaultWorkingDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7cbf668c22b..238fa0818f7 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -6,7 +6,7 @@ parameters: enableSbom: true runAsPublic: false PackageVersion: 9.0.0 - BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts' jobs: - template: /eng/common/core-templates/job/job.yml @@ -77,7 +77,7 @@ jobs: parameters: is1ESPipeline: false args: - targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + targetPath: '$(System.DefaultWorkingDirectory)\eng\common\BuildConfiguration' artifactName: 'BuildConfiguration' displayName: 'Publish build retry configuration' continueOnError: true diff --git a/global.json b/global.json index a919d87549e..4760d0d2f4f 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25411.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25416.109" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25418.119" } } From 24bb72707a70c82328733fad6039f087abf7b054 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Aug 2025 02:07:07 +0000 Subject: [PATCH 06/30] Update dependencies from https://github.com/dotnet/dotnet build 280198 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25418.119 -> 10.0.0-beta.25420.109) System.CommandLine (Version 2.0.0-rc.2.25418.119 -> 2.0.0-rc.2.25420.109) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 604ac1baf91..266922574a3 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,8 +7,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25418.119 - 2.0.0-rc.2.25418.119 + 10.0.0-beta.25420.109 + 2.0.0-rc.2.25420.109 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b461f842491..d36abd76f7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - ea90fea181ebdfa48b1c240085dcdc4ab5837ddb + 619d5633513d1b31c528db4360833fce52f51829 - + https://github.com/dotnet/dotnet - ea90fea181ebdfa48b1c240085dcdc4ab5837ddb + 619d5633513d1b31c528db4360833fce52f51829 diff --git a/global.json b/global.json index 4760d0d2f4f..b132fb43f42 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25411.109" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25418.119" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109" } } From 1526ea6a3708587b14530f2026a4bccc7554fb4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Aug 2025 02:06:44 +0000 Subject: [PATCH 07/30] Update dependencies from https://github.com/dotnet/dotnet build 281059 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25420.109 -> 10.0.0-beta.25426.115) System.CommandLine (Version 2.0.0-rc.2.25420.109 -> 2.0.0-rc.2.25426.115) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- .../steps/source-index-stage1-publish.yml | 4 ++-- eng/common/sdk-task.ps1 | 3 ++- eng/common/sdk-task.sh | 7 ++++++- eng/common/tools.ps1 | 2 +- global.json | 6 +++--- 7 files changed, 21 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 266922574a3..8c0b9c1447e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -7,8 +7,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25420.109 - 2.0.0-rc.2.25420.109 + 10.0.0-beta.25426.115 + 2.0.0-rc.2.25426.115 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d36abd76f7d..ff622fe1357 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 39ec54dcf651bb3f9fea7aa0ae946fad6d503954 - + https://github.com/dotnet/dotnet - 619d5633513d1b31c528db4360833fce52f51829 + 39ec54dcf651bb3f9fea7aa0ae946fad6d503954 diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index 75600735f17..e9a694afa58 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,6 +1,6 @@ parameters: - sourceIndexUploadPackageVersion: 2.0.0-20250425.2 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1 + sourceIndexUploadPackageVersion: 2.0.0-20250818.1 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json binlogPath: artifacts/log/Debug/Build.binlog diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index a9d2a2d2699..b62e132d32a 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -7,13 +7,14 @@ Param( [switch] $restore, [switch] $prepareMachine, [switch][Alias('nobl')]$excludeCIBinaryLog, + [switch]$noWarnAsError, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) $ci = $true $binaryLog = if ($excludeCIBinaryLog) { $false } else { $true } -$warnAsError = $true +$warnAsError = if ($noWarnAsError) { $false } else { $true } . $PSScriptRoot\tools.ps1 diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 2f83adc0269..0c92f81d74f 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -10,6 +10,7 @@ show_usage() { echo "Advanced settings:" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" + echo " --noWarnAsError Do not warn as error echo "" echo "Command line arguments not listed above are passed thru to msbuild." } @@ -52,6 +53,7 @@ exclude_ci_binary_log=false restore=false help=false properties='' +warnAsError=true while (($# > 0)); do lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")" @@ -73,6 +75,10 @@ while (($# > 0)); do exclude_ci_binary_log=true shift 1 ;; + --noWarnAsError) + warnAsError=false + shift 1 + ;; --help) help=true shift 1 @@ -85,7 +91,6 @@ while (($# > 0)); do done ci=true -warnAsError=true if $help; then show_usage diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4920464cc4a..06b44de7870 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -553,7 +553,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ if (!(Test-Path $vsWhereExe)) { Create-Directory $vsWhereDir - Write-Host 'Downloading vswhere $vswhereVersion' + Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe diff --git a/global.json b/global.json index b132fb43f42..d0219af5026 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25411.109", + "version": "10.0.100-rc.1.25420.111", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,9 +10,9 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-rc.1.25411.109" + "dotnet": "10.0.100-rc.1.25420.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25426.115" } } From 7965311fadd27631c3a2f1107a78a8f7857e168b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Aug 2025 02:08:21 +0000 Subject: [PATCH 08/30] Update dependencies from https://github.com/dotnet/dotnet build 281128 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25426.115 -> 10.0.0-beta.25427.104) System.CommandLine (Version 2.0.0-rc.2.25426.115 -> 2.0.0-rc.2.25427.104) --- eng/Version.Details.props | 5 ++--- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 8c0b9c1447e..f6bdebe9dfb 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -1,4 +1,3 @@ - - 10.0.0-beta.25426.115 - 2.0.0-rc.2.25426.115 + 10.0.0-beta.25427.104 + 2.0.0-rc.2.25427.104 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff622fe1357..e610862cc11 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 39ec54dcf651bb3f9fea7aa0ae946fad6d503954 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 - + https://github.com/dotnet/dotnet - 39ec54dcf651bb3f9fea7aa0ae946fad6d503954 + 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 diff --git a/global.json b/global.json index d0219af5026..cdaed36c507 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25420.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25426.115" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104" } } From ea6207697f27140d82da9654c183eb0b4c154c7b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Sep 2025 02:13:41 +0000 Subject: [PATCH 09/30] Update dependencies from https://github.com/dotnet/dotnet build 282024 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25427.104 -> 10.0.0-beta.25454.105) System.CommandLine (Version 2.0.0-rc.2.25427.104 -> 2.0.0-rc.2.25454.105) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/common/sdk-task.sh | 2 +- global.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f6bdebe9dfb..74dcaf9b37f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25427.104 - 2.0.0-rc.2.25427.104 + 10.0.0-beta.25454.105 + 2.0.0-rc.2.25454.105 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e610862cc11..1993368cf9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad - + https://github.com/dotnet/dotnet - 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index 0c92f81d74f..3270f83fa9a 100755 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -10,7 +10,7 @@ show_usage() { echo "Advanced settings:" echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" - echo " --noWarnAsError Do not warn as error + echo " --noWarnAsError Do not warn as error" echo "" echo "Command line arguments not listed above are passed thru to msbuild." } diff --git a/global.json b/global.json index cdaed36c507..0a154ba5ef8 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25420.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25454.105" } } From e6228796996ecdb5dda05baf3e025a34e39b4289 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Sep 2025 02:07:16 +0000 Subject: [PATCH 10/30] Update dependencies from https://github.com/dotnet/dotnet build 282086 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25454.105 -> 10.0.0-beta.25454.107) System.CommandLine (Version 2.0.0-rc.2.25454.105 -> 2.0.0-rc.2.25454.107) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 74dcaf9b37f..faf0183b2fe 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25454.105 - 2.0.0-rc.2.25454.105 + 10.0.0-beta.25454.107 + 2.0.0-rc.2.25454.107 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1993368cf9c..e8e1b9edae7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 96384f46287cd0b6ae49f3885676e3d1635c7894 - + https://github.com/dotnet/dotnet - 9eb0ecd40ec7a605a0c9c41341919db0ff9bf5ad + 96384f46287cd0b6ae49f3885676e3d1635c7894 diff --git a/global.json b/global.json index 0a154ba5ef8..8f51b5b5b6a 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25420.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25454.105" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25454.107" } } From 696c3823e0eb1d3e357d573bf5f4c36a8b9d7da5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Sep 2025 02:05:37 +0000 Subject: [PATCH 11/30] Update dependencies from https://github.com/dotnet/dotnet build 282207 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25454.107 -> 10.0.0-beta.25456.101) System.CommandLine (Version 2.0.0-rc.2.25454.107 -> 2.0.0-rc.2.25456.101) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index faf0183b2fe..83b8cbbeb6e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25454.107 - 2.0.0-rc.2.25454.107 + 10.0.0-beta.25456.101 + 2.0.0-rc.2.25456.101 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8e1b9edae7..3b051006c4c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 96384f46287cd0b6ae49f3885676e3d1635c7894 + 2b85e08c244605d0276b2b2ef8959360fd0d5a84 - + https://github.com/dotnet/dotnet - 96384f46287cd0b6ae49f3885676e3d1635c7894 + 2b85e08c244605d0276b2b2ef8959360fd0d5a84 diff --git a/global.json b/global.json index 8f51b5b5b6a..bbd67d7cf74 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25420.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25454.107" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25456.101" } } From 056363b9e6367737b9867a51857f07881572615d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Sep 2025 02:05:31 +0000 Subject: [PATCH 12/30] Update dependencies from https://github.com/dotnet/dotnet build 282240 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25456.101 -> 10.0.0-beta.25457.102) System.CommandLine (Version 2.0.0-rc.2.25456.101 -> 2.0.0-rc.2.25457.102) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 83b8cbbeb6e..f32bacd6158 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25456.101 - 2.0.0-rc.2.25456.101 + 10.0.0-beta.25457.102 + 2.0.0-rc.2.25457.102 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3b051006c4c..5aea256c11a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 2b85e08c244605d0276b2b2ef8959360fd0d5a84 + 8ea69c337be69385ff7eb44b2a54db78010110d8 - + https://github.com/dotnet/dotnet - 2b85e08c244605d0276b2b2ef8959360fd0d5a84 + 8ea69c337be69385ff7eb44b2a54db78010110d8 diff --git a/global.json b/global.json index bbd67d7cf74..eb00baa45f2 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25420.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25456.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25457.102" } } From 7efecc906d2e6f89cb12dcd40dfd6051a97400e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Sep 2025 02:08:39 +0000 Subject: [PATCH 13/30] Update dependencies from https://github.com/dotnet/dotnet build 282379 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25457.102 -> 10.0.0-beta.25458.103) System.CommandLine (Version 2.0.0-rc.2.25457.102 -> 2.0.0-rc.2.25458.103) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f32bacd6158..5d5fe96b56e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25457.102 - 2.0.0-rc.2.25457.102 + 10.0.0-beta.25458.103 + 2.0.0-rc.2.25458.103 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5aea256c11a..624f0455a58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + f7f9fbc789eaea36c447f3826eac66a925965915 - + https://github.com/dotnet/dotnet - 8ea69c337be69385ff7eb44b2a54db78010110d8 + f7f9fbc789eaea36c447f3826eac66a925965915 diff --git a/global.json b/global.json index eb00baa45f2..1a4afe35273 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25420.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25457.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25458.103" } } From 66a5eb6e28bc711b5e383ec11175468210cf9fc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Sep 2025 02:07:41 +0000 Subject: [PATCH 14/30] Update dependencies from https://github.com/dotnet/dotnet build 282477 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25458.103 -> 10.0.0-beta.25459.101) System.CommandLine (Version 2.0.0-rc.2.25458.103 -> 2.0.0-rc.2.25459.101) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5d5fe96b56e..e3ea42415bb 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25458.103 - 2.0.0-rc.2.25458.103 + 10.0.0-beta.25459.101 + 2.0.0-rc.2.25459.101 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 624f0455a58..369d127d6b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - f7f9fbc789eaea36c447f3826eac66a925965915 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 - + https://github.com/dotnet/dotnet - f7f9fbc789eaea36c447f3826eac66a925965915 + 13a7588dc6e538cc938ea1277a37f756a80c7f03 diff --git a/global.json b/global.json index 1a4afe35273..3cd9c541df7 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25420.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25458.103" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25459.101" } } From d826bc16054810319dc4cc3bc6dd30d1d88eb4bc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Sep 2025 02:13:57 +0000 Subject: [PATCH 15/30] Update dependencies from https://github.com/dotnet/dotnet build 282708 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25459.101 -> 10.0.0-beta.25460.104) System.CommandLine (Version 2.0.0-rc.2.25459.101 -> 2.0.0-rc.2.25460.104) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e3ea42415bb..cae8ef19b50 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25459.101 - 2.0.0-rc.2.25459.101 + 10.0.0-beta.25460.104 + 2.0.0-rc.2.25460.104 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 369d127d6b4..9636978b13a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 - + https://github.com/dotnet/dotnet - 13a7588dc6e538cc938ea1277a37f756a80c7f03 + eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 diff --git a/global.json b/global.json index 3cd9c541df7..30ea211a758 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25420.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25459.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25460.104" } } From 8d962f03ba31ec179c1d51f5e879c85a197c8b70 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Sep 2025 02:16:57 +0000 Subject: [PATCH 16/30] Update dependencies from https://github.com/dotnet/dotnet build 282973 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25460.104 -> 10.0.0-beta.25462.101) System.CommandLine (Version 2.0.0-rc.2.25460.104 -> 2.0.0-rc.2.25462.101) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/common/SetupNugetSources.ps1 | 2 +- eng/common/SetupNugetSources.sh | 2 +- global.json | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index cae8ef19b50..92ab78677ab 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25460.104 - 2.0.0-rc.2.25460.104 + 10.0.0-beta.25462.101 + 2.0.0-rc.2.25462.101 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9636978b13a..93bdeaab4f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 26861c107ef3684f67c07456f01096b0d29edad0 - + https://github.com/dotnet/dotnet - eac14590f69f6876d418cef9e8fdd3f44f6ef0b2 + 26861c107ef3684f67c07456f01096b0d29edad0 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 792b60b49d4..9445c314325 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -157,7 +157,7 @@ if ($dotnet31Source -ne $null) { AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } -$dotnetVersions = @('5','6','7','8','9') +$dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index facb415ca6f..ddf4efc81a4 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -99,7 +99,7 @@ if [ "$?" == "0" ]; then PackageSources+=('dotnet3.1-internal-transport') fi -DotNetVersions=('5' '6' '7' '8' '9') +DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; diff --git a/global.json b/global.json index 30ea211a758..774b96ff6a3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.1.25420.111", + "version": "10.0.100-rc.1.25451.107", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,9 +10,9 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-rc.1.25420.111" + "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25460.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25462.101" } } From b1881e9cfba94114e1d705021aa4038cd89b1496 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Sep 2025 02:07:32 +0000 Subject: [PATCH 17/30] Update dependencies from https://github.com/dotnet/dotnet build 283077 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25462.101 -> 10.0.0-beta.25462.117) System.CommandLine (Version 2.0.0-rc.2.25462.101 -> 2.0.0-rc.2.25462.117) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 92ab78677ab..c7aec0c3701 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25462.101 - 2.0.0-rc.2.25462.101 + 10.0.0-beta.25462.117 + 2.0.0-rc.2.25462.117 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93bdeaab4f5..0ed750ad85b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 26861c107ef3684f67c07456f01096b0d29edad0 + ee760c42a6df115208fe2262d358be6d4003e55f - + https://github.com/dotnet/dotnet - 26861c107ef3684f67c07456f01096b0d29edad0 + ee760c42a6df115208fe2262d358be6d4003e55f diff --git a/global.json b/global.json index 774b96ff6a3..4c7af0cba7d 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25462.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25462.117" } } From 414cce4a834b939f888bf42fb62f98119e28ccb2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Sep 2025 02:09:01 +0000 Subject: [PATCH 18/30] Update dependencies from https://github.com/dotnet/dotnet build 283152 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25462.117 -> 10.0.0-beta.25464.104) System.CommandLine (Version 2.0.0-rc.2.25462.117 -> 2.0.0-rc.2.25464.104) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c7aec0c3701..e33cce3dc1c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25462.117 - 2.0.0-rc.2.25462.117 + 10.0.0-beta.25464.104 + 2.0.0-rc.2.25464.104 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ed750ad85b..a4f95360530 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - ee760c42a6df115208fe2262d358be6d4003e55f + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 - + https://github.com/dotnet/dotnet - ee760c42a6df115208fe2262d358be6d4003e55f + 87cc9e9aebf530502d4450dd9b4682b8caa722b2 diff --git a/global.json b/global.json index 4c7af0cba7d..4c1caad9406 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25462.117" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25464.104" } } From da9e4ee9caf7a57b78cb4cc780182a6ba28dfd4d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Sep 2025 06:14:11 +0000 Subject: [PATCH 19/30] Update dependencies from https://github.com/dotnet/dotnet build 283422 (#9356) [release/10.0.1xx] Source code updates from dotnet/dotnet --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e33cce3dc1c..9f2747c00ad 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25464.104 - 2.0.0-rc.2.25464.104 + 10.0.0-beta.25466.101 + 2.0.0-rc.2.25466.101 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4f95360530..bc0b18d65ab 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + b0eeb50560544fa782bd8bbddbe2e964c2ab6388 - + https://github.com/dotnet/dotnet - 87cc9e9aebf530502d4450dd9b4682b8caa722b2 + b0eeb50560544fa782bd8bbddbe2e964c2ab6388 diff --git a/global.json b/global.json index 4c1caad9406..4e79d35362d 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25464.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25466.101" } } From a475df223fc94784ba85a2068c9657588405a33e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Sep 2025 02:09:31 +0000 Subject: [PATCH 20/30] Update dependencies from https://github.com/dotnet/dotnet build 283666 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25466.101 -> 10.0.0-beta.25467.107) System.CommandLine (Version 2.0.0-rc.2.25466.101 -> 2.0.0-rc.2.25467.107) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 9f2747c00ad..db8b14f3c6c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25466.101 - 2.0.0-rc.2.25466.101 + 10.0.0-beta.25467.107 + 2.0.0-rc.2.25467.107 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bc0b18d65ab..ff1d8e89ef6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - b0eeb50560544fa782bd8bbddbe2e964c2ab6388 + e533cfad385ba4f0ec96e35ad3d485dc13581906 - + https://github.com/dotnet/dotnet - b0eeb50560544fa782bd8bbddbe2e964c2ab6388 + e533cfad385ba4f0ec96e35ad3d485dc13581906 diff --git a/global.json b/global.json index 4e79d35362d..fc5b38bd6a8 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25466.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25467.107" } } From 1dc9e2c8368f50d21ab511cfd8376b02d14ee85d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Sep 2025 02:10:25 +0000 Subject: [PATCH 21/30] Update dependencies from https://github.com/dotnet/dotnet build 283828 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25467.107 -> 10.0.0-beta.25468.104) System.CommandLine (Version 2.0.0-rc.2.25467.107 -> 2.0.0-rc.2.25468.104) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/common/core-templates/job/publish-build-assets.yml | 9 ++++++++- eng/common/core-templates/jobs/jobs.yml | 2 ++ global.json | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index db8b14f3c6c..f2712f17af9 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25467.107 - 2.0.0-rc.2.25467.107 + 10.0.0-beta.25468.104 + 2.0.0-rc.2.25468.104 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff1d8e89ef6..ed31e76ffbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://github.com/dotnet/dotnet - e533cfad385ba4f0ec96e35ad3d485dc13581906 + 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 348cd16376f..37dff559fc1 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -40,6 +40,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -62,6 +64,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -124,7 +131,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests' /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }} /p:MaestroApiEndpoint=https://maestro.dot.net - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index b637cb6e948..01ada747665 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -44,6 +44,7 @@ parameters: artifacts: {} is1ESPipeline: '' repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -116,3 +117,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index fc5b38bd6a8..48053450531 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25467.107" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104" } } From 2bf1e357782df74119e0dfa5685070d6c1b510de Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 24 Sep 2025 12:50:10 -0700 Subject: [PATCH 22/30] Update branding for 10.0.2xx preview builds --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index df2ba4bc003..8eea6c62a93 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,15 +1,15 @@ - 10.0.100 + 10.0.200 false release - rc + preview rtm servicing - 2 + true true From a859aecaa2f8d127d22a92dac0b6ab0301e867ae Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Sep 2025 02:36:59 +0000 Subject: [PATCH 23/30] Update dependencies from https://github.com/dotnet/dotnet build 284571 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25468.104 -> 10.0.0-beta.25473.111) System.CommandLine (Version 2.0.0-rc.2.25468.104 -> 2.0.0-rc.2.25473.111) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f2712f17af9..1ce0e4b81ff 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25468.104 - 2.0.0-rc.2.25468.104 + 10.0.0-beta.25473.111 + 2.0.0-rc.2.25473.111 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed31e76ffbd..8204ec795ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd diff --git a/global.json b/global.json index 48053450531..a0dc9d66724 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25473.111" } } From 9165d10f9c01db26c1ad277d28914b7d896f9e09 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Sep 2025 02:08:26 +0000 Subject: [PATCH 24/30] Backflow from https://github.com/dotnet/dotnet / c9f0e3e build 284752 [[ commit created by automation ]] --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index df2ba4bc003..d58b167af06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -6,10 +6,10 @@ false release - rc + rtm rtm servicing - 2 + true true From 5591c0a86dcb59f4daf0f77099788cdf6985461e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Sep 2025 02:08:27 +0000 Subject: [PATCH 25/30] Update dependencies from https://github.com/dotnet/dotnet build 284752 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25473.111 -> 10.0.0-beta.25475.106) System.CommandLine (Version 2.0.0-rc.2.25473.111 -> 2.0.0-rtm.25475.106) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1ce0e4b81ff..67a244f8eb8 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25473.111 - 2.0.0-rc.2.25473.111 + 10.0.0-beta.25475.106 + 2.0.0-rtm.25475.106 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8204ec795ee..a822daa3de6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 diff --git a/global.json b/global.json index a0dc9d66724..c520bc79247 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25473.111" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25475.106" } } From 33e554c672ccdd681e46940a55f524fb8393c7e5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Sep 2025 02:08:42 +0000 Subject: [PATCH 26/30] Update dependencies from https://github.com/dotnet/dotnet build 284895 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25475.106 -> 10.0.0-beta.25476.104) System.CommandLine (Version 2.0.0-rtm.25475.106 -> 2.0.0-rtm.25476.104) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 67a244f8eb8..ccd26bf4b9e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25475.106 - 2.0.0-rtm.25475.106 + 10.0.0-beta.25476.104 + 2.0.0-rtm.25476.104 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a822daa3de6..c3d92c436b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 - + https://github.com/dotnet/dotnet - c9f0e3e586ba580f1ae64ef3990c6cd01374bf13 + e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 diff --git a/global.json b/global.json index c520bc79247..ab6041055e8 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25475.106" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25476.104" } } From 9eb54ffbdcc9444d0b51ab5d4aafa591e7eb499f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Sep 2025 02:07:24 +0000 Subject: [PATCH 27/30] Backflow from https://github.com/dotnet/dotnet / 8aba88f build 285155 [[ commit created by automation ]] --- es-metadata.yml | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 es-metadata.yml diff --git a/es-metadata.yml b/es-metadata.yml new file mode 100644 index 00000000000..af486ad81d2 --- /dev/null +++ b/es-metadata.yml @@ -0,0 +1,8 @@ +schemaVersion: 0.0.1 +isProduction: true +accountableOwners: + service: 30f635d8-2918-48af-8ddf-d9bc854b7584 +routing: + defaultAreaPath: + org: devdiv + path: DevDiv\NET Tools\SDK From 4e44dda862fd38d43c5f3b2009bbb4902bb4db1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Sep 2025 02:07:25 +0000 Subject: [PATCH 28/30] Update dependencies from https://github.com/dotnet/dotnet build 285155 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25476.104 -> 10.0.0-beta.25479.109) System.CommandLine (Version 2.0.0-rtm.25476.104 -> 2.0.0-rtm.25479.109) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- eng/common/post-build/nuget-verification.ps1 | 2 +- global.json | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ccd26bf4b9e..9c9fabfbbc0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25476.104 - 2.0.0-rtm.25476.104 + 10.0.0-beta.25479.109 + 2.0.0-rtm.25479.109 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3d92c436b9..a28e2082ff6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c - + https://github.com/dotnet/dotnet - e1eaf1bbd9702e9b6ee9b10dbc94105732e07896 + 8aba88f6f12f3ce1dd5740575cff9442f1f9122c diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index a365194a938..ac5c69ffcac 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -30,7 +30,7 @@ [CmdletBinding(PositionalBinding = $false)] param( [string]$NuGetExePath, - [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", [string]$DownloadPath, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$args diff --git a/global.json b/global.json index ab6041055e8..2601ff58bf9 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25476.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.109" } } From 4c36907d7149f0b3b59c7178acea6330540df851 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 30 Sep 2025 17:18:15 -0700 Subject: [PATCH 29/30] Enable internal sources in templating builds and PRs (#9389) --- azure-pipelines.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b6bf68666f0..49971921f1f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -120,6 +120,7 @@ extends: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) steps: # Use utility script to run script command dependent on agent OS. + - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self - script: eng/common/cibuild.cmd -configuration $(_BuildConfig) -prepareMachine @@ -137,6 +138,7 @@ extends: - _BuildConfig: ${{ config.buildConfig }} - _SignType: none steps: + - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine @@ -161,6 +163,7 @@ extends: - _BuildConfig: ${{ config.buildConfig }} - _SignType: none steps: + - template: /eng/common/templates-official/steps/enable-internal-sources.yml@self - script: eng/common/cibuild.sh --configuration $(_BuildConfig) --prepareMachine From aed9357332e5ae3396147e7dda2922b8183050f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Oct 2025 02:09:13 +0000 Subject: [PATCH 30/30] Update dependencies from https://github.com/dotnet/dotnet build 285185 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk (Version 10.0.0-beta.25479.109 -> 10.0.0-beta.25479.115) System.CommandLine (Version 2.0.0-rtm.25479.109 -> 2.0.0-rtm.25479.115) --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 10 +++++----- global.json | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 9c9fabfbbc0..747207e513e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,8 +6,8 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25479.109 - 2.0.0-rtm.25479.109 + 10.0.0-beta.25479.115 + 2.0.0-rtm.25479.115 9.0.3 9.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a28e2082ff6..6c6529212b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 8aba88f6f12f3ce1dd5740575cff9442f1f9122c + e72b5bbe719d747036ce9c36582a205df9f1c361 diff --git a/global.json b/global.json index 2601ff58bf9..55d2cf95c35 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.100-rc.1.25451.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.109" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.115" } }