From ffd8f751602ab10d7994d096c3e13a1b3a2c7d3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2025 00:26:56 +0000 Subject: [PATCH 1/5] [release/8.0.3xx] Update dependencies from dotnet/source-build-externals (#45867) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Michael Simons --- Directory.Packages.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 113a38536ab8..1af8ba333d69 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -108,7 +108,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a15b8d1bbe57..52e800cc014c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - 3b85d089311e89b47758ba6a84eeb79374476dc8 + c301b8babe9ea6aeac4452ccb4dde45cae769282 From d83d7e699c7ee2bd19f25bb99541688d58bb472f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Jan 2025 05:03:07 +0000 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20250110.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24415.1 -> To Version 8.0.0-alpha.1.25060.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52e800cc014c..9164e1cdfdd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -354,9 +354,9 @@ c301b8babe9ea6aeac4452ccb4dde45cae769282 - + https://github.com/dotnet/source-build-reference-packages - fe3794a68bd668d36d4d5014a9e6c9d22c0e6d86 + f9542c50beaefc38dd9d7ec9ea38d54fd154f21a From 790769d769bdec9a19ef30004b8e16dcc52ad120 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Jan 2025 05:03:20 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/source-build-externals build 20250110.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.25060.1 -> To Version 8.0.0-alpha.1.25060.2 --- eng/Version.Details.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52e800cc014c..20e876ca4152 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -349,9 +349,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/source-build-externals - c301b8babe9ea6aeac4452ccb4dde45cae769282 + c7cb4da26e74ef645e3e98fcb4534a7d66247a82 From 10c21e5336d687dbd5834cbd8076e46eda794168 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Jan 2025 05:03:27 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/arcade build 20250110.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24623.2 -> To Version 8.0.0-beta.25060.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../job/publish-build-assets.yml | 2 +- .../post-build/common-variables.yml | 2 +- eng/common/templates/job/job.yml | 2 +- global.json | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52e800cc014c..21838d384c01 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 278b1dda181ab18a9fbed73da998e50d128eae21 + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - 278b1dda181ab18a9fbed73da998e50d128eae21 + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - 278b1dda181ab18a9fbed73da998e50d128eae21 + c255aae7f2b128fa20a4441f0e192c3c53561621 - + https://github.com/dotnet/arcade - 278b1dda181ab18a9fbed73da998e50d128eae21 + c255aae7f2b128fa20a4441f0e192c3c53561621 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bdff77131e8c..bc716035a6aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.24623.2 + 8.0.0-beta.25060.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -213,7 +213,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.24623.2 + 8.0.0-beta.25060.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 0117328800c8..b2ccd9df6801 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -86,7 +86,7 @@ jobs: arguments: > -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml index c24193acfc98..173914f2364a 100644 --- a/eng/common/templates-official/post-build/common-variables.yml +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -7,7 +7,7 @@ variables: # Default Maestro++ API Endpoint and API Version - name: MaestroApiEndPoint - value: "https://maestro-prod.westus2.cloudapp.azure.com" + value: "https://maestro.dot.net" - name: MaestroApiAccessToken value: $(MaestroAccessToken) - name: MaestroApiVersion diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 8ec5c4f2d9f9..e295031c0985 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -128,7 +128,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - - task: MicroBuildSigningPlugin@3 + - task: MicroBuildSigningPlugin@4 displayName: Install MicroBuild plugin inputs: signType: $(_SignType) diff --git a/global.json b/global.json index 13ffec39d571..20106ebd00aa 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24623.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24623.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25060.1" } } From f40883498b014ca1a39ea3b863ba7401fdd597a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 13 Jan 2025 05:05:39 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/templating build 20250112.10 Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks From Version 8.0.406-servicing.25059.3 -> To Version 8.0.406-servicing.25062.10 --- NuGet.config | 2 +- eng/Version.Details.xml | 10 +++++----- eng/Versions.props | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NuGet.config b/NuGet.config index b0ce037d2a1c..d338ebb1678b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,7 +27,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6986982b39f6..788d7628941c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,15 +3,15 @@ https://github.com/dotnet/templating - 8316f1a2eea1fcb164b622c3a863a16e67c342f5 + 8e2a201983cf06110302014a4c4592da13419cb5 - + https://github.com/dotnet/templating - 8316f1a2eea1fcb164b622c3a863a16e67c342f5 + 8e2a201983cf06110302014a4c4592da13419cb5 - + https://github.com/dotnet/templating - 8316f1a2eea1fcb164b622c3a863a16e67c342f5 + 8e2a201983cf06110302014a4c4592da13419cb5 diff --git a/eng/Versions.props b/eng/Versions.props index 7ab4968a7b14..01ec3734df25 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -147,7 +147,7 @@ $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) - 8.0.406-servicing.25059.3 + 8.0.406-servicing.25062.10 $(MicrosoftTemplateEngineMocksPackageVersion) $(MicrosoftTemplateEngineAbstractionsPackageVersion) $(MicrosoftTemplateEngineMocksPackageVersion)