From a4a16ab5aefd4d599f3cf651a8909b8c422fab89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 13 Jun 2025 09:08:24 +0800 Subject: [PATCH 1/7] [vs17.11] Update dependencies from dotnet/arcade (#11996) * Update dependencies from https://github.com/dotnet/arcade build 20250610.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3 * Update VersionPrefix to 17.11.35 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Gang Wang --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- global.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec462690393..eb629f9c2be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,14 +71,14 @@ - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 @@ -100,9 +100,9 @@ 0b8371953e61f6179f39f1d62ebbd6a251f335e0 - + https://github.com/dotnet/arcade - 983d15077d88cfed26837e40e8f984fdee5d1715 + 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 diff --git a/eng/Versions.props b/eng/Versions.props index ed493c988cd..506bcc4867b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.11.34 + 17.11.35 release 17.10.4 15.1.0.0 @@ -51,7 +51,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 8.0.0-beta.25264.2 + 8.0.0-beta.25310.3 7.0.0 6.0.1 4.11.0-3.24313.9 diff --git a/global.json b/global.json index dd530ee261a..c5cf6d0b02a 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.8.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25264.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3" } } From e4f165e45046f7c72b6838124cb91de6ae750b2e Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Wed, 2 Jul 2025 07:00:56 +0000 Subject: [PATCH 2/7] Add the switch running OptProf tasks (#12076) * Add the switch running OptProf tasks * Update VersionPrefix to 17.11.36 * Improve the display name of EnableOptProf Co-authored-by: Rainer Sigwald --------- Co-authored-by: Rainer Sigwald --- .vsts-dotnet.yml | 15 ++++++++++----- eng/Versions.props | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index 0834d137b80..3f0235f9c0d 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -16,6 +16,10 @@ parameters: displayName: Optional OptProfDrop Override type: string default: 'default' +- name: EnableOptProf + displayName: Enable OptProf data collection for this build + type: boolean + default: true variables: # if OptProfDrop is not set, string '$(OptProfDrop)' will be passed to the build script. @@ -153,6 +157,7 @@ extends: AccessToken: '$(System.AccessToken)' feedSource: 'https://devdiv.pkgs.visualstudio.com/DefaultCollection/_packaging/MicroBuildToolset/nuget/v3/index.json' displayName: 'Install OptProf Plugin' + condition: and(succeeded(), ${{ parameters.EnableOptProf }}) # Required by MicroBuildBuildVSBootstrapper - task: MicroBuildSwixPlugin@4 @@ -188,7 +193,7 @@ extends: toLowerCase: false usePat: true displayName: 'OptProf - Publish to Artifact Services - ProfilingInputs' - condition: succeeded() + condition: and(succeeded(), ${{ parameters.EnableOptProf }}) # Build VS bootstrapper # Generates $(Build.StagingDirectory)\MicroBuild\Output\BootstrapperInfo.json @@ -200,7 +205,7 @@ extends: outputFolder: '$(Build.SourcesDirectory)\artifacts\VSSetup\$(BuildConfiguration)\Insertion' bootstrapperCoreVersion: displayName: 'OptProf - Build VS bootstrapper' - condition: succeeded() + condition: and(succeeded(), ${{ parameters.EnableOptProf }}) # Publish run settings - task: PowerShell@2 @@ -212,7 +217,7 @@ extends: /p:BootstrapperInfoPath=$(Build.StagingDirectory)\MicroBuild\Output\BootstrapperInfo.json /p:VisualStudioIbcTrainingSettingsPath=$(Build.SourcesDirectory)\eng\config\OptProf.runsettings displayName: 'OptProf - Build IBC training settings' - condition: succeeded() + condition: and(succeeded(), ${{ parameters.EnableOptProf }}) # Publish bootstrapper info - task: 1ES.PublishBuildArtifacts@1 @@ -221,7 +226,7 @@ extends: ArtifactName: MicroBuildOutputs ArtifactType: Container displayName: 'OptProf - Publish Artifact: MicroBuildOutputs' - condition: succeeded() + condition: and(succeeded(), ${{ parameters.EnableOptProf }}) - task: 1ES.PublishBuildArtifacts@1 displayName: 'Publish Artifact: logs' @@ -290,7 +295,7 @@ extends: displayName: Tag build as ready for optimization training inputs: tags: 'ready-for-training' - condition: succeeded() + condition: and(succeeded(), ${{ parameters.EnableOptProf }}) - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1 displayName: Execute cleanup tasks diff --git a/eng/Versions.props b/eng/Versions.props index 506bcc4867b..8fb1b41ff77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.11.35 + 17.11.36 release 17.10.4 15.1.0.0 From 714fcf8f443dc6a34a934f218e7038901f4343c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Jul 2025 09:09:42 +0800 Subject: [PATCH 3/7] [vs17.12] Update dependencies from dotnet/arcade (#12091) * Update dependencies from https://github.com/dotnet/arcade build 20250625.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25302.2 -> To Version 9.0.0-beta.25325.4 * Update VersionPrefix for vs17.12 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Nguyen Huu Linh <43189610+huulinhnguyen-dev@users.noreply.github.com> --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/core-templates/job/job.yml | 4 ++++ eng/common/internal/NuGet.config | 3 +++ global.json | 4 ++-- 5 files changed, 19 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1595cf8242f..5c81623c790 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,19 +71,19 @@ - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d https://github.com/nuget/nuget.client @@ -98,9 +98,9 @@ df4ae6b81013ac45367372176b9c3135a35a7e3c - + https://github.com/dotnet/arcade - 0d52a8b262d35fa2fde84e398cb2e791b8454bd2 + 13b20849f8294593bf150a801cab639397e6c29d diff --git a/eng/Versions.props b/eng/Versions.props index b6d39f5f132..3ab2f57fa5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.12.39 + 17.12.40 release 17.11.4 15.1.0.0 @@ -50,7 +50,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 9.0.0-beta.25302.2 + 9.0.0-beta.25325.4 7.0.0 6.0.1 4.12.0-3.24463.9 diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index ba53ebfbd51..abe80a2a0e0 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 19d3d311b16..f70261ed689 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -4,4 +4,7 @@ + + + diff --git a/global.json b/global.json index b8e061c5259..6490aeecbce 100644 --- a/global.json +++ b/global.json @@ -3,13 +3,13 @@ "allowPrerelease": true }, "tools": { - "dotnet": "9.0.106", + "dotnet": "9.0.107", "vs": { "version": "17.12.0" }, "xcopy-msbuild": "17.12.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25302.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25325.4" } } From 82fb8bbff3ced66900af2ecc6184d407e2a738e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Jul 2025 10:04:12 +0700 Subject: [PATCH 4/7] [vs17.11] Update dependencies from dotnet/arcade (#12088) * Update dependencies from https://github.com/dotnet/arcade build 20250626.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1 * Update VersionPrefix for vs17.11 * Update VersionPrefix to 17.11.37 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Nguyen Huu Linh <43189610+huulinhnguyen-dev@users.noreply.github.com> Co-authored-by: Gang Wang --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- eng/common/templates-official/job/job.yml | 4 ++++ eng/common/templates/job/job.yml | 4 ++++ global.json | 2 +- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eb629f9c2be..cc7c3aa253d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -71,14 +71,14 @@ - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d @@ -100,9 +100,9 @@ 0b8371953e61f6179f39f1d62ebbd6a251f335e0 - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d diff --git a/eng/Versions.props b/eng/Versions.props index 8fb1b41ff77..b1e40884a33 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.11.36 + 17.11.37 release 17.10.4 15.1.0.0 @@ -51,7 +51,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 8.0.0-beta.25310.3 + 8.0.0-beta.25326.1 7.0.0 6.0.1 4.11.0-3.24313.9 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 98ccbd7a9c1..9713e93c84c 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -135,6 +135,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e295031c098..2856f7de106 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -134,6 +134,10 @@ jobs: signType: $(_SignType) zipSources: false feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea + ${{ else }}: + ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca env: TeamName: $(_TeamName) continueOnError: ${{ parameters.continueOnError }} diff --git a/global.json b/global.json index c5cf6d0b02a..cfdfd6becfc 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.8.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1" } } From 901dc04e451b05d9d583d4cedd50c3db605dab8c Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Fri, 4 Jul 2025 02:41:32 +0000 Subject: [PATCH 5/7] Override SkipApplyOptimizationData to true when disabling OptProf data collection (#12106) * Override SkipApplyOptimizationData to true when disabling OptProf data collection * Update VersionPrefix to 17.11.38 --- .vsts-dotnet.yml | 4 ++++ eng/Versions.props | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.vsts-dotnet.yml b/.vsts-dotnet.yml index 3f0235f9c0d..b19449506cf 100644 --- a/.vsts-dotnet.yml +++ b/.vsts-dotnet.yml @@ -37,6 +37,10 @@ variables: value: ${{parameters.OptProfDropName}} - name: SourceBranch value: '' + # Override SkipApplyOptimizationData to true when disabling OptProf data collection + - ${{ if eq(parameters.EnableOptProf, false) }}: + - name: SkipApplyOptimizationData + value: true - name: EnableReleaseOneLocBuild value: false # disable loc for vs17.11 - name: Codeql.Enabled diff --git a/eng/Versions.props b/eng/Versions.props index b1e40884a33..ee16d26136f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.11.37 + 17.11.38 release 17.10.4 15.1.0.0 From 085248ef0f37cffb585ff80808b68c8e746d800e Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Tue, 8 Jul 2025 10:10:11 +0000 Subject: [PATCH 6/7] Update VersionPrefix to 17.12.41 --- eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3ab2f57fa5d..911951ff80c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.12.40 + 17.12.41 release 17.11.4 15.1.0.0 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 6e0eb4c46a3..817555505aa 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -78,4 +78,4 @@ jobs: ${{ each parameter in parameters }}: ${{ if and(ne(parameter.key, 'templateContext'), ne(parameter.key, 'is1ESPipeline')) }}: - ${{ parameter.key }}: ${{ parameter.value }} \ No newline at end of file + ${{ parameter.key }}: ${{ parameter.value }} From 213a3f17e7aea5a68b00dd6f31f7ab73d4582a3a Mon Sep 17 00:00:00 2001 From: Gang Wang Date: Wed, 9 Jul 2025 01:56:09 +0000 Subject: [PATCH 7/7] Update VersionPrefix to 17.14.16 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 672b97f5c20..4838e8caca1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.14.15 + 17.14.16 release 17.13.9 15.1.0.0