From 8ee6aa84ec2c77b1a9c7aef0b3c235527e59fb3d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Jun 2025 02:02:23 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20250626.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1 --- NuGet.config | 4 ++++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/templates-official/job/job.yml | 4 ++++ eng/common/templates/job/job.yml | 4 ++++ global.json | 4 ++-- 6 files changed, 24 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index edc3f8014a79..993212788d81 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,10 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97f5458b18c6..6ac370d7e889 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d - + https://github.com/dotnet/arcade - 2ce3f8c7b2614c2b19985b669ffcd934bc39ffd1 + 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index a1a1b5a85b97..c47faff41452 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25310.3 + 8.0.0-beta.25326.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -209,7 +209,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25310.3 + 8.0.0-beta.25326.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 98ccbd7a9c16..9713e93c84cd 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 e295031c0985..2856f7de1061 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 c1d4d016b412..ed50dd9fa2e4 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25310.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25310.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1" } } From 6e068e9a76597e72d2311bc65e76ac60cfd52e2d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 27 Jun 2025 04:17:26 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/templating build 20250626.3 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.118-servicing.25316.3 -> To Version 8.0.118-servicing.25326.3 --- NuGet.config | 6 +++++- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index edc3f8014a79..1a54a67d2517 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,10 @@ + + + + @@ -17,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 97f5458b18c6..0f34ccd9b5ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 792298e571e22f47422178c2b08e59554d3499a5 + b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 - + https://github.com/dotnet/templating - 792298e571e22f47422178c2b08e59554d3499a5 + b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 - + https://github.com/dotnet/templating - 792298e571e22f47422178c2b08e59554d3499a5 + b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 diff --git a/eng/Versions.props b/eng/Versions.props index a1a1b5a85b97..99419cecbd68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -143,7 +143,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.118-servicing.25316.3 + 8.0.118-servicing.25326.3 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 294777a40efac59d668aaada789759710f31238d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 3 Jul 2025 18:57:40 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/templating build 20250703.1 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.118-servicing.25316.3 -> To Version 8.0.119-servicing.25353.1 --- NuGet.config | 2 +- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1a54a67d2517..03c6f59ae026 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0f34ccd9b5ee..d92a91749b29 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/templating - b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 + a767f5ab3b1b19ed4ffca966caf040cff2da4c61 - + https://github.com/dotnet/templating - b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 + a767f5ab3b1b19ed4ffca966caf040cff2da4c61 - + https://github.com/dotnet/templating - b30e4ea1a5e1de7aa1143ebcd41f3810ed89d8a8 + a767f5ab3b1b19ed4ffca966caf040cff2da4c61 diff --git a/eng/Versions.props b/eng/Versions.props index 99419cecbd68..d0cdb87e9432 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -137,13 +137,13 @@ - 8.0.118 + 8.0.119 $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.118-servicing.25326.3 + 8.0.119-servicing.25353.1 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion) From 1b9caed2a116803c56fe330cbb6ec579613d7c19 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 3 Jul 2025 10:35:29 -0700 Subject: [PATCH 4/4] Update branding to 8.0.119 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1a1b5a85b97..615c65271944 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ - 8.0.118 + 8.0.119 true release