From f76556b879c9d98e70b9385ef64db43c8a1465db Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 29 Jan 2025 15:07:09 -0800 Subject: [PATCH 1/5] Use official templates even for PRs when run internal New template guidance is that a production pipeline can only use the official templates. Rather than creating a completely separate PR pipeline, we'll use the official templates. --- .vsts-ci.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 9b32c274f2ac..be7f82ee3e1d 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -44,10 +44,7 @@ resources: ref: refs/tags/release extends: - ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: - template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines - ${{ else }}: - template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines parameters: containers: alpine319WithNode: From a18237d14cac856914ecb9afc588162b927109b1 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 4 Feb 2025 14:25:53 -0800 Subject: [PATCH 2/5] Update branding to 8.0.114 (#20318) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d8f45ea2930f..8cf7ce6524d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 1 - 13 + 14 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 7eeae0155e89099398db956c7ea787b12b300cb1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 14:27:35 -0800 Subject: [PATCH 3/5] [release/8.0.1xx] Update dependencies from dotnet/arcade (#20315) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a4729495cf12..7b9ffe11bca4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -219,18 +219,18 @@ - + https://github.com/dotnet/arcade - 4db725213dccb0d1102427bce1c39ba3117da7f7 + 6418c9dcdccd29557cffca895f2309b810d45f15 - + https://github.com/dotnet/arcade - 4db725213dccb0d1102427bce1c39ba3117da7f7 + 6418c9dcdccd29557cffca895f2309b810d45f15 - + https://github.com/dotnet/arcade - 4db725213dccb0d1102427bce1c39ba3117da7f7 + 6418c9dcdccd29557cffca895f2309b810d45f15 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 8cf7ce6524d8..f89d4750c1a6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.25066.6 + 8.0.0-beta.25103.4 diff --git a/global.json b/global.json index 408ccf8072a2..616371ce611e 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25066.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25103.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25103.4" } } From 485e5621eed929769b5582fc14753d6519685132 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Feb 2025 14:29:24 -0800 Subject: [PATCH 4/5] [release/8.0.1xx] Update dependencies from dotnet/source-build-reference-packages (#20307) Co-authored-by: dotnet-maestro[bot] --- 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 7b9ffe11bca4..baed609523c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -248,9 +248,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://github.com/dotnet/source-build-reference-packages - f9542c50beaefc38dd9d7ec9ea38d54fd154f21a + d73fc552386797322e84fa9b2ef5eaa5369de83c From d68716aa25d4d174e15f906937e02ac1cef62df2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Feb 2025 05:01:48 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/arcade build 20250205.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.25103.4 -> To Version 8.0.0-beta.25105.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index baed609523c5..985e52e0419d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -219,18 +219,18 @@ - + https://github.com/dotnet/arcade - 6418c9dcdccd29557cffca895f2309b810d45f15 + f9e274e2269d2cda748e78344afe681411748157 - + https://github.com/dotnet/arcade - 6418c9dcdccd29557cffca895f2309b810d45f15 + f9e274e2269d2cda748e78344afe681411748157 - + https://github.com/dotnet/arcade - 6418c9dcdccd29557cffca895f2309b810d45f15 + f9e274e2269d2cda748e78344afe681411748157 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f89d4750c1a6..1b7f5a73d901 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.25103.4 + 8.0.0-beta.25105.2 diff --git a/global.json b/global.json index 616371ce611e..c4b9f3d4082f 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25103.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25103.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25105.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25105.2" } }