From 406f7ed42300583f03f08260a6b25df5357675b6 Mon Sep 17 00:00:00 2001 From: Forgind Date: Tue, 25 Jul 2023 16:08:41 -0700 Subject: [PATCH 001/652] Create task to parse json files --- src/core-sdk-tasks/JsonPropertyParser.cs | 54 ++++++++++++++++++++++++ 1 file changed, 54 insertions(+) create mode 100644 src/core-sdk-tasks/JsonPropertyParser.cs diff --git a/src/core-sdk-tasks/JsonPropertyParser.cs b/src/core-sdk-tasks/JsonPropertyParser.cs new file mode 100644 index 000000000000..ae023280e825 --- /dev/null +++ b/src/core-sdk-tasks/JsonPropertyParser.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Microsoft.Build.Framework; +using Microsoft.Build.Utilities; +using Newtonsoft.Json.Linq; + +namespace Microsoft.DotNet.Cli.Build +{ + public class JsonPropertyParser : Task + { + [Required] + public string Filename + { + get; + set; + } + + [Required] + public string Path + { + get; + set; + } + + [Output] + public string Value + { + get; + private set; + } + + public override bool Execute() + { + try + { + using (var sr = new StreamReader(Filename)) + { + var json = sr.ReadToEnd(); + var o = JObject.Parse(json); + Value = o.SelectToken(Path).Value(); + } + } + catch (Exception e) + { + Log.LogErrorFromException(e); + } + + return !Log.HasLoggedErrors; + } + } +} From 1a59a906851c652d33526ec0c298d219828a488f Mon Sep 17 00:00:00 2001 From: Forgind Date: Tue, 25 Jul 2023 16:08:53 -0700 Subject: [PATCH 002/652] Add to UsingTask (and sort) --- src/redist/targets/BuildCoreSdkTasks.targets | 29 ++++++++++---------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets index afd5d21bd0d1..491a7cf1b37b 100644 --- a/src/redist/targets/BuildCoreSdkTasks.targets +++ b/src/redist/targets/BuildCoreSdkTasks.targets @@ -19,27 +19,28 @@ Properties="ArtifactsDir=$(ArtifactsDir)tasks\"/> + + - - - - - - - - + + - + + - - - - - + + + + + + + + + From 9606060377ead89aca0ccd45325bf73c95461829 Mon Sep 17 00:00:00 2001 From: Forgind Date: Wed, 26 Jul 2023 15:14:04 -0700 Subject: [PATCH 003/652] Tweak task to make it more general --- src/core-sdk-tasks/JsonPropertyParser.cs | 37 ++++++++++++++---------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/src/core-sdk-tasks/JsonPropertyParser.cs b/src/core-sdk-tasks/JsonPropertyParser.cs index ae023280e825..d8e10e3984bc 100644 --- a/src/core-sdk-tasks/JsonPropertyParser.cs +++ b/src/core-sdk-tasks/JsonPropertyParser.cs @@ -1,8 +1,5 @@ using System; -using System.Collections.Generic; using System.IO; -using System.Linq; -using System.Text; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; using Newtonsoft.Json.Linq; @@ -12,21 +9,21 @@ namespace Microsoft.DotNet.Cli.Build public class JsonPropertyParser : Task { [Required] - public string Filename + public string[] JFilenames { get; set; } [Required] - public string Path + public string[] JPaths { get; set; } [Output] - public string Value + public ITaskItem[] Value { get; private set; @@ -34,18 +31,28 @@ public string Value public override bool Execute() { - try + Value = new TaskItem[JFilenames.Length]; + for (var i = 0; i < JFilenames.Length; i++) { - using (var sr = new StreamReader(Filename)) + Value[i] = new TaskItem(JFilenames[i]); + try { - var json = sr.ReadToEnd(); - var o = JObject.Parse(json); - Value = o.SelectToken(Path).Value(); + using (var sr = new StreamReader(JFilenames[i])) + { + var json = sr.ReadToEnd(); + var o = JObject.Parse(json); + foreach (var path in JPaths) + { + var lastDot = path.LastIndexOf('.'); + var name = lastDot == -1 ? path : path.Substring(lastDot + 1); + Value[i].SetMetadata(name, o.SelectToken(path).Value()); + } + } + } + catch (Exception e) + { + Log.LogErrorFromException(e); } - } - catch (Exception e) - { - Log.LogErrorFromException(e); } return !Log.HasLoggedErrors; From 198f9ca7d6cf2c4a97474a7501d7d7d83a232d56 Mon Sep 17 00:00:00 2001 From: Forgind Date: Wed, 26 Jul 2023 15:14:15 -0700 Subject: [PATCH 004/652] Use task to create BaselineManifest.json --- src/redist/targets/BundledManifests.targets | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index f4a425bc61f3..a0f146506578 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -104,6 +104,21 @@ - + + + + + + + + + + + + + + + + From f76662028cdc8c4509e024473183e3d8bd4993be Mon Sep 17 00:00:00 2001 From: Forgind Date: Thu, 27 Jul 2023 12:58:00 -0700 Subject: [PATCH 005/652] Add some copyright headers --- src/core-sdk-tasks/CollatePackageDownloads.cs | 5 ++++- src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs | 5 ++++- .../GetLinuxNativeInstallerDependencyVersions.cs | 5 ++++- src/core-sdk-tasks/GetRuntimePackRids.cs | 5 ++++- src/core-sdk-tasks/JsonPropertyParser.cs | 3 +++ 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/core-sdk-tasks/CollatePackageDownloads.cs b/src/core-sdk-tasks/CollatePackageDownloads.cs index 1e0c8ab9ee31..9e31720fe61c 100644 --- a/src/core-sdk-tasks/CollatePackageDownloads.cs +++ b/src/core-sdk-tasks/CollatePackageDownloads.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.Collections.Generic; using System.Linq; using System.Text; diff --git a/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs b/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs index 028f1aa329e2..1e5c9d33e929 100644 --- a/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs +++ b/src/core-sdk-tasks/GenerateSdkRuntimeIdentifierChain.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs index 195ac196b4f6..d4f324ce3fba 100644 --- a/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs +++ b/src/core-sdk-tasks/GetLinuxNativeInstallerDependencyVersions.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/core-sdk-tasks/GetRuntimePackRids.cs b/src/core-sdk-tasks/GetRuntimePackRids.cs index fa7b9b483f22..f03128599511 100644 --- a/src/core-sdk-tasks/GetRuntimePackRids.cs +++ b/src/core-sdk-tasks/GetRuntimePackRids.cs @@ -1,4 +1,7 @@ -using System; +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +using System; using System.Collections.Generic; using System.IO; using System.Linq; diff --git a/src/core-sdk-tasks/JsonPropertyParser.cs b/src/core-sdk-tasks/JsonPropertyParser.cs index d8e10e3984bc..8f80e57f386d 100644 --- a/src/core-sdk-tasks/JsonPropertyParser.cs +++ b/src/core-sdk-tasks/JsonPropertyParser.cs @@ -1,3 +1,6 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + using System; using System.IO; using Microsoft.Build.Framework; From 63faf3282d0c5aa53cb6eecfa981cf4036dbfbcc Mon Sep 17 00:00:00 2001 From: Forgind Date: Fri, 28 Jul 2023 12:20:25 -0700 Subject: [PATCH 006/652] Progress --- src/redist/targets/BundledManifests.targets | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index a0f146506578..bae041b3ffd8 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -119,6 +119,15 @@ +<<<<<<< Updated upstream +======= + + BaselineManifest + BaselineManifest + + + +>>>>>>> Stashed changes From 465fe07004f18734aecad45ea922a64c4c78aa1f Mon Sep 17 00:00:00 2001 From: Forgind Date: Mon, 31 Jul 2023 09:49:10 -0700 Subject: [PATCH 007/652] PR feedback --- src/core-sdk-tasks/JsonPropertyParser.cs | 64 -------------------- src/redist/targets/BuildCoreSdkTasks.targets | 1 - src/redist/targets/BundledManifests.targets | 25 +++----- 3 files changed, 9 insertions(+), 81 deletions(-) delete mode 100644 src/core-sdk-tasks/JsonPropertyParser.cs diff --git a/src/core-sdk-tasks/JsonPropertyParser.cs b/src/core-sdk-tasks/JsonPropertyParser.cs deleted file mode 100644 index 8f80e57f386d..000000000000 --- a/src/core-sdk-tasks/JsonPropertyParser.cs +++ /dev/null @@ -1,64 +0,0 @@ -// Copyright (c) .NET Foundation and contributors. All rights reserved. -// Licensed under the MIT license. See LICENSE file in the project root for full license information. - -using System; -using System.IO; -using Microsoft.Build.Framework; -using Microsoft.Build.Utilities; -using Newtonsoft.Json.Linq; - -namespace Microsoft.DotNet.Cli.Build -{ - public class JsonPropertyParser : Task - { - [Required] - public string[] JFilenames - { - get; - set; - } - - [Required] - public string[] JPaths - { - get; - set; - } - - [Output] - public ITaskItem[] Value - { - get; - private set; - } - - public override bool Execute() - { - Value = new TaskItem[JFilenames.Length]; - for (var i = 0; i < JFilenames.Length; i++) - { - Value[i] = new TaskItem(JFilenames[i]); - try - { - using (var sr = new StreamReader(JFilenames[i])) - { - var json = sr.ReadToEnd(); - var o = JObject.Parse(json); - foreach (var path in JPaths) - { - var lastDot = path.LastIndexOf('.'); - var name = lastDot == -1 ? path : path.Substring(lastDot + 1); - Value[i].SetMetadata(name, o.SelectToken(path).Value()); - } - } - } - catch (Exception e) - { - Log.LogErrorFromException(e); - } - } - - return !Log.HasLoggedErrors; - } - } -} diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets index 491a7cf1b37b..6268b743ff58 100644 --- a/src/redist/targets/BuildCoreSdkTasks.targets +++ b/src/redist/targets/BuildCoreSdkTasks.targets @@ -35,7 +35,6 @@ - diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index bae041b3ffd8..a9d6feadf8bd 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -105,29 +105,22 @@ + + $(Version)-baseline.$(_PatchNumber) + $(Version) + $(RedistLayoutPath)sdk-manifests\$(NetFeatureBand)\workloadsets\$(WorkloadSetVersion) + + - - - - - - + + -<<<<<<< Updated upstream - -======= - - BaselineManifest - BaselineManifest - - - ->>>>>>> Stashed changes + From db5ede1a12386149912b2908b3d7ddd6e4b33431 Mon Sep 17 00:00:00 2001 From: Forgind Date: Tue, 1 Aug 2023 17:12:42 -0700 Subject: [PATCH 008/652] Switch to VersionPrefix and _BuildNumberLabels --- src/redist/targets/BundledManifests.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index a9d6feadf8bd..23987058f0c4 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -106,7 +106,7 @@ DestinationFolder="$(RedistLayoutPath)sdk-manifests/%(DestinationPath)"/> - $(Version)-baseline.$(_PatchNumber) + $(VersionPrefix)-baseline$(_BuildNumberLabels) $(Version) $(RedistLayoutPath)sdk-manifests\$(NetFeatureBand)\workloadsets\$(WorkloadSetVersion) From bee2ea53d34bf75abc740feebeed2ffa68ec6876 Mon Sep 17 00:00:00 2001 From: Forgind Date: Wed, 2 Aug 2023 16:40:38 -0700 Subject: [PATCH 009/652] stabilize version --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c2d40c52554..c49800909506 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,12 +10,12 @@ 1 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rc + rtm 1 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release From c6abdacb6a22502a1ca5671dd2a463c8c9d79084 Mon Sep 17 00:00:00 2001 From: Forgind Date: Mon, 7 Aug 2023 18:13:17 -0700 Subject: [PATCH 010/652] Delete version line --- src/redist/targets/BundledManifests.targets | 1 - 1 file changed, 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index a19db2106e6b..e9b7749cfeb7 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -116,7 +116,6 @@ - From 52892915bdadd7ff4e8ab0c651f20e1a42b0cdb4 Mon Sep 17 00:00:00 2001 From: Forgind Date: Mon, 7 Aug 2023 18:16:03 -0700 Subject: [PATCH 011/652] Revert "stabilize version" This reverts commit bee2ea53d34bf75abc740feebeed2ffa68ec6876. --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index c8f8b38234fa..f32317ad5c6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -10,12 +10,12 @@ 1 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) - rtm + rc 1 $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release From 58289cf822c257d13c78fbb610ac6c931de9a919 Mon Sep 17 00:00:00 2001 From: Forgind Date: Tue, 8 Aug 2023 10:38:20 -0700 Subject: [PATCH 012/652] Add feature band --- src/redist/targets/BundledManifests.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index e9b7749cfeb7..d74478a55bd4 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -116,7 +116,7 @@ - + From 331711fafb50571501bfeee06f8d72aa7ff8eec1 Mon Sep 17 00:00:00 2001 From: Forgind Date: Tue, 8 Aug 2023 11:27:36 -0700 Subject: [PATCH 013/652] Switch to full version --- src/redist/targets/BundledManifests.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index d74478a55bd4..f073ebe2588b 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -116,7 +116,7 @@ - + From 2dfb8d0a578a67de244904143c67f9b74679e81f Mon Sep 17 00:00:00 2001 From: Forgind Date: Tue, 8 Aug 2023 14:38:29 -0700 Subject: [PATCH 014/652] Switch to another Version --- src/redist/targets/BundledManifests.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index f073ebe2588b..39d5df2fb9b1 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -108,7 +108,7 @@ $(VersionPrefix)-baseline$(_BuildNumberLabels) $(Version) - $(RedistLayoutPath)sdk-manifests\$(NetFeatureBand)\workloadsets\$(WorkloadSetVersion) + $(RedistLayoutPath)sdk-manifests\$(Version)\workloadsets\$(WorkloadSetVersion) From e0acb5805e14ef2441842e41e18f154d50ff716a Mon Sep 17 00:00:00 2001 From: Forgind Date: Tue, 8 Aug 2023 16:52:30 -0700 Subject: [PATCH 015/652] Use Manifests' feature band --- src/redist/targets/BundledManifests.targets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 39d5df2fb9b1..6b926f1594af 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -108,7 +108,7 @@ $(VersionPrefix)-baseline$(_BuildNumberLabels) $(Version) - $(RedistLayoutPath)sdk-manifests\$(Version)\workloadsets\$(WorkloadSetVersion) + $(RedistLayoutPath)sdk-manifests\$(NetFeatureBand)\workloadsets\$(WorkloadSetVersion) @@ -116,7 +116,7 @@ - + From d78a0b791203c608bbf3c81618ef511336df87f7 Mon Sep 17 00:00:00 2001 From: Forgind Date: Thu, 10 Aug 2023 09:19:55 -0700 Subject: [PATCH 016/652] Check for baseline manifest as well --- test/EndToEnd/ValidateInsertedManifests.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs index cdede126c997..ffd5dd329f5e 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -31,7 +31,12 @@ public void ManifestReaderCanReadManifests() string manifestFile = manifestDir.GetFile("WorkloadManifest.json").FullName; - File.Exists(manifestFile).Should().BeTrue(); + var baselineFile = manifestDir.GetFile("Baseline.WorkloadSet.json").FullName; + if (!(new FileInfo(baselineFile).Exists)) + { + new FileInfo(manifestFile).Exists.Should().BeTrue(); + } + using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile); readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid"); From 0220e2614c29f28bd6ed85f6b08308d3cdaa3b52 Mon Sep 17 00:00:00 2001 From: Forgind Date: Thu, 10 Aug 2023 09:35:04 -0700 Subject: [PATCH 017/652] =?UTF-8?q?Fix=20the=20fix=20=F0=9F=98=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- test/EndToEnd/ValidateInsertedManifests.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs index ffd5dd329f5e..eafb8ba566c3 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -35,11 +35,10 @@ public void ManifestReaderCanReadManifests() if (!(new FileInfo(baselineFile).Exists)) { new FileInfo(manifestFile).Exists.Should().BeTrue(); + using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); + Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile); + readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid"); } - - using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); - Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile); - readManifest.ShouldNotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid"); } } From 6910bc54d909bf2fdd1d1cd55c39cffaacf3afa9 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Thu, 17 Aug 2023 13:59:48 -0700 Subject: [PATCH 018/652] Update src/redist/targets/BundledManifests.targets Co-authored-by: Daniel Plaisted --- src/redist/targets/BundledManifests.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/BundledManifests.targets b/src/redist/targets/BundledManifests.targets index 6b926f1594af..9e35b84e3995 100644 --- a/src/redist/targets/BundledManifests.targets +++ b/src/redist/targets/BundledManifests.targets @@ -120,6 +120,6 @@ - + From f360881561cf02ee14969dbad7c55453eaab9fb6 Mon Sep 17 00:00:00 2001 From: Forgind Date: Thu, 7 Sep 2023 10:52:14 -0700 Subject: [PATCH 019/652] PR comments --- test/EndToEnd/ValidateInsertedManifests.cs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs index eafb8ba566c3..ccf6b39b1412 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -31,8 +31,7 @@ public void ManifestReaderCanReadManifests() string manifestFile = manifestDir.GetFile("WorkloadManifest.json").FullName; - var baselineFile = manifestDir.GetFile("Baseline.WorkloadSet.json").FullName; - if (!(new FileInfo(baselineFile).Exists)) + if (!string.Equals(manifestId, "workloadsets")) { new FileInfo(manifestFile).Exists.Should().BeTrue(); using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); From 6d6e5309a930e66b060db43f021e9481834741a4 Mon Sep 17 00:00:00 2001 From: Forgind Date: Fri, 8 Sep 2023 11:54:56 -0700 Subject: [PATCH 020/652] First --> Last --- test/EndToEnd/ValidateInsertedManifests.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs index ccf6b39b1412..0a8e4d917353 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -22,7 +22,7 @@ public ValidateInsertedManifests(ITestOutputHelper output) public void ManifestReaderCanReadManifests() { var sdkManifestDir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk-manifests"); - var sdkversionDir = new DirectoryInfo(sdkManifestDir).EnumerateDirectories().First(); + var sdkversionDir = new DirectoryInfo(sdkManifestDir).EnumerateDirectories().Last(); foreach (var manifestVersionDir in sdkversionDir.EnumerateDirectories()) { foreach (var manifestDir in manifestVersionDir.EnumerateDirectories()) From 1b03f4b2b44d42e820806e21779f6641fdbe2481 Mon Sep 17 00:00:00 2001 From: Forgind Date: Fri, 8 Sep 2023 12:15:03 -0700 Subject: [PATCH 021/652] Fix test? --- test/EndToEnd/ValidateInsertedManifests.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs index 0a8e4d917353..778c07ea7321 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -22,12 +22,12 @@ public ValidateInsertedManifests(ITestOutputHelper output) public void ManifestReaderCanReadManifests() { var sdkManifestDir = Path.Combine(Path.GetDirectoryName(RepoDirectoriesProvider.DotnetUnderTest), "sdk-manifests"); - var sdkversionDir = new DirectoryInfo(sdkManifestDir).EnumerateDirectories().Last(); + var sdkversionDir = new DirectoryInfo(sdkManifestDir).EnumerateDirectories().First(); foreach (var manifestVersionDir in sdkversionDir.EnumerateDirectories()) { foreach (var manifestDir in manifestVersionDir.EnumerateDirectories()) { - var manifestId = manifestDir.Name; + var manifestId = manifestVersionDir.Name; string manifestFile = manifestDir.GetFile("WorkloadManifest.json").FullName; From 62b7bdec2a3f83475ed58729c7af22a6ccfb3fb8 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Wed, 27 Sep 2023 12:28:41 -0700 Subject: [PATCH 022/652] Branding 8.0.2xx (#17408) --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9761a4caf699..c05eae78d7bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 8 0 - 1 + 2 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) @@ -16,7 +16,7 @@ false release - rtm + preview rtm servicing From d5ed66a10688f35e6cf4030965d88e814f11437b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 6 Oct 2023 14:56:32 -0700 Subject: [PATCH 023/652] Disable crossgen and zip file creation in the local dev build unless -pack is used --- eng/AfterSigning.targets | 1 + src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateArchives.targets | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets index b8a08378a1b5..dbe630432b7f 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -4,6 +4,7 @@ diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index d9f961933cc8..8d748f64e290 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,7 +1,7 @@ diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets index 814abbe71322..369d5451155d 100644 --- a/src/redist/targets/GenerateArchives.targets +++ b/src/redist/targets/GenerateArchives.targets @@ -1,5 +1,6 @@ From 577b7aab27104367f266816ecd9b59a83b344dba Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 6 Oct 2023 16:32:04 -0700 Subject: [PATCH 024/652] Pack get stripped out of the list of properties so let's route to a different property when pack is set --- eng/AfterSigning.targets | 2 +- run-build.ps1 | 5 +++++ run-build.sh | 3 +++ src/redist/targets/Crossgen.targets | 2 +- src/redist/targets/GenerateArchives.targets | 2 +- 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets index dbe630432b7f..a2a586db7df0 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -4,7 +4,7 @@ diff --git a/run-build.ps1 b/run-build.ps1 index 4f2e1275f5ae..4286a0a3f12f 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -8,6 +8,7 @@ param( [string]$Configuration="Debug", [string]$Architecture="x64", [switch]$Sign=$false, + [switch]$Pack=$false, [switch]$PgoInstrument, [bool]$WarnAsError=$true, [Parameter(ValueFromRemainingArguments=$true)][String[]]$ExtraParameters @@ -29,6 +30,10 @@ if ($Sign) { $WarnAsError = $false } +if ($Pack) { + $Parameters = "$Parameters /p:PackInstaller=true" +} + $Parameters = "$Parameters -WarnAsError `$$WarnAsError" try { diff --git a/run-build.sh b/run-build.sh index c380d75ce7cc..e735b79f30ff 100755 --- a/run-build.sh +++ b/run-build.sh @@ -45,6 +45,9 @@ while [[ $# > 0 ]]; do --pgoInstrument) args+=("/p:PgoInstrument=true") ;; + --pack) + args+=("/p:PackInstaller=true") + ;; --help) echo "Usage: $0 [--configuration ] [--architecture ] [--docker ] [--help]" echo "" diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index 8d748f64e290..b07e9abb328c 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,7 +1,7 @@ diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets index 369d5451155d..d19a60e8fe9f 100644 --- a/src/redist/targets/GenerateArchives.targets +++ b/src/redist/targets/GenerateArchives.targets @@ -1,6 +1,6 @@ From e6d550acf1a06d47e4c49c4a97a0d5d6d85361dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 19:23:57 +0000 Subject: [PATCH 025/652] Update dependencies from https://github.com/dotnet/sdk build 20231017.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23506.7 -> To Version 8.0.200-preview.23517.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rtm.23504.7 -> To Version 8.0.0-rtm.23516.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 128 ++++++++++++++++++++-------------------- eng/Versions.props | 54 ++++++++--------- 3 files changed, 91 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index e29400586a1f..9fcb5685fcf8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1dbc4f445f1..c8454b0715ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/windowsdesktop - fbc1fdd82c38765663b256e663a51e55b855f345 + e846ac57cea8f922cd5eb9b17fb4385db5af2a0f - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/aspnetcore - f37eb785c92218e668cf98e8c50139c1395492ad + 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + a405ba0950989e9af2f78a30c465450480ce9899 - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + a405ba0950989e9af2f78a30c465450480ce9899 - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + a405ba0950989e9af2f78a30c465450480ce9899 - + https://github.com/dotnet/sdk - 857f22d8f051c090fa367d230aebe9b26450f634 + a405ba0950989e9af2f78a30c465450480ce9899 https://github.com/dotnet/test-templates @@ -124,53 +124,53 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - 8226c3cbaf595ae2c6fb8ed7ccd69ae77d647bd4 + ecdff75cfde7dc49147be791da1ec15a4eee21a3 - + https://github.com/dotnet/wpf - b892ae845b9832e0873ef2f7c958c46dc6b3d637 + babeeb65b164c87633db21a20223c8d99e2185e9 - + https://github.com/dotnet/fsharp - 38b2bac6361e9b75dc2b51c0f2b78b008872767d + d1de6a8d1e6e18c636cf55894b5158ab0e324394 - + https://github.com/dotnet/fsharp - 38b2bac6361e9b75dc2b51c0f2b78b008872767d + d1de6a8d1e6e18c636cf55894b5158ab0e324394 - + https://github.com/microsoft/vstest - cf7d549fc0197abaabec19d61d2c20d7a7b089f8 + 5f9cc79b6542489218124e304c7118e862ae286f - + https://github.com/dotnet/runtime - 22b8a5665f5725a2c7bb09cfbe88f2cdc9847c1a + 567f81e719091bd1ba3c751d49bacee2c6a45e66 - + https://github.com/dotnet/roslyn - 81d9274600db701a8b08ed8af3fd6b00a775cc33 + fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 - + https://github.com/dotnet/msbuild - 585e09762f07aa6ec291cb75cf7e98bdded8e373 + 25fdeb3c8c2608f248faec3d6d37733ae144bbbb - + https://github.com/nuget/nuget.client - 0dd5a1ea536201af94725353e4bc711d7560b246 + 62c02514a26464c03574137628e33ed3690c06ef https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - ae4eaab4a9415d7f87ca7c6dc0b41ea482fa6337 + 0c28b5cfe0f9173000450a3edc808dc8c2b9286e diff --git a/eng/Versions.props b/eng/Versions.props index 6064718d0a50..f82990531bd7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23504.13 + 8.0.0-rtm.23516.9 - 8.0.0-rtm.23504.3 + 8.0.0-rtm.23516.12 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 - 8.0.0-rtm.23502.22 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 + 8.0.0-rtm.23516.6 0.2.0 - 8.0.100-rtm.23506.7 - 8.0.100-rtm.23506.7 - 8.0.100-rtm.23506.7 + 8.0.200-preview.23517.18 + 8.0.200-preview.23517.18 + 8.0.200-preview.23517.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.8.0-3.23504.4 + 4.9.0-1.23513.7 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23516.15 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 - 8.0.0-rtm.23504.8 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 + 8.0.0-rtm.23516.15 2.1.0 - 8.0.0-rtm.23504.7 - 8.0.0-rtm.23504.7 - 8.0.0-rtm.23504.7 - 8.0.0-rtm.23504.7 + 8.0.0-rtm.23516.9 + 8.0.0-rtm.23516.9 + 8.0.0-rtm.23516.9 + 8.0.0-rtm.23516.9 @@ -127,7 +127,7 @@ - 6.8.0-rc.122 + 6.9.0-preview.1.16 @@ -232,7 +232,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.8.0-release-23468-02 + 17.9.0-preview-23515-01 8.0.0-alpha.1.22557.12 @@ -247,7 +247,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rtm.23477.1 + 8.0.0-rtm.23504.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 3ae2c99e1da854b78b7970c822493e5e3f93446b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 21:07:02 +0000 Subject: [PATCH 026/652] Update dependencies from https://github.com/dotnet/sdk build 20231017.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23506.7 -> To Version 8.0.200-preview.23517.19 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rtm.23504.7 -> To Version 8.0.0-rtm.23516.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c8454b0715ee..e53a5fa2a767 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/sdk - a405ba0950989e9af2f78a30c465450480ce9899 + d7740eb73034be820b475cf5b64a6ee5f540c3e8 - + https://github.com/dotnet/sdk - a405ba0950989e9af2f78a30c465450480ce9899 + d7740eb73034be820b475cf5b64a6ee5f540c3e8 - + https://github.com/dotnet/sdk - a405ba0950989e9af2f78a30c465450480ce9899 + d7740eb73034be820b475cf5b64a6ee5f540c3e8 - + https://github.com/dotnet/sdk - a405ba0950989e9af2f78a30c465450480ce9899 + d7740eb73034be820b475cf5b64a6ee5f540c3e8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f82990531bd7..931984de9a8a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23517.18 - 8.0.200-preview.23517.18 - 8.0.200-preview.23517.18 + 8.0.200-preview.23517.19 + 8.0.200-preview.23517.19 + 8.0.200-preview.23517.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9fa4d237118f0788d0af30eff5ae69bd216b3691 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 22:00:10 +0000 Subject: [PATCH 027/652] Update dependencies from https://github.com/dotnet/sdk build 20231017.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.100-rtm.23506.7 -> To Version 8.0.200-preview.23517.27 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100.Transport From Version 8.0.0-rtm.23504.7 -> To Version 8.0.0-rtm.23516.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e53a5fa2a767..679346b36413 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore 02bdf7077b8d96039bd39d6189a1abdefc41e65e - + https://github.com/dotnet/sdk - d7740eb73034be820b475cf5b64a6ee5f540c3e8 + 1807d1df497f379d30060a553027fab6d8b804d9 - + https://github.com/dotnet/sdk - d7740eb73034be820b475cf5b64a6ee5f540c3e8 + 1807d1df497f379d30060a553027fab6d8b804d9 - + https://github.com/dotnet/sdk - d7740eb73034be820b475cf5b64a6ee5f540c3e8 + 1807d1df497f379d30060a553027fab6d8b804d9 - + https://github.com/dotnet/sdk - d7740eb73034be820b475cf5b64a6ee5f540c3e8 + 1807d1df497f379d30060a553027fab6d8b804d9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 931984de9a8a..a80f6d559ea6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23517.19 - 8.0.200-preview.23517.19 - 8.0.200-preview.23517.19 + 8.0.200-preview.23517.27 + 8.0.200-preview.23517.27 + 8.0.200-preview.23517.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d77c79b49b58ac005c0575a83aefa79923752e0b Mon Sep 17 00:00:00 2001 From: Larry Ewing Date: Wed, 11 Oct 2023 12:02:22 -0500 Subject: [PATCH 028/652] Add parens to the pattern to see if it fixes things --- test/EndToEnd/ProjectBuildTests.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index faad825c8a17..01925eb5fd95 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -202,16 +202,16 @@ public void DotnetNewShowsCuratedListCorrectly() string expectedOutput = @"[\-\s]+ -[\w \.]+webapp,razor\s+\[C#\][\w\ \/]+ -[\w \.]+classlib\s+\[C#\],F#,VB[\w\ \/]+ -[\w \.]+console\s+\[C#\],F#,VB[\w\ \/]+ +[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+ +[\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ +[\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ "; if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) { expectedOutput += -@"[\w \.]+winforms\s+\[C#\],VB[\w\ \/]+ -[\w \.]+\wpf\s+\[C#\],VB[\w\ \/]+ +@"[\w \.\(\)]+winforms\s+\[C#\],VB[\w\ \/]+ +[\w \.\(\)]+\wpf\s+\[C#\],VB[\w\ \/]+ "; } //list should end with new line From 7b8f6939b7599feb8ed61a144803bd6481e36ffa Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 17 Oct 2023 23:18:51 -0700 Subject: [PATCH 029/652] Revert Version.Details.xml file --- 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 6b8cd65590b2..679346b36413 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -230,9 +230,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 5dd44eb4f5ebf8d1b11152344397b5a79d7f88ea + 7b55da982fc6e71c1776c4de89111aee0eecb45a From c6c3f8e98367e510acb477338ee7ac616f51046d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:06:43 +0000 Subject: [PATCH 030/652] [release/8.0.2xx] Disable source build for PR and CI on non-1xx branches (#17584) --- eng/pipelines/vmr-build.yml | 4 ++++ eng/pipelines/vmr-sync-internal.yml | 4 ++++ src/SourceBuild/content/eng/pipelines/ci.yml | 7 +++++++ 3 files changed, 15 insertions(+) diff --git a/eng/pipelines/vmr-build.yml b/eng/pipelines/vmr-build.yml index 3f2e1c759fd9..dc28734075a2 100644 --- a/eng/pipelines/vmr-build.yml +++ b/eng/pipelines/vmr-build.yml @@ -4,6 +4,10 @@ pr: include: - main - release/* + exclude: + - release/*.0.2xx + - release/*.0.3xx + - release/*.0.4xx parameters: - name: vmrBranch diff --git a/eng/pipelines/vmr-sync-internal.yml b/eng/pipelines/vmr-sync-internal.yml index 176f98910c56..0a10a518e773 100644 --- a/eng/pipelines/vmr-sync-internal.yml +++ b/eng/pipelines/vmr-sync-internal.yml @@ -5,6 +5,10 @@ trigger: branches: include: - internal/release/* + exclude: + - internal/release/*.0.2xx + - internal/release/*.0.3xx + - internal/release/*.0.4xx resources: repositories: diff --git a/src/SourceBuild/content/eng/pipelines/ci.yml b/src/SourceBuild/content/eng/pipelines/ci.yml index 55b6a212d046..7a6756c3eaf9 100644 --- a/src/SourceBuild/content/eng/pipelines/ci.yml +++ b/src/SourceBuild/content/eng/pipelines/ci.yml @@ -7,6 +7,13 @@ trigger: - main - release/* - internal/release/* + exclude: + - release/*.0.2xx + - release/*.0.3xx + - release/*.0.4xx + - internal/release/*.0.2xx + - internal/release/*.0.3xx + - internal/release/*.0.4xx pr: branches: From 088c43663941e566932f771631de6392e5880656 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 23 Oct 2023 12:20:13 -0700 Subject: [PATCH 031/652] [release/8.0.2xx] Update dependencies from dotnet/sdk (#17558) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Matt Thalman Co-authored-by: Michael Simons --- eng/Version.Details.xml | 126 ++++++++++++++++++++-------------------- eng/Versions.props | 54 ++++++++--------- 2 files changed, 90 insertions(+), 90 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 679346b36413..99c375f498b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://github.com/dotnet/windowsdesktop - e846ac57cea8f922cd5eb9b17fb4385db5af2a0f + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/windowsdesktop - e846ac57cea8f922cd5eb9b17fb4385db5af2a0f + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/windowsdesktop - e846ac57cea8f922cd5eb9b17fb4385db5af2a0f + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/windowsdesktop - e846ac57cea8f922cd5eb9b17fb4385db5af2a0f + 5c87dea47f898cbfcc7b0cad77d66a62e998963d - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 11ad607efb2b31c5e1b906303fcd70341e9d5206 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/aspnetcore - 02bdf7077b8d96039bd39d6189a1abdefc41e65e + c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/sdk - 1807d1df497f379d30060a553027fab6d8b804d9 + d307aea02adaa1533a4587bc5855fe41e71e5941 - + https://github.com/dotnet/sdk - 1807d1df497f379d30060a553027fab6d8b804d9 + d307aea02adaa1533a4587bc5855fe41e71e5941 - + https://github.com/dotnet/sdk - 1807d1df497f379d30060a553027fab6d8b804d9 + d307aea02adaa1533a4587bc5855fe41e71e5941 - + https://github.com/dotnet/sdk - 1807d1df497f379d30060a553027fab6d8b804d9 + d307aea02adaa1533a4587bc5855fe41e71e5941 https://github.com/dotnet/test-templates @@ -124,42 +124,42 @@ 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/winforms - ecdff75cfde7dc49147be791da1ec15a4eee21a3 + abda8e3bfa78319363526b5a5f86863ec979940e - + https://github.com/dotnet/wpf - babeeb65b164c87633db21a20223c8d99e2185e9 + 0d629281c49061636a8a161bae6fceedd37acff7 - + https://github.com/dotnet/fsharp - d1de6a8d1e6e18c636cf55894b5158ab0e324394 + 0ddc4d640200417429be9daa6b0d4e54a27882b8 - + https://github.com/dotnet/fsharp - d1de6a8d1e6e18c636cf55894b5158ab0e324394 + 0ddc4d640200417429be9daa6b0d4e54a27882b8 - + https://github.com/microsoft/vstest - 5f9cc79b6542489218124e304c7118e862ae286f + fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 - + https://github.com/dotnet/runtime - 567f81e719091bd1ba3c751d49bacee2c6a45e66 + 11ad607efb2b31c5e1b906303fcd70341e9d5206 - + https://github.com/dotnet/roslyn - fe6cc3e7227caafafd76ffd1f3f8981926edf3b6 + 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/msbuild - 25fdeb3c8c2608f248faec3d6d37733ae144bbbb + 221fd2e8790a22ead513eb71630557efc02060e2 - + https://github.com/nuget/nuget.client 62c02514a26464c03574137628e33ed3690c06ef @@ -168,9 +168,9 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 0c28b5cfe0f9173000450a3edc808dc8c2b9286e + 1b7f3a6560f6fb5f32b2758603c0376037f555ea diff --git a/eng/Versions.props b/eng/Versions.props index a80f6d559ea6..58fb124cba4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23516.9 + 8.0.0-rtm.23520.14 - 8.0.0-rtm.23516.12 + 8.0.0-rtm.23521.1 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 - 8.0.0-rtm.23516.6 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 + 8.0.0-rtm.23520.10 0.2.0 - 8.0.200-preview.23517.27 - 8.0.200-preview.23517.27 - 8.0.200-preview.23517.27 + 8.0.200-preview.23523.1 + 8.0.200-preview.23523.1 + 8.0.200-preview.23523.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-1.23513.7 + 4.9.0-1.23520.1 - 8.0.0-rtm.23516.15 + 8.0.0-rtm.23520.16 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 - 8.0.0-rtm.23516.15 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 + 8.0.0-rtm.23520.16 2.1.0 - 8.0.0-rtm.23516.9 - 8.0.0-rtm.23516.9 - 8.0.0-rtm.23516.9 - 8.0.0-rtm.23516.9 + 8.0.0-rtm.23521.1 + 8.0.0-rtm.23521.1 + 8.0.0-rtm.23521.1 + 8.0.0-rtm.23521.1 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.16 + 6.9.0-preview.1.17 @@ -232,7 +232,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23515-01 + 17.9.0-preview-23519-02 8.0.0-alpha.1.22557.12 @@ -247,7 +247,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rtm.23504.4 + 8.0.0-rtm.23511.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 50dc5660c232ba028ecf4790230fc5d39d65f2cd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Oct 2023 22:16:48 +0000 Subject: [PATCH 032/652] Update dependencies from https://github.com/dotnet/sdk build 20231023.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23523.1 -> To Version 8.0.200-preview.23523.17 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 99c375f498b7..15224c424ddc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/sdk - d307aea02adaa1533a4587bc5855fe41e71e5941 + 6588d96cd055f2e39fb46505c4c9b57a423fbb88 - + https://github.com/dotnet/sdk - d307aea02adaa1533a4587bc5855fe41e71e5941 + 6588d96cd055f2e39fb46505c4c9b57a423fbb88 - + https://github.com/dotnet/sdk - d307aea02adaa1533a4587bc5855fe41e71e5941 + 6588d96cd055f2e39fb46505c4c9b57a423fbb88 - + https://github.com/dotnet/sdk - d307aea02adaa1533a4587bc5855fe41e71e5941 + 6588d96cd055f2e39fb46505c4c9b57a423fbb88 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 58fb124cba4e..956a570a024e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23523.1 - 8.0.200-preview.23523.1 - 8.0.200-preview.23523.1 + 8.0.200-preview.23523.17 + 8.0.200-preview.23523.17 + 8.0.200-preview.23523.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bea39c37bda5bcaf4adff071fff0db3fb1b5f083 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 23 Oct 2023 23:12:01 +0000 Subject: [PATCH 033/652] Update dependencies from https://github.com/dotnet/sdk build 20231023.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23523.1 -> To Version 8.0.200-preview.23523.23 Dependency coherency updates Microsoft.Build From Version 17.9.0-preview-23519-03 -> To Version 17.9.0-preview-23523-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 15224c424ddc..7cf9f2c74c36 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/sdk - 6588d96cd055f2e39fb46505c4c9b57a423fbb88 + d7a3ae71415a1c025fe4c85bc1e0d81d0b9e67b8 - + https://github.com/dotnet/sdk - 6588d96cd055f2e39fb46505c4c9b57a423fbb88 + d7a3ae71415a1c025fe4c85bc1e0d81d0b9e67b8 - + https://github.com/dotnet/sdk - 6588d96cd055f2e39fb46505c4c9b57a423fbb88 + d7a3ae71415a1c025fe4c85bc1e0d81d0b9e67b8 - + https://github.com/dotnet/sdk - 6588d96cd055f2e39fb46505c4c9b57a423fbb88 + d7a3ae71415a1c025fe4c85bc1e0d81d0b9e67b8 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 4414e2ffe333e304e7d9b2122f88242a23ab25a6 - + https://github.com/dotnet/msbuild - 221fd2e8790a22ead513eb71630557efc02060e2 + 08494c73128451a3f7cfb47a5e9cbd63f5507a1f https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 956a570a024e..da3f04a143e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23523.17 - 8.0.200-preview.23523.17 - 8.0.200-preview.23523.17 + 8.0.200-preview.23523.23 + 8.0.200-preview.23523.23 + 8.0.200-preview.23523.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 98fe6ea86810b48949b123f847b1abafe395a5cb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 24 Oct 2023 00:08:48 +0000 Subject: [PATCH 034/652] Update dependencies from https://github.com/dotnet/sdk build 20231023.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23523.1 -> To Version 8.0.200-preview.23523.30 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.8.0-beta.23519.4 -> To Version 12.8.0-beta.23523.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7cf9f2c74c36..ecc57947f2fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://github.com/dotnet/aspnetcore c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc - + https://github.com/dotnet/sdk - d7a3ae71415a1c025fe4c85bc1e0d81d0b9e67b8 + 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e - + https://github.com/dotnet/sdk - d7a3ae71415a1c025fe4c85bc1e0d81d0b9e67b8 + 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e - + https://github.com/dotnet/sdk - d7a3ae71415a1c025fe4c85bc1e0d81d0b9e67b8 + 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e - + https://github.com/dotnet/sdk - d7a3ae71415a1c025fe4c85bc1e0d81d0b9e67b8 + 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://github.com/dotnet/wpf 0d629281c49061636a8a161bae6fceedd37acff7 - + https://github.com/dotnet/fsharp - 0ddc4d640200417429be9daa6b0d4e54a27882b8 + 507114e990861aec5444df54de1dc77bfe26a310 - + https://github.com/dotnet/fsharp - 0ddc4d640200417429be9daa6b0d4e54a27882b8 + 507114e990861aec5444df54de1dc77bfe26a310 diff --git a/eng/Versions.props b/eng/Versions.props index da3f04a143e1..3c0f59f885fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23523.23 - 8.0.200-preview.23523.23 - 8.0.200-preview.23523.23 + 8.0.200-preview.23523.30 + 8.0.200-preview.23523.30 + 8.0.200-preview.23523.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dc613f898e137ce42203e8d3c7433803be49fbec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 28 Oct 2023 12:42:09 +0000 Subject: [PATCH 035/652] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23525.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecc57947f2fb..d698ae9cf953 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,18 +205,18 @@ - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + a57022b44f3ff23de925530ea1d27da9701aed57 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + a57022b44f3ff23de925530ea1d27da9701aed57 - + https://github.com/dotnet/arcade - 1d451c32dda2314c721adbf8829e1c0cd4e681ff + a57022b44f3ff23de925530ea1d27da9701aed57 https://github.com/dotnet/arcade-services @@ -235,9 +235,9 @@ 7b55da982fc6e71c1776c4de89111aee0eecb45a - + https://github.com/dotnet/xliff-tasks - 194f32828726c3f1f63f79f3dc09b9e99c157b11 + 73f0850939d96131c28cf6ea6ee5aacb4da0083a diff --git a/eng/Versions.props b/eng/Versions.props index 3c0f59f885fe..8533f48a0005 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23463.1 + 8.0.0-beta.23525.4 diff --git a/global.json b/global.json index 789235dfe60a..687a1eecb4b3 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-preview.7.23376.3", + "dotnet": "8.0.100-rtm.23506.1", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23463.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23525.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23525.4" } } From 5b6198b72350faaea01623bccbc8ebc2e5117dba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 29 Oct 2023 12:40:25 +0000 Subject: [PATCH 036/652] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23525.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk From 051596e4442ba4a2cfc659a023f89ccc411085b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 30 Oct 2023 12:35:52 +0000 Subject: [PATCH 037/652] Update dependencies from https://github.com/dotnet/arcade build 20231025.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23463.1 -> To Version 8.0.0-beta.23525.4 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23426.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk From b7bae3f7ae72edd4055c37f386cbd437bccf3e5c Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 8 Nov 2023 01:56:05 -0800 Subject: [PATCH 038/652] Revert "stabilize package versions" --- eng/Versions.props | 2 +- .../SourceBuiltArtifactsTests.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2635b91dbdbd..24b087e8df07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release preview diff --git a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs index d80eb8e548a6..8ab1a9600031 100644 --- a/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs +++ b/src/SourceBuild/content/test/Microsoft.DotNet.SourceBuild.SmokeTests/SourceBuiltArtifactsTests.cs @@ -58,8 +58,7 @@ public void VerifyVersionFile() string[] sdkVersionLines = File.ReadAllLines(Path.Combine(outputDir, sdkVersionPath)); string expectedSdkVersion = sdkVersionLines[1]; - // Disable due to https://github.com/dotnet/source-build/issues/3693 - // Assert.Equal(expectedSdkVersion, sdkVersion); + Assert.Equal(expectedSdkVersion, sdkVersion); } finally { From bbbba62fb7c5f1f34204ab73bab025de6d3ac737 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 8 Nov 2023 10:16:40 -0800 Subject: [PATCH 039/652] [release/8.0.2xx] Update dependencies from dotnet/arcade (#17731) 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 d698ae9cf953..27cccc7aea3e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,18 +205,18 @@ - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 - + https://github.com/dotnet/arcade - a57022b44f3ff23de925530ea1d27da9701aed57 + 080141bf0f9f15408bb6eb8e301b23bddf81d054 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 8533f48a0005..aca35532c6dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23525.4 + 8.0.0-beta.23556.5 diff --git a/global.json b/global.json index 687a1eecb4b3..639cb4f4410f 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.23525.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23525.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23556.5" } } From ca5f6b00776d14705579f1c9a5a3f9ef48f7a4e6 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 9 Nov 2023 13:26:53 -0800 Subject: [PATCH 040/652] Add comments explaining why these targets are disabled Clean up the run-build script --- run-build.ps1 | 5 +---- src/redist/targets/Crossgen.targets | 1 + src/redist/targets/GenerateArchives.targets | 1 + 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/run-build.ps1 b/run-build.ps1 index 4286a0a3f12f..7b98f2ee5106 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -24,10 +24,7 @@ if ($PgoInstrument) { } if ($Sign) { - $Parameters = "$Parameters -sign /p:SignCoreSdk=true" - - # Workaround https://github.com/dotnet/arcade/issues/1776 - $WarnAsError = $false + $Parameters = "$Parameters -sign" } if ($Pack) { diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index b07e9abb328c..e55047af60e0 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,5 +1,6 @@ + diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets index d19a60e8fe9f..b34065a101ab 100644 --- a/src/redist/targets/GenerateArchives.targets +++ b/src/redist/targets/GenerateArchives.targets @@ -1,4 +1,5 @@ + Date: Tue, 14 Nov 2023 10:49:41 +0100 Subject: [PATCH 041/652] [release/8.0.2xx] NGEN Microsoft.DotNet.MSBuildSdkResolver.dll and its dependencies (#17750) Backport of #17732 to release/8.0.2xx MSBuild.exe currently spends a significant amount of time JITting `Microsoft.DotNet.MSBuildSdkResolver` and its dependencies, see https://github.com/dotnet/msbuild/issues/9303 for details. This PR makes Visual Studio installer add these assemblies to the NGEN queue, which is a necessary condition for eliminating JITting. Just like `Microsoft.Build.*` assemblies, we need to NGEN these with two configurations: vsn.exe so it works in the devenv process, and MSBuild.exe so it works in MSBuild satellite processes. --- .../GenerateMSBuildExtensionsSWR.cs | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index eab79f2b7230..81f3943d2aae 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -24,7 +24,8 @@ public override bool Execute() AddFolder(sb, @"MSBuildSdkResolver", - @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver"); + @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver", + ngenAssemblies: true); AddFolder(sb, @"msbuildExtensions", @@ -39,7 +40,7 @@ public override bool Execute() return true; } - private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir) + private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir, bool ngenAssemblies = false) { string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath); var files = Directory.GetFiles(sourceFolder) @@ -55,7 +56,16 @@ private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrIn { sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); - sb.AppendLine("\""); + sb.Append('"'); + + if (ngenAssemblies && file.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) + { + sb.Append(@" vs.file.ngenApplications=""[installDir]\Common7\IDE\vsn.exe"""); + sb.Append(@" vs.file.ngenApplications=""[installDir]\MSBuild\Current\Bin\MSBuild.exe"""); + sb.Append(" vs.file.ngenArchitecture=all"); + } + + sb.AppendLine(); } sb.AppendLine(); @@ -67,6 +77,7 @@ private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrIn string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName); string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName); + // Don't propagate ngenAssemblies to subdirectories. AddFolder(sb, newRelativeSourcePath, newSwrInstallDir); } } From 7b966d51c650d9f5753733ef66c2c5d9babd0164 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 Nov 2023 09:32:22 -0800 Subject: [PATCH 042/652] fix indent --- src/redist/targets/GenerateArchives.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets index b34065a101ab..be8668f85099 100644 --- a/src/redist/targets/GenerateArchives.targets +++ b/src/redist/targets/GenerateArchives.targets @@ -1,5 +1,5 @@ - + Date: Wed, 15 Nov 2023 18:14:49 +0000 Subject: [PATCH 043/652] [release/8.0.2xx] Update dependencies from dotnet/arcade (#17803) [release/8.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d3236b84d0e2..77aed9c29d6e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -205,18 +205,18 @@ - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d - + https://github.com/dotnet/arcade - 080141bf0f9f15408bb6eb8e301b23bddf81d054 + 0aaeafef60933f87b0b50350313bb2fd77defb5d https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 9896a37d2a79..b677dc4c4a88 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23556.5 + 8.0.0-beta.23564.4 diff --git a/global.json b/global.json index 639cb4f4410f..88256e459dd9 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100-rtm.23506.1", + "dotnet": "8.0.100", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23556.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23556.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23564.4" } } From 94df731cdcf7d034251f494a1ae60f748a76eb6e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 21 Nov 2023 19:33:07 -0800 Subject: [PATCH 044/652] Update to the November released build implicit version (#17774) Co-authored-by: Jason Zhai --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b677dc4c4a88..903911f4d962 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - 22 - 11 + 25 + 14 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 1799acaa9c830aede6b1c90f2a1499df59eb640f Mon Sep 17 00:00:00 2001 From: v-wuzhai <46013274+v-wuzhai@users.noreply.github.com> Date: Tue, 28 Nov 2023 13:54:44 +0800 Subject: [PATCH 045/652] Revert "Disable crossgen and zip file creation in the local dev build unless -pack is used" --- eng/AfterSigning.targets | 1 - run-build.ps1 | 8 +++----- run-build.sh | 3 --- src/redist/targets/Crossgen.targets | 3 +-- src/redist/targets/GenerateArchives.targets | 2 -- 5 files changed, 4 insertions(+), 13 deletions(-) diff --git a/eng/AfterSigning.targets b/eng/AfterSigning.targets index a2a586db7df0..b8a08378a1b5 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -4,7 +4,6 @@ diff --git a/run-build.ps1 b/run-build.ps1 index 7b98f2ee5106..4f2e1275f5ae 100644 --- a/run-build.ps1 +++ b/run-build.ps1 @@ -8,7 +8,6 @@ param( [string]$Configuration="Debug", [string]$Architecture="x64", [switch]$Sign=$false, - [switch]$Pack=$false, [switch]$PgoInstrument, [bool]$WarnAsError=$true, [Parameter(ValueFromRemainingArguments=$true)][String[]]$ExtraParameters @@ -24,11 +23,10 @@ if ($PgoInstrument) { } if ($Sign) { - $Parameters = "$Parameters -sign" -} + $Parameters = "$Parameters -sign /p:SignCoreSdk=true" -if ($Pack) { - $Parameters = "$Parameters /p:PackInstaller=true" + # Workaround https://github.com/dotnet/arcade/issues/1776 + $WarnAsError = $false } $Parameters = "$Parameters -WarnAsError `$$WarnAsError" diff --git a/run-build.sh b/run-build.sh index e735b79f30ff..c380d75ce7cc 100755 --- a/run-build.sh +++ b/run-build.sh @@ -45,9 +45,6 @@ while [[ $# > 0 ]]; do --pgoInstrument) args+=("/p:PgoInstrument=true") ;; - --pack) - args+=("/p:PackInstaller=true") - ;; --help) echo "Usage: $0 [--configuration ] [--architecture ] [--docker ] [--help]" echo "" diff --git a/src/redist/targets/Crossgen.targets b/src/redist/targets/Crossgen.targets index e55047af60e0..d9f961933cc8 100644 --- a/src/redist/targets/Crossgen.targets +++ b/src/redist/targets/Crossgen.targets @@ -1,8 +1,7 @@ - diff --git a/src/redist/targets/GenerateArchives.targets b/src/redist/targets/GenerateArchives.targets index be8668f85099..814abbe71322 100644 --- a/src/redist/targets/GenerateArchives.targets +++ b/src/redist/targets/GenerateArchives.targets @@ -1,7 +1,5 @@ - From 2887ef065d12c10b365ad6f9593a020711ecb445 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 28 Nov 2023 12:40:03 +0000 Subject: [PATCH 046/652] Update dependencies from https://github.com/dotnet/test-templates build 20231128.1 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23410.2 -> To Version 1.1.0-rc.23578.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77aed9c29d6e..54139871fa02 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - + https://github.com/dotnet/test-templates - 1e5f3603af2277910aad946736ee23283e7f3e16 + e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a diff --git a/eng/Versions.props b/eng/Versions.props index 903911f4d962..458e85e0a454 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 - 1.1.0-rc.23410.2 + 1.1.0-rc.23578.1 + 1.1.0-rc.23578.1 + 1.1.0-rc.23578.1 From fba9ec68f7bc136c96794c3978cb0ad49bb36404 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 29 Nov 2023 08:27:49 -0600 Subject: [PATCH 047/652] Update Aspire version --- eng/Version.Details.xml | 5 +++++ eng/Versions.props | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54139871fa02..53b0cffeba04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -173,6 +173,11 @@ 1b7f3a6560f6fb5f32b2758603c0376037f555ea + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspire + 48e42f59d64d84b404e904996a9ed61f2a17a569 + + https://github.com/dotnet/deployment-tools 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 diff --git a/eng/Versions.props b/eng/Versions.props index 458e85e0a454..a4af4b2b83a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -239,8 +239,8 @@ - 8.0.100-rc.1 - 8.0.0-alpha.23471.13 + 8.0.100 + 8.0.0-preview.1.23557.2 8.0.100-rc.1 8.0.0-rc.1.9171 34.0.0-rc.1.432 From 48b005c37a3df4f4e0d62b95e8d589e4f590651e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 4 Dec 2023 15:41:28 +0000 Subject: [PATCH 048/652] [release/8.0.2xx] Update dependencies from dotnet/sdk (#17695) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23551.1 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.0-rtm.23520.10 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.0-rtm.23520.10 to 8.0.0 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.0-rtm.23520.10 to 8.0.0-rtm.23531.12 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.0-rtm.23520.14 to 8.0.0-rtm.23531.5 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.0-rtm.23521.1 to 8.0.0 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.0-rtm.23521.1 to 8.0.0-rtm.23531.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.0-beta.23523.2 to 12.8.0-beta.23579.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23523.2 to 8.0.200-beta.23579.1 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23519-02 to 17.9.0-preview-23580-01 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.9.0-1.23520.1 to 4.9.0-2.23562.2 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.9.0-preview-23523-01 to 17.9.0-preview-23601-02 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.9.0-preview.1.17 to 6.9.0-preview.1.45 (parent: Microsoft.NET.Sdk) - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Remove 8.0.100 feed from 8.0.200 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Merge branch 'release/8.0.2xx' into darc-release/8.0.2xx-db92f0fc-3348-4e4e-afc8-b90a040a28d4 - Fix the emsdk coherency and rerun the dependency update for the SKD build - Updating the dotnet new output to match current behavior Teams message sent to confirm if this is correct - Fix emsdk Dependency --- NuGet.config | 2 + eng/Version.Details.xml | 174 +++++++++++++++-------------- eng/Versions.props | 54 ++++----- test/EndToEnd/ProjectBuildTests.cs | 2 +- 4 files changed, 119 insertions(+), 113 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9fcb5685fcf8..94ab32f7a38a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b0cffeba04..98034b438f2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/windowsdesktop - 5c87dea47f898cbfcc7b0cad77d66a62e998963d + + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop + c0170915ed6c164a594cd9d558d44aaf98fc6961 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - - https://github.com/dotnet/aspnetcore - c9fa5f3a34605c93bffd1459a5e39e6bc63f50cc + + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore + 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca - + https://github.com/dotnet/sdk - 0740fa4a48be4a79c92cc5874a0db0325b3e1e9e + b1fc487a18f8db14a5f71112efeb57c267ba1fca https://github.com/dotnet/test-templates @@ -124,53 +124,57 @@ e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a - - https://github.com/dotnet/winforms - abda8e3bfa78319363526b5a5f86863ec979940e + + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms + e4ede9b8979b9d2b1b1d4383f30a791414f0625b - - https://github.com/dotnet/wpf - 0d629281c49061636a8a161bae6fceedd37acff7 + + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf + 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 507114e990861aec5444df54de1dc77bfe26a310 + a0396b1cade0e705abd16526f5f165a9894c055d - + https://github.com/dotnet/fsharp - 507114e990861aec5444df54de1dc77bfe26a310 + a0396b1cade0e705abd16526f5f165a9894c055d - + https://github.com/microsoft/vstest - fde8bf79d3f0f80e3548f873a56ffb4100c0ae49 + d6dc5a0343fec142369c744466be1d1fc52fecdb - - https://github.com/dotnet/runtime - 11ad607efb2b31c5e1b906303fcd70341e9d5206 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 4414e2ffe333e304e7d9b2122f88242a23ab25a6 + 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/msbuild - 08494c73128451a3f7cfb47a5e9cbd63f5507a1f + 67916dc4592efb2a0bec902aa1a77105859ee245 - + https://github.com/nuget/nuget.client - 62c02514a26464c03574137628e33ed3690c06ef + 707c46e558b2b027d7ae942028c369e26545f10a https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + + https://github.com/dotnet/emsdk + 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + + https://github.com/dotnet/emsdk - 1b7f3a6560f6fb5f32b2758603c0376037f555ea + 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 diff --git a/eng/Versions.props b/eng/Versions.props index a4af4b2b83a9..a43edc3aa12a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23520.14 + 8.0.0-rtm.23531.5 - 8.0.0-rtm.23521.1 + 8.0.0-rtm.23531.4 @@ -72,50 +72,50 @@ - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 - 8.0.0-rtm.23520.10 + 8.0.0 + 8.0.0 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 + 8.0.0-rtm.23531.12 0.2.0 - 8.0.200-preview.23523.30 - 8.0.200-preview.23523.30 - 8.0.200-preview.23523.30 + 8.0.200-preview.23603.4 + 8.0.200-preview.23603.4 + 8.0.200-preview.23603.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-1.23520.1 + 4.9.0-2.23562.2 - 8.0.0-rtm.23520.16 + 8.0.0-rtm.23531.3 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 - 8.0.0-rtm.23520.16 + 8.0.0-rtm.23531.3 + 8.0.0-rtm.23531.3 + 8.0.0 + 8.0.0 + 8.0.0 + 8.0.0 2.1.0 - 8.0.0-rtm.23521.1 - 8.0.0-rtm.23521.1 - 8.0.0-rtm.23521.1 - 8.0.0-rtm.23521.1 + 8.0.0-rtm.23551.1 + 8.0.0-rtm.23551.1 + 8.0.0 + 8.0.0 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.17 + 6.9.0-preview.1.45 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23519-02 + 17.9.0-preview-23580-01 8.0.0-alpha.1.22557.12 @@ -249,7 +249,7 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0-rtm.23511.3 + 8.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) diff --git a/test/EndToEnd/ProjectBuildTests.cs b/test/EndToEnd/ProjectBuildTests.cs index 01925eb5fd95..fa7350c1652d 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -202,7 +202,7 @@ public void DotnetNewShowsCuratedListCorrectly() string expectedOutput = @"[\-\s]+ -[\w \.\(\)]+webapp,razor\s+\[C#\][\w\ \/]+ +[\w \.\(\)]+blazor\s+\[C#\][\w\ \/]+ [\w \.\(\)]+classlib\s+\[C#\],F#,VB[\w\ \/]+ [\w \.\(\)]+console\s+\[C#\],F#,VB[\w\ \/]+ "; From a75f89274dc7e513f1af200c38a124e60f062ee4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Dec 2023 02:17:30 +0000 Subject: [PATCH 049/652] [release/8.0.2xx] Update dependencies from dotnet/sdk (#17908) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.0-beta.23580.2 to 12.8.0-beta.23604.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23580.2 to 8.0.200-beta.23604.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.9.0-preview-23601-02 to 17.9.0-preview-23604-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100: from 8.0.0 to 8.0.0 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.SourceBuild.Intermediate.emsdk: from 8.0.0-rtm.23558.2 to 8.0.0-rtm.23530.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) --- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 6 +++--- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 98034b438f2c..badc7e735f5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - b1fc487a18f8db14a5f71112efeb57c267ba1fca + 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f - + https://github.com/dotnet/sdk - b1fc487a18f8db14a5f71112efeb57c267ba1fca + 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f - + https://github.com/dotnet/sdk - b1fc487a18f8db14a5f71112efeb57c267ba1fca + 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f - + https://github.com/dotnet/sdk - b1fc487a18f8db14a5f71112efeb57c267ba1fca + 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - a0396b1cade0e705abd16526f5f165a9894c055d + 11a521c068d2c3d14798a7970cfcad70f5f05df2 - + https://github.com/dotnet/fsharp - a0396b1cade0e705abd16526f5f165a9894c055d + 11a521c068d2c3d14798a7970cfcad70f5f05df2 @@ -155,9 +155,9 @@ 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/msbuild - 67916dc4592efb2a0bec902aa1a77105859ee245 + f5ae5c6896f934f790fc000b7f3761c3c93aa9a9 https://github.com/nuget/nuget.client @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + 2406616d0e3a31d80b326e27c156955bfa41c791 - + https://github.com/dotnet/emsdk - 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + 2406616d0e3a31d80b326e27c156955bfa41c791 diff --git a/eng/Versions.props b/eng/Versions.props index a43edc3aa12a..33b4ca4813f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23603.4 - 8.0.200-preview.23603.4 - 8.0.200-preview.23603.4 + 8.0.200-preview.23604.16 + 8.0.200-preview.23604.16 + 8.0.200-preview.23604.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d79e6a8a5a004de35b425abce301987130004d43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Dec 2023 21:49:35 +0000 Subject: [PATCH 050/652] Update dependencies from https://github.com/dotnet/sdk build 20231205.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23605.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index badc7e735f5a..0d5c062d376b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f + cd5005e32d8f289e4f49417411bbee10c8c49217 - + https://github.com/dotnet/sdk - 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f + cd5005e32d8f289e4f49417411bbee10c8c49217 - + https://github.com/dotnet/sdk - 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f + cd5005e32d8f289e4f49417411bbee10c8c49217 - + https://github.com/dotnet/sdk - 4700ea8fa5fe4e92ec22fb49e5fdf150745e548f + cd5005e32d8f289e4f49417411bbee10c8c49217 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 11a521c068d2c3d14798a7970cfcad70f5f05df2 + 05bb885a7119b541816e16ca9980ab685ffbfaa5 - + https://github.com/dotnet/fsharp - 11a521c068d2c3d14798a7970cfcad70f5f05df2 + 05bb885a7119b541816e16ca9980ab685ffbfaa5 - + https://github.com/microsoft/vstest - d6dc5a0343fec142369c744466be1d1fc52fecdb + 3dec0798866b2d16b838d7a78421070b99574861 @@ -155,9 +155,9 @@ 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 - + https://github.com/dotnet/msbuild - f5ae5c6896f934f790fc000b7f3761c3c93aa9a9 + 2f3d37672a69142a13a62856b09034a915bedc70 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 33b4ca4813f7..19de1d070718 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23604.16 - 8.0.200-preview.23604.16 - 8.0.200-preview.23604.16 + 8.0.200-preview.23605.8 + 8.0.200-preview.23605.8 + 8.0.200-preview.23605.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23580-01 + 17.9.0-preview-23604-01 8.0.0-alpha.1.22557.12 From 2c8e1fbdf4eac90581ef0f211c8ff88b1d2bd8c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Dec 2023 22:57:24 +0000 Subject: [PATCH 051/652] Update dependencies from https://github.com/dotnet/sdk build 20231205.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23605.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0d5c062d376b..03e920a9c8ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - cd5005e32d8f289e4f49417411bbee10c8c49217 + b61fe9c7553f7407f617d032f6d8414cb54579bf - + https://github.com/dotnet/sdk - cd5005e32d8f289e4f49417411bbee10c8c49217 + b61fe9c7553f7407f617d032f6d8414cb54579bf - + https://github.com/dotnet/sdk - cd5005e32d8f289e4f49417411bbee10c8c49217 + b61fe9c7553f7407f617d032f6d8414cb54579bf - + https://github.com/dotnet/sdk - cd5005e32d8f289e4f49417411bbee10c8c49217 + b61fe9c7553f7407f617d032f6d8414cb54579bf https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 19de1d070718..5b1e51410ef7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23605.8 - 8.0.200-preview.23605.8 - 8.0.200-preview.23605.8 + 8.0.200-preview.23605.18 + 8.0.200-preview.23605.18 + 8.0.200-preview.23605.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2458b279655b35646c07c0401cde27153b3639a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Dec 2023 01:37:02 +0000 Subject: [PATCH 052/652] Update dependencies from https://github.com/dotnet/sdk build 20231205.41 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23605.41 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 03e920a9c8ac..08d9ffaf016c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - b61fe9c7553f7407f617d032f6d8414cb54579bf + 07628a161cc1bed4705f110407fbe86baba323ff - + https://github.com/dotnet/sdk - b61fe9c7553f7407f617d032f6d8414cb54579bf + 07628a161cc1bed4705f110407fbe86baba323ff - + https://github.com/dotnet/sdk - b61fe9c7553f7407f617d032f6d8414cb54579bf + 07628a161cc1bed4705f110407fbe86baba323ff - + https://github.com/dotnet/sdk - b61fe9c7553f7407f617d032f6d8414cb54579bf + 07628a161cc1bed4705f110407fbe86baba323ff https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5b1e51410ef7..a9a5bf126062 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23605.18 - 8.0.200-preview.23605.18 - 8.0.200-preview.23605.18 + 8.0.200-preview.23605.41 + 8.0.200-preview.23605.41 + 8.0.200-preview.23605.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ed1740246bfbb8ab8fd9223c4d57c45eaa528410 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Dec 2023 02:33:37 +0000 Subject: [PATCH 053/652] Update dependencies from https://github.com/dotnet/sdk build 20231205.42 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23605.42 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08d9ffaf016c..48b7eaed8c65 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 07628a161cc1bed4705f110407fbe86baba323ff + 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 - + https://github.com/dotnet/sdk - 07628a161cc1bed4705f110407fbe86baba323ff + 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 - + https://github.com/dotnet/sdk - 07628a161cc1bed4705f110407fbe86baba323ff + 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 - + https://github.com/dotnet/sdk - 07628a161cc1bed4705f110407fbe86baba323ff + 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a9a5bf126062..d6a296a60a4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23605.41 - 8.0.200-preview.23605.41 - 8.0.200-preview.23605.41 + 8.0.200-preview.23605.42 + 8.0.200-preview.23605.42 + 8.0.200-preview.23605.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 72c635732f1f55f01a7f02033e6dd1dee074eaa1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Dec 2023 09:38:16 +0000 Subject: [PATCH 054/652] Update dependencies from https://github.com/dotnet/sdk build 20231206.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23606.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 48b7eaed8c65..cea67a378406 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 + ccefa68ae7dca3a90697f1b804db41397b78e9a6 - + https://github.com/dotnet/sdk - 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 + ccefa68ae7dca3a90697f1b804db41397b78e9a6 - + https://github.com/dotnet/sdk - 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 + ccefa68ae7dca3a90697f1b804db41397b78e9a6 - + https://github.com/dotnet/sdk - 4c0ca0b4066e55d8a4d0d26849b38a77090c8c65 + ccefa68ae7dca3a90697f1b804db41397b78e9a6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d6a296a60a4d..985a11dc7e02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23605.42 - 8.0.200-preview.23605.42 - 8.0.200-preview.23605.42 + 8.0.200-preview.23606.1 + 8.0.200-preview.23606.1 + 8.0.200-preview.23606.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6e452d20fdef6d2e5aec9b18d98c240c6a3892e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 00:02:51 +0000 Subject: [PATCH 055/652] Update dependencies from https://github.com/dotnet/sdk build 20231206.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23606.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cea67a378406..d324c4529bec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - ccefa68ae7dca3a90697f1b804db41397b78e9a6 + e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 - + https://github.com/dotnet/sdk - ccefa68ae7dca3a90697f1b804db41397b78e9a6 + e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 - + https://github.com/dotnet/sdk - ccefa68ae7dca3a90697f1b804db41397b78e9a6 + e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 - + https://github.com/dotnet/sdk - ccefa68ae7dca3a90697f1b804db41397b78e9a6 + e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 2f3d37672a69142a13a62856b09034a915bedc70 - + https://github.com/nuget/nuget.client - 707c46e558b2b027d7ae942028c369e26545f10a + 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b diff --git a/eng/Versions.props b/eng/Versions.props index 985a11dc7e02..2a3b08b3bbab 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23606.1 - 8.0.200-preview.23606.1 - 8.0.200-preview.23606.1 + 8.0.200-preview.23606.6 + 8.0.200-preview.23606.6 + 8.0.200-preview.23606.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.45 + 6.9.0-preview.1.49 From df9a956e2514a7e1b94c8dd311d647f839887cc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 01:32:11 +0000 Subject: [PATCH 056/652] Update dependencies from https://github.com/dotnet/sdk build 20231206.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23604.16 -> To Version 8.0.200-preview.23606.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.0-beta.23604.1 -> To Version 12.8.200-beta.23605.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d324c4529bec..de03413afe43 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 + acd780029dbec62701a3644e0f64b1019021ba0b - + https://github.com/dotnet/sdk - e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 + acd780029dbec62701a3644e0f64b1019021ba0b - + https://github.com/dotnet/sdk - e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 + acd780029dbec62701a3644e0f64b1019021ba0b - + https://github.com/dotnet/sdk - e36c75e01cbe8e78e8ebb2e0fb50bb546c642d56 + acd780029dbec62701a3644e0f64b1019021ba0b https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 782b8cfd1c2d03592e13d840ffcdee1f60e5b142 + 6e0810e5148df608d62d169b007f6cbbe376a81e diff --git a/eng/Versions.props b/eng/Versions.props index 2a3b08b3bbab..4ceb28332c07 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23606.6 - 8.0.200-preview.23606.6 - 8.0.200-preview.23606.6 + 8.0.200-preview.23606.8 + 8.0.200-preview.23606.8 + 8.0.200-preview.23606.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-2.23562.2 + 4.9.0-3.23605.1 From 3fcf149d2591d0aa56b5ae4cb96b22d1be6114e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 06:35:29 +0000 Subject: [PATCH 057/652] Update dependencies from https://github.com/dotnet/sdk build 20231206.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23606.8 -> To Version 8.0.200-preview.23606.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.200-beta.23605.2 -> To Version 12.8.200-beta.23606.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de03413afe43..2a84abf4eac6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - acd780029dbec62701a3644e0f64b1019021ba0b + 6779f5d18b815766ff4f6eab474b855e70e10fab - + https://github.com/dotnet/sdk - acd780029dbec62701a3644e0f64b1019021ba0b + 6779f5d18b815766ff4f6eab474b855e70e10fab - + https://github.com/dotnet/sdk - acd780029dbec62701a3644e0f64b1019021ba0b + 6779f5d18b815766ff4f6eab474b855e70e10fab - + https://github.com/dotnet/sdk - acd780029dbec62701a3644e0f64b1019021ba0b + 6779f5d18b815766ff4f6eab474b855e70e10fab https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 05bb885a7119b541816e16ca9980ab685ffbfaa5 + 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 - + https://github.com/dotnet/fsharp - 05bb885a7119b541816e16ca9980ab685ffbfaa5 + 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 diff --git a/eng/Versions.props b/eng/Versions.props index 4ceb28332c07..9685422760af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23606.8 - 8.0.200-preview.23606.8 - 8.0.200-preview.23606.8 + 8.0.200-preview.23606.10 + 8.0.200-preview.23606.10 + 8.0.200-preview.23606.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dbea75d3092f049089606dd14619e7572277600a Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 6 Dec 2023 22:40:56 -0800 Subject: [PATCH 058/652] Update fedora-36, debian-stretch and ubuntu-18.04 image tags --- .vsts-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d14d1293e29d..655c9d190fe5 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -82,8 +82,8 @@ stages: - template: eng/build.yml parameters: agentOs: Linux - jobName: Build_Fedora_36_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36' + jobName: Build_Fedora_39_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39' buildConfiguration: Debug buildArchitecture: x64 linuxPortable: true @@ -100,8 +100,8 @@ stages: - template: eng/build.yml parameters: agentOs: Linux - jobName: Build_Debian_Stretch_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' + jobName: Build_Debian_11_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64' buildConfiguration: Debug buildArchitecture: x64 additionalBuildParameters: '/p:BuildSdkDeb=true' @@ -201,7 +201,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' From 50c6a3e7e21e2acfeac8daa7beae8a04c5209ae5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 14:09:20 +0000 Subject: [PATCH 059/652] Update dependencies from https://github.com/dotnet/test-templates build 20231207.1 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23578.1 -> To Version 1.1.0-rc.23607.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a84abf4eac6..4571c993eb42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a + 45226f35518e3152b5a54ed7a90ae66bcae22944 - + https://github.com/dotnet/test-templates - e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a + 45226f35518e3152b5a54ed7a90ae66bcae22944 - + https://github.com/dotnet/test-templates - e1aecaf3a332e25fae8cc7aa09d524b5e7c4a47a + 45226f35518e3152b5a54ed7a90ae66bcae22944 diff --git a/eng/Versions.props b/eng/Versions.props index 9685422760af..6e117c22da48 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.23578.1 - 1.1.0-rc.23578.1 - 1.1.0-rc.23578.1 + 1.1.0-rc.23607.1 + 1.1.0-rc.23607.1 + 1.1.0-rc.23607.1 From 756a93903dbc04447af864e0489f5c75f434374a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 19:36:42 +0000 Subject: [PATCH 060/652] Update dependencies from https://github.com/dotnet/sdk build 20231207.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23606.10 -> To Version 8.0.200-preview.23607.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2a84abf4eac6..f53f059b7afb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 6779f5d18b815766ff4f6eab474b855e70e10fab + 02f85fd3de9591e69632c0d652c8ff84e3cd3968 - + https://github.com/dotnet/sdk - 6779f5d18b815766ff4f6eab474b855e70e10fab + 02f85fd3de9591e69632c0d652c8ff84e3cd3968 - + https://github.com/dotnet/sdk - 6779f5d18b815766ff4f6eab474b855e70e10fab + 02f85fd3de9591e69632c0d652c8ff84e3cd3968 - + https://github.com/dotnet/sdk - 6779f5d18b815766ff4f6eab474b855e70e10fab + 02f85fd3de9591e69632c0d652c8ff84e3cd3968 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9685422760af..6b65af4f2064 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23606.10 - 8.0.200-preview.23606.10 - 8.0.200-preview.23606.10 + 8.0.200-preview.23607.1 + 8.0.200-preview.23607.1 + 8.0.200-preview.23607.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From befe99830698466edbe3361eed5912fbb47aef23 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 09:33:45 +0000 Subject: [PATCH 061/652] Update dependencies from https://github.com/dotnet/sdk build 20231208.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23607.1 -> To Version 8.0.200-preview.23608.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 054db7569320..625c362cf227 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 02f85fd3de9591e69632c0d652c8ff84e3cd3968 + 3039c96ce4e81b41a42496306e331d90bab678b1 - + https://github.com/dotnet/sdk - 02f85fd3de9591e69632c0d652c8ff84e3cd3968 + 3039c96ce4e81b41a42496306e331d90bab678b1 - + https://github.com/dotnet/sdk - 02f85fd3de9591e69632c0d652c8ff84e3cd3968 + 3039c96ce4e81b41a42496306e331d90bab678b1 - + https://github.com/dotnet/sdk - 02f85fd3de9591e69632c0d652c8ff84e3cd3968 + 3039c96ce4e81b41a42496306e331d90bab678b1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f5ca2545cb60..5c44abcba3f0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23607.1 - 8.0.200-preview.23607.1 - 8.0.200-preview.23607.1 + 8.0.200-preview.23608.1 + 8.0.200-preview.23608.1 + 8.0.200-preview.23608.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e8e6d7b93face362743700a5f08b5c0fea4f28c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 11:03:20 +0000 Subject: [PATCH 062/652] Update dependencies from https://github.com/dotnet/sdk build 20231208.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.1 -> To Version 8.0.200-preview.23608.2 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.9.0-3.23605.1 -> To Version 4.9.0-3.23606.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 625c362cf227..929e69008fa2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 3039c96ce4e81b41a42496306e331d90bab678b1 + 1b12c37feebe58e3ccfce85c972a968f1058eed9 - + https://github.com/dotnet/sdk - 3039c96ce4e81b41a42496306e331d90bab678b1 + 1b12c37feebe58e3ccfce85c972a968f1058eed9 - + https://github.com/dotnet/sdk - 3039c96ce4e81b41a42496306e331d90bab678b1 + 1b12c37feebe58e3ccfce85c972a968f1058eed9 - + https://github.com/dotnet/sdk - 3039c96ce4e81b41a42496306e331d90bab678b1 + 1b12c37feebe58e3ccfce85c972a968f1058eed9 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 6e0810e5148df608d62d169b007f6cbbe376a81e + d0a733c809d479b4608af6fd64c97d4c3d12112b https://github.com/dotnet/msbuild 2f3d37672a69142a13a62856b09034a915bedc70 - + https://github.com/nuget/nuget.client - 54ece9ae0d153e7e8bd8ff842c535a46acdf6f1b + a59e64507383b64bcfbe9bf63b34aca946ab0da9 diff --git a/eng/Versions.props b/eng/Versions.props index 5c44abcba3f0..3b80cef6f2d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23608.1 - 8.0.200-preview.23608.1 - 8.0.200-preview.23608.1 + 8.0.200-preview.23608.2 + 8.0.200-preview.23608.2 + 8.0.200-preview.23608.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23605.1 + 4.9.0-3.23606.8 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.49 + 6.9.0-preview.1.50 From 888ed9f29e0da6bb2e8d0374fe82fe3dbed8ea3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 11:59:10 +0000 Subject: [PATCH 063/652] Update dependencies from https://github.com/dotnet/sdk build 20231208.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.1 -> To Version 8.0.200-preview.23608.4 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 17.9.0-preview-23604-01 -> To Version 17.9.0-preview-23606-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 929e69008fa2..54219a9d53f1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1b12c37feebe58e3ccfce85c972a968f1058eed9 + 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 - + https://github.com/dotnet/sdk - 1b12c37feebe58e3ccfce85c972a968f1058eed9 + 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 - + https://github.com/dotnet/sdk - 1b12c37feebe58e3ccfce85c972a968f1058eed9 + 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 - + https://github.com/dotnet/sdk - 1b12c37feebe58e3ccfce85c972a968f1058eed9 + 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 - + https://github.com/microsoft/vstest - 3dec0798866b2d16b838d7a78421070b99574861 + 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 diff --git a/eng/Versions.props b/eng/Versions.props index 3b80cef6f2d5..d8927db00c14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23608.2 - 8.0.200-preview.23608.2 - 8.0.200-preview.23608.2 + 8.0.200-preview.23608.4 + 8.0.200-preview.23608.4 + 8.0.200-preview.23608.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23604-01 + 17.9.0-preview-23606-01 8.0.0-alpha.1.22557.12 From e450950e033bbcd246988e3cd7a8b1013a992571 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Dec 2023 19:24:10 +0000 Subject: [PATCH 064/652] Update dependencies from https://github.com/dotnet/sdk build 20231208.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.4 -> To Version 8.0.200-preview.23608.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23606.1 -> To Version 12.8.200-beta.23607.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54219a9d53f1..1e3b21e8ffb6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 + f0414ab5878979ede3983744237050ba86197763 - + https://github.com/dotnet/sdk - 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 + f0414ab5878979ede3983744237050ba86197763 - + https://github.com/dotnet/sdk - 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 + f0414ab5878979ede3983744237050ba86197763 - + https://github.com/dotnet/sdk - 4ebffa5ee49e45002ac3f2f46db217b2df0035c5 + f0414ab5878979ede3983744237050ba86197763 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 + a57b5e75c970694cd6159f827ffbdd14f87db185 - + https://github.com/dotnet/fsharp - 48b4a3bb4fcf74027658fdd02a4cf6b2b1f38242 + a57b5e75c970694cd6159f827ffbdd14f87db185 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - d0a733c809d479b4608af6fd64c97d4c3d12112b + 3ed29fed2de537fb06dccd854b1c343b7d01b3de diff --git a/eng/Versions.props b/eng/Versions.props index d8927db00c14..2c58f8a76c20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23608.4 - 8.0.200-preview.23608.4 - 8.0.200-preview.23608.4 + 8.0.200-preview.23608.13 + 8.0.200-preview.23608.13 + 8.0.200-preview.23608.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23606.8 + 4.9.0-3.23607.11 From 4548efe441eb71c470f0fb5738b2be20bb3de8a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Dec 2023 00:56:59 +0000 Subject: [PATCH 065/652] Update dependencies from https://github.com/dotnet/sdk build 20231208.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.4 -> To Version 8.0.200-preview.23608.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23606.1 -> To Version 12.8.200-beta.23607.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1e3b21e8ffb6..134fe1bd4616 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - f0414ab5878979ede3983744237050ba86197763 + d435a91084a638496c1627648ee6c9486b82255c - + https://github.com/dotnet/sdk - f0414ab5878979ede3983744237050ba86197763 + d435a91084a638496c1627648ee6c9486b82255c - + https://github.com/dotnet/sdk - f0414ab5878979ede3983744237050ba86197763 + d435a91084a638496c1627648ee6c9486b82255c - + https://github.com/dotnet/sdk - f0414ab5878979ede3983744237050ba86197763 + d435a91084a638496c1627648ee6c9486b82255c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2c58f8a76c20..800e95a8a324 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23608.13 - 8.0.200-preview.23608.13 - 8.0.200-preview.23608.13 + 8.0.200-preview.23608.18 + 8.0.200-preview.23608.18 + 8.0.200-preview.23608.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 56bb481d62fa8ae04da71aec8ad2180123bfb207 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Dec 2023 03:08:22 +0000 Subject: [PATCH 066/652] Update dependencies from https://github.com/dotnet/sdk build 20231210.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23608.18 -> To Version 8.0.200-preview.23610.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23607.6 -> To Version 12.8.200-beta.23608.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 134fe1bd4616..5a7311b86389 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - d435a91084a638496c1627648ee6c9486b82255c + 69bb7de8da2b923445d9097247487af5961a2ae2 - + https://github.com/dotnet/sdk - d435a91084a638496c1627648ee6c9486b82255c + 69bb7de8da2b923445d9097247487af5961a2ae2 - + https://github.com/dotnet/sdk - d435a91084a638496c1627648ee6c9486b82255c + 69bb7de8da2b923445d9097247487af5961a2ae2 - + https://github.com/dotnet/sdk - d435a91084a638496c1627648ee6c9486b82255c + 69bb7de8da2b923445d9097247487af5961a2ae2 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - a57b5e75c970694cd6159f827ffbdd14f87db185 + e479cbe697a26f864e60ea49f02c278a8331f7bc - + https://github.com/dotnet/fsharp - a57b5e75c970694cd6159f827ffbdd14f87db185 + e479cbe697a26f864e60ea49f02c278a8331f7bc @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 3ed29fed2de537fb06dccd854b1c343b7d01b3de + 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f diff --git a/eng/Versions.props b/eng/Versions.props index 800e95a8a324..b3032cb5fad7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23608.18 - 8.0.200-preview.23608.18 - 8.0.200-preview.23608.18 + 8.0.200-preview.23610.2 + 8.0.200-preview.23610.2 + 8.0.200-preview.23610.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23607.11 + 4.9.0-3.23608.9 From c912a505d9a5b004524326d90bd7e9e4b68a332e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 11:19:35 +0000 Subject: [PATCH 067/652] Update dependencies from https://github.com/dotnet/test-templates build 20231212.1 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23607.1 -> To Version 1.1.0-rc.23612.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a7311b86389..aa47486cdbc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d - + https://github.com/dotnet/test-templates - 45226f35518e3152b5a54ed7a90ae66bcae22944 + ec54b2c1553db0a544ef0e8595be2318fc12e08d diff --git a/eng/Versions.props b/eng/Versions.props index b3032cb5fad7..11d4ad1bfec2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.23607.1 - 1.1.0-rc.23607.1 - 1.1.0-rc.23607.1 + 1.1.0-rc.23612.1 + 1.1.0-rc.23612.1 + 1.1.0-rc.23612.1 From e8105db7a03df8408c1d961af0679170d1760637 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Dec 2023 21:18:56 +0000 Subject: [PATCH 068/652] [release/8.0.2xx] Update dependencies from dotnet/sdk (#17942) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.200-beta.23608.3 to 12.8.200-beta.23611.3 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.23608.3 to 8.0.200-beta.23611.3 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.9.0-preview-23606-01 to 17.9.0-preview-23610-02 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a7311b86389..ecb75523228e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b - + https://github.com/dotnet/sdk - 69bb7de8da2b923445d9097247487af5961a2ae2 + aa68a3a1f7f8603227dd2d81972739b72b043e3b https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - e479cbe697a26f864e60ea49f02c278a8331f7bc + bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/dotnet/fsharp - e479cbe697a26f864e60ea49f02c278a8331f7bc + bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/microsoft/vstest - 4572ac35d2bb1c3c8de81eab54cc99ec76f987c2 + 50c0f7889fdd8d13381d325bdbb6d253e33da1ff diff --git a/eng/Versions.props b/eng/Versions.props index b3032cb5fad7..d274ff29b653 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23610.2 - 8.0.200-preview.23610.2 - 8.0.200-preview.23610.2 + 8.0.200-preview.23612.6 + 8.0.200-preview.23612.6 + 8.0.200-preview.23612.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23606-01 + 17.9.0-preview-23610-02 8.0.0-alpha.1.22557.12 From 680d9fd886f9165c8c278353c1a8f51bae140b43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 22:14:32 +0000 Subject: [PATCH 069/652] Update dependencies from https://github.com/dotnet/sdk build 20231212.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.6 -> To Version 8.0.200-preview.23612.9 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23611.13 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecb75523228e..eea1d97d10ed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 - + https://github.com/dotnet/sdk - aa68a3a1f7f8603227dd2d81972739b72b043e3b + 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 8e4ab418a8f9703f7dfe3a66adc9b3876ef9382f + 544f1e9300e500c25a0759134c27e9bc9b9eec6d diff --git a/eng/Versions.props b/eng/Versions.props index d274ff29b653..94d2dfb739b6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23612.6 - 8.0.200-preview.23612.6 - 8.0.200-preview.23612.6 + 8.0.200-preview.23612.9 + 8.0.200-preview.23612.9 + 8.0.200-preview.23612.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23608.9 + 4.9.0-3.23611.13 From 3232b64c14cbc13b1666d0b8ddb71489ac67f85d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Dec 2023 23:19:24 +0000 Subject: [PATCH 070/652] Update dependencies from https://github.com/dotnet/sdk build 20231212.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.6 -> To Version 8.0.200-preview.23612.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23611.13 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eea1d97d10ed..11718930733f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a - + https://github.com/dotnet/sdk - 75b2d44816bb0ba9262afc7e18d94a89c3bc96a7 + 8a4a88381a5cf417ba892fd3266648d0fd48b20a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 94d2dfb739b6..f632de489ab6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23612.9 - 8.0.200-preview.23612.9 - 8.0.200-preview.23612.9 + 8.0.200-preview.23612.11 + 8.0.200-preview.23612.11 + 8.0.200-preview.23612.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a76328b8fcb5a48cfeae67790b374db5140d0327 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 00:13:26 +0000 Subject: [PATCH 071/652] Update dependencies from https://github.com/dotnet/sdk build 20231212.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.6 -> To Version 8.0.200-preview.23612.12 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23608.9 -> To Version 4.9.0-3.23611.13 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11718930733f..048dc57a2f48 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 - + https://github.com/dotnet/sdk - 8a4a88381a5cf417ba892fd3266648d0fd48b20a + 28d8b51fe1a80c81e7357158b0c23b153d3536e5 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f632de489ab6..cf53c8370bcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23612.11 - 8.0.200-preview.23612.11 - 8.0.200-preview.23612.11 + 8.0.200-preview.23612.12 + 8.0.200-preview.23612.12 + 8.0.200-preview.23612.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From cff8d4f08d7735dd86215513d0009da81a18bcf3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Dec 2023 21:15:36 +0000 Subject: [PATCH 072/652] Update dependencies from https://github.com/dotnet/sdk build 20231213.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23612.12 -> To Version 8.0.200-preview.23613.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5774a15b6a49..22a94aa467ff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 - + https://github.com/dotnet/sdk - 28d8b51fe1a80c81e7357158b0c23b153d3536e5 + 2d357a1bc9da42b4076f7220a65b8013195cce52 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 13f8e564fc11..5c44d37543f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23612.12 - 8.0.200-preview.23612.12 - 8.0.200-preview.23612.12 + 8.0.200-preview.23613.4 + 8.0.200-preview.23613.4 + 8.0.200-preview.23613.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c9dc3fb1806f4d0f422a3afdbc95ef9c3b592158 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 02:57:43 +0000 Subject: [PATCH 073/652] Update dependencies from https://github.com/dotnet/sdk build 20231213.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.4 -> To Version 8.0.200-preview.23613.8 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 17.9.0-preview-23610-02 -> To Version 17.9.0-preview-23612-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 22a94aa467ff..2c705685ad1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b - + https://github.com/dotnet/sdk - 2d357a1bc9da42b4076f7220a65b8013195cce52 + 1e5a383b2d32fab7df55b18b99982ecbace9bd2b https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ bb832169d6b799a62962452212010e66c3fecacf - + https://github.com/microsoft/vstest - 50c0f7889fdd8d13381d325bdbb6d253e33da1ff + dc8fe3865011cef3a0891f5f55c1fc5c7f401066 @@ -155,13 +155,13 @@ 544f1e9300e500c25a0759134c27e9bc9b9eec6d - + https://github.com/dotnet/msbuild - 2f3d37672a69142a13a62856b09034a915bedc70 + eea84ad7cf250b9dbf80f0981c594155d55de0b7 - + https://github.com/nuget/nuget.client - a59e64507383b64bcfbe9bf63b34aca946ab0da9 + 400ac5960800c110213fe2a6069e40879f2d8fbe diff --git a/eng/Versions.props b/eng/Versions.props index 5c44d37543f5..56011947b22d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23613.4 - 8.0.200-preview.23613.4 - 8.0.200-preview.23613.4 + 8.0.200-preview.23613.8 + 8.0.200-preview.23613.8 + 8.0.200-preview.23613.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.50 + 6.9.0-preview.1.52 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23610-02 + 17.9.0-preview-23612-01 8.0.0-alpha.1.22557.12 From 04c50a4008f5e9ef9214c5a6f45881be20cf2bd7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 06:32:57 +0000 Subject: [PATCH 074/652] Update dependencies from https://github.com/dotnet/sdk build 20231213.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.8 -> To Version 8.0.200-preview.23613.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23611.3 -> To Version 12.8.200-beta.23613.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c705685ad1e..d662d5b45965 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 - + https://github.com/dotnet/sdk - 1e5a383b2d32fab7df55b18b99982ecbace9bd2b + 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - bb832169d6b799a62962452212010e66c3fecacf + e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 - + https://github.com/dotnet/fsharp - bb832169d6b799a62962452212010e66c3fecacf + e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 544f1e9300e500c25a0759134c27e9bc9b9eec6d + 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 diff --git a/eng/Versions.props b/eng/Versions.props index 56011947b22d..243ee7a6cfb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23613.8 - 8.0.200-preview.23613.8 - 8.0.200-preview.23613.8 + 8.0.200-preview.23613.11 + 8.0.200-preview.23613.11 + 8.0.200-preview.23613.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23611.13 + 4.9.0-3.23612.11 From 598774040361d6a942fc31f9dd9cdddbb43ec25e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 18:25:01 +0000 Subject: [PATCH 075/652] Update dependencies from https://github.com/dotnet/sdk build 20231214.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.11 -> To Version 8.0.200-preview.23614.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d662d5b45965..53b98a1a37b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 - + https://github.com/dotnet/sdk - 73ff3e9d7cbe5e8c9494e5e469cd713a73797fd8 + 35f77362d0100515bb1df3dc831df962a664d918 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 243ee7a6cfb6..bec0a08ee9a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23613.11 - 8.0.200-preview.23613.11 - 8.0.200-preview.23613.11 + 8.0.200-preview.23614.3 + 8.0.200-preview.23614.3 + 8.0.200-preview.23614.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8d954a396ff696fad9e24be022eada7094d1cac0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Dec 2023 19:30:47 +0000 Subject: [PATCH 076/652] Update dependencies from https://github.com/dotnet/sdk build 20231214.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23613.11 -> To Version 8.0.200-preview.23614.5 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.9.0-preview-23613-03 -> To Version 17.9.0-preview-23613-14 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b98a1a37b7..60add4c858c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e - + https://github.com/dotnet/sdk - 35f77362d0100515bb1df3dc831df962a664d918 + 94d71ce73c9b5bab34cba2d312127ec324e83f8e https://github.com/dotnet/test-templates @@ -155,13 +155,13 @@ 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 - + https://github.com/dotnet/msbuild - eea84ad7cf250b9dbf80f0981c594155d55de0b7 + fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa - + https://github.com/nuget/nuget.client - 400ac5960800c110213fe2a6069e40879f2d8fbe + e8b43e6602749844de42f9f37e07fa9aa1fb108c diff --git a/eng/Versions.props b/eng/Versions.props index bec0a08ee9a3..b94a88920983 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23614.3 - 8.0.200-preview.23614.3 - 8.0.200-preview.23614.3 + 8.0.200-preview.23614.5 + 8.0.200-preview.23614.5 + 8.0.200-preview.23614.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.52 + 6.9.0-preview.1.54 From d7393e0fb89faed666dc34a3c95354a61ee1486e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 07:39:32 +0000 Subject: [PATCH 077/652] Update dependencies from https://github.com/dotnet/sdk build 20231214.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.5 -> To Version 8.0.200-preview.23614.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23612.11 -> To Version 4.9.0-3.23613.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60add4c858c8..d0bff5a066e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 - + https://github.com/dotnet/sdk - 94d71ce73c9b5bab34cba2d312127ec324e83f8e + af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 8c38000b3bb2fb64699633eb58e0d284cb3a0ed1 + 01173c5ae735625ac079e08414359ff0e8ea19b6 diff --git a/eng/Versions.props b/eng/Versions.props index b94a88920983..b38c17dec4ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23614.5 - 8.0.200-preview.23614.5 - 8.0.200-preview.23614.5 + 8.0.200-preview.23614.11 + 8.0.200-preview.23614.11 + 8.0.200-preview.23614.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23612.11 + 4.9.0-3.23613.8 From 726df15ef2ff9624d3b7312d013cab44132797b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 08:32:45 +0000 Subject: [PATCH 078/652] Update dependencies from https://github.com/dotnet/sdk build 20231214.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.5 -> To Version 8.0.200-preview.23614.13 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.200-beta.23613.1 -> To Version 12.8.200-beta.23613.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d0bff5a066e4..79e5e1d3cda0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f - + https://github.com/dotnet/sdk - af98bbd47a9e1c57cbca41bcaca9ec8b97f42f55 + 08056b1bb57e3f445355346f8dc60bdfd745293f https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 - + https://github.com/dotnet/fsharp - e328bdd74abe197edaa5da4411dfdb3c0ce6bc26 + 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 diff --git a/eng/Versions.props b/eng/Versions.props index b38c17dec4ff..561f0b51567f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23614.11 - 8.0.200-preview.23614.11 - 8.0.200-preview.23614.11 + 8.0.200-preview.23614.13 + 8.0.200-preview.23614.13 + 8.0.200-preview.23614.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82af839034e9e8fe429c86719c8fa4bc080d851f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 20:13:58 +0000 Subject: [PATCH 079/652] Update dependencies from https://github.com/dotnet/sdk build 20231215.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23615.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79e5e1d3cda0..020e64f37423 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 08056b1bb57e3f445355346f8dc60bdfd745293f + a6fd3852455d396598bb927837ac8a1a84060c0c - + https://github.com/dotnet/sdk - 08056b1bb57e3f445355346f8dc60bdfd745293f + a6fd3852455d396598bb927837ac8a1a84060c0c - + https://github.com/dotnet/sdk - 08056b1bb57e3f445355346f8dc60bdfd745293f + a6fd3852455d396598bb927837ac8a1a84060c0c - + https://github.com/dotnet/sdk - 08056b1bb57e3f445355346f8dc60bdfd745293f + a6fd3852455d396598bb927837ac8a1a84060c0c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 561f0b51567f..187e47fb2035 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23614.13 - 8.0.200-preview.23614.13 - 8.0.200-preview.23614.13 + 8.0.200-preview.23615.6 + 8.0.200-preview.23615.6 + 8.0.200-preview.23615.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 22839d007b44c5640df385470ff0a006107b6a89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 22:54:42 +0000 Subject: [PATCH 080/652] Update dependencies from https://github.com/dotnet/sdk build 20231215.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23615.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 020e64f37423..a5a3d3aacea8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 - + https://github.com/dotnet/sdk - a6fd3852455d396598bb927837ac8a1a84060c0c + 895748e163f7e90ee42e02b04dde125cc09c0ad6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 187e47fb2035..982af7dedc75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23615.6 - 8.0.200-preview.23615.6 - 8.0.200-preview.23615.6 + 8.0.200-preview.23615.8 + 8.0.200-preview.23615.8 + 8.0.200-preview.23615.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ef89c6bb5659892d874a7aa0dd4ff10a8a0e4ea3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Dec 2023 23:51:20 +0000 Subject: [PATCH 081/652] Update dependencies from https://github.com/dotnet/sdk build 20231215.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23615.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.200-beta.23613.4 -> To Version 12.8.200-beta.23614.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5a3d3aacea8..f95ef5580bcb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 - + https://github.com/dotnet/sdk - 895748e163f7e90ee42e02b04dde125cc09c0ad6 + 1007d95210af6af5606c14fa13f4233b5e889240 https://github.com/dotnet/test-templates @@ -132,32 +132,32 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/dotnet/fsharp - 2aefcec87bf9e73a712c0c3f5b49c23358b034e8 + a521e1cd420beb56c15faf6836184fadd2b7937a - + https://github.com/microsoft/vstest - dc8fe3865011cef3a0891f5f55c1fc5c7f401066 + 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 01173c5ae735625ac079e08414359ff0e8ea19b6 + 462e180642875c0540ae1379e60425f635ec4f78 - + https://github.com/dotnet/msbuild - fcff9b0a5eb7165ca2f81cb3a80ca4294afbebaa + b0e2b79230019c8f28ad7bedd82ecaa85a114761 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 982af7dedc75..e8b5bd4daef7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23615.8 - 8.0.200-preview.23615.8 - 8.0.200-preview.23615.8 + 8.0.200-preview.23615.10 + 8.0.200-preview.23615.10 + 8.0.200-preview.23615.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23613.8 + 4.9.0-3.23614.9 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23612-01 + 17.9.0-preview-23614-02 8.0.0-alpha.1.22557.12 From dc0381c8fa6475f124c4784173563e32cb2c6110 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 03:04:29 +0000 Subject: [PATCH 082/652] Update dependencies from https://github.com/dotnet/sdk build 20231217.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23614.13 -> To Version 8.0.200-preview.23617.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.200-beta.23613.4 -> To Version 12.8.200-beta.23615.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f95ef5580bcb..c6b5f5467ad4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 - + https://github.com/dotnet/sdk - 1007d95210af6af5606c14fa13f4233b5e889240 + b6e711e23fd6cd4565f7695b6008a6cc3b510196 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 - + https://github.com/dotnet/fsharp - a521e1cd420beb56c15faf6836184fadd2b7937a + 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 462e180642875c0540ae1379e60425f635ec4f78 + 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 https://github.com/dotnet/msbuild b0e2b79230019c8f28ad7bedd82ecaa85a114761 - + https://github.com/nuget/nuget.client - e8b43e6602749844de42f9f37e07fa9aa1fb108c + 2a234707a663f731e4de93cba4014ed1a8259def diff --git a/eng/Versions.props b/eng/Versions.props index e8b5bd4daef7..4bb59dadb2e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23615.10 - 8.0.200-preview.23615.10 - 8.0.200-preview.23615.10 + 8.0.200-preview.23617.3 + 8.0.200-preview.23617.3 + 8.0.200-preview.23617.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23614.9 + 4.9.0-3.23615.7 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.54 + 6.9.0-preview.1.64 From 3cbceaa60a506b01c6a20e65be4b1a7c99421332 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 16:19:29 +0000 Subject: [PATCH 083/652] Update dependencies from https://github.com/dotnet/sdk build 20231218.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23617.3 -> To Version 8.0.200-preview.23618.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c6b5f5467ad4..484561ff3732 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - b6e711e23fd6cd4565f7695b6008a6cc3b510196 + a6c752a26faa1b39384ba2a54d0a608acae80f23 - + https://github.com/dotnet/sdk - b6e711e23fd6cd4565f7695b6008a6cc3b510196 + a6c752a26faa1b39384ba2a54d0a608acae80f23 - + https://github.com/dotnet/sdk - b6e711e23fd6cd4565f7695b6008a6cc3b510196 + a6c752a26faa1b39384ba2a54d0a608acae80f23 - + https://github.com/dotnet/sdk - b6e711e23fd6cd4565f7695b6008a6cc3b510196 + a6c752a26faa1b39384ba2a54d0a608acae80f23 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4bb59dadb2e6..5ad82096029d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23617.3 - 8.0.200-preview.23617.3 - 8.0.200-preview.23617.3 + 8.0.200-preview.23618.2 + 8.0.200-preview.23618.2 + 8.0.200-preview.23618.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c5a3763638af0fa9c121b64eebabb8faeab055e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 18:14:05 +0000 Subject: [PATCH 084/652] Update dependencies from https://github.com/dotnet/sdk build 20231218.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23617.3 -> To Version 8.0.200-preview.23618.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 484561ff3732..7acda4f01d1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - a6c752a26faa1b39384ba2a54d0a608acae80f23 + 7cf2fbaee4782d14f471a2b3c7cbef85af565abd - + https://github.com/dotnet/sdk - a6c752a26faa1b39384ba2a54d0a608acae80f23 + 7cf2fbaee4782d14f471a2b3c7cbef85af565abd - + https://github.com/dotnet/sdk - a6c752a26faa1b39384ba2a54d0a608acae80f23 + 7cf2fbaee4782d14f471a2b3c7cbef85af565abd - + https://github.com/dotnet/sdk - a6c752a26faa1b39384ba2a54d0a608acae80f23 + 7cf2fbaee4782d14f471a2b3c7cbef85af565abd https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5ad82096029d..571714567281 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23618.2 - 8.0.200-preview.23618.2 - 8.0.200-preview.23618.2 + 8.0.200-preview.23618.3 + 8.0.200-preview.23618.3 + 8.0.200-preview.23618.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 61a5609d157657a413e93831516ceee9180dd5af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Dec 2023 19:03:51 +0000 Subject: [PATCH 085/652] Update dependencies from https://github.com/dotnet/sdk build 20231218.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23617.3 -> To Version 8.0.200-preview.23618.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7acda4f01d1c..021dffee2237 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 7cf2fbaee4782d14f471a2b3c7cbef85af565abd + 7037cf5c8cbaf32e5591551a0a4121eb363f3be7 - + https://github.com/dotnet/sdk - 7cf2fbaee4782d14f471a2b3c7cbef85af565abd + 7037cf5c8cbaf32e5591551a0a4121eb363f3be7 - + https://github.com/dotnet/sdk - 7cf2fbaee4782d14f471a2b3c7cbef85af565abd + 7037cf5c8cbaf32e5591551a0a4121eb363f3be7 - + https://github.com/dotnet/sdk - 7cf2fbaee4782d14f471a2b3c7cbef85af565abd + 7037cf5c8cbaf32e5591551a0a4121eb363f3be7 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 571714567281..a6f11005b8b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23618.3 - 8.0.200-preview.23618.3 - 8.0.200-preview.23618.3 + 8.0.200-preview.23618.4 + 8.0.200-preview.23618.4 + 8.0.200-preview.23618.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0fc198d332facb1beaa12fd625a2a936ce4f20ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Dec 2023 07:04:56 +0000 Subject: [PATCH 086/652] Update dependencies from https://github.com/dotnet/sdk build 20231219.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23618.4 -> To Version 8.0.200-preview.23619.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.200-beta.23615.3 -> To Version 12.8.200-beta.23618.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 021dffee2237..1012a0494603 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 7037cf5c8cbaf32e5591551a0a4121eb363f3be7 + ad6f642103d4c5495107180ec4b1f4019e511998 - + https://github.com/dotnet/sdk - 7037cf5c8cbaf32e5591551a0a4121eb363f3be7 + ad6f642103d4c5495107180ec4b1f4019e511998 - + https://github.com/dotnet/sdk - 7037cf5c8cbaf32e5591551a0a4121eb363f3be7 + ad6f642103d4c5495107180ec4b1f4019e511998 - + https://github.com/dotnet/sdk - 7037cf5c8cbaf32e5591551a0a4121eb363f3be7 + ad6f642103d4c5495107180ec4b1f4019e511998 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 + 0c489541068f311e23b582410c1df3ff86f1d526 - + https://github.com/dotnet/fsharp - 7aa5ff65041954475ad6d0a3bd7205ae7dde4a42 + 0c489541068f311e23b582410c1df3ff86f1d526 @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 6a1cfc22d6b40c4e0fe5ac98a77a251c987a7c51 + 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 - + https://github.com/dotnet/msbuild - b0e2b79230019c8f28ad7bedd82ecaa85a114761 + 82d381eb23290d50936683719bda333461af9528 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index a6f11005b8b9..f33314510493 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23618.4 - 8.0.200-preview.23618.4 - 8.0.200-preview.23618.4 + 8.0.200-preview.23619.7 + 8.0.200-preview.23619.7 + 8.0.200-preview.23619.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23615.7 + 4.9.0-3.23618.7 From 4c217dfad708b88330213630881887a5a0155a82 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Dec 2023 20:22:17 +0000 Subject: [PATCH 087/652] Update dependencies from https://github.com/dotnet/sdk build 20231220.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23619.7 -> To Version 8.0.200-preview.23620.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1012a0494603..cb6e3cbc9168 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - ad6f642103d4c5495107180ec4b1f4019e511998 + af2ee1774a7843344142c4d223ad0dcd5176ce69 - + https://github.com/dotnet/sdk - ad6f642103d4c5495107180ec4b1f4019e511998 + af2ee1774a7843344142c4d223ad0dcd5176ce69 - + https://github.com/dotnet/sdk - ad6f642103d4c5495107180ec4b1f4019e511998 + af2ee1774a7843344142c4d223ad0dcd5176ce69 - + https://github.com/dotnet/sdk - ad6f642103d4c5495107180ec4b1f4019e511998 + af2ee1774a7843344142c4d223ad0dcd5176ce69 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f33314510493..9cbd97018cc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23619.7 - 8.0.200-preview.23619.7 - 8.0.200-preview.23619.7 + 8.0.200-preview.23620.6 + 8.0.200-preview.23620.6 + 8.0.200-preview.23620.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From be1263578c2fd1a1fd0c3755084858e2671c0388 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 03:02:16 +0000 Subject: [PATCH 088/652] Update dependencies from https://github.com/dotnet/sdk build 20231220.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23620.6 -> To Version 8.0.200-preview.23620.9 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23618.7 -> To Version 4.9.0-3.23619.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb6e3cbc9168..5587de7a10b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - af2ee1774a7843344142c4d223ad0dcd5176ce69 + 769e1a0597f123228080c2fa22b329880691d2b2 - + https://github.com/dotnet/sdk - af2ee1774a7843344142c4d223ad0dcd5176ce69 + 769e1a0597f123228080c2fa22b329880691d2b2 - + https://github.com/dotnet/sdk - af2ee1774a7843344142c4d223ad0dcd5176ce69 + 769e1a0597f123228080c2fa22b329880691d2b2 - + https://github.com/dotnet/sdk - af2ee1774a7843344142c4d223ad0dcd5176ce69 + 769e1a0597f123228080c2fa22b329880691d2b2 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 95f4a35aad5cdff67d9b48c87c3aa1c0b0b6f495 + 0caa9d162683c44645ccc6e1645ce4a01acfd8dc diff --git a/eng/Versions.props b/eng/Versions.props index 9cbd97018cc7..9345907268e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23620.6 - 8.0.200-preview.23620.6 - 8.0.200-preview.23620.6 + 8.0.200-preview.23620.9 + 8.0.200-preview.23620.9 + 8.0.200-preview.23620.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23618.7 + 4.9.0-3.23619.3 From c3ccb092bd5f6f0c0f9276240f0397f5ee5c5a48 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Dec 2023 20:24:52 +0000 Subject: [PATCH 089/652] Update dependencies from https://github.com/dotnet/sdk build 20231221.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23620.9 -> To Version 8.0.200-preview.23621.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5587de7a10b4..08ca0e138acb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 769e1a0597f123228080c2fa22b329880691d2b2 + 79f803797964e4e9d04707038d97ce497bb568d0 - + https://github.com/dotnet/sdk - 769e1a0597f123228080c2fa22b329880691d2b2 + 79f803797964e4e9d04707038d97ce497bb568d0 - + https://github.com/dotnet/sdk - 769e1a0597f123228080c2fa22b329880691d2b2 + 79f803797964e4e9d04707038d97ce497bb568d0 - + https://github.com/dotnet/sdk - 769e1a0597f123228080c2fa22b329880691d2b2 + 79f803797964e4e9d04707038d97ce497bb568d0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9345907268e7..13ecb7900a17 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23620.9 - 8.0.200-preview.23620.9 - 8.0.200-preview.23620.9 + 8.0.200-preview.23621.3 + 8.0.200-preview.23621.3 + 8.0.200-preview.23621.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b5b3359679ee2d419b70430ac0407cd8e5c71eef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 06:35:13 +0000 Subject: [PATCH 090/652] Update dependencies from https://github.com/dotnet/sdk build 20231221.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23621.3 -> To Version 8.0.200-preview.23621.5 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.9.0-preview-23614-02 -> To Version 17.9.0-release-23619-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 08ca0e138acb..32d9724e11e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 79f803797964e4e9d04707038d97ce497bb568d0 + dbf19305aa638aa13611b32685682b2d042f4a68 - + https://github.com/dotnet/sdk - 79f803797964e4e9d04707038d97ce497bb568d0 + dbf19305aa638aa13611b32685682b2d042f4a68 - + https://github.com/dotnet/sdk - 79f803797964e4e9d04707038d97ce497bb568d0 + dbf19305aa638aa13611b32685682b2d042f4a68 - + https://github.com/dotnet/sdk - 79f803797964e4e9d04707038d97ce497bb568d0 + dbf19305aa638aa13611b32685682b2d042f4a68 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 0c489541068f311e23b582410c1df3ff86f1d526 - + https://github.com/microsoft/vstest - 37a9284cea77fefcdf1f9b023bdb1eaed080e3d8 + f33b3e4ec550c48607057bf051574c048d3ef7b6 diff --git a/eng/Versions.props b/eng/Versions.props index 13ecb7900a17..57b7a3f269e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23621.3 - 8.0.200-preview.23621.3 - 8.0.200-preview.23621.3 + 8.0.200-preview.23621.5 + 8.0.200-preview.23621.5 + 8.0.200-preview.23621.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-preview-23614-02 + 17.9.0-release-23619-01 8.0.0-alpha.1.22557.12 From 5337095fb43613adc08f0e05ca6e5aa7185b083b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Dec 2023 09:24:30 +0000 Subject: [PATCH 091/652] Update dependencies from https://github.com/dotnet/sdk build 20231222.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23621.5 -> To Version 8.0.200-preview.23622.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.9.0-3.23619.3 -> To Version 4.9.0-3.23620.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32d9724e11e8..dcb41a2986b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - dbf19305aa638aa13611b32685682b2d042f4a68 + 703446eba5785d51a1035bd7e62b7c482190cbd8 - + https://github.com/dotnet/sdk - dbf19305aa638aa13611b32685682b2d042f4a68 + 703446eba5785d51a1035bd7e62b7c482190cbd8 - + https://github.com/dotnet/sdk - dbf19305aa638aa13611b32685682b2d042f4a68 + 703446eba5785d51a1035bd7e62b7c482190cbd8 - + https://github.com/dotnet/sdk - dbf19305aa638aa13611b32685682b2d042f4a68 + 703446eba5785d51a1035bd7e62b7c482190cbd8 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 0caa9d162683c44645ccc6e1645ce4a01acfd8dc + 67ef2fb7409e0ab54ac627d6ac525069172ed494 https://github.com/dotnet/msbuild 82d381eb23290d50936683719bda333461af9528 - + https://github.com/nuget/nuget.client - 2a234707a663f731e4de93cba4014ed1a8259def + cabdb9886f3bc99c7a342ccc1661d393b14a0d1d diff --git a/eng/Versions.props b/eng/Versions.props index 57b7a3f269e1..c331a60f2fca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23621.5 - 8.0.200-preview.23621.5 - 8.0.200-preview.23621.5 + 8.0.200-preview.23622.1 + 8.0.200-preview.23622.1 + 8.0.200-preview.23622.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23619.3 + 4.9.0-3.23620.1 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.64 + 6.9.0-preview.1.65 From d503628521d6639c67780cde39a4acdefe31dacc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Dec 2023 02:57:03 +0000 Subject: [PATCH 092/652] Update dependencies from https://github.com/dotnet/sdk build 20231224.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23622.1 -> To Version 8.0.200-preview.23624.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcb41a2986b2..8b63f03a5dd2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 703446eba5785d51a1035bd7e62b7c482190cbd8 + 3d75562bdb3297c70ff2e45b4c098b2709a36d9f - + https://github.com/dotnet/sdk - 703446eba5785d51a1035bd7e62b7c482190cbd8 + 3d75562bdb3297c70ff2e45b4c098b2709a36d9f - + https://github.com/dotnet/sdk - 703446eba5785d51a1035bd7e62b7c482190cbd8 + 3d75562bdb3297c70ff2e45b4c098b2709a36d9f - + https://github.com/dotnet/sdk - 703446eba5785d51a1035bd7e62b7c482190cbd8 + 3d75562bdb3297c70ff2e45b4c098b2709a36d9f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c331a60f2fca..7f44f62986c6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23622.1 - 8.0.200-preview.23622.1 - 8.0.200-preview.23622.1 + 8.0.200-preview.23624.1 + 8.0.200-preview.23624.1 + 8.0.200-preview.23624.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 61846438b0352b5897a1ac0f0825ac2c8087fe0b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Dec 2023 06:33:41 +0000 Subject: [PATCH 093/652] Update dependencies from https://github.com/dotnet/sdk build 20231224.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23624.1 -> To Version 8.0.200-preview.23624.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.9.0-3.23620.1 -> To Version 4.9.0-3.23621.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8b63f03a5dd2..1d3d488b74f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 3d75562bdb3297c70ff2e45b4c098b2709a36d9f + e2d57cca8917108792875548b5d8aa4b29b68302 - + https://github.com/dotnet/sdk - 3d75562bdb3297c70ff2e45b4c098b2709a36d9f + e2d57cca8917108792875548b5d8aa4b29b68302 - + https://github.com/dotnet/sdk - 3d75562bdb3297c70ff2e45b4c098b2709a36d9f + e2d57cca8917108792875548b5d8aa4b29b68302 - + https://github.com/dotnet/sdk - 3d75562bdb3297c70ff2e45b4c098b2709a36d9f + e2d57cca8917108792875548b5d8aa4b29b68302 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 67ef2fb7409e0ab54ac627d6ac525069172ed494 + 182e829faf57b84150a2b28036f20918f368fc9d https://github.com/dotnet/msbuild 82d381eb23290d50936683719bda333461af9528 - + https://github.com/nuget/nuget.client - cabdb9886f3bc99c7a342ccc1661d393b14a0d1d + 95f6e0c8b7bd627862a08dcf60f43397f42723ca diff --git a/eng/Versions.props b/eng/Versions.props index 7f44f62986c6..f7346812d60c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23624.1 - 8.0.200-preview.23624.1 - 8.0.200-preview.23624.1 + 8.0.200-preview.23624.3 + 8.0.200-preview.23624.3 + 8.0.200-preview.23624.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23620.1 + 4.9.0-3.23621.4 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.65 + 6.9.0-preview.1.67 From bf0b1923a2ced1c6bd2dc2687b4fa3dde8733099 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Dec 2023 09:22:53 +0000 Subject: [PATCH 094/652] Update dependencies from https://github.com/dotnet/sdk build 20231228.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23624.3 -> To Version 8.0.200-preview.23628.1 Dependency coherency updates NuGet.Build.Tasks From Version 6.9.0-preview.1.67 -> To Version 6.9.0-preview.1.69 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d3d488b74f7..4d89d0853485 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - e2d57cca8917108792875548b5d8aa4b29b68302 + d6b84df10203277d912c410b3d418996f8de8f80 - + https://github.com/dotnet/sdk - e2d57cca8917108792875548b5d8aa4b29b68302 + d6b84df10203277d912c410b3d418996f8de8f80 - + https://github.com/dotnet/sdk - e2d57cca8917108792875548b5d8aa4b29b68302 + d6b84df10203277d912c410b3d418996f8de8f80 - + https://github.com/dotnet/sdk - e2d57cca8917108792875548b5d8aa4b29b68302 + d6b84df10203277d912c410b3d418996f8de8f80 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 82d381eb23290d50936683719bda333461af9528 - + https://github.com/nuget/nuget.client - 95f6e0c8b7bd627862a08dcf60f43397f42723ca + 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 diff --git a/eng/Versions.props b/eng/Versions.props index f7346812d60c..86b841206471 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23624.3 - 8.0.200-preview.23624.3 - 8.0.200-preview.23624.3 + 8.0.200-preview.23628.1 + 8.0.200-preview.23628.1 + 8.0.200-preview.23628.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.67 + 6.9.0-preview.1.69 From 5fc7d565b1ee86e541203b6e6966f38913cb488c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Dec 2023 19:48:53 +0000 Subject: [PATCH 095/652] Update dependencies from https://github.com/dotnet/sdk build 20231228.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23628.1 -> To Version 8.0.200-preview.23628.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d89d0853485..1c5d601b6bff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - d6b84df10203277d912c410b3d418996f8de8f80 + 65deefc71bd7d0977062fffb782c5459b6b29e66 - + https://github.com/dotnet/sdk - d6b84df10203277d912c410b3d418996f8de8f80 + 65deefc71bd7d0977062fffb782c5459b6b29e66 - + https://github.com/dotnet/sdk - d6b84df10203277d912c410b3d418996f8de8f80 + 65deefc71bd7d0977062fffb782c5459b6b29e66 - + https://github.com/dotnet/sdk - d6b84df10203277d912c410b3d418996f8de8f80 + 65deefc71bd7d0977062fffb782c5459b6b29e66 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 86b841206471..670035a6ac46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23628.1 - 8.0.200-preview.23628.1 - 8.0.200-preview.23628.1 + 8.0.200-preview.23628.3 + 8.0.200-preview.23628.3 + 8.0.200-preview.23628.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8ba15c29bf08ada7f97bb52ee2766c2fbde70303 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Dec 2023 20:39:12 +0000 Subject: [PATCH 096/652] Update dependencies from https://github.com/dotnet/sdk build 20231228.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23628.1 -> To Version 8.0.200-preview.23628.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c5d601b6bff..aa644e31d9c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 65deefc71bd7d0977062fffb782c5459b6b29e66 + 2d2f01d25fd11ae228df60a00812631a6df47a2b - + https://github.com/dotnet/sdk - 65deefc71bd7d0977062fffb782c5459b6b29e66 + 2d2f01d25fd11ae228df60a00812631a6df47a2b - + https://github.com/dotnet/sdk - 65deefc71bd7d0977062fffb782c5459b6b29e66 + 2d2f01d25fd11ae228df60a00812631a6df47a2b - + https://github.com/dotnet/sdk - 65deefc71bd7d0977062fffb782c5459b6b29e66 + 2d2f01d25fd11ae228df60a00812631a6df47a2b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 670035a6ac46..537bd056d5cf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23628.3 - 8.0.200-preview.23628.3 - 8.0.200-preview.23628.3 + 8.0.200-preview.23628.4 + 8.0.200-preview.23628.4 + 8.0.200-preview.23628.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5ccf3e73c00d2476e4e68d530a8180436228e923 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Dec 2023 02:55:18 +0000 Subject: [PATCH 097/652] Update dependencies from https://github.com/dotnet/sdk build 20231228.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23628.4 -> To Version 8.0.200-preview.23628.6 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.9.0-release-23619-01 -> To Version 17.9.0-release-23627-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aa644e31d9c7..6f1d0a776a77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 2d2f01d25fd11ae228df60a00812631a6df47a2b + 50bc6a5256c2ff5fb1b432e7f770b8322371f681 - + https://github.com/dotnet/sdk - 2d2f01d25fd11ae228df60a00812631a6df47a2b + 50bc6a5256c2ff5fb1b432e7f770b8322371f681 - + https://github.com/dotnet/sdk - 2d2f01d25fd11ae228df60a00812631a6df47a2b + 50bc6a5256c2ff5fb1b432e7f770b8322371f681 - + https://github.com/dotnet/sdk - 2d2f01d25fd11ae228df60a00812631a6df47a2b + 50bc6a5256c2ff5fb1b432e7f770b8322371f681 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 0c489541068f311e23b582410c1df3ff86f1d526 - + https://github.com/microsoft/vstest - f33b3e4ec550c48607057bf051574c048d3ef7b6 + 053d7114a72aac12d1382ecc2a23b2dfdd5b084b diff --git a/eng/Versions.props b/eng/Versions.props index 537bd056d5cf..0b035e52704c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.23628.4 - 8.0.200-preview.23628.4 - 8.0.200-preview.23628.4 + 8.0.200-preview.23628.6 + 8.0.200-preview.23628.6 + 8.0.200-preview.23628.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-release-23619-01 + 17.9.0-release-23627-01 8.0.0-alpha.1.22557.12 From 1ce0b60eb5eb3657e4b2dfa885634d66d1cc9ab0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Dec 2023 07:34:59 +0000 Subject: [PATCH 098/652] Update dependencies from https://github.com/dotnet/sdk build 20231228.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23628.6 -> To Version 8.0.200-preview.23628.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23621.4 -> To Version 4.9.0-3.23627.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f1d0a776a77..6bdfd7a8f9f3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 50bc6a5256c2ff5fb1b432e7f770b8322371f681 + 43af3203568162fc5f064435c8c440f561f1847e - + https://github.com/dotnet/sdk - 50bc6a5256c2ff5fb1b432e7f770b8322371f681 + 43af3203568162fc5f064435c8c440f561f1847e - + https://github.com/dotnet/sdk - 50bc6a5256c2ff5fb1b432e7f770b8322371f681 + 43af3203568162fc5f064435c8c440f561f1847e - + https://github.com/dotnet/sdk - 50bc6a5256c2ff5fb1b432e7f770b8322371f681 + 43af3203568162fc5f064435c8c440f561f1847e https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 182e829faf57b84150a2b28036f20918f368fc9d + 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 diff --git a/eng/Versions.props b/eng/Versions.props index 0b035e52704c..985abdf87015 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23628.6 - 8.0.200-preview.23628.6 - 8.0.200-preview.23628.6 + 8.0.200-preview.23628.8 + 8.0.200-preview.23628.8 + 8.0.200-preview.23628.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23621.4 + 4.9.0-3.23627.3 From 65837ee82095263cbe6bb0d9ab979257d72eb70f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Dec 2023 18:03:46 +0000 Subject: [PATCH 099/652] Update dependencies from https://github.com/dotnet/sdk build 20231229.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23628.6 -> To Version 8.0.200-preview.23629.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.23621.4 -> To Version 4.9.0-3.23628.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bdfd7a8f9f3..b0bd43de112a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 43af3203568162fc5f064435c8c440f561f1847e + 318b4f3296223f50ddd87452c57c60ddf654c69b - + https://github.com/dotnet/sdk - 43af3203568162fc5f064435c8c440f561f1847e + 318b4f3296223f50ddd87452c57c60ddf654c69b - + https://github.com/dotnet/sdk - 43af3203568162fc5f064435c8c440f561f1847e + 318b4f3296223f50ddd87452c57c60ddf654c69b - + https://github.com/dotnet/sdk - 43af3203568162fc5f064435c8c440f561f1847e + 318b4f3296223f50ddd87452c57c60ddf654c69b https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 072cbffda581a3bf26dac3bc5feb9fdcb0f5ff13 + bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 diff --git a/eng/Versions.props b/eng/Versions.props index 985abdf87015..99bf9171ff97 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23628.8 - 8.0.200-preview.23628.8 - 8.0.200-preview.23628.8 + 8.0.200-preview.23629.1 + 8.0.200-preview.23629.1 + 8.0.200-preview.23629.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23627.3 + 4.9.0-3.23628.2 From 1280e0d0e7e99a51342fb610d4bdaa6ecef7d57b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 2 Jan 2024 02:55:22 +0000 Subject: [PATCH 100/652] Update dependencies from https://github.com/dotnet/sdk build 20240101.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.23629.1 -> To Version 8.0.200-preview.24051.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.9.0-3.23628.2 -> To Version 4.9.0-3.23629.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b0bd43de112a..6a1ab0cc1c2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 318b4f3296223f50ddd87452c57c60ddf654c69b + 0074a68a37fc8d79d619765f4c0fc1198297f92c - + https://github.com/dotnet/sdk - 318b4f3296223f50ddd87452c57c60ddf654c69b + 0074a68a37fc8d79d619765f4c0fc1198297f92c - + https://github.com/dotnet/sdk - 318b4f3296223f50ddd87452c57c60ddf654c69b + 0074a68a37fc8d79d619765f4c0fc1198297f92c - + https://github.com/dotnet/sdk - 318b4f3296223f50ddd87452c57c60ddf654c69b + 0074a68a37fc8d79d619765f4c0fc1198297f92c https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - bd598e3e4de3b0c9f38a5fc205fe8ca28412d245 + ebb588725e707db23d8723b633258e7eb918277b https://github.com/dotnet/msbuild 82d381eb23290d50936683719bda333461af9528 - + https://github.com/nuget/nuget.client - 0adf7ac2d046bbc6d7e8db29ff82b3b2f8fc5f14 + 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 diff --git a/eng/Versions.props b/eng/Versions.props index 99bf9171ff97..e535f369b126 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.23629.1 - 8.0.200-preview.23629.1 - 8.0.200-preview.23629.1 + 8.0.200-preview.24051.1 + 8.0.200-preview.24051.1 + 8.0.200-preview.24051.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23628.2 + 4.9.0-3.23629.3 @@ -127,7 +127,7 @@ - 6.9.0-preview.1.69 + 6.9.0-preview.1.70 From 07753fbe69dfcd225a20bf91c9ba3e1b5f395a13 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Jan 2024 23:38:10 +0000 Subject: [PATCH 101/652] Update dependencies from https://github.com/dotnet/sdk build 20240103.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24051.1 -> To Version 8.0.200-preview.24053.24 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.9.0-3.23629.3 -> To Version 4.9.0-3.24052.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 + eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 94ab32f7a38a..e3428e9185b5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a1ab0cc1c2c..d6fb430028a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 0074a68a37fc8d79d619765f4c0fc1198297f92c + 1109d97e98f8fe1559174454ef54f7e71b72cf66 - + https://github.com/dotnet/sdk - 0074a68a37fc8d79d619765f4c0fc1198297f92c + 1109d97e98f8fe1559174454ef54f7e71b72cf66 - + https://github.com/dotnet/sdk - 0074a68a37fc8d79d619765f4c0fc1198297f92c + 1109d97e98f8fe1559174454ef54f7e71b72cf66 - + https://github.com/dotnet/sdk - 0074a68a37fc8d79d619765f4c0fc1198297f92c + 1109d97e98f8fe1559174454ef54f7e71b72cf66 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - ebb588725e707db23d8723b633258e7eb918277b + 45421ad7dfcb8e1563e172eda81d9d892a0fe73c - + https://github.com/dotnet/msbuild - 82d381eb23290d50936683719bda333461af9528 + e514b5973d09e1b8fe4e2cb154e4b680efc135ec https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index e535f369b126..61679004ceda 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.24051.1 - 8.0.200-preview.24051.1 - 8.0.200-preview.24051.1 + 8.0.200-preview.24053.24 + 8.0.200-preview.24053.24 + 8.0.200-preview.24053.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.23629.3 + 4.9.0-3.24052.3 From 54e22b112e57d80c8d329145e163d55ca08365e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Jan 2024 12:25:10 -0800 Subject: [PATCH 102/652] [release/8.0.2xx] Update dependencies from dotnet/sdk (#18103) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d6fb430028a3..62a90b728038 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1109d97e98f8fe1559174454ef54f7e71b72cf66 + 852e9c368cc8d024681115b554dfd78a206ade92 - + https://github.com/dotnet/sdk - 1109d97e98f8fe1559174454ef54f7e71b72cf66 + 852e9c368cc8d024681115b554dfd78a206ade92 - + https://github.com/dotnet/sdk - 1109d97e98f8fe1559174454ef54f7e71b72cf66 + 852e9c368cc8d024681115b554dfd78a206ade92 - + https://github.com/dotnet/sdk - 1109d97e98f8fe1559174454ef54f7e71b72cf66 + 852e9c368cc8d024681115b554dfd78a206ade92 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 61679004ceda..655a2b31480c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24053.24 - 8.0.200-preview.24053.24 - 8.0.200-preview.24053.24 + 8.0.200-preview.24054.4 + 8.0.200-preview.24054.4 + 8.0.200-preview.24054.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 764e1919eb929b4012e1ecd88b8c7d1fe7be6be9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jan 2024 20:43:12 +0000 Subject: [PATCH 103/652] Update dependencies from https://github.com/dotnet/sdk build 20240104.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24054.4 -> To Version 8.0.200-preview.24054.7 Dependency coherency updates NuGet.Build.Tasks From Version 6.9.0-preview.1.70 -> To Version 6.9.0-rc.74 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 62a90b728038..cfdaf4bbcab1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 852e9c368cc8d024681115b554dfd78a206ade92 + 1edd268c8b77f8b8751a74006adbdfc0339ecad6 - + https://github.com/dotnet/sdk - 852e9c368cc8d024681115b554dfd78a206ade92 + 1edd268c8b77f8b8751a74006adbdfc0339ecad6 - + https://github.com/dotnet/sdk - 852e9c368cc8d024681115b554dfd78a206ade92 + 1edd268c8b77f8b8751a74006adbdfc0339ecad6 - + https://github.com/dotnet/sdk - 852e9c368cc8d024681115b554dfd78a206ade92 + 1edd268c8b77f8b8751a74006adbdfc0339ecad6 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild e514b5973d09e1b8fe4e2cb154e4b680efc135ec - + https://github.com/nuget/nuget.client - 6a82332d4936d893fb1e22fd86f2e3cb4d54c471 + e92be3915309e687044768de38933ac5fc4cb40c diff --git a/eng/Versions.props b/eng/Versions.props index 655a2b31480c..9584995d709f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24054.4 - 8.0.200-preview.24054.4 - 8.0.200-preview.24054.4 + 8.0.200-preview.24054.7 + 8.0.200-preview.24054.7 + 8.0.200-preview.24054.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-preview.1.70 + 6.9.0-rc.74 From b211d930910e3cb090abfca56109d301629aafaf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jan 2024 21:44:49 +0000 Subject: [PATCH 104/652] Update dependencies from https://github.com/dotnet/sdk build 20240104.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24054.4 -> To Version 8.0.200-preview.24054.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.9.0-3.24052.3 -> To Version 4.9.0-3.24053.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfdaf4bbcab1..c25af0bf97a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1edd268c8b77f8b8751a74006adbdfc0339ecad6 + 8cf291c5add437f1ac5c7d3a890b445b339f6412 - + https://github.com/dotnet/sdk - 1edd268c8b77f8b8751a74006adbdfc0339ecad6 + 8cf291c5add437f1ac5c7d3a890b445b339f6412 - + https://github.com/dotnet/sdk - 1edd268c8b77f8b8751a74006adbdfc0339ecad6 + 8cf291c5add437f1ac5c7d3a890b445b339f6412 - + https://github.com/dotnet/sdk - 1edd268c8b77f8b8751a74006adbdfc0339ecad6 + 8cf291c5add437f1ac5c7d3a890b445b339f6412 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 45421ad7dfcb8e1563e172eda81d9d892a0fe73c + 237fb52c683601ed639f1fdeaf38ceef0c768fbc diff --git a/eng/Versions.props b/eng/Versions.props index 9584995d709f..6cac2b87cc2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.24054.7 - 8.0.200-preview.24054.7 - 8.0.200-preview.24054.7 + 8.0.200-preview.24054.8 + 8.0.200-preview.24054.8 + 8.0.200-preview.24054.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.24052.3 + 4.9.0-3.24053.1 From 5dc7639d3c248d5840cc56da301c6d7b739e3120 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 4 Jan 2024 22:39:19 +0000 Subject: [PATCH 105/652] Update dependencies from https://github.com/dotnet/sdk build 20240104.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24054.4 -> To Version 8.0.200-preview.24054.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 4.9.0-3.24052.3 -> To Version 4.9.0-3.24053.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index e3428e9185b5..9dedafcb5030 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c25af0bf97a3..b557684c6ed2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 8cf291c5add437f1ac5c7d3a890b445b339f6412 + 74b892ac17dfad6c02dbd30f7cfb194138fb0943 - + https://github.com/dotnet/sdk - 8cf291c5add437f1ac5c7d3a890b445b339f6412 + 74b892ac17dfad6c02dbd30f7cfb194138fb0943 - + https://github.com/dotnet/sdk - 8cf291c5add437f1ac5c7d3a890b445b339f6412 + 74b892ac17dfad6c02dbd30f7cfb194138fb0943 - + https://github.com/dotnet/sdk - 8cf291c5add437f1ac5c7d3a890b445b339f6412 + 74b892ac17dfad6c02dbd30f7cfb194138fb0943 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/msbuild - e514b5973d09e1b8fe4e2cb154e4b680efc135ec + 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 6cac2b87cc2a..7992d3b385f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24054.8 - 8.0.200-preview.24054.8 - 8.0.200-preview.24054.8 + 8.0.200-preview.24054.11 + 8.0.200-preview.24054.11 + 8.0.200-preview.24054.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fccbe158e18a2afec3f0bf4484cd80fac92b4515 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Jan 2024 15:44:01 -0800 Subject: [PATCH 106/652] [release/8.0.2xx] Update dependencies from dotnet/sdk (#18114) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9dedafcb5030..ba606dcba8ac 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b557684c6ed2..59af8b631965 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 74b892ac17dfad6c02dbd30f7cfb194138fb0943 + 9599baa3832545dbdea0959e22bc81092d19e032 - + https://github.com/dotnet/sdk - 74b892ac17dfad6c02dbd30f7cfb194138fb0943 + 9599baa3832545dbdea0959e22bc81092d19e032 - + https://github.com/dotnet/sdk - 74b892ac17dfad6c02dbd30f7cfb194138fb0943 + 9599baa3832545dbdea0959e22bc81092d19e032 - + https://github.com/dotnet/sdk - 74b892ac17dfad6c02dbd30f7cfb194138fb0943 + 9599baa3832545dbdea0959e22bc81092d19e032 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 237fb52c683601ed639f1fdeaf38ceef0c768fbc - + https://github.com/dotnet/msbuild - 5f481c7bc7d489e0d369b82b9cd18aac25f63ce6 + bb6fadf23225f5097f4e05ed507d93683a21ae56 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 7992d3b385f7..f0dff43a45ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24054.11 - 8.0.200-preview.24054.11 - 8.0.200-preview.24054.11 + 8.0.200-preview.24055.7 + 8.0.200-preview.24055.7 + 8.0.200-preview.24055.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0d0edb5b6bede59602015871b8a8d0032cb2299 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Jan 2024 03:11:14 +0000 Subject: [PATCH 107/652] Update dependencies from https://github.com/dotnet/sdk build 20240107.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24055.7 -> To Version 8.0.200-preview.24057.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.200-beta.23618.1 -> To Version 12.8.200-beta.24055.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59af8b631965..220d02f64729 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 9599baa3832545dbdea0959e22bc81092d19e032 + 8b1d49493edee44364e2117b49df1bf0df4ea46a - + https://github.com/dotnet/sdk - 9599baa3832545dbdea0959e22bc81092d19e032 + 8b1d49493edee44364e2117b49df1bf0df4ea46a - + https://github.com/dotnet/sdk - 9599baa3832545dbdea0959e22bc81092d19e032 + 8b1d49493edee44364e2117b49df1bf0df4ea46a - + https://github.com/dotnet/sdk - 9599baa3832545dbdea0959e22bc81092d19e032 + 8b1d49493edee44364e2117b49df1bf0df4ea46a https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 0c489541068f311e23b582410c1df3ff86f1d526 + cc741852156e5f048e4e046061fa36477f8b92fb - + https://github.com/dotnet/fsharp - 0c489541068f311e23b582410c1df3ff86f1d526 + cc741852156e5f048e4e046061fa36477f8b92fb diff --git a/eng/Versions.props b/eng/Versions.props index f0dff43a45ed..409964fb931e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24055.7 - 8.0.200-preview.24055.7 - 8.0.200-preview.24055.7 + 8.0.200-preview.24057.5 + 8.0.200-preview.24057.5 + 8.0.200-preview.24057.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9dd35668a38509227db5f01ae007301831370d61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 13:53:43 +0000 Subject: [PATCH 108/652] Update dependencies from https://github.com/dotnet/test-templates build 20240109.1 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.23612.1 -> To Version 1.1.0-rc.24059.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 220d02f64729..f2b10a8bcb15 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - ec54b2c1553db0a544ef0e8595be2318fc12e08d + 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://github.com/dotnet/test-templates - ec54b2c1553db0a544ef0e8595be2318fc12e08d + 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://github.com/dotnet/test-templates - ec54b2c1553db0a544ef0e8595be2318fc12e08d + 7d2f2719628e6744f3172a2d48e0d1f600b360c0 diff --git a/eng/Versions.props b/eng/Versions.props index 409964fb931e..23556b3a9f11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.23612.1 - 1.1.0-rc.23612.1 - 1.1.0-rc.23612.1 + 1.1.0-rc.24059.1 + 1.1.0-rc.24059.1 + 1.1.0-rc.24059.1 From 60657853f5cc8e128741ef888ab2ba46b6af0c56 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 20:35:57 +0000 Subject: [PATCH 109/652] Update dependencies from https://github.com/dotnet/sdk build 20240109.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24057.5 -> To Version 8.0.200-preview.24059.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 220d02f64729..1054fdcb03e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 8b1d49493edee44364e2117b49df1bf0df4ea46a + 75b02ea86c5e8e386affab9c86e9391c1450a9f1 - + https://github.com/dotnet/sdk - 8b1d49493edee44364e2117b49df1bf0df4ea46a + 75b02ea86c5e8e386affab9c86e9391c1450a9f1 - + https://github.com/dotnet/sdk - 8b1d49493edee44364e2117b49df1bf0df4ea46a + 75b02ea86c5e8e386affab9c86e9391c1450a9f1 - + https://github.com/dotnet/sdk - 8b1d49493edee44364e2117b49df1bf0df4ea46a + 75b02ea86c5e8e386affab9c86e9391c1450a9f1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 409964fb931e..1d1aa66d34e2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24057.5 - 8.0.200-preview.24057.5 - 8.0.200-preview.24057.5 + 8.0.200-preview.24059.7 + 8.0.200-preview.24059.7 + 8.0.200-preview.24059.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5539a3e44a908f4d953e7dfa8e6733768150e684 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 9 Jan 2024 21:38:09 +0000 Subject: [PATCH 110/652] Update dependencies from https://github.com/dotnet/sdk build 20240109.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24057.5 -> To Version 8.0.200-preview.24059.9 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1054fdcb03e2..c8ce09bb0d10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 75b02ea86c5e8e386affab9c86e9391c1450a9f1 + b20592807140cdf3e9f174e1df76ee971ecfe4a8 - + https://github.com/dotnet/sdk - 75b02ea86c5e8e386affab9c86e9391c1450a9f1 + b20592807140cdf3e9f174e1df76ee971ecfe4a8 - + https://github.com/dotnet/sdk - 75b02ea86c5e8e386affab9c86e9391c1450a9f1 + b20592807140cdf3e9f174e1df76ee971ecfe4a8 - + https://github.com/dotnet/sdk - 75b02ea86c5e8e386affab9c86e9391c1450a9f1 + b20592807140cdf3e9f174e1df76ee971ecfe4a8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1d1aa66d34e2..2246e57411fe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24059.7 - 8.0.200-preview.24059.7 - 8.0.200-preview.24059.7 + 8.0.200-preview.24059.9 + 8.0.200-preview.24059.9 + 8.0.200-preview.24059.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c0112c53cb3f2cd8ea688b892c43906d996cf319 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 10:56:40 +0000 Subject: [PATCH 111/652] Update dependencies from https://github.com/dotnet/sdk build 20240110.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24059.9 -> To Version 8.0.200-preview.24060.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 798f2c3915a8..8ccc8494ef51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - b20592807140cdf3e9f174e1df76ee971ecfe4a8 + a9db03d634eae446d0aae7fea79c12f955b9f80a - + https://github.com/dotnet/sdk - b20592807140cdf3e9f174e1df76ee971ecfe4a8 + a9db03d634eae446d0aae7fea79c12f955b9f80a - + https://github.com/dotnet/sdk - b20592807140cdf3e9f174e1df76ee971ecfe4a8 + a9db03d634eae446d0aae7fea79c12f955b9f80a - + https://github.com/dotnet/sdk - b20592807140cdf3e9f174e1df76ee971ecfe4a8 + a9db03d634eae446d0aae7fea79c12f955b9f80a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4751434a32ff..bf014dd8f0b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24059.9 - 8.0.200-preview.24059.9 - 8.0.200-preview.24059.9 + 8.0.200-preview.24060.5 + 8.0.200-preview.24060.5 + 8.0.200-preview.24060.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b6560b24e81ef896951c7ea4ea8d70e3ea4a208b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jan 2024 17:01:32 +0000 Subject: [PATCH 112/652] Update dependencies from https://github.com/dotnet/arcade build 20240109.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.23564.4 -> To Version 8.0.0-beta.24059.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 4 ++-- eng/common/tools.ps1 | 10 +++++++++- eng/common/tools.sh | 7 ++++++- global.json | 6 +++--- 8 files changed, 29 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 798f2c3915a8..79a56b30ad90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade - 0aaeafef60933f87b0b50350313bb2fd77defb5d + 61ae141d2bf3534619265c8f691fd55dc3e75147 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4751434a32ff..48cb07a47e3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.23564.4 + 8.0.0-beta.24059.4 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e20ee3a983cb..e24ca2f46f98 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -136,7 +136,7 @@ jobs: condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index bb0d9f8b0f12..fa5446c093dd 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -72,7 +72,7 @@ jobs: condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Build Assets diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ef720f9d7819..3f74abf7ce0f 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -169,7 +169,7 @@ stages: # This is necessary whenever we want to publish/restore to an AzDO private feed # Since sdk-task.ps1 tries to restore packages we need to do this authentication here # otherwise it'll complain about accessing a private feed. - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 displayName: 'Authenticate to AzDO Feeds' # Signing validation will optionally work with the buildmanifest file which is downloaded from @@ -266,7 +266,7 @@ stages: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: NuGetAuthenticate@0 + - task: NuGetAuthenticate@1 - task: PowerShell@2 displayName: Publish Using Darc diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index fdd0cbb91f85..eb188cfda415 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -601,7 +601,15 @@ function InitializeBuildTool() { ExitWithExitCode 1 } $dotnetPath = Join-Path $dotnetRoot (GetExecutableFileName 'dotnet') - $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = 'net8.0' } + + # Use override if it exists - commonly set by source-build + if ($null -eq $env:_OverrideArcadeInitializeBuildToolFramework) { + $initializeBuildToolFramework="net8.0" + } else { + $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework + } + + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { $msbuildPath = InitializeVisualStudioMSBuild -install:$restore diff --git a/eng/common/tools.sh b/eng/common/tools.sh index e8d478943341..3392e3a99921 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -341,7 +341,12 @@ function InitializeBuildTool { # return values _InitializeBuildTool="$_InitializeDotNetCli/dotnet" _InitializeBuildToolCommand="msbuild" - _InitializeBuildToolFramework="net8.0" + # use override if it exists - commonly set by source-build + if [[ "${_OverrideArcadeInitializeBuildToolFramework:-x}" == "x" ]]; then + _InitializeBuildToolFramework="net8.0" + else + _InitializeBuildToolFramework="${_OverrideArcadeInitializeBuildToolFramework}" + fi } # Set RestoreNoCache as a workaround for https://github.com/NuGet/Home/issues/3116 diff --git a/global.json b/global.json index 88256e459dd9..52a0f29ecf49 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.100", + "dotnet": "8.0.101", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23564.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.23564.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24059.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24059.4" } } From 44560a527550b104b354aee08838a64a5f140dfd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 03:18:27 +0000 Subject: [PATCH 113/652] [release/8.0.2xx] Update dependencies from dotnet/sdk (#18207) [release/8.0.2xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.200-beta.24055.2 to 12.8.200-beta.24059.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.200-beta.24055.2 to 8.0.200-beta.24059.2 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4321af5befa4..4ddb10fde883 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - a9db03d634eae446d0aae7fea79c12f955b9f80a + 10e6ba662e4f8d990af44f423f2f4a492b4b53ba - + https://github.com/dotnet/sdk - a9db03d634eae446d0aae7fea79c12f955b9f80a + 10e6ba662e4f8d990af44f423f2f4a492b4b53ba - + https://github.com/dotnet/sdk - a9db03d634eae446d0aae7fea79c12f955b9f80a + 10e6ba662e4f8d990af44f423f2f4a492b4b53ba - + https://github.com/dotnet/sdk - a9db03d634eae446d0aae7fea79c12f955b9f80a + 10e6ba662e4f8d990af44f423f2f4a492b4b53ba https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - cc741852156e5f048e4e046061fa36477f8b92fb + 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 - + https://github.com/dotnet/fsharp - cc741852156e5f048e4e046061fa36477f8b92fb + 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 diff --git a/eng/Versions.props b/eng/Versions.props index 0c9f96af316b..f122b766a245 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24060.5 - 8.0.200-preview.24060.5 - 8.0.200-preview.24060.5 + 8.0.200-preview.24060.53 + 8.0.200-preview.24060.53 + 8.0.200-preview.24060.53 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 974ce9ca680cf5fd077b42bab2f518ae600a097e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jan 2024 16:03:04 -0800 Subject: [PATCH 114/652] [release/8.0.2xx] Update dependencies from dotnet/sdk (#18221) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ddb10fde883..6af5af2a011b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 10e6ba662e4f8d990af44f423f2f4a492b4b53ba + c36194b2b406e055611adfb1347de1a01e212e22 - + https://github.com/dotnet/sdk - 10e6ba662e4f8d990af44f423f2f4a492b4b53ba + c36194b2b406e055611adfb1347de1a01e212e22 - + https://github.com/dotnet/sdk - 10e6ba662e4f8d990af44f423f2f4a492b4b53ba + c36194b2b406e055611adfb1347de1a01e212e22 - + https://github.com/dotnet/sdk - 10e6ba662e4f8d990af44f423f2f4a492b4b53ba + c36194b2b406e055611adfb1347de1a01e212e22 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 237fb52c683601ed639f1fdeaf38ceef0c768fbc + 28e49407a6e4744819bd471707259b99964e441c diff --git a/eng/Versions.props b/eng/Versions.props index f122b766a245..460f5286c57b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.24060.53 - 8.0.200-preview.24060.53 - 8.0.200-preview.24060.53 + 8.0.200-preview.24061.35 + 8.0.200-preview.24061.35 + 8.0.200-preview.24061.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.24053.1 + 4.9.0-3.24054.13 From bd0809a8457f518f352dede53ab0a4eb3c31a92a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 01:03:51 +0000 Subject: [PATCH 115/652] Update dependencies from https://github.com/dotnet/sdk build 20240111.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.35 -> To Version 8.0.200-preview.24061.38 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6af5af2a011b..6babfcc43842 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - c36194b2b406e055611adfb1347de1a01e212e22 + 9614445cd20031368f890be63c34a1b9de23f2d9 - + https://github.com/dotnet/sdk - c36194b2b406e055611adfb1347de1a01e212e22 + 9614445cd20031368f890be63c34a1b9de23f2d9 - + https://github.com/dotnet/sdk - c36194b2b406e055611adfb1347de1a01e212e22 + 9614445cd20031368f890be63c34a1b9de23f2d9 - + https://github.com/dotnet/sdk - c36194b2b406e055611adfb1347de1a01e212e22 + 9614445cd20031368f890be63c34a1b9de23f2d9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 460f5286c57b..672bc0b4a29a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24061.35 - 8.0.200-preview.24061.35 - 8.0.200-preview.24061.35 + 8.0.200-preview.24061.38 + 8.0.200-preview.24061.38 + 8.0.200-preview.24061.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 28e8805b11cf44507a722112314eca90b1f70d6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 02:56:34 +0000 Subject: [PATCH 116/652] Update dependencies from https://github.com/dotnet/sdk build 20240111.39 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.38 -> To Version 8.0.200-preview.24061.39 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.200-beta.24059.2 -> To Version 12.8.200-beta.24060.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6babfcc43842..b5722d5b91bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 9614445cd20031368f890be63c34a1b9de23f2d9 + f0a96025b67d2614a7fe244f643665f31bed0532 - + https://github.com/dotnet/sdk - 9614445cd20031368f890be63c34a1b9de23f2d9 + f0a96025b67d2614a7fe244f643665f31bed0532 - + https://github.com/dotnet/sdk - 9614445cd20031368f890be63c34a1b9de23f2d9 + f0a96025b67d2614a7fe244f643665f31bed0532 - + https://github.com/dotnet/sdk - 9614445cd20031368f890be63c34a1b9de23f2d9 + f0a96025b67d2614a7fe244f643665f31bed0532 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 + 2e4dde8f8fd64aad0026cd03060698c30bf30a8d - + https://github.com/dotnet/fsharp - 55c2405c6a7024aa38ca595f6d1f6ee37ef4af99 + 2e4dde8f8fd64aad0026cd03060698c30bf30a8d diff --git a/eng/Versions.props b/eng/Versions.props index 672bc0b4a29a..c26eb152ea6d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24061.38 - 8.0.200-preview.24061.38 - 8.0.200-preview.24061.38 + 8.0.200-preview.24061.39 + 8.0.200-preview.24061.39 + 8.0.200-preview.24061.39 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0681ce79bc9e8187212a3f6e374ea92e4ef94810 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 05:42:38 +0000 Subject: [PATCH 117/652] Update dependencies from https://github.com/dotnet/sdk build 20240111.45 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.38 -> To Version 8.0.200-preview.24061.45 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.200-beta.24059.2 -> To Version 12.8.200-beta.24060.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5722d5b91bf..e46406508612 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - f0a96025b67d2614a7fe244f643665f31bed0532 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - f0a96025b67d2614a7fe244f643665f31bed0532 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - f0a96025b67d2614a7fe244f643665f31bed0532 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - f0a96025b67d2614a7fe244f643665f31bed0532 + 41185cf4240faf705904213e1a0468d8164c99a8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c26eb152ea6d..3a2155e5cdec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24061.39 - 8.0.200-preview.24061.39 - 8.0.200-preview.24061.39 + 8.0.200-preview.24061.45 + 8.0.200-preview.24061.45 + 8.0.200-preview.24061.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7b6ffd0a22704617fbd1173bca1b1c8be06741db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 18:44:32 +0000 Subject: [PATCH 118/652] Update dependencies from https://github.com/dotnet/sdk build 20240112.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.45 -> To Version 8.0.200-preview.24062.10 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 750bc6edfb70..0a4e6d72564a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + 67c548395fafd42a6ac4e3a7969242f72de5f8e2 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + 67c548395fafd42a6ac4e3a7969242f72de5f8e2 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + 67c548395fafd42a6ac4e3a7969242f72de5f8e2 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + 67c548395fafd42a6ac4e3a7969242f72de5f8e2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5bcd4880e95e..54146585edfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.200-preview.24061.45 - 8.0.200-preview.24061.45 - 8.0.200-preview.24061.45 + 8.0.200-preview.24062.10 + 8.0.200-preview.24062.10 + 8.0.200-preview.24062.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 53cb7c0a2287b6ba320806f5b28445cf15dada0b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 12 Jan 2024 11:50:03 -0800 Subject: [PATCH 119/652] Stabilize branding Update implicit versions --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5bcd4880e95e..7c413d4f63e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release preview @@ -26,8 +26,8 @@ 30 32 17 - 25 - 14 + $([MSBuild]::Add($(VersionFeature), 27)) + $([MSBuild]::Add($(VersionFeature), 16)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 89a709f0c07a1011df0b84b5269d662d0fb8567b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 12 Jan 2024 13:45:15 -0800 Subject: [PATCH 120/652] disable test that targets 6.0 --- test/SdkTests/TestConfig.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index ed432ea13e7f..245dd40e7188 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -257,5 +257,9 @@ Skip="true" Issue="" Reason="Requires props file not in installer repo"/> + From 8a3bb8090a5546364918e0e2fd70b6efc9e390c1 Mon Sep 17 00:00:00 2001 From: Forgind <12969783+Forgind@users.noreply.github.com> Date: Fri, 12 Jan 2024 14:27:20 -0800 Subject: [PATCH 121/652] Increase version (#18240) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5bcd4880e95e..66241754745f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,7 +7,7 @@ 8 0 - 2 + 3 00 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) From 0fe2917a54667f106d1971e424c0f2f0aaf6855f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 23:15:46 +0000 Subject: [PATCH 122/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240112.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.23621.3 -> To Version 1.1.0-beta.24062.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b8aebb8b0593..3c713eb84f8f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.23621.3", + "version": "1.1.0-beta.24062.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 750bc6edfb70..9e50c18660a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 61ae141d2bf3534619265c8f691fd55dc3e75147 - + https://github.com/dotnet/arcade-services - 702f946f89ace6197fdca2ac309d32187c4bc1bd + 3fe5ccd30a3bc843ca0a3e971bfe6ed70eda0825 - + https://github.com/dotnet/arcade-services - 702f946f89ace6197fdca2ac309d32187c4bc1bd + 3fe5ccd30a3bc843ca0a3e971bfe6ed70eda0825 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 66241754745f..1172f1ebcbeb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.23621.3 + 1.1.0-beta.24062.2 From 69302ed428b57075ddb546944da98a231f53ffe6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 23:17:03 +0000 Subject: [PATCH 123/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23502.1 -> To Version 8.0.0-alpha.1.24059.4 --- 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 750bc6edfb70..52e0261c9ea7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - ed17956dbc31097b7ba6a66be086f4a70a97d84f + 7134e53b6b1210a1ce8838b12b8f6071e0a3433b From b3743bf35490c506153434d0c16bf537cc044a06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 23:17:13 +0000 Subject: [PATCH 124/652] Update dependencies from https://github.com/dotnet/arcade build 20240110.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24059.4 -> To Version 8.0.0-beta.24060.4 --- 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 750bc6edfb70..bdae94ac1b2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + 888985fb9a9ae4cb30bca75f98af9126c839e660 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 66241754745f..f94cdd5e9019 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24059.4 + 8.0.0-beta.24060.4 diff --git a/global.json b/global.json index 52a0f29ecf49..57a162e417da 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.24059.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24059.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24060.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24060.4" } } From eff7d312197f6d4cb5cb318f5ab789d6b3218d1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Jan 2024 23:17:33 +0000 Subject: [PATCH 125/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23471.1 -> To Version 8.0.0-alpha.1.24061.1 --- 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 750bc6edfb70..b1339f75acf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 7b55da982fc6e71c1776c4de89111aee0eecb45a + 453a37ef7ae6c335cd49b3b9ab7713c87faeb265 From dce6942baedceb45ba62a6479a6eb5ce90c23f81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 14:09:21 +0000 Subject: [PATCH 126/652] Update dependencies from https://github.com/dotnet/arcade build 20240110.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24059.4 -> To Version 8.0.0-beta.24060.4 From 880b84c6fb4cb2da7666bfb17dea6d5270b72414 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 14:09:45 +0000 Subject: [PATCH 127/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23471.1 -> To Version 8.0.0-alpha.1.24061.1 From 6d6a603605321c2099fe0f45d9a760a1138bd8fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 14:13:17 +0000 Subject: [PATCH 128/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240112.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.23621.3 -> To Version 1.1.0-beta.24062.2 From 58f7541d77f37e5e209663c3e570776cb4ffd3db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Jan 2024 14:13:42 +0000 Subject: [PATCH 129/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23502.1 -> To Version 8.0.0-alpha.1.24059.4 From 933ee04a8083de282741f8933cd9fc97a8971aec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 14:00:48 +0000 Subject: [PATCH 130/652] Update dependencies from https://github.com/dotnet/arcade build 20240110.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24059.4 -> To Version 8.0.0-beta.24060.4 From 121ce389d6b9e774d091bbc0bb88d381a06f8699 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 14:01:09 +0000 Subject: [PATCH 131/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240111.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.23471.1 -> To Version 8.0.0-alpha.1.24061.1 From 6dadf0a8b53ac9421c55823da811a51e4523555b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 14:04:41 +0000 Subject: [PATCH 132/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240112.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.23621.3 -> To Version 1.1.0-beta.24062.2 From 4768421106cb874a52bd1184cab87b3583578229 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Jan 2024 14:05:08 +0000 Subject: [PATCH 133/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240109.4 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.23502.1 -> To Version 8.0.0-alpha.1.24059.4 From afd746c9ba8de304cb9d8db3dec0e17fa51cf359 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Jan 2024 13:51:31 +0000 Subject: [PATCH 134/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240115.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24062.2 -> To Version 1.1.0-beta.24065.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3c713eb84f8f..1e231bdb233b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24062.2", + "version": "1.1.0-beta.24065.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9ec5be5bed7..65514e542410 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade-services - 3fe5ccd30a3bc843ca0a3e971bfe6ed70eda0825 + 7fab0443ef68ca1e326678bfb6123a5e0fc4ac81 - + https://github.com/dotnet/arcade-services - 3fe5ccd30a3bc843ca0a3e971bfe6ed70eda0825 + 7fab0443ef68ca1e326678bfb6123a5e0fc4ac81 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 942e871c4a48..3dbf7ca5b957 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24062.2 + 1.1.0-beta.24065.1 From 9213169c26d570e1a209f7e46b47f9d04df60350 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jan 2024 14:13:49 +0000 Subject: [PATCH 135/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240116.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24065.1 -> To Version 1.1.0-beta.24066.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1e231bdb233b..fe98f4232f8e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24065.1", + "version": "1.1.0-beta.24066.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65514e542410..957ad6782550 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade-services - 7fab0443ef68ca1e326678bfb6123a5e0fc4ac81 + 13127001582f67623ee96d79e13cf11d1df31017 - + https://github.com/dotnet/arcade-services - 7fab0443ef68ca1e326678bfb6123a5e0fc4ac81 + 13127001582f67623ee96d79e13cf11d1df31017 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3dbf7ca5b957..e8417193cb9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24065.1 + 1.1.0-beta.24066.1 From cbd3e8573da4cc8c18e948e8c30a7946885a6c97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jan 2024 14:14:13 +0000 Subject: [PATCH 136/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240115.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24059.4 -> To Version 8.0.0-alpha.1.24065.1 --- 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 65514e542410..687db648c56d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7134e53b6b1210a1ce8838b12b8f6071e0a3433b + 83274d94c7e2ff21081b0d75ecbec2da2241f831 From ae16586f7637bef18e6c84d8a71a3cab46e60230 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 16 Jan 2024 21:58:19 -0800 Subject: [PATCH 137/652] Revert the changes in the eng folder --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 12 ++++++------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06df7ea46384..957ad6782550 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + 41185cf4240faf705904213e1a0468d8164c99a8 - + https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + 41185cf4240faf705904213e1a0468d8164c99a8 https://github.com/dotnet/test-templates @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 83274d94c7e2ff21081b0d75ecbec2da2241f831 + 7134e53b6b1210a1ce8838b12b8f6071e0a3433b diff --git a/eng/Versions.props b/eng/Versions.props index 49cfadf93912..e8417193cb9a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - true + false release preview @@ -26,8 +26,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 27)) - $([MSBuild]::Add($(VersionFeature), 16)) + 25 + 14 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 @@ -85,9 +85,9 @@ - 8.0.200-preview.24062.10 - 8.0.200-preview.24062.10 - 8.0.200-preview.24062.10 + 8.0.200-preview.24061.45 + 8.0.200-preview.24061.45 + 8.0.200-preview.24061.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From de4f1385b7cb12136bfca75fc20d19f6c4996a04 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Jan 2024 14:09:55 +0000 Subject: [PATCH 138/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240117.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24066.1 -> To Version 1.1.0-beta.24067.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index fe98f4232f8e..58251c5f5a5e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24066.1", + "version": "1.1.0-beta.24067.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d78efa337ea2..a8070b8174b6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade-services - 13127001582f67623ee96d79e13cf11d1df31017 + 0e7066949ad0fd9503cc4f3d138a4a9c68aa57bc - + https://github.com/dotnet/arcade-services - 13127001582f67623ee96d79e13cf11d1df31017 + 0e7066949ad0fd9503cc4f3d138a4a9c68aa57bc https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e8417193cb9a..1fb88a39ab00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24066.1 + 1.1.0-beta.24067.2 From edd193abd25ba278e43da09cd854b2c96234bb9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Jan 2024 23:26:38 +0000 Subject: [PATCH 139/652] Update dependencies from https://github.com/dotnet/sdk build 20240117.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24061.45 -> To Version 8.0.300-preview.24067.17 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.200-beta.24060.4 -> To Version 12.8.300-beta.24066.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 1 - eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba606dcba8ac..94ab32f7a38a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 957ad6782550..38aea4e5b8de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + a585c60cad72a31ff26125065c0cd861e861ec48 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + a585c60cad72a31ff26125065c0cd861e861ec48 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + a585c60cad72a31ff26125065c0cd861e861ec48 - + https://github.com/dotnet/sdk - 41185cf4240faf705904213e1a0468d8164c99a8 + a585c60cad72a31ff26125065c0cd861e861ec48 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 2e4dde8f8fd64aad0026cd03060698c30bf30a8d + 8d7795d4a68a21010577f11084ba937e51daf9a3 - + https://github.com/dotnet/fsharp - 2e4dde8f8fd64aad0026cd03060698c30bf30a8d + 8d7795d4a68a21010577f11084ba937e51daf9a3 @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - 28e49407a6e4744819bd471707259b99964e441c + fda44c407b951fe551c2a9935faf500bc3aea18b - + https://github.com/dotnet/msbuild - bb6fadf23225f5097f4e05ed507d93683a21ae56 + f1448f15870e0d229cb9ae6efe336b94cefe3ab3 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index e8417193cb9a..3ef7e211fbe9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.200-preview.24061.45 - 8.0.200-preview.24061.45 - 8.0.200-preview.24061.45 + 8.0.300-preview.24067.17 + 8.0.300-preview.24067.17 + 8.0.300-preview.24067.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.24054.13 + 4.10.0-1.24067.1 From 8aed5ea942fbc399befdf3f699c9cafa898bf416 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jan 2024 10:23:15 +0000 Subject: [PATCH 140/652] Update dependencies from https://github.com/dotnet/sdk build 20240118.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24067.17 -> To Version 8.0.300-preview.24068.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75b4da61f48a..26d323836cd6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - a585c60cad72a31ff26125065c0cd861e861ec48 + 3ec1b9940131afb0d1c837fabd755de040be84aa - + https://github.com/dotnet/sdk - a585c60cad72a31ff26125065c0cd861e861ec48 + 3ec1b9940131afb0d1c837fabd755de040be84aa - + https://github.com/dotnet/sdk - a585c60cad72a31ff26125065c0cd861e861ec48 + 3ec1b9940131afb0d1c837fabd755de040be84aa - + https://github.com/dotnet/sdk - a585c60cad72a31ff26125065c0cd861e861ec48 + 3ec1b9940131afb0d1c837fabd755de040be84aa https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7fb02d092ff0..436fc759488f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24067.17 - 8.0.300-preview.24067.17 - 8.0.300-preview.24067.17 + 8.0.300-preview.24068.5 + 8.0.300-preview.24068.5 + 8.0.300-preview.24068.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c3ba276434682a7f6cffd2066d0dba9d402417df Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jan 2024 14:04:10 +0000 Subject: [PATCH 141/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240117.3 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24067.2 -> To Version 1.1.0-beta.24067.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 58251c5f5a5e..e02fdf230a34 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24067.2", + "version": "1.1.0-beta.24067.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75b4da61f48a..32be90ff17b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade-services - 0e7066949ad0fd9503cc4f3d138a4a9c68aa57bc + 071e96dd7619c82088d061d9736f725216db6b21 - + https://github.com/dotnet/arcade-services - 0e7066949ad0fd9503cc4f3d138a4a9c68aa57bc + 071e96dd7619c82088d061d9736f725216db6b21 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7fb02d092ff0..54cdb8769f90 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24067.2 + 1.1.0-beta.24067.3 From 913012906e4a1098cea6e530fbdc6902e8693876 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jan 2024 15:32:06 +0000 Subject: [PATCH 142/652] Update dependencies from https://github.com/dotnet/test-templates build 20240118.1 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.24059.1 -> To Version 1.1.0-rc.24068.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0a4e6d72564a..0dd5184f08db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - 7d2f2719628e6744f3172a2d48e0d1f600b360c0 + ed71db57db0c5c92da6dca026a5eda695e1ea2c2 - + https://github.com/dotnet/test-templates - 7d2f2719628e6744f3172a2d48e0d1f600b360c0 + ed71db57db0c5c92da6dca026a5eda695e1ea2c2 - + https://github.com/dotnet/test-templates - 7d2f2719628e6744f3172a2d48e0d1f600b360c0 + ed71db57db0c5c92da6dca026a5eda695e1ea2c2 diff --git a/eng/Versions.props b/eng/Versions.props index 720b0ae3f178..f707807f9fdb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.24059.1 - 1.1.0-rc.24059.1 - 1.1.0-rc.24059.1 + 1.1.0-rc.24068.1 + 1.1.0-rc.24068.1 + 1.1.0-rc.24068.1 From eecdad660d560bfb50041e9fd7eae54ac130dad8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jan 2024 17:30:16 +0000 Subject: [PATCH 143/652] Update dependencies from https://github.com/dotnet/test-templates build 20240118.2 Microsoft.DotNet.Test.ProjectTemplates.6.0 , Microsoft.DotNet.Test.ProjectTemplates.7.0 , Microsoft.DotNet.Test.ProjectTemplates.8.0 From Version 1.1.0-rc.24059.1 -> To Version 1.1.0-rc.24068.2 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dd5184f08db..3471a6b452c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - ed71db57db0c5c92da6dca026a5eda695e1ea2c2 + 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://github.com/dotnet/test-templates - ed71db57db0c5c92da6dca026a5eda695e1ea2c2 + 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://github.com/dotnet/test-templates - ed71db57db0c5c92da6dca026a5eda695e1ea2c2 + 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 diff --git a/eng/Versions.props b/eng/Versions.props index f707807f9fdb..a1246fc5f728 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.24068.1 - 1.1.0-rc.24068.1 - 1.1.0-rc.24068.1 + 1.1.0-rc.24068.2 + 1.1.0-rc.24068.2 + 1.1.0-rc.24068.2 From af8936beb401e21ad3505fb171d3b2c6d1761ada Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jan 2024 18:14:52 +0000 Subject: [PATCH 144/652] Update dependencies from https://github.com/dotnet/sdk build 20240118.23 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24067.17 -> To Version 8.0.300-preview.24068.23 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-1.24067.1 -> To Version 4.10.0-1.24067.21 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26d323836cd6..05a1bb7a0bce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 3ec1b9940131afb0d1c837fabd755de040be84aa + d37744031f363a1108a5e17cf23b310f2bd6bd56 - + https://github.com/dotnet/sdk - 3ec1b9940131afb0d1c837fabd755de040be84aa + d37744031f363a1108a5e17cf23b310f2bd6bd56 - + https://github.com/dotnet/sdk - 3ec1b9940131afb0d1c837fabd755de040be84aa + d37744031f363a1108a5e17cf23b310f2bd6bd56 - + https://github.com/dotnet/sdk - 3ec1b9940131afb0d1c837fabd755de040be84aa + d37744031f363a1108a5e17cf23b310f2bd6bd56 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://github.com/dotnet/roslyn - fda44c407b951fe551c2a9935faf500bc3aea18b + 3cd939f76803da435c20b082a5cfcc844386fcfb diff --git a/eng/Versions.props b/eng/Versions.props index 436fc759488f..0de36df42b57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24068.5 - 8.0.300-preview.24068.5 - 8.0.300-preview.24068.5 + 8.0.300-preview.24068.23 + 8.0.300-preview.24068.23 + 8.0.300-preview.24068.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-1.24067.1 + 4.10.0-1.24067.21 From f72bc1a9c6b26339534c55b99d3e8cf2a0ed2698 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 18 Jan 2024 10:19:03 -0800 Subject: [PATCH 145/652] Update to the January implicit versions --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 7fb02d092ff0..008eebbe19a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - 25 - 14 + 26 + 15 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From b0dcc98b2ef542fdab663c23222d810d9efde146 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Jan 2024 00:14:15 +0000 Subject: [PATCH 146/652] Update dependencies from https://github.com/dotnet/sdk build 20240118.48 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24068.23 -> To Version 8.0.300-preview.24068.48 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24067-01 -> To Version 17.10.0-preview-24068-10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 746f118dc731..e0aab81eb853 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - d37744031f363a1108a5e17cf23b310f2bd6bd56 + b9141371365c722afbc78a9f298a0b388a917774 - + https://github.com/dotnet/sdk - d37744031f363a1108a5e17cf23b310f2bd6bd56 + b9141371365c722afbc78a9f298a0b388a917774 - + https://github.com/dotnet/sdk - d37744031f363a1108a5e17cf23b310f2bd6bd56 + b9141371365c722afbc78a9f298a0b388a917774 - + https://github.com/dotnet/sdk - d37744031f363a1108a5e17cf23b310f2bd6bd56 + b9141371365c722afbc78a9f298a0b388a917774 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - f1448f15870e0d229cb9ae6efe336b94cefe3ab3 + 6e97308dc4652452833d8ee1ca1d0c1cf5d17ad3 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index af57718eb29d..125c074491a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24068.23 - 8.0.300-preview.24068.23 - 8.0.300-preview.24068.23 + 8.0.300-preview.24068.48 + 8.0.300-preview.24068.48 + 8.0.300-preview.24068.48 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f07eca1c5758ecf0f1af68f1ddbce19a3c39d5d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 17:36:35 +0000 Subject: [PATCH 147/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200-preview.24062.10 -> To Version 8.0.200 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 17 +++++- eng/Version.Details.xml | 132 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++-------- 3 files changed, 106 insertions(+), 91 deletions(-) diff --git a/NuGet.config b/NuGet.config index ba606dcba8ac..ee1171ec626a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,12 +6,23 @@ + + + + + + + - + + + + + @@ -31,11 +42,15 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3471a6b452c2..6c765391eb69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - - https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + b52099fa633d4a8951144072c341cf859df36b45 - - https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + b52099fa633d4a8951144072c341cf859df36b45 - - https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + b52099fa633d4a8951144072c341cf859df36b45 - - https://github.com/dotnet/sdk - 67c548395fafd42a6ac4e3a7969242f72de5f8e2 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + b52099fa633d4a8951144072c341cf859df36b45 https://github.com/dotnet/test-templates @@ -124,21 +124,21 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 2e4dde8f8fd64aad0026cd03060698c30bf30a8d + a7979111f86ab7332897ea617635bf3435c39bc3 - + https://github.com/dotnet/fsharp - 2e4dde8f8fd64aad0026cd03060698c30bf30a8d + a7979111f86ab7332897ea617635bf3435c39bc3 @@ -146,18 +146,18 @@ 053d7114a72aac12d1382ecc2a23b2dfdd5b084b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 28e49407a6e4744819bd471707259b99964e441c + 4fc721bbc2c0eac5931f588e1d14ab2a1f936646 - + https://github.com/dotnet/msbuild - bb6fadf23225f5097f4e05ed507d93683a21ae56 + 90725d08d9825ad5897029b47f600345c29125b7 https://github.com/nuget/nuget.client @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d diff --git a/eng/Versions.props b/eng/Versions.props index a1246fc5f728..cb3811182281 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.5 + 8.0.2-servicing.24068.3 - 8.0.0-rtm.23531.4 + 8.0.2-servicing.24068.6 @@ -72,50 +72,50 @@ - 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 + 8.0.2 + 8.0.2 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 0.2.0 - 8.0.200-preview.24062.10 - 8.0.200-preview.24062.10 - 8.0.200-preview.24062.10 + 8.0.200 + 8.0.200-rtm.24069.6 + 8.0.200-rtm.24069.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.24054.13 + 4.9.0-3.24067.18 - 8.0.0-rtm.23531.3 + 8.0.2-servicing.24067.11 - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2 + 8.0.2 + 8.0.2 + 8.0.2 2.1.0 - 8.0.0-rtm.23551.1 - 8.0.0-rtm.23551.1 - 8.0.0 - 8.0.0 + 8.0.2-servicing.24068.6 + 8.0.2-servicing.24068.6 + 8.0.2 + 8.0.2 From 26661b74715a327a0fca68641f419cb01785837f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 19:12:53 +0000 Subject: [PATCH 148/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200 -> To Version 8.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.9.0-rc.74 -> To Version 6.9.1-rc.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index ee1171ec626a..b05f5723022b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c765391eb69..3c2b0dd78a41 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b52099fa633d4a8951144072c341cf859df36b45 + a96621e7a46f1549e058719777f4c12650cc5ee7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b52099fa633d4a8951144072c341cf859df36b45 + a96621e7a46f1549e058719777f4c12650cc5ee7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b52099fa633d4a8951144072c341cf859df36b45 + a96621e7a46f1549e058719777f4c12650cc5ee7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b52099fa633d4a8951144072c341cf859df36b45 + a96621e7a46f1549e058719777f4c12650cc5ee7 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 90725d08d9825ad5897029b47f600345c29125b7 - - https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf diff --git a/eng/Versions.props b/eng/Versions.props index cb3811182281..b37213b7ee1a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.200 - 8.0.200-rtm.24069.6 - 8.0.200-rtm.24069.6 + 8.0.200-rtm.24069.11 + 8.0.200-rtm.24069.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-rc.74 + 6.9.1-rc.3 From 746e3e55e52bc944f3689bca5060463199d912bb Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 19 Jan 2024 19:51:37 +0000 Subject: [PATCH 149/652] Fix the emsdk versions.props entry --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index b37213b7ee1a..28210248b03c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -249,8 +249,8 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) + 8.0.2 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From b27c71890f6e5caba07e04cd44172aed84117fb4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Jan 2024 20:20:57 +0000 Subject: [PATCH 150/652] Update dependencies from https://github.com/dotnet/sdk build 20240119.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24068.48 -> To Version 8.0.300-preview.24069.15 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e0aab81eb853..7ec6501b823b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - b9141371365c722afbc78a9f298a0b388a917774 + 0c3f6485f40d050665746abd7f75acb4950ee256 - + https://github.com/dotnet/sdk - b9141371365c722afbc78a9f298a0b388a917774 + 0c3f6485f40d050665746abd7f75acb4950ee256 - + https://github.com/dotnet/sdk - b9141371365c722afbc78a9f298a0b388a917774 + 0c3f6485f40d050665746abd7f75acb4950ee256 - + https://github.com/dotnet/sdk - b9141371365c722afbc78a9f298a0b388a917774 + 0c3f6485f40d050665746abd7f75acb4950ee256 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 125c074491a7..133f4f60ff80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24068.48 - 8.0.300-preview.24068.48 - 8.0.300-preview.24068.48 + 8.0.300-preview.24069.15 + 8.0.300-preview.24069.15 + 8.0.300-preview.24069.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c26160121f0b4ac08ce944ffd0f92a1a061ec2dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 20:52:26 +0000 Subject: [PATCH 151/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240119.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200 -> To Version 8.0.200 Dependency coherency updates NuGet.Build.Tasks From Version 6.9.0-rc.74 -> To Version 6.9.1-rc.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index b05f5723022b..bd0c810122ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c2b0dd78a41..503791971797 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a96621e7a46f1549e058719777f4c12650cc5ee7 + af4967de46a87229c49f6d567028791c4c4683d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a96621e7a46f1549e058719777f4c12650cc5ee7 + af4967de46a87229c49f6d567028791c4c4683d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a96621e7a46f1549e058719777f4c12650cc5ee7 + af4967de46a87229c49f6d567028791c4c4683d0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a96621e7a46f1549e058719777f4c12650cc5ee7 + af4967de46a87229c49f6d567028791c4c4683d0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 28210248b03c..c9d82544cdcd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.200 - 8.0.200-rtm.24069.11 - 8.0.200-rtm.24069.11 + 8.0.200-rtm.24069.18 + 8.0.200-rtm.24069.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e64b794cd14f57dd18bc89888bbbe07419167d7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Jan 2024 21:23:35 +0000 Subject: [PATCH 152/652] Update dependencies from https://github.com/dotnet/sdk build 20240119.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24068.48 -> To Version 8.0.300-preview.24069.20 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24068-10 -> To Version 17.10.0-preview-24069-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ec6501b823b..a42d5d2266de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 0c3f6485f40d050665746abd7f75acb4950ee256 + 5c4b7934c2925f372b8ddbecb68395eb3d4cb9e4 - + https://github.com/dotnet/sdk - 0c3f6485f40d050665746abd7f75acb4950ee256 + 5c4b7934c2925f372b8ddbecb68395eb3d4cb9e4 - + https://github.com/dotnet/sdk - 0c3f6485f40d050665746abd7f75acb4950ee256 + 5c4b7934c2925f372b8ddbecb68395eb3d4cb9e4 - + https://github.com/dotnet/sdk - 0c3f6485f40d050665746abd7f75acb4950ee256 + 5c4b7934c2925f372b8ddbecb68395eb3d4cb9e4 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - 6e97308dc4652452833d8ee1ca1d0c1cf5d17ad3 + 0932b436c6fa26bb356ce21815d5892ed41834d3 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 133f4f60ff80..6160ff572b4d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24069.15 - 8.0.300-preview.24069.15 - 8.0.300-preview.24069.15 + 8.0.300-preview.24069.20 + 8.0.300-preview.24069.20 + 8.0.300-preview.24069.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2049e89716a67844e08a8e746f3466e63922fcb7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Jan 2024 00:24:38 +0000 Subject: [PATCH 153/652] Update dependencies from https://github.com/dotnet/sdk build 20240119.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24069.20 -> To Version 8.0.300-preview.24069.24 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a42d5d2266de..e68f36fdc7b0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 5c4b7934c2925f372b8ddbecb68395eb3d4cb9e4 + 5395566bc10e7c482085c2deec909905177e23d7 - + https://github.com/dotnet/sdk - 5c4b7934c2925f372b8ddbecb68395eb3d4cb9e4 + 5395566bc10e7c482085c2deec909905177e23d7 - + https://github.com/dotnet/sdk - 5c4b7934c2925f372b8ddbecb68395eb3d4cb9e4 + 5395566bc10e7c482085c2deec909905177e23d7 - + https://github.com/dotnet/sdk - 5c4b7934c2925f372b8ddbecb68395eb3d4cb9e4 + 5395566bc10e7c482085c2deec909905177e23d7 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6160ff572b4d..2e238296dd46 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24069.20 - 8.0.300-preview.24069.20 - 8.0.300-preview.24069.20 + 8.0.300-preview.24069.24 + 8.0.300-preview.24069.24 + 8.0.300-preview.24069.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e550daea83ef416f976256e563ce6e22f2ede5ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jan 2024 03:25:10 +0000 Subject: [PATCH 154/652] Update dependencies from https://github.com/dotnet/sdk build 20240121.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24069.24 -> To Version 8.0.300-preview.24071.1 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24069-02 -> To Version 17.10.0-preview-24069-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e68f36fdc7b0..e4a80678185c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 5395566bc10e7c482085c2deec909905177e23d7 + 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 - + https://github.com/dotnet/sdk - 5395566bc10e7c482085c2deec909905177e23d7 + 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 - + https://github.com/dotnet/sdk - 5395566bc10e7c482085c2deec909905177e23d7 + 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 - + https://github.com/dotnet/sdk - 5395566bc10e7c482085c2deec909905177e23d7 + 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - 0932b436c6fa26bb356ce21815d5892ed41834d3 + 6d97976719d4aefae595ee919b942da452e97e57 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 2e238296dd46..68f76d482ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24069.24 - 8.0.300-preview.24069.24 - 8.0.300-preview.24069.24 + 8.0.300-preview.24071.1 + 8.0.300-preview.24071.1 + 8.0.300-preview.24071.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7bc6ef016aebc9da4f49bfab0ed796c622428674 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jan 2024 21:17:07 +0000 Subject: [PATCH 155/652] Update dependencies from https://github.com/dotnet/sdk build 20240122.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24071.1 -> To Version 8.0.300-preview.24072.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4a80678185c..04a5534d6257 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 + 82605fd9c0404af0a4b844a9bcd4312f9b830803 - + https://github.com/dotnet/sdk - 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 + 82605fd9c0404af0a4b844a9bcd4312f9b830803 - + https://github.com/dotnet/sdk - 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 + 82605fd9c0404af0a4b844a9bcd4312f9b830803 - + https://github.com/dotnet/sdk - 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 + 82605fd9c0404af0a4b844a9bcd4312f9b830803 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 68f76d482ae8..40e32aa0c111 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24071.1 - 8.0.300-preview.24071.1 - 8.0.300-preview.24071.1 + 8.0.300-preview.24072.4 + 8.0.300-preview.24072.4 + 8.0.300-preview.24072.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e3d166056f7578ece46c7987f5b8b6c053bb21e6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jan 2024 23:10:26 +0000 Subject: [PATCH 156/652] Update dependencies from https://github.com/dotnet/sdk build 20240122.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24071.1 -> To Version 8.0.300-preview.24072.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 04a5534d6257..0b0680650a0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 82605fd9c0404af0a4b844a9bcd4312f9b830803 + 0dee7d7a926f90ac38d298c09ecd122bd71f9ce4 - + https://github.com/dotnet/sdk - 82605fd9c0404af0a4b844a9bcd4312f9b830803 + 0dee7d7a926f90ac38d298c09ecd122bd71f9ce4 - + https://github.com/dotnet/sdk - 82605fd9c0404af0a4b844a9bcd4312f9b830803 + 0dee7d7a926f90ac38d298c09ecd122bd71f9ce4 - + https://github.com/dotnet/sdk - 82605fd9c0404af0a4b844a9bcd4312f9b830803 + 0dee7d7a926f90ac38d298c09ecd122bd71f9ce4 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 40e32aa0c111..dce4fab86ea7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24072.4 - 8.0.300-preview.24072.4 - 8.0.300-preview.24072.4 + 8.0.300-preview.24072.6 + 8.0.300-preview.24072.6 + 8.0.300-preview.24072.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 99f080168b17e7bad0ea506931ce35d580dc7da6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jan 2024 02:48:46 +0000 Subject: [PATCH 157/652] Update dependencies from https://github.com/dotnet/sdk build 20240122.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24072.6 -> To Version 8.0.300-preview.24072.11 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b0680650a0e..605f3445e957 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 0dee7d7a926f90ac38d298c09ecd122bd71f9ce4 + fc1a0860b3a5995a467ae3425cbe9c11812c0221 - + https://github.com/dotnet/sdk - 0dee7d7a926f90ac38d298c09ecd122bd71f9ce4 + fc1a0860b3a5995a467ae3425cbe9c11812c0221 - + https://github.com/dotnet/sdk - 0dee7d7a926f90ac38d298c09ecd122bd71f9ce4 + fc1a0860b3a5995a467ae3425cbe9c11812c0221 - + https://github.com/dotnet/sdk - 0dee7d7a926f90ac38d298c09ecd122bd71f9ce4 + fc1a0860b3a5995a467ae3425cbe9c11812c0221 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index dce4fab86ea7..14da891733a9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24072.6 - 8.0.300-preview.24072.6 - 8.0.300-preview.24072.6 + 8.0.300-preview.24072.11 + 8.0.300-preview.24072.11 + 8.0.300-preview.24072.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7458ac187af84c3f1f7ccd6e74d8cd62207085b5 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 22 Jan 2024 22:02:09 -0800 Subject: [PATCH 158/652] Revert the changes in the eng folder --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e832f3076ff0..e4a80678185c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - fc1a0860b3a5995a467ae3425cbe9c11812c0221 + 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 - + https://github.com/dotnet/sdk - fc1a0860b3a5995a467ae3425cbe9c11812c0221 + 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 - + https://github.com/dotnet/sdk - fc1a0860b3a5995a467ae3425cbe9c11812c0221 + 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 - + https://github.com/dotnet/sdk - fc1a0860b3a5995a467ae3425cbe9c11812c0221 + 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 https://github.com/dotnet/test-templates @@ -110,18 +110,18 @@ https://github.com/dotnet/test-templates 1e5f3603af2277910aad946736ee23283e7f3e16 - + https://github.com/dotnet/test-templates - 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 + 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://github.com/dotnet/test-templates - 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 + 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://github.com/dotnet/test-templates - 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 + 7d2f2719628e6744f3172a2d48e0d1f600b360c0 diff --git a/eng/Versions.props b/eng/Versions.props index 579fb301d176..68f76d482ae8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,9 +62,9 @@ 1.1.0-rc.22558.1 1.1.0-rc.23410.2 - 1.1.0-rc.24068.2 - 1.1.0-rc.24068.2 - 1.1.0-rc.24068.2 + 1.1.0-rc.24059.1 + 1.1.0-rc.24059.1 + 1.1.0-rc.24059.1 @@ -85,9 +85,9 @@ - 8.0.300-preview.24072.11 - 8.0.300-preview.24072.11 - 8.0.300-preview.24072.11 + 8.0.300-preview.24071.1 + 8.0.300-preview.24071.1 + 8.0.300-preview.24071.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 34dff3dca12c4097d0926c7a9d7070e649872968 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jan 2024 14:03:31 +0000 Subject: [PATCH 159/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240123.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24067.3 -> To Version 1.1.0-beta.24073.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e02fdf230a34..541597d59873 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24067.3", + "version": "1.1.0-beta.24073.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 605f3445e957..8f488b77b54c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade-services - 071e96dd7619c82088d061d9736f725216db6b21 + 94608f93ee72a99bd613d3f922e095daeb4d1bf1 - + https://github.com/dotnet/arcade-services - 071e96dd7619c82088d061d9736f725216db6b21 + 94608f93ee72a99bd613d3f922e095daeb4d1bf1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 14da891733a9..c722ae60f490 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24067.3 + 1.1.0-beta.24073.2 From 3ff35f4b3e9d84d0c195305c2235b103b41e637e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jan 2024 20:44:41 +0000 Subject: [PATCH 160/652] Update dependencies from https://github.com/dotnet/sdk build 20240123.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24071.1 -> To Version 8.0.300-preview.24073.8 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24069-03 -> To Version 17.10.0-preview-24073-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4a80678185c..f9d7f212f311 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 + 31a989319810e1a861b20b8bf1b9ca5903717571 - + https://github.com/dotnet/sdk - 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 + 31a989319810e1a861b20b8bf1b9ca5903717571 - + https://github.com/dotnet/sdk - 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 + 31a989319810e1a861b20b8bf1b9ca5903717571 - + https://github.com/dotnet/sdk - 00e0fb47b46b3eb8c626b57f1b8a250e3688e361 + 31a989319810e1a861b20b8bf1b9ca5903717571 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - 6d97976719d4aefae595ee919b942da452e97e57 + f0936bf4b63d97a87e163fb1cb204e447550bcae https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 0997fb80bf76..b314117a13d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24071.1 - 8.0.300-preview.24071.1 - 8.0.300-preview.24071.1 + 8.0.300-preview.24073.8 + 8.0.300-preview.24073.8 + 8.0.300-preview.24073.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f1fb2695f5406a60f6b759245762f62e3b661e16 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jan 2024 21:59:02 +0000 Subject: [PATCH 161/652] Update dependencies from https://github.com/dotnet/sdk build 20240123.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24071.1 -> To Version 8.0.300-preview.24073.13 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24069-03 -> To Version 17.10.0-preview-24073-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f9d7f212f311..6729947e7844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 31a989319810e1a861b20b8bf1b9ca5903717571 + 572b3f11710aefd4e5db524a5265b3f325741d1e - + https://github.com/dotnet/sdk - 31a989319810e1a861b20b8bf1b9ca5903717571 + 572b3f11710aefd4e5db524a5265b3f325741d1e - + https://github.com/dotnet/sdk - 31a989319810e1a861b20b8bf1b9ca5903717571 + 572b3f11710aefd4e5db524a5265b3f325741d1e - + https://github.com/dotnet/sdk - 31a989319810e1a861b20b8bf1b9ca5903717571 + 572b3f11710aefd4e5db524a5265b3f325741d1e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b314117a13d6..e476ffc41820 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24073.8 - 8.0.300-preview.24073.8 - 8.0.300-preview.24073.8 + 8.0.300-preview.24073.13 + 8.0.300-preview.24073.13 + 8.0.300-preview.24073.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 03a4f0b0fa9150a6fef61a478be0b21d673c864f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jan 2024 03:28:48 +0000 Subject: [PATCH 162/652] Update dependencies from https://github.com/dotnet/sdk build 20240123.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24073.13 -> To Version 8.0.300-preview.24073.21 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92ae7850933d..9165e47d330b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 572b3f11710aefd4e5db524a5265b3f325741d1e + e02e2e79ed65799793b85a994cc7a7cc183ce0b8 - + https://github.com/dotnet/sdk - 572b3f11710aefd4e5db524a5265b3f325741d1e + e02e2e79ed65799793b85a994cc7a7cc183ce0b8 - + https://github.com/dotnet/sdk - 572b3f11710aefd4e5db524a5265b3f325741d1e + e02e2e79ed65799793b85a994cc7a7cc183ce0b8 - + https://github.com/dotnet/sdk - 572b3f11710aefd4e5db524a5265b3f325741d1e + e02e2e79ed65799793b85a994cc7a7cc183ce0b8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index eb848b6ca150..d3ca3b41a3ae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24073.13 - 8.0.300-preview.24073.13 - 8.0.300-preview.24073.13 + 8.0.300-preview.24073.21 + 8.0.300-preview.24073.21 + 8.0.300-preview.24073.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ebe57d61888415e5292382782676c18a2db57a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jan 2024 14:03:37 +0000 Subject: [PATCH 163/652] Update dependencies from https://github.com/dotnet/arcade build 20240124.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24060.4 -> To Version 8.0.0-beta.24074.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 9165e47d330b..688a55ab9b77 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 888985fb9a9ae4cb30bca75f98af9126c839e660 + 96c2cee493aa1542c0b06a6498e0379eb11e005f - + https://github.com/dotnet/arcade - 888985fb9a9ae4cb30bca75f98af9126c839e660 + 96c2cee493aa1542c0b06a6498e0379eb11e005f - + https://github.com/dotnet/arcade - 888985fb9a9ae4cb30bca75f98af9126c839e660 + 96c2cee493aa1542c0b06a6498e0379eb11e005f https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d3ca3b41a3ae..39a4434d1e56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24060.4 + 8.0.0-beta.24074.2 diff --git a/global.json b/global.json index 57a162e417da..1555822ddfa3 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.24060.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24060.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24074.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24074.2" } } From 269dff59628a9f7128b23179ee147315c36de568 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jan 2024 14:10:41 +0000 Subject: [PATCH 164/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240124.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24073.2 -> To Version 1.1.0-beta.24074.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 541597d59873..44d3876d9b2c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24073.2", + "version": "1.1.0-beta.24074.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9165e47d330b..7d3acc433707 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 888985fb9a9ae4cb30bca75f98af9126c839e660 - + https://github.com/dotnet/arcade-services - 94608f93ee72a99bd613d3f922e095daeb4d1bf1 + 70e9b79b12680b7be6c36913f1d0ecb5cc9e32cf - + https://github.com/dotnet/arcade-services - 94608f93ee72a99bd613d3f922e095daeb4d1bf1 + 70e9b79b12680b7be6c36913f1d0ecb5cc9e32cf https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d3ca3b41a3ae..b0b63ad18cb9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24073.2 + 1.1.0-beta.24074.1 From 039da4b5ee06c5ccc46ee605472e416d1b29d743 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jan 2024 19:34:06 +0000 Subject: [PATCH 165/652] Update dependencies from https://github.com/dotnet/sdk build 20240124.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24073.21 -> To Version 8.0.300-preview.24074.6 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24073-01 -> To Version 17.10.0-preview-24073-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c3aa7f3c7f0c..362a9dbe34a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - e02e2e79ed65799793b85a994cc7a7cc183ce0b8 + 9ea2d1339b454b4b9b3a45c4764bc43dfd578c61 - + https://github.com/dotnet/sdk - e02e2e79ed65799793b85a994cc7a7cc183ce0b8 + 9ea2d1339b454b4b9b3a45c4764bc43dfd578c61 - + https://github.com/dotnet/sdk - e02e2e79ed65799793b85a994cc7a7cc183ce0b8 + 9ea2d1339b454b4b9b3a45c4764bc43dfd578c61 - + https://github.com/dotnet/sdk - e02e2e79ed65799793b85a994cc7a7cc183ce0b8 + 9ea2d1339b454b4b9b3a45c4764bc43dfd578c61 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - f0936bf4b63d97a87e163fb1cb204e447550bcae + d51ae5297cd0a24caa8cfe356442cc8634c3f087 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index f233ba74dad8..d66377886ae2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24073.21 - 8.0.300-preview.24073.21 - 8.0.300-preview.24073.21 + 8.0.300-preview.24074.6 + 8.0.300-preview.24074.6 + 8.0.300-preview.24074.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1f2d141e2f9a22b9fe8643c19750b69100308407 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jan 2024 20:30:47 +0000 Subject: [PATCH 166/652] Update dependencies from https://github.com/dotnet/sdk build 20240124.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24073.21 -> To Version 8.0.300-preview.24074.8 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.10.0-preview-24073-01 -> To Version 17.10.0-preview-24073-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 362a9dbe34a5..9fc5d702fe7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 9ea2d1339b454b4b9b3a45c4764bc43dfd578c61 + 8382d65bf318158a4a7d4f44707a268450cf2fca - + https://github.com/dotnet/sdk - 9ea2d1339b454b4b9b3a45c4764bc43dfd578c61 + 8382d65bf318158a4a7d4f44707a268450cf2fca - + https://github.com/dotnet/sdk - 9ea2d1339b454b4b9b3a45c4764bc43dfd578c61 + 8382d65bf318158a4a7d4f44707a268450cf2fca - + https://github.com/dotnet/sdk - 9ea2d1339b454b4b9b3a45c4764bc43dfd578c61 + 8382d65bf318158a4a7d4f44707a268450cf2fca https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild d51ae5297cd0a24caa8cfe356442cc8634c3f087 - + https://github.com/nuget/nuget.client - e92be3915309e687044768de38933ac5fc4cb40c + e4899ee48ff3d7787ee345f546c818ce6b962807 diff --git a/eng/Versions.props b/eng/Versions.props index d66377886ae2..927620225bd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24074.6 - 8.0.300-preview.24074.6 - 8.0.300-preview.24074.6 + 8.0.300-preview.24074.8 + 8.0.300-preview.24074.8 + 8.0.300-preview.24074.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.9.0-rc.74 + 6.10.0-preview.1.12 From 1d299436a182643451ced707c31d6de306769b62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jan 2024 00:27:20 +0000 Subject: [PATCH 167/652] Update dependencies from https://github.com/dotnet/sdk build 20240124.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24074.8 -> To Version 8.0.300-preview.24074.14 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9fc5d702fe7e..4b594ac1dd05 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 8382d65bf318158a4a7d4f44707a268450cf2fca + 9e951d5dfe46de5be914f76d723f1ed3aa4c1933 - + https://github.com/dotnet/sdk - 8382d65bf318158a4a7d4f44707a268450cf2fca + 9e951d5dfe46de5be914f76d723f1ed3aa4c1933 - + https://github.com/dotnet/sdk - 8382d65bf318158a4a7d4f44707a268450cf2fca + 9e951d5dfe46de5be914f76d723f1ed3aa4c1933 - + https://github.com/dotnet/sdk - 8382d65bf318158a4a7d4f44707a268450cf2fca + 9e951d5dfe46de5be914f76d723f1ed3aa4c1933 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 927620225bd8..a8cf2eb7ba7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24074.8 - 8.0.300-preview.24074.8 - 8.0.300-preview.24074.8 + 8.0.300-preview.24074.14 + 8.0.300-preview.24074.14 + 8.0.300-preview.24074.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d17cc4976185a2ab898ff299cef7c202cd46a8af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jan 2024 09:38:23 +0000 Subject: [PATCH 168/652] Update dependencies from https://github.com/dotnet/sdk build 20240125.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24074.14 -> To Version 8.0.300-preview.24075.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b594ac1dd05..739dd571a249 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 9e951d5dfe46de5be914f76d723f1ed3aa4c1933 + 1304a6f0303216c40e125df4de08a1677940ad37 - + https://github.com/dotnet/sdk - 9e951d5dfe46de5be914f76d723f1ed3aa4c1933 + 1304a6f0303216c40e125df4de08a1677940ad37 - + https://github.com/dotnet/sdk - 9e951d5dfe46de5be914f76d723f1ed3aa4c1933 + 1304a6f0303216c40e125df4de08a1677940ad37 - + https://github.com/dotnet/sdk - 9e951d5dfe46de5be914f76d723f1ed3aa4c1933 + 1304a6f0303216c40e125df4de08a1677940ad37 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a8cf2eb7ba7d..d36675001c57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24074.14 - 8.0.300-preview.24074.14 - 8.0.300-preview.24074.14 + 8.0.300-preview.24075.2 + 8.0.300-preview.24075.2 + 8.0.300-preview.24075.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7b5ad14dd2d7743636539ab6d80dbf2f72fb150c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jan 2024 14:01:11 +0000 Subject: [PATCH 169/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240124.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24074.1 -> To Version 1.1.0-beta.24074.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 44d3876d9b2c..b88ce43b02cc 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24074.1", + "version": "1.1.0-beta.24074.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 739dd571a249..d939cc4fea50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 96c2cee493aa1542c0b06a6498e0379eb11e005f - + https://github.com/dotnet/arcade-services - 70e9b79b12680b7be6c36913f1d0ecb5cc9e32cf + 515f0dc18ab7997cb52cb5722cda1f4245910626 - + https://github.com/dotnet/arcade-services - 70e9b79b12680b7be6c36913f1d0ecb5cc9e32cf + 515f0dc18ab7997cb52cb5722cda1f4245910626 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d36675001c57..f50da251be8e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24074.1 + 1.1.0-beta.24074.2 From faf351a8ade8dec97d135da0ab5ecbf6b81e49d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jan 2024 19:05:53 +0000 Subject: [PATCH 170/652] Update dependencies from https://github.com/dotnet/sdk build 20240125.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24075.2 -> To Version 8.0.300-preview.24075.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 739dd571a249..4cc16f0fa61a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1304a6f0303216c40e125df4de08a1677940ad37 + ec6f1420fdd732aa27c30a2e78a55a6997c6703f - + https://github.com/dotnet/sdk - 1304a6f0303216c40e125df4de08a1677940ad37 + ec6f1420fdd732aa27c30a2e78a55a6997c6703f - + https://github.com/dotnet/sdk - 1304a6f0303216c40e125df4de08a1677940ad37 + ec6f1420fdd732aa27c30a2e78a55a6997c6703f - + https://github.com/dotnet/sdk - 1304a6f0303216c40e125df4de08a1677940ad37 + ec6f1420fdd732aa27c30a2e78a55a6997c6703f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d36675001c57..a7cf1062d859 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24075.2 - 8.0.300-preview.24075.2 - 8.0.300-preview.24075.2 + 8.0.300-preview.24075.4 + 8.0.300-preview.24075.4 + 8.0.300-preview.24075.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 42f557262305679ad5800cc0674afaac4984fdc7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jan 2024 20:37:34 +0000 Subject: [PATCH 171/652] Update dependencies from https://github.com/dotnet/sdk build 20240125.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24075.2 -> To Version 8.0.300-preview.24075.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cc16f0fa61a..ccf0ac68d9e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - ec6f1420fdd732aa27c30a2e78a55a6997c6703f + 1d1b3c94a9963bc6d64b4577c1dd720251a7fc24 - + https://github.com/dotnet/sdk - ec6f1420fdd732aa27c30a2e78a55a6997c6703f + 1d1b3c94a9963bc6d64b4577c1dd720251a7fc24 - + https://github.com/dotnet/sdk - ec6f1420fdd732aa27c30a2e78a55a6997c6703f + 1d1b3c94a9963bc6d64b4577c1dd720251a7fc24 - + https://github.com/dotnet/sdk - ec6f1420fdd732aa27c30a2e78a55a6997c6703f + 1d1b3c94a9963bc6d64b4577c1dd720251a7fc24 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index a7cf1062d859..ddbcfbec8490 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24075.4 - 8.0.300-preview.24075.4 - 8.0.300-preview.24075.4 + 8.0.300-preview.24075.8 + 8.0.300-preview.24075.8 + 8.0.300-preview.24075.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f603126d124eaf3043a89882f44cb3b8a15949bf Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 25 Jan 2024 21:48:30 -0800 Subject: [PATCH 172/652] Update alpine image tag --- .vsts-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 655c9d190fe5..429c53be0639 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -121,7 +121,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Debug buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' @@ -222,7 +222,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' buildConfiguration: Release buildArchitecture: x64 runtimeIdentifier: 'linux-musl-x64' From c72ab99b91f86f94eed5b91aba03f6e7c7679360 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jan 2024 17:32:28 +0000 Subject: [PATCH 173/652] Update dependencies from https://github.com/dotnet/sdk build 20240126.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24075.8 -> To Version 8.0.300-preview.24076.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24066.3 -> To Version 12.8.300-beta.24075.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f775f2bf6c9..bff1a7432611 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1d1b3c94a9963bc6d64b4577c1dd720251a7fc24 + b96488d547e1598fa53442bf7b9492f092b4b2a0 - + https://github.com/dotnet/sdk - 1d1b3c94a9963bc6d64b4577c1dd720251a7fc24 + b96488d547e1598fa53442bf7b9492f092b4b2a0 - + https://github.com/dotnet/sdk - 1d1b3c94a9963bc6d64b4577c1dd720251a7fc24 + b96488d547e1598fa53442bf7b9492f092b4b2a0 - + https://github.com/dotnet/sdk - 1d1b3c94a9963bc6d64b4577c1dd720251a7fc24 + b96488d547e1598fa53442bf7b9492f092b4b2a0 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 8d7795d4a68a21010577f11084ba937e51daf9a3 + 32898dc51efc669de98e7e47f57d521bc07ac4cc - + https://github.com/dotnet/fsharp - 8d7795d4a68a21010577f11084ba937e51daf9a3 + 32898dc51efc669de98e7e47f57d521bc07ac4cc diff --git a/eng/Versions.props b/eng/Versions.props index 334d4398bc83..9c25d28ea64d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24075.8 - 8.0.300-preview.24075.8 - 8.0.300-preview.24075.8 + 8.0.300-preview.24076.4 + 8.0.300-preview.24076.4 + 8.0.300-preview.24076.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 84ea85192bb26fefe33648e5aba912f6828f912c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 26 Jan 2024 11:46:10 -0800 Subject: [PATCH 174/652] Separate out the test exclusions that apply to stable SDKs when we're targeting the latest downlevel runtime. This should simplify things as we want to run these tests at least some of the time but codeflow ends up removing them. --- test/SdkTests/SdkTests.csproj | 6 +- test/SdkTests/TestConfig.xml | 200 -------------------------- test/SdkTests/TestConfigStableSDK.xml | 200 ++++++++++++++++++++++++++ 3 files changed, 205 insertions(+), 201 deletions(-) create mode 100644 test/SdkTests/TestConfigStableSDK.xml diff --git a/test/SdkTests/SdkTests.csproj b/test/SdkTests/SdkTests.csproj index 8902bb1a6875..dd8620df0c81 100644 --- a/test/SdkTests/SdkTests.csproj +++ b/test/SdkTests/SdkTests.csproj @@ -1,4 +1,4 @@ - + false @@ -215,6 +215,10 @@ $(TestArgs) -testList SdkIntegrationTests + + + $(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipStableSDK.xml" + diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 245dd40e7188..9b38840fd8ab 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -45,10 +45,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/test/SdkTests/TestConfigStableSDK.xml b/test/SdkTests/TestConfigStableSDK.xml new file mode 100644 index 000000000000..7140b5f76696 --- /dev/null +++ b/test/SdkTests/TestConfigStableSDK.xml @@ -0,0 +1,200 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From b230279c695eb6646c22a22193d72fc948f4be8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jan 2024 20:11:03 +0000 Subject: [PATCH 175/652] Update dependencies from https://github.com/dotnet/sdk build 20240126.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24076.4 -> To Version 8.0.300-preview.24076.9 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24073-02 -> To Version 17.10.0-preview-24076-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bff1a7432611..b554df4afe53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - b96488d547e1598fa53442bf7b9492f092b4b2a0 + 1bf5fd5fb0a4a249b2d4bf43fbcb6541753e7a7b - + https://github.com/dotnet/sdk - b96488d547e1598fa53442bf7b9492f092b4b2a0 + 1bf5fd5fb0a4a249b2d4bf43fbcb6541753e7a7b - + https://github.com/dotnet/sdk - b96488d547e1598fa53442bf7b9492f092b4b2a0 + 1bf5fd5fb0a4a249b2d4bf43fbcb6541753e7a7b - + https://github.com/dotnet/sdk - b96488d547e1598fa53442bf7b9492f092b4b2a0 + 1bf5fd5fb0a4a249b2d4bf43fbcb6541753e7a7b https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - d51ae5297cd0a24caa8cfe356442cc8634c3f087 + e7a44d757e097eb17dcac5a8436645dc612fec4b https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 9c25d28ea64d..5c72de7f7b09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24076.4 - 8.0.300-preview.24076.4 - 8.0.300-preview.24076.4 + 8.0.300-preview.24076.9 + 8.0.300-preview.24076.9 + 8.0.300-preview.24076.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8a35ac3fbb2bf53da560d2266a368fe2b6c2ee2c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 26 Jan 2024 15:00:03 -0800 Subject: [PATCH 176/652] Rename the XML file Add a specific test back to the exclusion list Move two tests to the linux-only exclusion list --- test/SdkTests/TestConfig.xml | 4 ++++ .../{TestConfigStableSDK.xml => TestToSkipStableSDK.xml} | 8 -------- test/SdkTests/TestsToSkipLinux.xml | 8 ++++++++ 3 files changed, 12 insertions(+), 8 deletions(-) rename test/SdkTests/{TestConfigStableSDK.xml => TestToSkipStableSDK.xml} (96%) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 9b38840fd8ab..f5b3aa5233c6 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -61,5 +61,9 @@ Skip="true" Issue="" Reason="Requires props file not in installer repo"/> + diff --git a/test/SdkTests/TestConfigStableSDK.xml b/test/SdkTests/TestToSkipStableSDK.xml similarity index 96% rename from test/SdkTests/TestConfigStableSDK.xml rename to test/SdkTests/TestToSkipStableSDK.xml index 7140b5f76696..d1138b3706a5 100644 --- a/test/SdkTests/TestConfigStableSDK.xml +++ b/test/SdkTests/TestToSkipStableSDK.xml @@ -4,10 +4,6 @@ Skip="true" Issue="" Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> - - + + From c111c9556e603f895a7a0553240e53a712aadf69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Jan 2024 08:39:56 +0000 Subject: [PATCH 177/652] Update dependencies from https://github.com/dotnet/sdk build 20240126.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24076.9 -> To Version 8.0.300-preview.24076.15 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b554df4afe53..a1a140adaf6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 1bf5fd5fb0a4a249b2d4bf43fbcb6541753e7a7b + dc2a5fe965efcafe5a9babaf983cd9b8867bd0a4 - + https://github.com/dotnet/sdk - 1bf5fd5fb0a4a249b2d4bf43fbcb6541753e7a7b + dc2a5fe965efcafe5a9babaf983cd9b8867bd0a4 - + https://github.com/dotnet/sdk - 1bf5fd5fb0a4a249b2d4bf43fbcb6541753e7a7b + dc2a5fe965efcafe5a9babaf983cd9b8867bd0a4 - + https://github.com/dotnet/sdk - 1bf5fd5fb0a4a249b2d4bf43fbcb6541753e7a7b + dc2a5fe965efcafe5a9babaf983cd9b8867bd0a4 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5c72de7f7b09..4dc20a8ed7ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24076.9 - 8.0.300-preview.24076.9 - 8.0.300-preview.24076.9 + 8.0.300-preview.24076.15 + 8.0.300-preview.24076.15 + 8.0.300-preview.24076.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9fa744fe2e0668358c797ba8ade585121dcc689d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Jan 2024 14:00:41 +0000 Subject: [PATCH 178/652] Update dependencies from https://github.com/dotnet/arcade build 20240125.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24074.2 -> To Version 8.0.0-beta.24075.5 --- 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 b554df4afe53..6f44e8a5b285 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 96c2cee493aa1542c0b06a6498e0379eb11e005f + 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 - + https://github.com/dotnet/arcade - 96c2cee493aa1542c0b06a6498e0379eb11e005f + 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 - + https://github.com/dotnet/arcade - 96c2cee493aa1542c0b06a6498e0379eb11e005f + 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 5c72de7f7b09..8c949b4d8f5c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24074.2 + 8.0.0-beta.24075.5 diff --git a/global.json b/global.json index 1555822ddfa3..6317ab3a328d 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.24074.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24074.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24075.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24075.5" } } From 52da9ea1d6b2a8ac5679a071e8793306dea395ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Jan 2024 14:06:20 +0000 Subject: [PATCH 179/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240126.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24074.2 -> To Version 1.1.0-beta.24076.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b88ce43b02cc..db62fda5ca9f 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24074.2", + "version": "1.1.0-beta.24076.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b554df4afe53..5dd2222f3f6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 96c2cee493aa1542c0b06a6498e0379eb11e005f - + https://github.com/dotnet/arcade-services - 515f0dc18ab7997cb52cb5722cda1f4245910626 + e9cac5ab2b545c66de5414b330d2187286d17194 - + https://github.com/dotnet/arcade-services - 515f0dc18ab7997cb52cb5722cda1f4245910626 + e9cac5ab2b545c66de5414b330d2187286d17194 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5c72de7f7b09..571428713c4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24074.2 + 1.1.0-beta.24076.2 From e4cfc320ec584845ac47a90d28e66773ed425367 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Jan 2024 13:43:45 +0000 Subject: [PATCH 180/652] Update dependencies from https://github.com/dotnet/arcade build 20240125.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24074.2 -> To Version 8.0.0-beta.24075.5 From 19f47d70430869507aa062371b0dbdd8b39d9209 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Jan 2024 13:49:38 +0000 Subject: [PATCH 181/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240126.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24074.2 -> To Version 1.1.0-beta.24076.2 From 7cc351c8c7e536afed4b18a1678b54e02410567e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Jan 2024 03:55:11 +0000 Subject: [PATCH 182/652] Update dependencies from https://github.com/dotnet/sdk build 20240128.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24076.15 -> To Version 8.0.300-preview.24078.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 13e3b6a599f8..c5e7ed4ac82a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - dc2a5fe965efcafe5a9babaf983cd9b8867bd0a4 + 60f91f0ff4d47d2940e699da40802fc20ee6ca2d - + https://github.com/dotnet/sdk - dc2a5fe965efcafe5a9babaf983cd9b8867bd0a4 + 60f91f0ff4d47d2940e699da40802fc20ee6ca2d - + https://github.com/dotnet/sdk - dc2a5fe965efcafe5a9babaf983cd9b8867bd0a4 + 60f91f0ff4d47d2940e699da40802fc20ee6ca2d - + https://github.com/dotnet/sdk - dc2a5fe965efcafe5a9babaf983cd9b8867bd0a4 + 60f91f0ff4d47d2940e699da40802fc20ee6ca2d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7934eb545b63..635f75a20cc2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24076.15 - 8.0.300-preview.24076.15 - 8.0.300-preview.24076.15 + 8.0.300-preview.24078.2 + 8.0.300-preview.24078.2 + 8.0.300-preview.24078.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6f38f21e41d696325cd02e0d3031c0d58d93faf3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jan 2024 03:24:11 +0000 Subject: [PATCH 183/652] Update dependencies from https://github.com/dotnet/sdk build 20240129.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24078.2 -> To Version 8.0.300-preview.24079.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5e7ed4ac82a..1c5cfa722dfb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 60f91f0ff4d47d2940e699da40802fc20ee6ca2d + c6e28e063aaf7b282e3dc762cf3c9e02ebd6fd57 - + https://github.com/dotnet/sdk - 60f91f0ff4d47d2940e699da40802fc20ee6ca2d + c6e28e063aaf7b282e3dc762cf3c9e02ebd6fd57 - + https://github.com/dotnet/sdk - 60f91f0ff4d47d2940e699da40802fc20ee6ca2d + c6e28e063aaf7b282e3dc762cf3c9e02ebd6fd57 - + https://github.com/dotnet/sdk - 60f91f0ff4d47d2940e699da40802fc20ee6ca2d + c6e28e063aaf7b282e3dc762cf3c9e02ebd6fd57 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 635f75a20cc2..06834fdf7f2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24078.2 - 8.0.300-preview.24078.2 - 8.0.300-preview.24078.2 + 8.0.300-preview.24079.6 + 8.0.300-preview.24079.6 + 8.0.300-preview.24079.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 28c0f30d1ef3d3f0875b8e4d95ba3ef096d2791b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jan 2024 08:42:57 +0000 Subject: [PATCH 184/652] Update dependencies from https://github.com/dotnet/sdk build 20240129.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24079.6 -> To Version 8.0.300-preview.24079.8 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24076-01 -> To Version 17.10.0-preview-24076-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c5cfa722dfb..3532f25c98a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - c6e28e063aaf7b282e3dc762cf3c9e02ebd6fd57 + 017e5b1f62a040353b40e959597a2515eb6f7aa9 - + https://github.com/dotnet/sdk - c6e28e063aaf7b282e3dc762cf3c9e02ebd6fd57 + 017e5b1f62a040353b40e959597a2515eb6f7aa9 - + https://github.com/dotnet/sdk - c6e28e063aaf7b282e3dc762cf3c9e02ebd6fd57 + 017e5b1f62a040353b40e959597a2515eb6f7aa9 - + https://github.com/dotnet/sdk - c6e28e063aaf7b282e3dc762cf3c9e02ebd6fd57 + 017e5b1f62a040353b40e959597a2515eb6f7aa9 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - e7a44d757e097eb17dcac5a8436645dc612fec4b + 0d8d09e5c582526daeb4af0b52956c3290e424d1 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 06834fdf7f2b..0cf3573e7d0c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24079.6 - 8.0.300-preview.24079.6 - 8.0.300-preview.24079.6 + 8.0.300-preview.24079.8 + 8.0.300-preview.24079.8 + 8.0.300-preview.24079.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2d5511ca8e07f7164fc46752ae6282d9f9f34937 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jan 2024 14:05:14 +0000 Subject: [PATCH 185/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240130.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24076.2 -> To Version 1.1.0-beta.24080.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index db62fda5ca9f..e3f5153b8ab3 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24076.2", + "version": "1.1.0-beta.24080.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3532f25c98a2..ba4546f80ecf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 - + https://github.com/dotnet/arcade-services - e9cac5ab2b545c66de5414b330d2187286d17194 + 749beebfd890571ce6f3fe8f557cb3cad070c946 - + https://github.com/dotnet/arcade-services - e9cac5ab2b545c66de5414b330d2187286d17194 + 749beebfd890571ce6f3fe8f557cb3cad070c946 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0cf3573e7d0c..4227a9e8581b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24076.2 + 1.1.0-beta.24080.1 From 77e52344c869f7f3922636fa60b2757fc7e8bf44 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jan 2024 23:43:45 +0000 Subject: [PATCH 186/652] Update dependencies from https://github.com/dotnet/sdk build 20240130.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24079.8 -> To Version 8.0.300-preview.24080.12 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.9.0-release-23627-01 -> To Version 17.10.0-preview-24080-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3532f25c98a2..3ff9236e8755 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 017e5b1f62a040353b40e959597a2515eb6f7aa9 + 8d38bc1ced47c725df1552163ab6c8422a7546df - + https://github.com/dotnet/sdk - 017e5b1f62a040353b40e959597a2515eb6f7aa9 + 8d38bc1ced47c725df1552163ab6c8422a7546df - + https://github.com/dotnet/sdk - 017e5b1f62a040353b40e959597a2515eb6f7aa9 + 8d38bc1ced47c725df1552163ab6c8422a7546df - + https://github.com/dotnet/sdk - 017e5b1f62a040353b40e959597a2515eb6f7aa9 + 8d38bc1ced47c725df1552163ab6c8422a7546df https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 32898dc51efc669de98e7e47f57d521bc07ac4cc - + https://github.com/microsoft/vstest - 053d7114a72aac12d1382ecc2a23b2dfdd5b084b + d61759559535f43790211fa53be7829dfe598841 diff --git a/eng/Versions.props b/eng/Versions.props index 0cf3573e7d0c..507103ca6760 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24079.8 - 8.0.300-preview.24079.8 - 8.0.300-preview.24079.8 + 8.0.300-preview.24080.12 + 8.0.300-preview.24080.12 + 8.0.300-preview.24080.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-release-23627-01 + 17.10.0-preview-24080-01 8.0.0-alpha.1.22557.12 From 273673f0a3967373a846f1759be7eb876b5f2b21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 03:27:49 +0000 Subject: [PATCH 187/652] Update dependencies from https://github.com/dotnet/sdk build 20240130.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24080.12 -> To Version 8.0.300-preview.24080.15 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 974e5e10b188..40c3eaf011a1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 8d38bc1ced47c725df1552163ab6c8422a7546df + 06b24135c1602ea9f10da22fa9ba175d6912577a - + https://github.com/dotnet/sdk - 8d38bc1ced47c725df1552163ab6c8422a7546df + 06b24135c1602ea9f10da22fa9ba175d6912577a - + https://github.com/dotnet/sdk - 8d38bc1ced47c725df1552163ab6c8422a7546df + 06b24135c1602ea9f10da22fa9ba175d6912577a - + https://github.com/dotnet/sdk - 8d38bc1ced47c725df1552163ab6c8422a7546df + 06b24135c1602ea9f10da22fa9ba175d6912577a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 769cfe385101..e4edd57bdeca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24080.12 - 8.0.300-preview.24080.12 - 8.0.300-preview.24080.12 + 8.0.300-preview.24080.15 + 8.0.300-preview.24080.15 + 8.0.300-preview.24080.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9dfa19879293726b092c7580ee9f8d248ade16f2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 05:50:32 +0000 Subject: [PATCH 188/652] Update dependencies from https://github.com/dotnet/sdk build 20240130.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24080.15 -> To Version 8.0.300-preview.24080.20 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.10.0-preview-24076-03 -> To Version 17.10.0-preview-24080-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40c3eaf011a1..578e47549f0e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 06b24135c1602ea9f10da22fa9ba175d6912577a + 6a3887856108dbd0e8b0495ae0b4d5af01972805 - + https://github.com/dotnet/sdk - 06b24135c1602ea9f10da22fa9ba175d6912577a + 6a3887856108dbd0e8b0495ae0b4d5af01972805 - + https://github.com/dotnet/sdk - 06b24135c1602ea9f10da22fa9ba175d6912577a + 6a3887856108dbd0e8b0495ae0b4d5af01972805 - + https://github.com/dotnet/sdk - 06b24135c1602ea9f10da22fa9ba175d6912577a + 6a3887856108dbd0e8b0495ae0b4d5af01972805 https://github.com/dotnet/test-templates @@ -155,13 +155,13 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - 0d8d09e5c582526daeb4af0b52956c3290e424d1 + caaccdd1ec890391d936f491a1a411b473853c2b - + https://github.com/nuget/nuget.client - e4899ee48ff3d7787ee345f546c818ce6b962807 + 98b7d827d91c055fcaa77be7f34bf66811381b5a diff --git a/eng/Versions.props b/eng/Versions.props index e4edd57bdeca..24671a0675ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24080.15 - 8.0.300-preview.24080.15 - 8.0.300-preview.24080.15 + 8.0.300-preview.24080.20 + 8.0.300-preview.24080.20 + 8.0.300-preview.24080.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.1.12 + 6.10.0-preview.1.17 From 56ca2a936078eb3f3af13ba8da88fce9cd0cb536 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 11:26:30 +0000 Subject: [PATCH 189/652] Update dependencies from https://github.com/dotnet/sdk build 20240131.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24080.20 -> To Version 8.0.300-preview.24081.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24075.4 -> To Version 12.8.300-beta.24080.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 578e47549f0e..5eae957f31b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 3f1acb59718cadf111a0a796681e3d3509bb3381 - + https://github.com/dotnet/sdk - 6a3887856108dbd0e8b0495ae0b4d5af01972805 + a57726a5129765adddd102456763de4beed77b5f - + https://github.com/dotnet/sdk - 6a3887856108dbd0e8b0495ae0b4d5af01972805 + a57726a5129765adddd102456763de4beed77b5f - + https://github.com/dotnet/sdk - 6a3887856108dbd0e8b0495ae0b4d5af01972805 + a57726a5129765adddd102456763de4beed77b5f - + https://github.com/dotnet/sdk - 6a3887856108dbd0e8b0495ae0b4d5af01972805 + a57726a5129765adddd102456763de4beed77b5f https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a - + https://github.com/dotnet/fsharp - 32898dc51efc669de98e7e47f57d521bc07ac4cc + 3def38d082f0e3b15b4be08f273f3d616776cd32 - + https://github.com/dotnet/fsharp - 32898dc51efc669de98e7e47f57d521bc07ac4cc + 3def38d082f0e3b15b4be08f273f3d616776cd32 diff --git a/eng/Versions.props b/eng/Versions.props index 24671a0675ee..2e44972eef77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24080.20 - 8.0.300-preview.24080.20 - 8.0.300-preview.24080.20 + 8.0.300-preview.24081.5 + 8.0.300-preview.24081.5 + 8.0.300-preview.24081.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9e2ee1e5374b17d8f28c41babb65fef3b8925818 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 14:04:50 +0000 Subject: [PATCH 190/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240130.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24080.1 -> To Version 1.1.0-beta.24080.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e3f5153b8ab3..0e657c448808 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24080.1", + "version": "1.1.0-beta.24080.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 578e47549f0e..72a4e1ce56a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 - + https://github.com/dotnet/arcade-services - 749beebfd890571ce6f3fe8f557cb3cad070c946 + 2a734cad5b603ea6b6f67a309cbaa081af57cf77 - + https://github.com/dotnet/arcade-services - 749beebfd890571ce6f3fe8f557cb3cad070c946 + 2a734cad5b603ea6b6f67a309cbaa081af57cf77 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 24671a0675ee..7c3b3bd5b421 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24080.1 + 1.1.0-beta.24080.2 From f945bfc62543239c458cac9d11d9be5be77bc98b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jan 2024 23:43:16 +0000 Subject: [PATCH 191/652] Update dependencies from https://github.com/dotnet/sdk build 20240131.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24080.20 -> To Version 8.0.300-preview.24081.16 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 108 ++++++++++++++++++++-------------------- eng/Versions.props | 46 ++++++++--------- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5eae957f31b8..82b09214aad9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - c0170915ed6c164a594cd9d558d44aaf98fc6961 + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 3f1acb59718cadf111a0a796681e3d3509bb3381 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - a57726a5129765adddd102456763de4beed77b5f + 27717ac6846835c1c15d302d7bdd08877c38ca29 - + https://github.com/dotnet/sdk - a57726a5129765adddd102456763de4beed77b5f + 27717ac6846835c1c15d302d7bdd08877c38ca29 - + https://github.com/dotnet/sdk - a57726a5129765adddd102456763de4beed77b5f + 27717ac6846835c1c15d302d7bdd08877c38ca29 - + https://github.com/dotnet/sdk - a57726a5129765adddd102456763de4beed77b5f + 27717ac6846835c1c15d302d7bdd08877c38ca29 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4ede9b8979b9d2b1b1d4383f30a791414f0625b + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 239f8da8fbf8cf2a6cd0c793f0d02679bf4ccf6a + ac40bed7a33baf164d3984ca90c2aedba996a7b2 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ d61759559535f43790211fa53be7829dfe598841 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5535e31a712343a63f5d7d796cd874e563e5ac14 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://github.com/dotnet/roslyn @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 - + https://github.com/dotnet/emsdk - 2406616d0e3a31d80b326e27c156955bfa41c791 + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 diff --git a/eng/Versions.props b/eng/Versions.props index 2e44972eef77..9af726290c3f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.0-rtm.23531.5 + 8.0.1-servicing.23580.6 - 8.0.0-rtm.23531.4 + 8.0.1-servicing.23580.5 @@ -72,22 +72,22 @@ - 8.0.0 - 8.0.0 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 - 8.0.0-rtm.23531.12 + 8.0.1 + 8.0.1 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 0.2.0 - 8.0.300-preview.24081.5 - 8.0.300-preview.24081.5 - 8.0.300-preview.24081.5 + 8.0.300-preview.24081.16 + 8.0.300-preview.24081.16 + 8.0.300-preview.24081.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,24 +98,24 @@ - 8.0.0-rtm.23531.3 + 8.0.1-servicing.23580.1 - 8.0.0-rtm.23531.3 - 8.0.0-rtm.23531.3 - 8.0.0 - 8.0.0 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23580.1 + 8.0.1-servicing.23580.1 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.1 2.1.0 - 8.0.0-rtm.23551.1 - 8.0.0-rtm.23551.1 - 8.0.0 - 8.0.0 + 8.0.1-servicing.23580.5 + 8.0.1-servicing.23580.5 + 8.0.1 + 8.0.1 From b3cb48bdbc084b073887590057490d183398d990 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Feb 2024 03:20:21 +0000 Subject: [PATCH 192/652] Update dependencies from https://github.com/dotnet/sdk build 20240131.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24080.20 -> To Version 8.0.300-preview.24081.18 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82b09214aad9..b88536b7c6e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 27717ac6846835c1c15d302d7bdd08877c38ca29 + fe1cde4e6acc60ebccc53f5f25898afbdcca8d11 - + https://github.com/dotnet/sdk - 27717ac6846835c1c15d302d7bdd08877c38ca29 + fe1cde4e6acc60ebccc53f5f25898afbdcca8d11 - + https://github.com/dotnet/sdk - 27717ac6846835c1c15d302d7bdd08877c38ca29 + fe1cde4e6acc60ebccc53f5f25898afbdcca8d11 - + https://github.com/dotnet/sdk - 27717ac6846835c1c15d302d7bdd08877c38ca29 + fe1cde4e6acc60ebccc53f5f25898afbdcca8d11 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + https://github.com/dotnet/fsharp - 3def38d082f0e3b15b4be08f273f3d616776cd32 + 80003bb3f0516455a0046887aa169febf2c4d3a8 - + https://github.com/dotnet/fsharp - 3def38d082f0e3b15b4be08f273f3d616776cd32 + 80003bb3f0516455a0046887aa169febf2c4d3a8 - + https://github.com/microsoft/vstest - d61759559535f43790211fa53be7829dfe598841 + fa9d5c94bd4311da4db7e48dd990484e7ad4b120 @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - caaccdd1ec890391d936f491a1a411b473853c2b + 25df00b64f0dc3cf47bcbbc99dc9ad384e74454a https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 9af726290c3f..7de84994e498 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24081.16 - 8.0.300-preview.24081.16 - 8.0.300-preview.24081.16 + 8.0.300-preview.24081.18 + 8.0.300-preview.24081.18 + 8.0.300-preview.24081.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24080-01 + 17.10.0-preview-24080-03 8.0.0-alpha.1.22557.12 From 2fd4546faf1a4622ef8c05d6a1cc1e56dd9d9d28 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Feb 2024 14:02:49 +0000 Subject: [PATCH 193/652] Update dependencies from https://github.com/dotnet/arcade build 20240131.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24075.5 -> To Version 8.0.0-beta.24081.5 --- 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 72a4e1ce56a2..69d01c195959 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 + be88b08c41971b52ec11aec05ef31e72185d4a1f - + https://github.com/dotnet/arcade - 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 + be88b08c41971b52ec11aec05ef31e72185d4a1f - + https://github.com/dotnet/arcade - 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 + be88b08c41971b52ec11aec05ef31e72185d4a1f https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 7c3b3bd5b421..ad191360e2e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24075.5 + 8.0.0-beta.24081.5 diff --git a/global.json b/global.json index 6317ab3a328d..f27f8981d9df 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.24075.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24075.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24081.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24081.5" } } From c1e9d5695e4d7aa412824d44c4a4a756e581dd31 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Feb 2024 14:09:28 +0000 Subject: [PATCH 194/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240201.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24080.2 -> To Version 1.1.0-beta.24101.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0e657c448808..6ab51d1f104c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24080.2", + "version": "1.1.0-beta.24101.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72a4e1ce56a2..d21bbe93f12e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 07cf24f27ee58b5d1a9662334a101d84bd1e07e5 - + https://github.com/dotnet/arcade-services - 2a734cad5b603ea6b6f67a309cbaa081af57cf77 + 2b98442571c24e1f66b33faf79001254b3243d5a - + https://github.com/dotnet/arcade-services - 2a734cad5b603ea6b6f67a309cbaa081af57cf77 + 2b98442571c24e1f66b33faf79001254b3243d5a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7c3b3bd5b421..f485119dbbdc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24080.2 + 1.1.0-beta.24101.1 From 763ea9e7e4c0714e9863147dfe5cb4f8b8f550fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Feb 2024 18:50:02 +0000 Subject: [PATCH 195/652] Update dependencies from https://github.com/dotnet/sdk build 20240201.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24080.20 -> To Version 8.0.300-preview.24101.6 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 10 +++++----- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3aaf05aa6578..2e7b5a1b0be4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - fe1cde4e6acc60ebccc53f5f25898afbdcca8d11 + 8b4d4e61bc30a189071113cdbebc655c96247232 - + https://github.com/dotnet/sdk - fe1cde4e6acc60ebccc53f5f25898afbdcca8d11 + 8b4d4e61bc30a189071113cdbebc655c96247232 - + https://github.com/dotnet/sdk - fe1cde4e6acc60ebccc53f5f25898afbdcca8d11 + 8b4d4e61bc30a189071113cdbebc655c96247232 - + https://github.com/dotnet/sdk - fe1cde4e6acc60ebccc53f5f25898afbdcca8d11 + 8b4d4e61bc30a189071113cdbebc655c96247232 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 80003bb3f0516455a0046887aa169febf2c4d3a8 - + https://github.com/microsoft/vstest - fa9d5c94bd4311da4db7e48dd990484e7ad4b120 + 73d640131c4c120f3d865cfc91790dde49710e71 @@ -155,13 +155,13 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - 25df00b64f0dc3cf47bcbbc99dc9ad384e74454a + 07fd5d51f25134ea3ab3620c66f6501a74df2921 - + https://github.com/nuget/nuget.client - 98b7d827d91c055fcaa77be7f34bf66811381b5a + f207cbb3530350f785d1b04014e15563cc9b5e03 diff --git a/eng/Versions.props b/eng/Versions.props index 98661ec660ee..142bef67ef50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24081.18 - 8.0.300-preview.24081.18 - 8.0.300-preview.24081.18 + 8.0.300-preview.24101.6 + 8.0.300-preview.24101.6 + 8.0.300-preview.24101.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.1.17 + 6.10.0-preview.1.18 @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24080-03 + 17.10.0-preview-24081-04 8.0.0-alpha.1.22557.12 From 6409fc11b827f5cfb2ac6e058cfce8d252591b0f Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 30 Jan 2024 17:11:10 -0800 Subject: [PATCH 196/652] Fix the file rename --- .../{TestToSkipStableSDK.xml => TestsToSkipStableSDK.xml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename test/SdkTests/{TestToSkipStableSDK.xml => TestsToSkipStableSDK.xml} (100%) diff --git a/test/SdkTests/TestToSkipStableSDK.xml b/test/SdkTests/TestsToSkipStableSDK.xml similarity index 100% rename from test/SdkTests/TestToSkipStableSDK.xml rename to test/SdkTests/TestsToSkipStableSDK.xml From 700b78e1fdf8f25eb72243942f98d33263a74ca2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 31 Jan 2024 14:47:44 -0800 Subject: [PATCH 197/652] add an additional test to disable --- test/SdkTests/TestsToSkipStableSDK.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/SdkTests/TestsToSkipStableSDK.xml b/test/SdkTests/TestsToSkipStableSDK.xml index d1138b3706a5..550025aa6779 100644 --- a/test/SdkTests/TestsToSkipStableSDK.xml +++ b/test/SdkTests/TestsToSkipStableSDK.xml @@ -185,6 +185,10 @@ Issue="" Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> + From 084a85c6a729e689905da76295ff5fa53c4e0dd4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Feb 2024 21:58:06 +0000 Subject: [PATCH 198/652] Update dependencies from https://github.com/dotnet/sdk build 20240201.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24080.20 -> To Version 8.0.300-preview.24101.12 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.0 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e7b5a1b0be4..400778403843 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 8b4d4e61bc30a189071113cdbebc655c96247232 + 9898fa5d5f47fb7c2669fdf47c05ebc2d220e904 - + https://github.com/dotnet/sdk - 8b4d4e61bc30a189071113cdbebc655c96247232 + 9898fa5d5f47fb7c2669fdf47c05ebc2d220e904 - + https://github.com/dotnet/sdk - 8b4d4e61bc30a189071113cdbebc655c96247232 + 9898fa5d5f47fb7c2669fdf47c05ebc2d220e904 - + https://github.com/dotnet/sdk - 8b4d4e61bc30a189071113cdbebc655c96247232 + 9898fa5d5f47fb7c2669fdf47c05ebc2d220e904 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 142bef67ef50..be79ee32f6cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24101.6 - 8.0.300-preview.24101.6 - 8.0.300-preview.24101.6 + 8.0.300-preview.24101.12 + 8.0.300-preview.24101.12 + 8.0.300-preview.24101.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 37cf51952c653bc584f5213e4b9b9cb6671d1a08 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 1 Feb 2024 16:42:38 -0800 Subject: [PATCH 199/652] Update the emscripten version and props to match version.detail.xml --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index be79ee32f6cd..d2fd3da825c7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -249,8 +249,8 @@ 13.3.8825-net8-rc1 16.4.8825-net8-rc1 - 8.0.0 - $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) + 8.0.1 + $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 9bec2bdbc56d0e406a5ba53f9835d274724d0986 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Feb 2024 14:06:32 +0000 Subject: [PATCH 200/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240202.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24101.1 -> To Version 1.1.0-beta.24102.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6ab51d1f104c..af69f5bf0547 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24101.1", + "version": "1.1.0-beta.24102.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 400778403843..9c2eecbe95ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade be88b08c41971b52ec11aec05ef31e72185d4a1f - + https://github.com/dotnet/arcade-services - 2b98442571c24e1f66b33faf79001254b3243d5a + 53f2cd34bb9651afc9c23921723c19e9be09869d - + https://github.com/dotnet/arcade-services - 2b98442571c24e1f66b33faf79001254b3243d5a + 53f2cd34bb9651afc9c23921723c19e9be09869d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d2fd3da825c7..5d4f8c2f4657 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24101.1 + 1.1.0-beta.24102.1 From 19126d7654eaaea5dafe4ff3abbe8fbf02f11ba5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Feb 2024 19:50:28 +0000 Subject: [PATCH 201/652] Update dependencies from https://github.com/dotnet/sdk build 20240202.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24101.12 -> To Version 8.0.300-preview.24102.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.8.300-beta.24080.5 -> To Version 12.8.300-beta.24101.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 400778403843..befc13d0d730 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 9898fa5d5f47fb7c2669fdf47c05ebc2d220e904 + 3d6bcf550e499dd3b474e29940cc4724e9aaede1 - + https://github.com/dotnet/sdk - 9898fa5d5f47fb7c2669fdf47c05ebc2d220e904 + 3d6bcf550e499dd3b474e29940cc4724e9aaede1 - + https://github.com/dotnet/sdk - 9898fa5d5f47fb7c2669fdf47c05ebc2d220e904 + 3d6bcf550e499dd3b474e29940cc4724e9aaede1 - + https://github.com/dotnet/sdk - 9898fa5d5f47fb7c2669fdf47c05ebc2d220e904 + 3d6bcf550e499dd3b474e29940cc4724e9aaede1 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + https://github.com/dotnet/fsharp - 80003bb3f0516455a0046887aa169febf2c4d3a8 + 052d1133c78aa5af36c8e100afb91b1b5fc478af - + https://github.com/dotnet/fsharp - 80003bb3f0516455a0046887aa169febf2c4d3a8 + 052d1133c78aa5af36c8e100afb91b1b5fc478af - + https://github.com/microsoft/vstest - 73d640131c4c120f3d865cfc91790dde49710e71 + edaf4ff11b2b706e88c74d870035d2025776ec06 diff --git a/eng/Versions.props b/eng/Versions.props index d2fd3da825c7..e57798311654 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24101.12 - 8.0.300-preview.24101.12 - 8.0.300-preview.24101.12 + 8.0.300-preview.24102.5 + 8.0.300-preview.24102.5 + 8.0.300-preview.24102.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24081-04 + 17.10.0-preview-24101-03 8.0.0-alpha.1.22557.12 From 5b6defdd0f5f7814fa6fcb346685e36881c7711e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 3 Feb 2024 14:00:04 +0000 Subject: [PATCH 202/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240202.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24101.1 -> To Version 1.1.0-beta.24102.1 From f5a1158ea30ba4e798dacd4d2ec502fa96a17a34 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 4 Feb 2024 06:36:30 +0000 Subject: [PATCH 203/652] Update dependencies from https://github.com/dotnet/sdk build 20240203.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24102.5 -> To Version 8.0.300-preview.24103.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d805f8ba9e9d..5ac445d5552a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 3d6bcf550e499dd3b474e29940cc4724e9aaede1 + 0a32bb769e23437a1a6607bf6899891e72ccb5df - + https://github.com/dotnet/sdk - 3d6bcf550e499dd3b474e29940cc4724e9aaede1 + 0a32bb769e23437a1a6607bf6899891e72ccb5df - + https://github.com/dotnet/sdk - 3d6bcf550e499dd3b474e29940cc4724e9aaede1 + 0a32bb769e23437a1a6607bf6899891e72ccb5df - + https://github.com/dotnet/sdk - 3d6bcf550e499dd3b474e29940cc4724e9aaede1 + 0a32bb769e23437a1a6607bf6899891e72ccb5df https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6d97d3fea83d..4d40959137b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24102.5 - 8.0.300-preview.24102.5 - 8.0.300-preview.24102.5 + 8.0.300-preview.24103.4 + 8.0.300-preview.24103.4 + 8.0.300-preview.24103.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 62466c266b3e895c299f79dca7133e22ba336c10 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Feb 2024 13:41:27 +0000 Subject: [PATCH 204/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240205.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24102.1 -> To Version 1.1.0-beta.24105.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index af69f5bf0547..4656bb04e687 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24102.1", + "version": "1.1.0-beta.24105.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ac445d5552a..cabaf89e6c78 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade be88b08c41971b52ec11aec05ef31e72185d4a1f - + https://github.com/dotnet/arcade-services - 53f2cd34bb9651afc9c23921723c19e9be09869d + e6ae493a5e14abaee3677bd7d081260544e1cefb - + https://github.com/dotnet/arcade-services - 53f2cd34bb9651afc9c23921723c19e9be09869d + e6ae493a5e14abaee3677bd7d081260544e1cefb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 4d40959137b2..929c61c42c7d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24102.1 + 1.1.0-beta.24105.1 From 2184c8529e70c188523fceafa5e9ba328ea3d7fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Feb 2024 18:33:09 +0000 Subject: [PATCH 205/652] Update dependencies from https://github.com/dotnet/sdk build 20240205.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24103.4 -> To Version 8.0.300-preview.24105.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5ac445d5552a..7d5a87ffdc0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 0a32bb769e23437a1a6607bf6899891e72ccb5df + 4723eb3124f71fb16fbbbe726e69ec381e1af17c - + https://github.com/dotnet/sdk - 0a32bb769e23437a1a6607bf6899891e72ccb5df + 4723eb3124f71fb16fbbbe726e69ec381e1af17c - + https://github.com/dotnet/sdk - 0a32bb769e23437a1a6607bf6899891e72ccb5df + 4723eb3124f71fb16fbbbe726e69ec381e1af17c - + https://github.com/dotnet/sdk - 0a32bb769e23437a1a6607bf6899891e72ccb5df + 4723eb3124f71fb16fbbbe726e69ec381e1af17c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 4d40959137b2..8f3d52a2e0f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24103.4 - 8.0.300-preview.24103.4 - 8.0.300-preview.24103.4 + 8.0.300-preview.24105.2 + 8.0.300-preview.24105.2 + 8.0.300-preview.24105.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c1149106dc5cc554d14a45418896c48cf7270209 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Feb 2024 21:19:31 +0000 Subject: [PATCH 206/652] Update dependencies from https://github.com/dotnet/sdk build 20240205.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24103.4 -> To Version 8.0.300-preview.24105.4 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24101-01 -> To Version 17.10.0-preview-24105-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7d5a87ffdc0f..b5a473980fde 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 4723eb3124f71fb16fbbbe726e69ec381e1af17c + 2ee7582271ec559688f13c3343c97f4b702566ef - + https://github.com/dotnet/sdk - 4723eb3124f71fb16fbbbe726e69ec381e1af17c + 2ee7582271ec559688f13c3343c97f4b702566ef - + https://github.com/dotnet/sdk - 4723eb3124f71fb16fbbbe726e69ec381e1af17c + 2ee7582271ec559688f13c3343c97f4b702566ef - + https://github.com/dotnet/sdk - 4723eb3124f71fb16fbbbe726e69ec381e1af17c + 2ee7582271ec559688f13c3343c97f4b702566ef https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - 07fd5d51f25134ea3ab3620c66f6501a74df2921 + bea6b4aebe6548d714ca643db9107162965b94d5 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 8f3d52a2e0f8..4bc85f6fcfb6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24105.2 - 8.0.300-preview.24105.2 - 8.0.300-preview.24105.2 + 8.0.300-preview.24105.4 + 8.0.300-preview.24105.4 + 8.0.300-preview.24105.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 88ccb6c335d3ea6c82ff0f83497b3649031a3a91 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 Feb 2024 14:01:28 +0000 Subject: [PATCH 207/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240205.3 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24105.1 -> To Version 1.1.0-beta.24105.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 4656bb04e687..5cd72c03554e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24105.1", + "version": "1.1.0-beta.24105.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 218bf4deba05..468f5778a586 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade be88b08c41971b52ec11aec05ef31e72185d4a1f - + https://github.com/dotnet/arcade-services - e6ae493a5e14abaee3677bd7d081260544e1cefb + 7d6b01312a083686fb9228eae1ae569aa47fed65 - + https://github.com/dotnet/arcade-services - e6ae493a5e14abaee3677bd7d081260544e1cefb + 7d6b01312a083686fb9228eae1ae569aa47fed65 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 46b9ab047f59..3c2fc5a5a252 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24105.1 + 1.1.0-beta.24105.3 From 3fd68863daf7cca0c93cbe9908c8f28398ed0824 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Feb 2024 03:11:24 +0000 Subject: [PATCH 208/652] Update dependencies from https://github.com/dotnet/sdk build 20240206.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24105.4 -> To Version 8.0.300-preview.24106.29 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.10.0-preview-24101-03 -> To Version 17.10.0-preview-24106-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 218bf4deba05..ca8c5498b708 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 2ee7582271ec559688f13c3343c97f4b702566ef + 238743c3927102955cf421c27eb5a90e730b519d - + https://github.com/dotnet/sdk - 2ee7582271ec559688f13c3343c97f4b702566ef + 238743c3927102955cf421c27eb5a90e730b519d - + https://github.com/dotnet/sdk - 2ee7582271ec559688f13c3343c97f4b702566ef + 238743c3927102955cf421c27eb5a90e730b519d - + https://github.com/dotnet/sdk - 2ee7582271ec559688f13c3343c97f4b702566ef + 238743c3927102955cf421c27eb5a90e730b519d https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 052d1133c78aa5af36c8e100afb91b1b5fc478af - + https://github.com/microsoft/vstest - edaf4ff11b2b706e88c74d870035d2025776ec06 + 4e52655f318fbc1677b4274b3f0add42609be0df @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - bea6b4aebe6548d714ca643db9107162965b94d5 + 668b19903aec6334c05190cb336a10b9a9aba01f https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 46b9ab047f59..a83fc763a0bd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24105.4 - 8.0.300-preview.24105.4 - 8.0.300-preview.24105.4 + 8.0.300-preview.24106.29 + 8.0.300-preview.24106.29 + 8.0.300-preview.24106.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24101-03 + 17.10.0-preview-24106-01 8.0.0-alpha.1.22557.12 From 44786ab1ddc9ff2135444567b0fa40b41d08ea3b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 Feb 2024 19:46:45 +0000 Subject: [PATCH 209/652] Update dependencies from https://github.com/dotnet/sdk build 20240207.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24106.29 -> To Version 8.0.300-preview.24107.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93aea90bc878..1610522a05a2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 238743c3927102955cf421c27eb5a90e730b519d + 4b817f5c219b5aec5cebacbef8228ebb1977d225 - + https://github.com/dotnet/sdk - 238743c3927102955cf421c27eb5a90e730b519d + 4b817f5c219b5aec5cebacbef8228ebb1977d225 - + https://github.com/dotnet/sdk - 238743c3927102955cf421c27eb5a90e730b519d + 4b817f5c219b5aec5cebacbef8228ebb1977d225 - + https://github.com/dotnet/sdk - 238743c3927102955cf421c27eb5a90e730b519d + 4b817f5c219b5aec5cebacbef8228ebb1977d225 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 40292753bac9..f806139fa4a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24106.29 - 8.0.300-preview.24106.29 - 8.0.300-preview.24106.29 + 8.0.300-preview.24107.7 + 8.0.300-preview.24107.7 + 8.0.300-preview.24107.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a2b4fa30eea4b0c05d64ecf0ce94e360b6123058 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 7 Feb 2024 13:19:35 -0800 Subject: [PATCH 210/652] Update branding to 8.0.201 (#18533) Co-authored-by: Jacques Eloff --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1246fc5f728..46f35b231731 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 2 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) @@ -153,8 +153,8 @@ true $([MSBuild]::Subtract($(VersionFeature60), 1)) $([MSBuild]::Subtract($(VersionFeature70), 1)) - $(VersionFeature60) - $(VersionFeature70) + $(VersionFeature60) + $(VersionFeature70) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature70), 1)) From 51db99db7ce7a76cf680d73da7bf4f97b47eac1b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 8 Feb 2024 13:47:28 +0000 Subject: [PATCH 211/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240208.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24105.3 -> To Version 1.1.0-beta.24108.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5cd72c03554e..83183de72a6a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24105.3", + "version": "1.1.0-beta.24108.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1610522a05a2..f63156e3db5b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade be88b08c41971b52ec11aec05ef31e72185d4a1f - + https://github.com/dotnet/arcade-services - 7d6b01312a083686fb9228eae1ae569aa47fed65 + a2ccd01081a1c360ee58fc066fad5ddc6da8b8db - + https://github.com/dotnet/arcade-services - 7d6b01312a083686fb9228eae1ae569aa47fed65 + a2ccd01081a1c360ee58fc066fad5ddc6da8b8db https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f806139fa4a2..03d6f17736c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24105.3 + 1.1.0-beta.24108.1 From 883b0e5ea09bf4a8b2a9cd999c2f3106798d5bca Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 9 Feb 2024 10:03:08 -0800 Subject: [PATCH 212/652] Update WiX to latest release --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 03d6f17736c3..896a13789bfa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,7 +178,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548e97..e6cd301f7a46 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 5acc61c19412..41d2c7820370 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -3,7 +3,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From 05188a3e9e7b7b8765ebd322d7720e3286bce9fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Feb 2024 22:32:08 +0000 Subject: [PATCH 213/652] Update dependencies from https://github.com/dotnet/sdk build 20240209.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24107.7 -> To Version 8.0.300-preview.24109.12 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.10.0-preview-24106-01 -> To Version 17.10.0-preview-24107-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f63156e3db5b..8d1339ff835e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 4b817f5c219b5aec5cebacbef8228ebb1977d225 + cac56fb18f8525d35486746164d4e74251604906 - + https://github.com/dotnet/sdk - 4b817f5c219b5aec5cebacbef8228ebb1977d225 + cac56fb18f8525d35486746164d4e74251604906 - + https://github.com/dotnet/sdk - 4b817f5c219b5aec5cebacbef8228ebb1977d225 + cac56fb18f8525d35486746164d4e74251604906 - + https://github.com/dotnet/sdk - 4b817f5c219b5aec5cebacbef8228ebb1977d225 + cac56fb18f8525d35486746164d4e74251604906 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 052d1133c78aa5af36c8e100afb91b1b5fc478af - + https://github.com/microsoft/vstest - 4e52655f318fbc1677b4274b3f0add42609be0df + f21d0dae0b91fe59e4afa92166bd721ddd2f0036 @@ -155,9 +155,9 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - 668b19903aec6334c05190cb336a10b9a9aba01f + e71eb7a1fc535b438007286c840d7cecc139d13b https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 03d6f17736c3..90f9d196ad8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24107.7 - 8.0.300-preview.24107.7 - 8.0.300-preview.24107.7 + 8.0.300-preview.24109.12 + 8.0.300-preview.24109.12 + 8.0.300-preview.24109.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -234,7 +234,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24106-01 + 17.10.0-preview-24107-02 8.0.0-alpha.1.22557.12 From eb456897cbd54c087445029e0408596dcfc0eb3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 9 Feb 2024 23:18:23 +0000 Subject: [PATCH 214/652] Update dependencies from https://github.com/dotnet/sdk build 20240209.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24107.7 -> To Version 8.0.300-preview.24109.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build From Version 12.8.300-beta.24101.1 -> To Version 12.8.300-beta.24108.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d1339ff835e..777f7c21136f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - cac56fb18f8525d35486746164d4e74251604906 + 01376e11d17c415323b948891435af848d7effb6 - + https://github.com/dotnet/sdk - cac56fb18f8525d35486746164d4e74251604906 + 01376e11d17c415323b948891435af848d7effb6 - + https://github.com/dotnet/sdk - cac56fb18f8525d35486746164d4e74251604906 + 01376e11d17c415323b948891435af848d7effb6 - + https://github.com/dotnet/sdk - cac56fb18f8525d35486746164d4e74251604906 + 01376e11d17c415323b948891435af848d7effb6 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + https://github.com/dotnet/fsharp - 052d1133c78aa5af36c8e100afb91b1b5fc478af + dcbb4d3d5bd6de445d48002367a474f7b0fc199c - + https://github.com/dotnet/fsharp - 052d1133c78aa5af36c8e100afb91b1b5fc478af + dcbb4d3d5bd6de445d48002367a474f7b0fc199c diff --git a/eng/Versions.props b/eng/Versions.props index 90f9d196ad8f..8302cbed9fd8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24109.12 - 8.0.300-preview.24109.12 - 8.0.300-preview.24109.12 + 8.0.300-preview.24109.16 + 8.0.300-preview.24109.16 + 8.0.300-preview.24109.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 36530589e2fd31d12ee5153b3dbdba32473e2297 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 12 Feb 2024 09:42:55 -0800 Subject: [PATCH 215/652] [release/8.0.2xx] Update WiX to latest release (#18604) Co-authored-by: Jacques Eloff --- eng/Versions.props | 3 ++- src/finalizer_shim/finalizer_shim.csproj | 3 ++- src/redist/targets/GenerateMSIs.targets | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 46f35b231731..620c6fb99418 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -178,7 +178,8 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) - 1.0.0-v3.14.0.5722 + + 3.14.0.8606 diff --git a/src/finalizer_shim/finalizer_shim.csproj b/src/finalizer_shim/finalizer_shim.csproj index ad9af2548e97..e6cd301f7a46 100644 --- a/src/finalizer_shim/finalizer_shim.csproj +++ b/src/finalizer_shim/finalizer_shim.csproj @@ -12,7 +12,8 @@ - + + diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 5acc61c19412..41d2c7820370 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -3,7 +3,6 @@ - $(WixPackageVersion) https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip $(ArtifactsDir)Tools/WixTools/$(WixVersion) $(WixRoot)/WixTools.$(WixVersion).zip From 7b256400e03e2aa319f72753ae3062da0d9ffd12 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 23:19:51 +0000 Subject: [PATCH 216/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#18627) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.300-beta.24108.7 to 12.8.300-beta.24112.4 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.300-beta.24108.7 to 8.0.300-beta.24112.4 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.10.0-preview-24107-02 to 17.10.0-preview-24112-02 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.10.0-preview-24108-04 to 17.10.0-preview-24109-03 (parent: Microsoft.NET.Sdk) - NuGet.Build.Tasks: from 6.10.0-preview.1.18 to 6.10.0-preview.2.32 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 10 +++++----- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 777f7c21136f..f900746e54b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 01376e11d17c415323b948891435af848d7effb6 + ff9e2c6f223d006a93bc2dcf172c2ab364fc5d9c - + https://github.com/dotnet/sdk - 01376e11d17c415323b948891435af848d7effb6 + ff9e2c6f223d006a93bc2dcf172c2ab364fc5d9c - + https://github.com/dotnet/sdk - 01376e11d17c415323b948891435af848d7effb6 + ff9e2c6f223d006a93bc2dcf172c2ab364fc5d9c - + https://github.com/dotnet/sdk - 01376e11d17c415323b948891435af848d7effb6 + ff9e2c6f223d006a93bc2dcf172c2ab364fc5d9c https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + https://github.com/dotnet/fsharp - dcbb4d3d5bd6de445d48002367a474f7b0fc199c + 9de468a9bcd1dd5f3791639e0be2227aee0696a7 - + https://github.com/dotnet/fsharp - dcbb4d3d5bd6de445d48002367a474f7b0fc199c + 9de468a9bcd1dd5f3791639e0be2227aee0696a7 - + https://github.com/microsoft/vstest - f21d0dae0b91fe59e4afa92166bd721ddd2f0036 + 5eed35d4a9a2e1b688eb86c5e4171e370a561b2a @@ -155,13 +155,13 @@ 3cd939f76803da435c20b082a5cfcc844386fcfb - + https://github.com/dotnet/msbuild - e71eb7a1fc535b438007286c840d7cecc139d13b + 15f7ddcaafa6622447fa69c1785ab7b3d1183719 - + https://github.com/nuget/nuget.client - f207cbb3530350f785d1b04014e15563cc9b5e03 + 8b658e2eee6391936887b9fd1b39f7918d16a9cb diff --git a/eng/Versions.props b/eng/Versions.props index 36f8edaa8d44..87cc4a2c45f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24109.16 - 8.0.300-preview.24109.16 - 8.0.300-preview.24109.16 + 8.0.300-preview.24113.18 + 8.0.300-preview.24113.18 + 8.0.300-preview.24113.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.1.18 + 6.10.0-preview.2.32 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24107-02 + 17.10.0-preview-24112-02 8.0.0-alpha.1.22557.12 From ed69c9d295e8ec22eb26ebdb05c3c4f547dcdca8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 13 Feb 2024 23:26:42 +0000 Subject: [PATCH 217/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18596) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 83183de72a6a..94cf00988b61 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24108.1", + "version": "1.1.0-beta.24112.4", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f900746e54b9..7086d083f64b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade be88b08c41971b52ec11aec05ef31e72185d4a1f - + https://github.com/dotnet/arcade-services - a2ccd01081a1c360ee58fc066fad5ddc6da8b8db + f78fce70cdf7f2a91475f210ad77c18e60cb91ff - + https://github.com/dotnet/arcade-services - a2ccd01081a1c360ee58fc066fad5ddc6da8b8db + f78fce70cdf7f2a91475f210ad77c18e60cb91ff https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 87cc4a2c45f1..cbb1f4fd970b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24108.1 + 1.1.0-beta.24112.4 From 82639d7f5aa40a62f788e3b9d2edf34601b92f16 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 14 Feb 2024 10:12:48 -0800 Subject: [PATCH 218/652] Update .NET 8 GA MAUI baseline manifests --- eng/Versions.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 620c6fb99418..66bcd35a160f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -242,13 +242,13 @@ 8.0.100 8.0.0-preview.1.23557.2 - 8.0.100-rc.1 - 8.0.0-rc.1.9171 - 34.0.0-rc.1.432 - 16.4.8825-net8-rc1 - 16.4.8825-net8-rc1 - 13.3.8825-net8-rc1 - 16.4.8825-net8-rc1 + 8.0.100 + 8.0.3 + 34.0.43 + 17.0.8478 + 17.0.8478 + 14.0.8478 + 17.0.8478 8.0.0 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100TransportPackageVersion) From 7f96574e2edb808c8950a9011735b22478f9c3db Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 14 Feb 2024 14:41:06 -0800 Subject: [PATCH 219/652] Update branding again and downgrade implicit version Only merge this if we decide to release a hotfix for the Maui issue --- eng/Versions.props | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 66bcd35a160f..0a5de56c6976 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 2 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) @@ -26,8 +26,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 27)) - $([MSBuild]::Add($(VersionFeature), 16)) + $([MSBuild]::Add($(VersionFeature), 26)) + $([MSBuild]::Add($(VersionFeature), 15)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From b67b9a904ed364f8c55a3d9db4793ad2bb93326a Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 14 Feb 2024 22:57:53 +0000 Subject: [PATCH 220/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240214.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200 -> To Version 8.0.201 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 13 +--- eng/Version.Details.xml | 134 ++++++++++++++++++++-------------------- eng/Versions.props | 54 ++++++++-------- 3 files changed, 97 insertions(+), 104 deletions(-) diff --git a/NuGet.config b/NuGet.config index bd0c810122ce..780eb8898870 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,18 @@ - - - - + - - + @@ -42,15 +38,12 @@ - - - + - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 503791971797..dabf52107cc8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af4967de46a87229c49f6d567028791c4c4683d0 + ec76419ce020025c133d2fc17d8f0fac589589cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af4967de46a87229c49f6d567028791c4c4683d0 + ec76419ce020025c133d2fc17d8f0fac589589cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af4967de46a87229c49f6d567028791c4c4683d0 + ec76419ce020025c133d2fc17d8f0fac589589cb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - af4967de46a87229c49f6d567028791c4c4683d0 + ec76419ce020025c133d2fc17d8f0fac589589cb https://github.com/dotnet/test-templates @@ -124,57 +124,57 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c58fa00bd16b92aab1d7fb2b93e71af6a7768139 + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 472140dd926227876848e48f41cfc9acb9275492 + ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + https://github.com/dotnet/fsharp - a7979111f86ab7332897ea617635bf3435c39bc3 + b64141459e78b327e39bf59bd5f57737ce0a6a44 - + https://github.com/dotnet/fsharp - a7979111f86ab7332897ea617635bf3435c39bc3 + b64141459e78b327e39bf59bd5f57737ce0a6a44 - + https://github.com/microsoft/vstest - 053d7114a72aac12d1382ecc2a23b2dfdd5b084b + a77b8d5b4aa89504bbff10e2880c27fd55adc55b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://github.com/dotnet/roslyn - 4fc721bbc2c0eac5931f588e1d14ab2a1f936646 + 989117396f26e5453ff157df610d22ce45b6b0a9 - + https://github.com/dotnet/msbuild - 90725d08d9825ad5897029b47f600345c29125b7 + a4ecab324c0586fe69b6bdcc062264b244dd8cd0 - - https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 623fde83a3cd73cb479ec7fa03866c6116894dbf + + https://github.com/nuget/nuget.client + d55931a69dcda3dcb87ba46a09fe268e0febc223 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 diff --git a/eng/Versions.props b/eng/Versions.props index 8858a8d5b1c7..9601fada4752 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.2-servicing.24068.3 + 8.0.1-servicing.23580.6 - 8.0.2-servicing.24068.6 + 8.0.1-servicing.23580.5 @@ -72,50 +72,50 @@ - 8.0.2 - 8.0.2 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 + 8.0.1 + 8.0.1 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 0.2.0 - 8.0.200 - 8.0.200-rtm.24069.18 - 8.0.200-rtm.24069.18 + 8.0.201 + 8.0.201-servicing.24114.17 + 8.0.201-servicing.24114.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.24067.18 + 4.9.0-3.24081.11 - 8.0.2-servicing.24067.11 + 8.0.1-servicing.23580.1 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2 - 8.0.2 - 8.0.2 - 8.0.2 + 8.0.1-servicing.23580.1 + 8.0.1-servicing.23580.1 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.1 2.1.0 - 8.0.2-servicing.24068.6 - 8.0.2-servicing.24068.6 - 8.0.2 - 8.0.2 + 8.0.1-servicing.23580.5 + 8.0.1-servicing.23580.5 + 8.0.1 + 8.0.1 @@ -127,7 +127,7 @@ - 6.9.1-rc.3 + 6.9.0-rc.86 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.9.0-release-23627-01 + 17.9.0-release-24072-02 8.0.0-alpha.1.22557.12 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.2 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From da14072ef82ffae73f398787effe59b7ed6389fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 23:56:45 +0000 Subject: [PATCH 221/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#18659) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.10.0-1.24067.21 to 4.10.0-2.24112.13 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7086d083f64b..276187854e8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - ff9e2c6f223d006a93bc2dcf172c2ab364fc5d9c + 692f9fc7e80596a6ac63090f4fe721f37da19e42 - + https://github.com/dotnet/sdk - ff9e2c6f223d006a93bc2dcf172c2ab364fc5d9c + 692f9fc7e80596a6ac63090f4fe721f37da19e42 - + https://github.com/dotnet/sdk - ff9e2c6f223d006a93bc2dcf172c2ab364fc5d9c + 692f9fc7e80596a6ac63090f4fe721f37da19e42 - + https://github.com/dotnet/sdk - ff9e2c6f223d006a93bc2dcf172c2ab364fc5d9c + 692f9fc7e80596a6ac63090f4fe721f37da19e42 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://github.com/dotnet/roslyn - 3cd939f76803da435c20b082a5cfcc844386fcfb + 892d5f01f7f41dfe7fcd82522276c5628255ef74 diff --git a/eng/Versions.props b/eng/Versions.props index cbb1f4fd970b..3c7d5375341f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24113.18 - 8.0.300-preview.24113.18 - 8.0.300-preview.24113.18 + 8.0.300-preview.24114.9 + 8.0.300-preview.24114.9 + 8.0.300-preview.24114.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-1.24067.21 + 4.10.0-2.24112.13 From 21324dc28ba24c64de08d3f1bc9e798fb76d1fe8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 23:58:19 +0000 Subject: [PATCH 222/652] [release/8.0.2xx] Update dependencies from dotnet/arcade (#18670) [release/8.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 14 +++++++------- eng/common/templates/post-build/post-build.yml | 16 ++++++++-------- .../templates/variables/pool-providers.yml | 12 ++++++------ global.json | 4 ++-- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3471a6b452c2..912f5728bdf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - 61ae141d2bf3534619265c8f691fd55dc3e75147 + da98edc4c3ea539f109ea320672136ceb32591a7 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 66bcd35a160f..129f867738e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24059.4 + 8.0.0-beta.24113.2 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4dd1..5a3a32ea8d75 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index fa5446c093dd..8ec0151def21 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -58,7 +58,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -71,7 +71,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 - task: PowerShell@2 @@ -86,7 +86,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -95,7 +95,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -121,7 +121,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -137,7 +137,7 @@ jobs: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' @@ -148,4 +148,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3f74abf7ce0f..aba44a25a338 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -221,9 +221,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -258,7 +258,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -272,7 +272,7 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 9cc5c550d3b3..d236f9fdbb15 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -1,15 +1,15 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, # otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. -# Motivation: +# Motivation: # Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS # (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing # (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. -# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services -# team needs to move resources around and create new and potentially differently-named pools. Using this template +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template # file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. -# How to use: +# How to use: # This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). # If we find alternate naming conventions in broad usage it can be added to the condition below. # @@ -54,4 +54,4 @@ variables: False, 'NetCore1ESPool-Internal' ) - ] \ No newline at end of file + ] diff --git a/global.json b/global.json index 52a0f29ecf49..e46bfeda971c 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.24059.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24059.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24113.2" } } From 45769a113437a31819e8aef412efd6174b980033 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 23:58:25 +0000 Subject: [PATCH 223/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#18661) [release/8.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/post-build/publish-using-darc.ps1 | 4 ++-- .../templates/job/publish-build-assets.yml | 14 +++++++------- eng/common/templates/post-build/post-build.yml | 16 ++++++++-------- .../templates/variables/pool-providers.yml | 12 ++++++------ global.json | 4 ++-- 7 files changed, 32 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 276187854e8f..75094ba5564b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - be88b08c41971b52ec11aec05ef31e72185d4a1f + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - be88b08c41971b52ec11aec05ef31e72185d4a1f + da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade - be88b08c41971b52ec11aec05ef31e72185d4a1f + da98edc4c3ea539f109ea320672136ceb32591a7 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 3c7d5375341f..9879ef214a73 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24081.5 + 8.0.0-beta.24113.2 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 1e779fec4dd1..5a3a32ea8d75 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -12,7 +12,7 @@ param( try { . $PSScriptRoot\post-build-utils.ps1 - $darc = Get-Darc + $darc = Get-Darc $optionalParams = [System.Collections.ArrayList]::new() @@ -46,7 +46,7 @@ try { } Write-Host 'done.' -} +} catch { Write-Host $_ Write-PipelineTelemetryError -Category 'PromoteBuild' -Message "There was an error while trying to publish build '$BuildId' to default channels." diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index fa5446c093dd..8ec0151def21 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -58,7 +58,7 @@ jobs: demands: Cmd # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: @@ -71,7 +71,7 @@ jobs: checkDownloadedFiles: true condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: NuGetAuthenticate@1 - task: PowerShell@2 @@ -86,7 +86,7 @@ jobs: /p:OfficialBuildId=$(Build.BuildNumber) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} - + - task: powershell@2 displayName: Create ReleaseConfigs Artifact inputs: @@ -95,7 +95,7 @@ jobs: Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) - + - task: PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: @@ -121,7 +121,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Publish SymbolPublishingExclusionsFile Artifact - condition: eq(variables['SymbolExclusionFile'], 'true') + condition: eq(variables['SymbolExclusionFile'], 'true') inputs: PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' PublishLocation: Container @@ -137,7 +137,7 @@ jobs: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' @@ -148,4 +148,4 @@ jobs: - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: - template: /eng/common/templates/steps/publish-logs.yml parameters: - JobLabel: 'Publish_Artifacts_Logs' + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 3f74abf7ce0f..aba44a25a338 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -131,8 +131,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -221,9 +221,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -258,7 +258,7 @@ stages: demands: Cmd # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) + name: NetCore1ESPool-Publishing-Internal demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: setup-maestro-vars.yml @@ -272,7 +272,7 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 9cc5c550d3b3..d236f9fdbb15 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -1,15 +1,15 @@ -# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, # otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. -# Motivation: +# Motivation: # Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS # (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing # (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. -# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services -# team needs to move resources around and create new and potentially differently-named pools. Using this template +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template # file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. -# How to use: +# How to use: # This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). # If we find alternate naming conventions in broad usage it can be added to the condition below. # @@ -54,4 +54,4 @@ variables: False, 'NetCore1ESPool-Internal' ) - ] \ No newline at end of file + ] diff --git a/global.json b/global.json index f27f8981d9df..e46bfeda971c 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.24081.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24081.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24113.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24113.2" } } From ba484b27c374b587d6c6d4f7153dd07f730a10be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 14 Feb 2024 23:58:31 +0000 Subject: [PATCH 224/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18662) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 94cf00988b61..fef83eecfe84 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24112.4", + "version": "1.1.0-beta.24114.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 75094ba5564b..521cfd816bfe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - f78fce70cdf7f2a91475f210ad77c18e60cb91ff + 94bf4ed94375578cbf8b9c28451dddbb44f0842b - + https://github.com/dotnet/arcade-services - f78fce70cdf7f2a91475f210ad77c18e60cb91ff + 94bf4ed94375578cbf8b9c28451dddbb44f0842b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 9879ef214a73..596becd2d86e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24112.4 + 1.1.0-beta.24114.1 From f905d18fd594203a7e162e7c561799b47a336c2b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Feb 2024 09:26:27 -0800 Subject: [PATCH 225/652] disable tests that can't run on the unreleased runtime --- test/SdkTests/TestConfig.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 245dd40e7188..88c5e4f82b4d 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -258,6 +258,14 @@ Issue="" Reason="Requires props file not in installer repo"/> + + From c6a7d6ae60801a83eef9d06482b8abb3c2b750e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 17:29:06 +0000 Subject: [PATCH 226/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#18685) [release/8.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 521cfd816bfe..0dd4cdc7cf50 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 692f9fc7e80596a6ac63090f4fe721f37da19e42 + 1919c17c87e11d77ba8b909f08d9466224143281 - + https://github.com/dotnet/sdk - 692f9fc7e80596a6ac63090f4fe721f37da19e42 + 1919c17c87e11d77ba8b909f08d9466224143281 - + https://github.com/dotnet/sdk - 692f9fc7e80596a6ac63090f4fe721f37da19e42 + 1919c17c87e11d77ba8b909f08d9466224143281 - + https://github.com/dotnet/sdk - 692f9fc7e80596a6ac63090f4fe721f37da19e42 + 1919c17c87e11d77ba8b909f08d9466224143281 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e229db7066bf..e84fa7ad53cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24114.9 - 8.0.300-preview.24114.9 - 8.0.300-preview.24114.9 + 8.0.300-preview.24115.4 + 8.0.300-preview.24115.4 + 8.0.300-preview.24115.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b5ea52f9a1159b6800585d57834b65c0bc78810a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 17:30:43 +0000 Subject: [PATCH 227/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18683) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index fef83eecfe84..8559a1ad79f7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24114.1", + "version": "1.1.0-beta.24114.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dd4cdc7cf50..d7f5a1310040 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - 94bf4ed94375578cbf8b9c28451dddbb44f0842b + b71688df5fa228b14646e2430ece373a9619f583 - + https://github.com/dotnet/arcade-services - 94bf4ed94375578cbf8b9c28451dddbb44f0842b + b71688df5fa228b14646e2430ece373a9619f583 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e84fa7ad53cc..9345c9ccda26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24114.1 + 1.1.0-beta.24114.2 From 16bdce438f3367b2420b16ebf9fe1221cdad749f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 Feb 2024 19:16:13 +0000 Subject: [PATCH 228/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240215.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.200 -> To Version 8.0.201 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- NuGet.config | 9 ++++- eng/Version.Details.xml | 82 ++++++++++++++++++++--------------------- eng/Versions.props | 34 ++++++++--------- 3 files changed, 65 insertions(+), 60 deletions(-) diff --git a/NuGet.config b/NuGet.config index 780eb8898870..db353d72842f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,8 +7,10 @@ + + @@ -16,9 +18,10 @@ + - + @@ -38,10 +41,12 @@ + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dabf52107cc8..dd76287bf2a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 0c7efec09666babeebea1f608c91757b8faccca0 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 0c7efec09666babeebea1f608c91757b8faccca0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec76419ce020025c133d2fc17d8f0fac589589cb + 79f90f547c367657ca67bd09013be8ba339bbf84 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec76419ce020025c133d2fc17d8f0fac589589cb + 79f90f547c367657ca67bd09013be8ba339bbf84 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec76419ce020025c133d2fc17d8f0fac589589cb + 79f90f547c367657ca67bd09013be8ba339bbf84 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ec76419ce020025c133d2fc17d8f0fac589589cb + 79f90f547c367657ca67bd09013be8ba339bbf84 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ a77b8d5b4aa89504bbff10e2880c27fd55adc55b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 0c7efec09666babeebea1f608c91757b8faccca0 https://github.com/dotnet/roslyn @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 9a29abdd764a4de0f253ed368871877a47725247 - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 9a29abdd764a4de0f253ed368871877a47725247 diff --git a/eng/Versions.props b/eng/Versions.props index 9601fada4752..8c58657fba8f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,13 +72,13 @@ - 8.0.1 - 8.0.1 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 + 8.0.3 + 8.0.3 + 8.0.3-servicing.24113.14 + 8.0.3-servicing.24113.14 + 8.0.3-servicing.24113.14 + 8.0.3-servicing.24113.14 + 8.0.3-servicing.24113.14 0.2.0 @@ -86,8 +86,8 @@ 8.0.201 - 8.0.201-servicing.24114.17 - 8.0.201-servicing.24114.17 + 8.0.201-servicing.24115.26 + 8.0.201-servicing.24115.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,16 +98,16 @@ - 8.0.1-servicing.23580.1 + 8.0.3-servicing.24114.5 - 8.0.1-servicing.23580.1 - 8.0.1-servicing.23580.1 - 8.0.1 - 8.0.1 - 8.0.1 - 8.0.1 + 8.0.3-servicing.24114.5 + 8.0.3-servicing.24114.5 + 8.0.3 + 8.0.3 + 8.0.3 + 8.0.3 2.1.0 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.1 + 8.0.3 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 629e8fd12e47a07d840349c7cb80170b8c154410 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Feb 2024 11:45:11 -0800 Subject: [PATCH 229/652] Remove the tests from the list to run in case that's overwriting the skip list --- test/SdkTests/TestConfig.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 88c5e4f82b4d..1da2a5ee8dc5 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -16,8 +16,6 @@ - - From 0cd62eb947e3e183962ba9030952c5262463d810 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Feb 2024 13:12:52 -0800 Subject: [PATCH 230/652] Update implicit versions for Feb --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9345c9ccda26..df1cfbbe20ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - 26 - 15 + 27 + 16 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From f2ed1564f56a3bfff8971b2e0496337482ed38e7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 15 Feb 2024 21:21:27 +0000 Subject: [PATCH 231/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#18692) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.300-beta.24112.4 to 12.8.300-beta.24114.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.300-beta.24112.4 to 8.0.300-beta.24114.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.10.0-2.24112.13 to 4.10.0-2.24114.13 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.10.0-preview-24109-03 to 17.10.0-preview-24115-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d7f5a1310040..770b2a74cdaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 1919c17c87e11d77ba8b909f08d9466224143281 + 782cab2e06d2b5024b73fa4a03370f574128ef2c - + https://github.com/dotnet/sdk - 1919c17c87e11d77ba8b909f08d9466224143281 + 782cab2e06d2b5024b73fa4a03370f574128ef2c - + https://github.com/dotnet/sdk - 1919c17c87e11d77ba8b909f08d9466224143281 + 782cab2e06d2b5024b73fa4a03370f574128ef2c - + https://github.com/dotnet/sdk - 1919c17c87e11d77ba8b909f08d9466224143281 + 782cab2e06d2b5024b73fa4a03370f574128ef2c https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf ac40bed7a33baf164d3984ca90c2aedba996a7b2 - + https://github.com/dotnet/fsharp - 9de468a9bcd1dd5f3791639e0be2227aee0696a7 + 14ddb01cad17d7737028afdd90e36b85a1086626 - + https://github.com/dotnet/fsharp - 9de468a9bcd1dd5f3791639e0be2227aee0696a7 + 14ddb01cad17d7737028afdd90e36b85a1086626 @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://github.com/dotnet/roslyn - 892d5f01f7f41dfe7fcd82522276c5628255ef74 + 77372c66fd54927312b5b0a2e399e192f74445c9 - + https://github.com/dotnet/msbuild - 15f7ddcaafa6622447fa69c1785ab7b3d1183719 + b783f61ef6fcadef68c54daac21e18c1c20fc071 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 9345c9ccda26..4fa7ce4c77f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24115.4 - 8.0.300-preview.24115.4 - 8.0.300-preview.24115.4 + 8.0.300-preview.24115.32 + 8.0.300-preview.24115.32 + 8.0.300-preview.24115.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24112.13 + 4.10.0-2.24114.13 From 7c870b70106da573405d0c84e0e9f6c90f910c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 16 Feb 2024 16:46:53 +0100 Subject: [PATCH 232/652] Add back tests --- test/SdkTests/TestConfig.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/SdkTests/TestConfig.xml b/test/SdkTests/TestConfig.xml index 46a6f8f517ef..f5b3aa5233c6 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -16,6 +16,8 @@ + + From d682c98d5d1c0861d6566ff47621ffff4a6f38b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:14:31 +0000 Subject: [PATCH 233/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#18701) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.10.0-preview-24112-02 to 17.10.0-preview-24114-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 770b2a74cdaf..ed2f6f460e4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/sdk - 782cab2e06d2b5024b73fa4a03370f574128ef2c + 8d363357261a336863d9b4d0fa7c5592ce937642 - + https://github.com/dotnet/sdk - 782cab2e06d2b5024b73fa4a03370f574128ef2c + 8d363357261a336863d9b4d0fa7c5592ce937642 - + https://github.com/dotnet/sdk - 782cab2e06d2b5024b73fa4a03370f574128ef2c + 8d363357261a336863d9b4d0fa7c5592ce937642 - + https://github.com/dotnet/sdk - 782cab2e06d2b5024b73fa4a03370f574128ef2c + 8d363357261a336863d9b4d0fa7c5592ce937642 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 14ddb01cad17d7737028afdd90e36b85a1086626 - + https://github.com/microsoft/vstest - 5eed35d4a9a2e1b688eb86c5e4171e370a561b2a + f6c1ca66f0e01c64d663a8780d501432b680d804 diff --git a/eng/Versions.props b/eng/Versions.props index 4fa7ce4c77f1..1375da55fdc0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24115.32 - 8.0.300-preview.24115.32 - 8.0.300-preview.24115.32 + 8.0.300-preview.24116.2 + 8.0.300-preview.24116.2 + 8.0.300-preview.24116.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24112-02 + 17.10.0-preview-24114-01 8.0.0-alpha.1.22557.12 From 64ae341fb5060659bd46a23cf487c546f6483fdd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 16 Feb 2024 18:16:19 +0000 Subject: [PATCH 234/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18705) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8559a1ad79f7..bf883dfe5498 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24114.2", + "version": "1.1.0-beta.24116.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ed2f6f460e4b..916a6a068a88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - b71688df5fa228b14646e2430ece373a9619f583 + e8b535ab0c8d3a51041e391e1bb280009c330211 - + https://github.com/dotnet/arcade-services - b71688df5fa228b14646e2430ece373a9619f583 + e8b535ab0c8d3a51041e391e1bb280009c330211 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1375da55fdc0..94b36d90077a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24114.2 + 1.1.0-beta.24116.1 From 6ba8ce2677fc7e37df40729db762e030cba3bebd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 23:25:26 +0000 Subject: [PATCH 235/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.60 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.201 -> To Version 8.0.202 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.1 -> To Version 8.0.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++++++--- eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 26 ++++++++-------- 3 files changed, 61 insertions(+), 51 deletions(-) diff --git a/NuGet.config b/NuGet.config index db353d72842f..eacbe0a71047 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,15 +13,20 @@ + + + + + - + - + @@ -44,11 +49,16 @@ - + - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0b95db0193e3..424d0ffb4b1d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79f90f547c367657ca67bd09013be8ba339bbf84 + 48c5197b523937929042c994a0aa83aa8cdd73d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79f90f547c367657ca67bd09013be8ba339bbf84 + 48c5197b523937929042c994a0aa83aa8cdd73d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79f90f547c367657ca67bd09013be8ba339bbf84 + 48c5197b523937929042c994a0aa83aa8cdd73d3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 79f90f547c367657ca67bd09013be8ba339bbf84 + 48c5197b523937929042c994a0aa83aa8cdd73d3 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 + c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ac40bed7a33baf164d3984ca90c2aedba996a7b2 + 472140dd926227876848e48f41cfc9acb9275492 https://github.com/dotnet/fsharp @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 0c7efec09666babeebea1f608c91757b8faccca0 + 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd https://github.com/dotnet/roslyn @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild a4ecab324c0586fe69b6bdcc062264b244dd8cd0 - - https://github.com/nuget/nuget.client - d55931a69dcda3dcb87ba46a09fe268e0febc223 + + https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted + 623fde83a3cd73cb479ec7fa03866c6116894dbf diff --git a/eng/Versions.props b/eng/Versions.props index b7e3b00e3c52..9b511b507188 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23580.6 + 8.0.2-servicing.24068.3 - 8.0.1-servicing.23580.5 + 8.0.2-servicing.24068.6 @@ -85,9 +85,9 @@ - 8.0.201 - 8.0.201-servicing.24115.26 - 8.0.201-servicing.24115.26 + 8.0.202 + 8.0.202-servicing.24116.60 + 8.0.202-servicing.24116.60 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.3-servicing.24114.5 + 8.0.3-servicing.24114.23 - 8.0.3-servicing.24114.5 - 8.0.3-servicing.24114.5 + 8.0.3-servicing.24114.23 + 8.0.3-servicing.24114.23 8.0.3 8.0.3 8.0.3 @@ -112,10 +112,10 @@ - 8.0.1-servicing.23580.5 - 8.0.1-servicing.23580.5 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24068.6 + 8.0.2-servicing.24068.6 + 8.0.2 + 8.0.2 @@ -127,7 +127,7 @@ - 6.9.0-rc.86 + 6.9.1-rc.3 From 2896ad666bfb95926e04872e5f43b7aa1e8b5217 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:14:58 +0000 Subject: [PATCH 236/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.71 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.201 -> To Version 8.0.202 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.1 -> To Version 8.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++------------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index eacbe0a71047..2efd8a26b124 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,11 +13,7 @@ - - - - - + @@ -26,7 +22,7 @@ - + @@ -51,14 +47,10 @@ - + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 424d0ffb4b1d..7041bf7fa4a5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + baf3c0df45e13d065884f7e84260f645295f219e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48c5197b523937929042c994a0aa83aa8cdd73d3 + 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48c5197b523937929042c994a0aa83aa8cdd73d3 + 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48c5197b523937929042c994a0aa83aa8cdd73d3 + 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 48c5197b523937929042c994a0aa83aa8cdd73d3 + 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c58fa00bd16b92aab1d7fb2b93e71af6a7768139 + bd280bbb5c9699bb93097206f076ad2f330ea8e1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 472140dd926227876848e48f41cfc9acb9275492 + 46fb08cfa8160d0885b74c7f28a7b187ab86efed https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9b511b507188..86c79b81005a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.2-servicing.24068.3 + 8.0.3-servicing.24116.3 - 8.0.2-servicing.24068.6 + 8.0.3-servicing.24116.6 @@ -86,8 +86,8 @@ 8.0.202 - 8.0.202-servicing.24116.60 - 8.0.202-servicing.24116.60 + 8.0.202-servicing.24116.71 + 8.0.202-servicing.24116.71 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.2-servicing.24068.6 - 8.0.2-servicing.24068.6 - 8.0.2 - 8.0.2 + 8.0.3-servicing.24116.9 + 8.0.3-servicing.24116.9 + 8.0.3 + 8.0.3 From 01f8164f807fb438066bb60591d02b29e29f6f9e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 17 Feb 2024 00:52:24 +0000 Subject: [PATCH 237/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240216.87 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.201 -> To Version 8.0.202 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,NuGet.Build.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.1 -> To Version 8.0.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2efd8a26b124..9bf35989ec7d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7041bf7fa4a5..c7edb5ad45ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a244ff1c54c5d9c89cbd4244e3ec17e74d91a8b6 + 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc + eb70f97f848818c5ba75752797e43e5940e25745 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc + eb70f97f848818c5ba75752797e43e5940e25745 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc + eb70f97f848818c5ba75752797e43e5940e25745 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 7adf0f8fde6b9dd9f921aac1e9cd5e86815436bc + eb70f97f848818c5ba75752797e43e5940e25745 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 86c79b81005a..20a1879a564a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.3 8.0.3 - 8.0.3-servicing.24113.14 - 8.0.3-servicing.24113.14 - 8.0.3-servicing.24113.14 - 8.0.3-servicing.24113.14 - 8.0.3-servicing.24113.14 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 + 8.0.3-servicing.24116.15 0.2.0 @@ -86,8 +86,8 @@ 8.0.202 - 8.0.202-servicing.24116.71 - 8.0.202-servicing.24116.71 + 8.0.202-servicing.24116.87 + 8.0.202-servicing.24116.87 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f656b13ce2df156a97da70b12eb9e1c62e332f01 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 17 Feb 2024 13:32:32 +0000 Subject: [PATCH 238/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240216.3 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24116.1 -> To Version 1.1.0-beta.24116.3 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.2 -> To Version 8.0.1 (parent: Microsoft.NET.Sdk --- .config/dotnet-tools.json | 2 +- NuGet.config | 10 ---- eng/Version.Details.xml | 100 +++++++++++++++++++------------------- eng/Versions.props | 44 ++++++++--------- 4 files changed, 73 insertions(+), 83 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index bf883dfe5498..93956909113d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24116.1", + "version": "1.1.0-beta.24116.3", "commands": [ "darc" ] diff --git a/NuGet.config b/NuGet.config index bd0c810122ce..35977ccbda9a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,16 @@ - - - - - - @@ -42,15 +36,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38540879661f..f83e68863c1f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 @@ -52,38 +52,38 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 8e941eb42f819adb116b881195158b3887a70a1c https://github.com/dotnet/sdk @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c58fa00bd16b92aab1d7fb2b93e71af6a7768139 + 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 472140dd926227876848e48f41cfc9acb9275492 + ac40bed7a33baf164d3984ca90c2aedba996a7b2 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ f6c1ca66f0e01c64d663a8780d501432b680d804 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + bf5e279d9239bfef5bb1b8d6212f1b971c434606 https://github.com/dotnet/roslyn @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - e8b535ab0c8d3a51041e391e1bb280009c330211 + 96b6c69bb9975a7798da873ee9ef0b03373a939a - + https://github.com/dotnet/arcade-services - e8b535ab0c8d3a51041e391e1bb280009c330211 + 96b6c69bb9975a7798da873ee9ef0b03373a939a https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 23d93170ad7f..cdc969e00158 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,15 +44,15 @@ - 1.1.0-beta.24116.1 + 1.1.0-beta.24116.3 - 8.0.2-servicing.24068.3 + 8.0.1-servicing.23580.6 - 8.0.2-servicing.24068.6 + 8.0.1-servicing.23580.5 @@ -72,13 +72,13 @@ - 8.0.2 - 8.0.2 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 + 8.0.1 + 8.0.1 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 + 8.0.1-servicing.23580.8 0.2.0 @@ -98,24 +98,24 @@ - 8.0.2-servicing.24067.11 + 8.0.1-servicing.23580.1 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2 - 8.0.2 - 8.0.2 - 8.0.2 + 8.0.1-servicing.23580.1 + 8.0.1-servicing.23580.1 + 8.0.1 + 8.0.1 + 8.0.1 + 8.0.1 2.1.0 - 8.0.2-servicing.24068.6 - 8.0.2-servicing.24068.6 - 8.0.2 - 8.0.2 + 8.0.1-servicing.23580.5 + 8.0.1-servicing.23580.5 + 8.0.1 + 8.0.1 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.2 + 8.0.1 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 11303e6b9bd5a42a9152f95c7036086a8c554727 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 18 Feb 2024 03:52:36 +0000 Subject: [PATCH 239/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#18710) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.WindowsDesktop.App.Ref: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0: from 8.0.1-servicing.23580.5 to 8.0.2-servicing.24068.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0: from 8.0.1-servicing.23580.5 to 8.0.2-servicing.24068.6 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.SharedFramework.x64.8.0: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Ref: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.NetCore.TargetingPack.x64.8.0: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Host.win-x64: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.DotNetHostResolver: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.Platforms: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24067.11 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Ref.Internal: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - Microsoft.AspNetCore.App.Runtime.win-x64: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - dotnet-dev-certs: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - dotnet-user-jwts: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - dotnet-user-secrets: from 8.0.1-servicing.23580.8 to 8.0.2-servicing.24068.4 (parent: Microsoft.NET.Sdk) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.Dotnet.WinForms.ProjectTemplates: from 8.0.1-servicing.23580.6 to 8.0.2-servicing.24068.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.WindowsDesktop.App.Runtime.win-x64: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.DotNet.Wpf.ProjectTemplates: from 8.0.1-servicing.23580.5 to 8.0.2-servicing.24068.6 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - Microsoft.FSharp.Compiler: from 12.8.300-beta.24114.2 to 12.8.300-beta.24115.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.300-beta.24114.2 to 8.0.300-beta.24115.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Test.Sdk: from 17.10.0-preview-24114-01 to 17.10.0-preview-24116-01 (parent: Microsoft.NET.Sdk) - Microsoft.NET.ILLink.Tasks: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.Net.Compilers.Toolset: from 4.10.0-2.24114.13 to 4.10.0-2.24116.4 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.10.0-preview-24115-01 to 17.10.0-preview-24116-06 (parent: Microsoft.NET.Sdk) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100: from 8.0.1 to 8.0.2 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Microsoft.NETCore.App.Runtime.win-x64: from 8.0.1 to 8.0.2 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.emsdk: from 8.0.1-servicing.23571.1 to 8.0.2-servicing.24062.1 (parent: Microsoft.NETCore.App.Runtime.win-x64) - Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer into darc-release/8.0.3xx-136067a1-49ce-4144-a039-3ec10c318bb1 --- NuGet.config | 9 +++ eng/Version.Details.xml | 128 ++++++++++++++++++++-------------------- eng/Versions.props | 52 ++++++++-------- 3 files changed, 99 insertions(+), 90 deletions(-) diff --git a/NuGet.config b/NuGet.config index 35977ccbda9a..09597eeba522 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,12 @@ + + + + + + @@ -41,6 +47,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f83e68863c1f..519804902404 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - a0e7b5d8673f28c41bcac6e2001b39ba2c8fab54 + 593444ad8328a5a933c006c6564469666f45ad2e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e941eb42f819adb116b881195158b3887a70a1c + da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 8d363357261a336863d9b4d0fa7c5592ce937642 + 72b4019558f443896adb87e614de75b94af4de94 - + https://github.com/dotnet/sdk - 8d363357261a336863d9b4d0fa7c5592ce937642 + 72b4019558f443896adb87e614de75b94af4de94 - + https://github.com/dotnet/sdk - 8d363357261a336863d9b4d0fa7c5592ce937642 + 72b4019558f443896adb87e614de75b94af4de94 - + https://github.com/dotnet/sdk - 8d363357261a336863d9b4d0fa7c5592ce937642 + 72b4019558f443896adb87e614de75b94af4de94 https://github.com/dotnet/test-templates @@ -124,40 +124,40 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 0b4028eb507aeb222f5bd1fc421876cc5e5e3fb8 + c58fa00bd16b92aab1d7fb2b93e71af6a7768139 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - ac40bed7a33baf164d3984ca90c2aedba996a7b2 + 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 14ddb01cad17d7737028afdd90e36b85a1086626 + efff9e358a26116fe7f0c513ed5534dc4de740a6 - + https://github.com/dotnet/fsharp - 14ddb01cad17d7737028afdd90e36b85a1086626 + efff9e358a26116fe7f0c513ed5534dc4de740a6 - + https://github.com/microsoft/vstest - f6c1ca66f0e01c64d663a8780d501432b680d804 + 5d731c3c1afa6456b447c7efa11eacb313964e02 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - bf5e279d9239bfef5bb1b8d6212f1b971c434606 + 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 77372c66fd54927312b5b0a2e399e192f74445c9 + f656544b1a42c3d212362dab79829e0b3abe30f4 - + https://github.com/dotnet/msbuild - b783f61ef6fcadef68c54daac21e18c1c20fc071 + 23f77529a83531782dd498bf400381842c3d2d9e https://github.com/nuget/nuget.client @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d - + https://github.com/dotnet/emsdk - 201f4dae9d1a1e105d8ba86d7ece61eed1f665e0 + 2fc2ffd960930318f33fcaa690cbdbc55d72f52d diff --git a/eng/Versions.props b/eng/Versions.props index cdc969e00158..74405626a7a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.1-servicing.23580.6 + 8.0.2-servicing.24068.3 - 8.0.1-servicing.23580.5 + 8.0.2-servicing.24068.6 @@ -72,50 +72,50 @@ - 8.0.1 - 8.0.1 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 - 8.0.1-servicing.23580.8 + 8.0.2 + 8.0.2 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 + 8.0.2-servicing.24068.4 0.2.0 - 8.0.300-preview.24116.2 - 8.0.300-preview.24116.2 - 8.0.300-preview.24116.2 + 8.0.300-preview.24117.2 + 8.0.300-preview.24117.2 + 8.0.300-preview.24117.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24114.13 + 4.10.0-2.24116.4 - 8.0.1-servicing.23580.1 + 8.0.2-servicing.24067.11 - 8.0.1-servicing.23580.1 - 8.0.1-servicing.23580.1 - 8.0.1 - 8.0.1 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24067.11 + 8.0.2-servicing.24067.11 + 8.0.2 + 8.0.2 + 8.0.2 + 8.0.2 2.1.0 - 8.0.1-servicing.23580.5 - 8.0.1-servicing.23580.5 - 8.0.1 - 8.0.1 + 8.0.2-servicing.24068.6 + 8.0.2-servicing.24068.6 + 8.0.2 + 8.0.2 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24114-01 + 17.10.0-preview-24116-01 8.0.0-alpha.1.22557.12 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.1 + 8.0.2 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 9f23c33cd665de0821962fbe5362ddfaa048e509 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 19 Feb 2024 13:27:56 +0000 Subject: [PATCH 240/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240219.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24116.3 -> To Version 1.1.0-beta.24119.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 93956909113d..a61f1c3d28c4 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24116.3", + "version": "1.1.0-beta.24119.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 519804902404..26be08c6daa0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - 96b6c69bb9975a7798da873ee9ef0b03373a939a + a7ff621078f5c8843ba7f30a73e8f9f5bfe7febb - + https://github.com/dotnet/arcade-services - 96b6c69bb9975a7798da873ee9ef0b03373a939a + a7ff621078f5c8843ba7f30a73e8f9f5bfe7febb https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3564e4b4792f..ec7111f31479 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24116.3 + 1.1.0-beta.24119.1 From 8570553fbeaed7ec9f7c1d38f0b7f21381439af2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Feb 2024 02:50:30 +0000 Subject: [PATCH 241/652] Update dependencies from https://github.com/dotnet/sdk build 20240219.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24117.2 -> To Version 8.0.300-preview.24119.2 --- NuGet.config | 4 ---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 09597eeba522..76d6c5c5e705 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,10 +9,6 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 26be08c6daa0..d5aed7d173e8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 72b4019558f443896adb87e614de75b94af4de94 + fbd02b3824b6a0956ade1ccffe685ed24cd47e24 - + https://github.com/dotnet/sdk - 72b4019558f443896adb87e614de75b94af4de94 + fbd02b3824b6a0956ade1ccffe685ed24cd47e24 - + https://github.com/dotnet/sdk - 72b4019558f443896adb87e614de75b94af4de94 + fbd02b3824b6a0956ade1ccffe685ed24cd47e24 - + https://github.com/dotnet/sdk - 72b4019558f443896adb87e614de75b94af4de94 + fbd02b3824b6a0956ade1ccffe685ed24cd47e24 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ec7111f31479..4f38d356a39e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24117.2 - 8.0.300-preview.24117.2 - 8.0.300-preview.24117.2 + 8.0.300-preview.24119.2 + 8.0.300-preview.24119.2 + 8.0.300-preview.24119.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 918f2157888df84b89e139282f7d09312144e8a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Feb 2024 06:25:27 +0000 Subject: [PATCH 242/652] Update dependencies from https://github.com/dotnet/sdk build 20240219.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24119.2 -> To Version 8.0.300-preview.24119.5 Dependency coherency updates Microsoft.Build From Version 17.10.0-preview-24116-06 -> To Version 17.10.0-preview-24119-02 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d5aed7d173e8..80c7ea558343 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - fbd02b3824b6a0956ade1ccffe685ed24cd47e24 + cf7d79bd2d538c4fad5bbeb836ad600328e6588a - + https://github.com/dotnet/sdk - fbd02b3824b6a0956ade1ccffe685ed24cd47e24 + cf7d79bd2d538c4fad5bbeb836ad600328e6588a - + https://github.com/dotnet/sdk - fbd02b3824b6a0956ade1ccffe685ed24cd47e24 + cf7d79bd2d538c4fad5bbeb836ad600328e6588a - + https://github.com/dotnet/sdk - fbd02b3824b6a0956ade1ccffe685ed24cd47e24 + cf7d79bd2d538c4fad5bbeb836ad600328e6588a https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ f656544b1a42c3d212362dab79829e0b3abe30f4 - + https://github.com/dotnet/msbuild - 23f77529a83531782dd498bf400381842c3d2d9e + 3f6dd37bc7a4ee5d1a75e4d690b7278c5cd91683 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 4f38d356a39e..d7d73bfd2425 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24119.2 - 8.0.300-preview.24119.2 - 8.0.300-preview.24119.2 + 8.0.300-preview.24119.5 + 8.0.300-preview.24119.5 + 8.0.300-preview.24119.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6dc8ed7b974331fd0abbc61ef433a88848a9e3d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Feb 2024 13:36:10 +0000 Subject: [PATCH 243/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240220.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24119.1 -> To Version 1.1.0-beta.24120.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a61f1c3d28c4..b44e1ffa9b3b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24119.1", + "version": "1.1.0-beta.24120.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 80c7ea558343..2ac25dd8c1df 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - a7ff621078f5c8843ba7f30a73e8f9f5bfe7febb + ec44dc78f4fce3309f2c2a8ffe6ab6bfca5f0a1b - + https://github.com/dotnet/arcade-services - a7ff621078f5c8843ba7f30a73e8f9f5bfe7febb + ec44dc78f4fce3309f2c2a8ffe6ab6bfca5f0a1b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d7d73bfd2425..4eadf8823b53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24119.1 + 1.1.0-beta.24120.2 From 886c8a754ad95a7d7ea5b6787a0bce0d0ee78d0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Feb 2024 18:38:43 +0000 Subject: [PATCH 244/652] Update dependencies from https://github.com/dotnet/sdk build 20240220.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24119.5 -> To Version 8.0.300-preview.24120.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24115.2 -> To Version 12.8.300-beta.24119.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2ac25dd8c1df..93a8e3833015 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - cf7d79bd2d538c4fad5bbeb836ad600328e6588a + addf6cb4ce9577551a8fd691e365834a15e82ea6 - + https://github.com/dotnet/sdk - cf7d79bd2d538c4fad5bbeb836ad600328e6588a + addf6cb4ce9577551a8fd691e365834a15e82ea6 - + https://github.com/dotnet/sdk - cf7d79bd2d538c4fad5bbeb836ad600328e6588a + addf6cb4ce9577551a8fd691e365834a15e82ea6 - + https://github.com/dotnet/sdk - cf7d79bd2d538c4fad5bbeb836ad600328e6588a + addf6cb4ce9577551a8fd691e365834a15e82ea6 https://github.com/dotnet/test-templates @@ -132,27 +132,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - efff9e358a26116fe7f0c513ed5534dc4de740a6 + e74bc18e6411ce3a6265aabd36ae6491ee4ebf5c - + https://github.com/dotnet/fsharp - efff9e358a26116fe7f0c513ed5534dc4de740a6 + e74bc18e6411ce3a6265aabd36ae6491ee4ebf5c - + https://github.com/microsoft/vstest - 5d731c3c1afa6456b447c7efa11eacb313964e02 + c13b1f9b2bb6acbb9785de003be3d9ace33c9d7c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - f656544b1a42c3d212362dab79829e0b3abe30f4 + 25aa74d725e801b8232dbb3e5abcda0fa72da8c5 diff --git a/eng/Versions.props b/eng/Versions.props index 4eadf8823b53..6c160e4df3b7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24119.5 - 8.0.300-preview.24119.5 - 8.0.300-preview.24119.5 + 8.0.300-preview.24120.4 + 8.0.300-preview.24120.4 + 8.0.300-preview.24120.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24116.4 + 4.10.0-2.24120.1 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24116-01 + 17.10.0-preview-24119-01 8.0.0-alpha.1.22557.12 From 8a2c7a96924529dab6c227bcc8a9a34b2d33fec8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 20 Feb 2024 19:40:48 +0000 Subject: [PATCH 245/652] Update dependencies from https://github.com/dotnet/sdk build 20240220.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24119.5 -> To Version 8.0.300-preview.24120.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.300-beta.24115.2 -> To Version 12.8.300-beta.24119.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 93a8e3833015..bb48e0223939 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - addf6cb4ce9577551a8fd691e365834a15e82ea6 + 3977ae6295936ea725ef20adee06d472c60deec5 - + https://github.com/dotnet/sdk - addf6cb4ce9577551a8fd691e365834a15e82ea6 + 3977ae6295936ea725ef20adee06d472c60deec5 - + https://github.com/dotnet/sdk - addf6cb4ce9577551a8fd691e365834a15e82ea6 + 3977ae6295936ea725ef20adee06d472c60deec5 - + https://github.com/dotnet/sdk - addf6cb4ce9577551a8fd691e365834a15e82ea6 + 3977ae6295936ea725ef20adee06d472c60deec5 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 25aa74d725e801b8232dbb3e5abcda0fa72da8c5 - + https://github.com/dotnet/msbuild - 3f6dd37bc7a4ee5d1a75e4d690b7278c5cd91683 + 53c4f49868e88ecd7407339a3f4dab9e75c7937f https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 6c160e4df3b7..b92a5a5c797e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24120.4 - 8.0.300-preview.24120.4 - 8.0.300-preview.24120.4 + 8.0.300-preview.24120.6 + 8.0.300-preview.24120.6 + 8.0.300-preview.24120.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b3a0178e3a1b1b6a0a17455b5f7f8f695a689409 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 00:10:49 +0000 Subject: [PATCH 246/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240220.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.202 -> To Version 8.0.202 --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9bf35989ec7d..e49b2e3081df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,25 @@ + + + + - + @@ -42,14 +46,17 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7edb5ad45ea..d4a3824ed509 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb70f97f848818c5ba75752797e43e5940e25745 + 8117aaf24aff844d5ff400647af7136dbbe4174f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb70f97f848818c5ba75752797e43e5940e25745 + 8117aaf24aff844d5ff400647af7136dbbe4174f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb70f97f848818c5ba75752797e43e5940e25745 + 8117aaf24aff844d5ff400647af7136dbbe4174f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb70f97f848818c5ba75752797e43e5940e25745 + 8117aaf24aff844d5ff400647af7136dbbe4174f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 20a1879a564a..448c96a59f56 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.202 - 8.0.202-servicing.24116.87 - 8.0.202-servicing.24116.87 + 8.0.202-servicing.24120.12 + 8.0.202-servicing.24120.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2fd3b64555db8d148fbb2e5ba59a9d1ece5fb483 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Feb 2024 05:46:16 +0000 Subject: [PATCH 247/652] Update dependencies from https://github.com/dotnet/sdk build 20240220.28 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24120.6 -> To Version 8.0.300-preview.24120.28 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb48e0223939..24f627816b73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 3977ae6295936ea725ef20adee06d472c60deec5 + 0be44f810fc1074a8ce19f02a5877493ebd40680 - + https://github.com/dotnet/sdk - 3977ae6295936ea725ef20adee06d472c60deec5 + 0be44f810fc1074a8ce19f02a5877493ebd40680 - + https://github.com/dotnet/sdk - 3977ae6295936ea725ef20adee06d472c60deec5 + 0be44f810fc1074a8ce19f02a5877493ebd40680 - + https://github.com/dotnet/sdk - 3977ae6295936ea725ef20adee06d472c60deec5 + 0be44f810fc1074a8ce19f02a5877493ebd40680 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b92a5a5c797e..7b21521c6dfd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24120.6 - 8.0.300-preview.24120.6 - 8.0.300-preview.24120.6 + 8.0.300-preview.24120.28 + 8.0.300-preview.24120.28 + 8.0.300-preview.24120.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bc50a67febd219b370690eb11bd87d9e51fc9cea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Feb 2024 13:28:49 +0000 Subject: [PATCH 248/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240221.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24120.2 -> To Version 1.1.0-beta.24121.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b44e1ffa9b3b..14f6417bbb7b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24120.2", + "version": "1.1.0-beta.24121.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24f627816b73..35665e980992 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - ec44dc78f4fce3309f2c2a8ffe6ab6bfca5f0a1b + 846b89e45f98c63d88d84f9ae2314e430d799c3b - + https://github.com/dotnet/arcade-services - ec44dc78f4fce3309f2c2a8ffe6ab6bfca5f0a1b + 846b89e45f98c63d88d84f9ae2314e430d799c3b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7b21521c6dfd..4c673751bced 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24120.2 + 1.1.0-beta.24121.1 From d8c5b2d9af50b8d95a7c2a70a22a94229d894c97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Feb 2024 21:09:23 +0000 Subject: [PATCH 249/652] Update dependencies from https://github.com/dotnet/sdk build 20240221.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24120.28 -> To Version 8.0.300-preview.24121.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build From Version 12.8.300-beta.24119.1 -> To Version 12.8.300-beta.24120.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 6 +++--- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 24f627816b73..9200b6a56ee0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 0be44f810fc1074a8ce19f02a5877493ebd40680 + 08059da317ff921edbd60accf09505248f19d950 - + https://github.com/dotnet/sdk - 0be44f810fc1074a8ce19f02a5877493ebd40680 + 08059da317ff921edbd60accf09505248f19d950 - + https://github.com/dotnet/sdk - 0be44f810fc1074a8ce19f02a5877493ebd40680 + 08059da317ff921edbd60accf09505248f19d950 - + https://github.com/dotnet/sdk - 0be44f810fc1074a8ce19f02a5877493ebd40680 + 08059da317ff921edbd60accf09505248f19d950 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - e74bc18e6411ce3a6265aabd36ae6491ee4ebf5c + f2a6810476e1b589bcf56eb5f377c5214c509bc6 - + https://github.com/dotnet/fsharp - e74bc18e6411ce3a6265aabd36ae6491ee4ebf5c + f2a6810476e1b589bcf56eb5f377c5214c509bc6 @@ -155,9 +155,9 @@ 25aa74d725e801b8232dbb3e5abcda0fa72da8c5 - + https://github.com/dotnet/msbuild - 53c4f49868e88ecd7407339a3f4dab9e75c7937f + aa5b55280b9e4ba92aaf39a650b94227a44bf834 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 7b21521c6dfd..515723c743ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24120.28 - 8.0.300-preview.24120.28 - 8.0.300-preview.24120.28 + 8.0.300-preview.24121.2 + 8.0.300-preview.24121.2 + 8.0.300-preview.24121.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e7a45ecd84ff66168769696df9dd63e5c773339a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 21 Feb 2024 21:53:33 +0000 Subject: [PATCH 250/652] Update dependencies from https://github.com/dotnet/sdk build 20240221.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24120.28 -> To Version 8.0.300-preview.24121.4 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 12.8.300-beta.24119.1 -> To Version 12.8.300-beta.24120.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9200b6a56ee0..6aa81559b575 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 08059da317ff921edbd60accf09505248f19d950 + c293e7562fdeda4268080558c279355c2e25ac14 - + https://github.com/dotnet/sdk - 08059da317ff921edbd60accf09505248f19d950 + c293e7562fdeda4268080558c279355c2e25ac14 - + https://github.com/dotnet/sdk - 08059da317ff921edbd60accf09505248f19d950 + c293e7562fdeda4268080558c279355c2e25ac14 - + https://github.com/dotnet/sdk - 08059da317ff921edbd60accf09505248f19d950 + c293e7562fdeda4268080558c279355c2e25ac14 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 25aa74d725e801b8232dbb3e5abcda0fa72da8c5 + 3472dcbca677f86bced5a1f180ae45e83c3e8f2d diff --git a/eng/Versions.props b/eng/Versions.props index 515723c743ea..b89851eee26a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24121.2 - 8.0.300-preview.24121.2 - 8.0.300-preview.24121.2 + 8.0.300-preview.24121.4 + 8.0.300-preview.24121.4 + 8.0.300-preview.24121.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24120.1 + 4.10.0-2.24121.2 From cdf975bb994d473ff7fc3d76a3c57d35ee122a41 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 21:59:27 +0000 Subject: [PATCH 251/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240221.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.202 -> To Version 8.0.202 --- NuGet.config | 6 +++--- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index e49b2e3081df..773d2a57ebb4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,14 +19,14 @@ - + - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d4a3824ed509..29a5272e6f6a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8117aaf24aff844d5ff400647af7136dbbe4174f + 5089683c8415e19425582bec77c5d91fa38c7b6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8117aaf24aff844d5ff400647af7136dbbe4174f + 5089683c8415e19425582bec77c5d91fa38c7b6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8117aaf24aff844d5ff400647af7136dbbe4174f + 5089683c8415e19425582bec77c5d91fa38c7b6c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8117aaf24aff844d5ff400647af7136dbbe4174f + 5089683c8415e19425582bec77c5d91fa38c7b6c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 448c96a59f56..6de8d862c528 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.202 - 8.0.202-servicing.24120.12 - 8.0.202-servicing.24120.12 + 8.0.202-servicing.24121.5 + 8.0.202-servicing.24121.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 33619720681ff30d59a160ec88293a32be864042 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:48:51 +0000 Subject: [PATCH 252/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#18753) [release/8.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29bed6e7e3a7..395022070ddc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c293e7562fdeda4268080558c279355c2e25ac14 + 8eea5e6b3b39002eb60211447718a043985efd81 - + https://github.com/dotnet/sdk - c293e7562fdeda4268080558c279355c2e25ac14 + 8eea5e6b3b39002eb60211447718a043985efd81 - + https://github.com/dotnet/sdk - c293e7562fdeda4268080558c279355c2e25ac14 + 8eea5e6b3b39002eb60211447718a043985efd81 - + https://github.com/dotnet/sdk - c293e7562fdeda4268080558c279355c2e25ac14 + 8eea5e6b3b39002eb60211447718a043985efd81 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e1bc17a2186d..cab7dce389ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24121.4 - 8.0.300-preview.24121.4 - 8.0.300-preview.24121.4 + 8.0.300-preview.24122.6 + 8.0.300-preview.24122.6 + 8.0.300-preview.24122.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 44bbbf3d32c3a74c7879dc3fdcb536c4b0211564 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 22 Feb 2024 22:49:55 +0000 Subject: [PATCH 253/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18747) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 14f6417bbb7b..01905f676a05 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24121.1", + "version": "1.1.0-beta.24121.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 395022070ddc..bced0592bf9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - 846b89e45f98c63d88d84f9ae2314e430d799c3b + 1b327f29751e73d06f66e45d0ad16d1b906fd4c4 - + https://github.com/dotnet/arcade-services - 846b89e45f98c63d88d84f9ae2314e430d799c3b + 1b327f29751e73d06f66e45d0ad16d1b906fd4c4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index cab7dce389ee..dd595f4d9d5b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24121.1 + 1.1.0-beta.24121.3 From 85413a8d9af67e31cb68262e1acfc4fb75ebb000 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Feb 2024 00:55:30 +0000 Subject: [PATCH 254/652] Update dependencies from https://github.com/dotnet/sdk build 20240222.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24122.6 -> To Version 8.0.300-preview.24122.10 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-preview-24119-01 -> To Version 17.10.0-preview-24120-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bced0592bf9b..3499ce35b441 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 8eea5e6b3b39002eb60211447718a043985efd81 + cff0933b10b3ff5f6a470045f53ee28a02cb046f - + https://github.com/dotnet/sdk - 8eea5e6b3b39002eb60211447718a043985efd81 + cff0933b10b3ff5f6a470045f53ee28a02cb046f - + https://github.com/dotnet/sdk - 8eea5e6b3b39002eb60211447718a043985efd81 + cff0933b10b3ff5f6a470045f53ee28a02cb046f - + https://github.com/dotnet/sdk - 8eea5e6b3b39002eb60211447718a043985efd81 + cff0933b10b3ff5f6a470045f53ee28a02cb046f https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ f2a6810476e1b589bcf56eb5f377c5214c509bc6 - + https://github.com/microsoft/vstest - c13b1f9b2bb6acbb9785de003be3d9ace33c9d7c + 48d8e778c871315db0bad221b00f4843b06242c3 diff --git a/eng/Versions.props b/eng/Versions.props index dd595f4d9d5b..7cd77f4df144 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24122.6 - 8.0.300-preview.24122.6 - 8.0.300-preview.24122.6 + 8.0.300-preview.24122.10 + 8.0.300-preview.24122.10 + 8.0.300-preview.24122.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24119-01 + 17.10.0-preview-24120-01 8.0.0-alpha.1.22557.12 From cb55e5a710a00797ebe08f35946e8c0653e48e8e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Feb 2024 01:42:15 +0000 Subject: [PATCH 255/652] Update dependencies from https://github.com/dotnet/sdk build 20240222.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24122.6 -> To Version 8.0.300-preview.24122.12 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 17.10.0-preview-24119-01 -> To Version 17.10.0-preview-24120-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3499ce35b441..09346dc56b67 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - cff0933b10b3ff5f6a470045f53ee28a02cb046f + 61a668d8b0b763202e0f7c0aa99fedfe538b1905 - + https://github.com/dotnet/sdk - cff0933b10b3ff5f6a470045f53ee28a02cb046f + 61a668d8b0b763202e0f7c0aa99fedfe538b1905 - + https://github.com/dotnet/sdk - cff0933b10b3ff5f6a470045f53ee28a02cb046f + 61a668d8b0b763202e0f7c0aa99fedfe538b1905 - + https://github.com/dotnet/sdk - cff0933b10b3ff5f6a470045f53ee28a02cb046f + 61a668d8b0b763202e0f7c0aa99fedfe538b1905 https://github.com/dotnet/test-templates @@ -155,13 +155,13 @@ 3472dcbca677f86bced5a1f180ae45e83c3e8f2d - + https://github.com/dotnet/msbuild - aa5b55280b9e4ba92aaf39a650b94227a44bf834 + d4cb14fe4d2e6df0327308feab18ccbb2046246c - + https://github.com/nuget/nuget.client - 8b658e2eee6391936887b9fd1b39f7918d16a9cb + d49b8abb6b64d2a49a439380af8c62d099ba31fb diff --git a/eng/Versions.props b/eng/Versions.props index 7cd77f4df144..e42812001f84 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24122.10 - 8.0.300-preview.24122.10 - 8.0.300-preview.24122.10 + 8.0.300-preview.24122.12 + 8.0.300-preview.24122.12 + 8.0.300-preview.24122.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.32 + 6.10.0-preview.2.40 From 692cbcc559c766ffc1d50ffdfbad1244e4910ad0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Feb 2024 03:21:23 +0000 Subject: [PATCH 256/652] Update dependencies from https://github.com/dotnet/sdk build 20240222.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24122.6 -> To Version 8.0.300-preview.24122.14 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.300-beta.24120.1 -> To Version 12.8.300-beta.24121.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09346dc56b67..dcb4d8f913e1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 61a668d8b0b763202e0f7c0aa99fedfe538b1905 + d8df3998654ab7ee0cbad0f321731f063b1a71b2 - + https://github.com/dotnet/sdk - 61a668d8b0b763202e0f7c0aa99fedfe538b1905 + d8df3998654ab7ee0cbad0f321731f063b1a71b2 - + https://github.com/dotnet/sdk - 61a668d8b0b763202e0f7c0aa99fedfe538b1905 + d8df3998654ab7ee0cbad0f321731f063b1a71b2 - + https://github.com/dotnet/sdk - 61a668d8b0b763202e0f7c0aa99fedfe538b1905 + d8df3998654ab7ee0cbad0f321731f063b1a71b2 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - f2a6810476e1b589bcf56eb5f377c5214c509bc6 + b1a970dcc7631fb07ec20f2f0485ae732c3f30d7 - + https://github.com/dotnet/fsharp - f2a6810476e1b589bcf56eb5f377c5214c509bc6 + b1a970dcc7631fb07ec20f2f0485ae732c3f30d7 diff --git a/eng/Versions.props b/eng/Versions.props index e42812001f84..90156633a0e9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24122.12 - 8.0.300-preview.24122.12 - 8.0.300-preview.24122.12 + 8.0.300-preview.24122.14 + 8.0.300-preview.24122.14 + 8.0.300-preview.24122.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From df88b919dd72fa79232e70ed6e9f3fd8a01604a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 23 Feb 2024 19:09:58 +0000 Subject: [PATCH 257/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18758) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 01905f676a05..cc3b1734c6f2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24121.3", + "version": "1.1.0-beta.24123.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcb4d8f913e1..1c1829215061 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - 1b327f29751e73d06f66e45d0ad16d1b906fd4c4 + ad1622f5e314fdb10d6484a9348822a4dd928f98 - + https://github.com/dotnet/arcade-services - 1b327f29751e73d06f66e45d0ad16d1b906fd4c4 + ad1622f5e314fdb10d6484a9348822a4dd928f98 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 90156633a0e9..4b1315e54465 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24121.3 + 1.1.0-beta.24123.1 From d39b3d20cf4c0ece1d5772bbeac14540dc8d4f8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Feb 2024 01:06:01 +0000 Subject: [PATCH 258/652] Update dependencies from https://github.com/dotnet/sdk build 20240223.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24122.14 -> To Version 8.0.300-preview.24123.12 Dependency coherency updates NuGet.Build.Tasks From Version 6.10.0-preview.2.40 -> To Version 6.10.0-preview.2.41 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c1829215061..21db136e71aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - d8df3998654ab7ee0cbad0f321731f063b1a71b2 + 195fc36bdd8193f077f8e7a09629f9080e0a563c - + https://github.com/dotnet/sdk - d8df3998654ab7ee0cbad0f321731f063b1a71b2 + 195fc36bdd8193f077f8e7a09629f9080e0a563c - + https://github.com/dotnet/sdk - d8df3998654ab7ee0cbad0f321731f063b1a71b2 + 195fc36bdd8193f077f8e7a09629f9080e0a563c - + https://github.com/dotnet/sdk - d8df3998654ab7ee0cbad0f321731f063b1a71b2 + 195fc36bdd8193f077f8e7a09629f9080e0a563c https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild d4cb14fe4d2e6df0327308feab18ccbb2046246c - + https://github.com/nuget/nuget.client - d49b8abb6b64d2a49a439380af8c62d099ba31fb + 63958aab19b7120862ff55eac32ab6a155596a59 diff --git a/eng/Versions.props b/eng/Versions.props index 4b1315e54465..0b594ac3bb09 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24122.14 - 8.0.300-preview.24122.14 - 8.0.300-preview.24122.14 + 8.0.300-preview.24123.12 + 8.0.300-preview.24123.12 + 8.0.300-preview.24123.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.40 + 6.10.0-preview.2.41 From f1eb52b96dba29a540344ee14dc9d91d5e81d5b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Feb 2024 16:12:57 +0000 Subject: [PATCH 259/652] Update dependencies from https://github.com/dotnet/sdk build 20240224.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24122.14 -> To Version 8.0.300-preview.24124.1 Dependency coherency updates Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 17.10.0-preview-24120-01 -> To Version 17.10.0-preview-24123-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 21db136e71aa..9e91b8be0d55 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 195fc36bdd8193f077f8e7a09629f9080e0a563c + a9d563a05e231804b58f8758cbf2552e9a62fe2c - + https://github.com/dotnet/sdk - 195fc36bdd8193f077f8e7a09629f9080e0a563c + a9d563a05e231804b58f8758cbf2552e9a62fe2c - + https://github.com/dotnet/sdk - 195fc36bdd8193f077f8e7a09629f9080e0a563c + a9d563a05e231804b58f8758cbf2552e9a62fe2c - + https://github.com/dotnet/sdk - 195fc36bdd8193f077f8e7a09629f9080e0a563c + a9d563a05e231804b58f8758cbf2552e9a62fe2c https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ b1a970dcc7631fb07ec20f2f0485ae732c3f30d7 - + https://github.com/microsoft/vstest - 48d8e778c871315db0bad221b00f4843b06242c3 + f2323247155845f00166ebeca5cffdebff410b49 diff --git a/eng/Versions.props b/eng/Versions.props index 0b594ac3bb09..5f60666fd68e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24123.12 - 8.0.300-preview.24123.12 - 8.0.300-preview.24123.12 + 8.0.300-preview.24124.1 + 8.0.300-preview.24124.1 + 8.0.300-preview.24124.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24120-01 + 17.10.0-preview-24123-01 8.0.0-alpha.1.22557.12 From 96680be29c8e6308e0908decae3827c7c8817f0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Feb 2024 16:50:47 +0000 Subject: [PATCH 260/652] Update dependencies from https://github.com/dotnet/sdk build 20240224.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24122.14 -> To Version 8.0.300-preview.24124.2 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build,NuGet.Build.Tasks From Version 17.10.0-preview-24120-01 -> To Version 17.10.0-preview-24123-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e91b8be0d55..c667c039162e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - a9d563a05e231804b58f8758cbf2552e9a62fe2c + c5a6fa97195c89327f4f993fd40daafa26566fd1 - + https://github.com/dotnet/sdk - a9d563a05e231804b58f8758cbf2552e9a62fe2c + c5a6fa97195c89327f4f993fd40daafa26566fd1 - + https://github.com/dotnet/sdk - a9d563a05e231804b58f8758cbf2552e9a62fe2c + c5a6fa97195c89327f4f993fd40daafa26566fd1 - + https://github.com/dotnet/sdk - a9d563a05e231804b58f8758cbf2552e9a62fe2c + c5a6fa97195c89327f4f993fd40daafa26566fd1 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3472dcbca677f86bced5a1f180ae45e83c3e8f2d - + https://github.com/dotnet/msbuild - d4cb14fe4d2e6df0327308feab18ccbb2046246c + 56c003594af2772b8a5f4c58023f239a431154fa https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 5f60666fd68e..0567a9ea7ac3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24124.1 - 8.0.300-preview.24124.1 - 8.0.300-preview.24124.1 + 8.0.300-preview.24124.2 + 8.0.300-preview.24124.2 + 8.0.300-preview.24124.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f03308e7e8b73f3bbe4478c0a0f198f02b1e35a3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Feb 2024 17:27:15 +0000 Subject: [PATCH 261/652] Update dependencies from https://github.com/dotnet/sdk build 20240224.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24122.14 -> To Version 8.0.300-preview.24124.3 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 17.10.0-preview-24120-01 -> To Version 17.10.0-preview-24123-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c667c039162e..805e6e2a1f7d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c5a6fa97195c89327f4f993fd40daafa26566fd1 + d602ca25331d730aa9edf2c8895d3b11dcd66d65 - + https://github.com/dotnet/sdk - c5a6fa97195c89327f4f993fd40daafa26566fd1 + d602ca25331d730aa9edf2c8895d3b11dcd66d65 - + https://github.com/dotnet/sdk - c5a6fa97195c89327f4f993fd40daafa26566fd1 + d602ca25331d730aa9edf2c8895d3b11dcd66d65 - + https://github.com/dotnet/sdk - c5a6fa97195c89327f4f993fd40daafa26566fd1 + d602ca25331d730aa9edf2c8895d3b11dcd66d65 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 3472dcbca677f86bced5a1f180ae45e83c3e8f2d + ae73e6a38ed37eb7b6e3a47403d290f9f51e006e diff --git a/eng/Versions.props b/eng/Versions.props index 0567a9ea7ac3..3fdfa15a482d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24124.2 - 8.0.300-preview.24124.2 - 8.0.300-preview.24124.2 + 8.0.300-preview.24124.3 + 8.0.300-preview.24124.3 + 8.0.300-preview.24124.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24121.2 + 4.10.0-2.24123.6 From 44ae14b5c2a118a024ed63af4714059382a78f9d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 Feb 2024 16:08:30 +0000 Subject: [PATCH 262/652] Update dependencies from https://github.com/dotnet/sdk build 20240225.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24122.14 -> To Version 8.0.300-preview.24125.2 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.300-beta.24121.3 -> To Version 12.8.300-beta.24122.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 805e6e2a1f7d..2203a59eda1b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - d602ca25331d730aa9edf2c8895d3b11dcd66d65 + a9e54e3d90e4292eb4f6ce4984d92399c2e8331b - + https://github.com/dotnet/sdk - d602ca25331d730aa9edf2c8895d3b11dcd66d65 + a9e54e3d90e4292eb4f6ce4984d92399c2e8331b - + https://github.com/dotnet/sdk - d602ca25331d730aa9edf2c8895d3b11dcd66d65 + a9e54e3d90e4292eb4f6ce4984d92399c2e8331b - + https://github.com/dotnet/sdk - d602ca25331d730aa9edf2c8895d3b11dcd66d65 + a9e54e3d90e4292eb4f6ce4984d92399c2e8331b https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - b1a970dcc7631fb07ec20f2f0485ae732c3f30d7 + 02bb351b606468bce98688fccda9d0c8adcd964d - + https://github.com/dotnet/fsharp - b1a970dcc7631fb07ec20f2f0485ae732c3f30d7 + 02bb351b606468bce98688fccda9d0c8adcd964d diff --git a/eng/Versions.props b/eng/Versions.props index 3fdfa15a482d..061638bd7a2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24124.3 - 8.0.300-preview.24124.3 - 8.0.300-preview.24124.3 + 8.0.300-preview.24125.2 + 8.0.300-preview.24125.2 + 8.0.300-preview.24125.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fc6663dc316fd75a96db8f41c28cf82d7346cb21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Feb 2024 02:39:13 +0000 Subject: [PATCH 263/652] Update dependencies from https://github.com/dotnet/sdk build 20240225.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24125.2 -> To Version 8.0.300-preview.24125.3 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-2.24123.6 -> To Version 4.10.0-2.24124.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2203a59eda1b..3dc1283d2264 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - a9e54e3d90e4292eb4f6ce4984d92399c2e8331b + c0920d1a23ee97c886f977a73cbed77947711b0f - + https://github.com/dotnet/sdk - a9e54e3d90e4292eb4f6ce4984d92399c2e8331b + c0920d1a23ee97c886f977a73cbed77947711b0f - + https://github.com/dotnet/sdk - a9e54e3d90e4292eb4f6ce4984d92399c2e8331b + c0920d1a23ee97c886f977a73cbed77947711b0f - + https://github.com/dotnet/sdk - a9e54e3d90e4292eb4f6ce4984d92399c2e8331b + c0920d1a23ee97c886f977a73cbed77947711b0f https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - ae73e6a38ed37eb7b6e3a47403d290f9f51e006e + 3059a073c923ae9ee56c4ad012a0f2151583dd16 diff --git a/eng/Versions.props b/eng/Versions.props index 061638bd7a2c..9969908dfd36 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24125.2 - 8.0.300-preview.24125.2 - 8.0.300-preview.24125.2 + 8.0.300-preview.24125.3 + 8.0.300-preview.24125.3 + 8.0.300-preview.24125.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24123.6 + 4.10.0-2.24124.2 From 9b6cfd8e9d9a2afc6c8b08658f35a11169d26dde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Feb 2024 06:19:44 +0000 Subject: [PATCH 264/652] Update dependencies from https://github.com/dotnet/sdk build 20240225.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24125.2 -> To Version 8.0.300-preview.24125.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.10.0-2.24123.6 -> To Version 4.10.0-2.24124.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3dc1283d2264..620efb719ffa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c0920d1a23ee97c886f977a73cbed77947711b0f + b462e5aee59a4467be27fd1e5cf5ef1d6998b27d - + https://github.com/dotnet/sdk - c0920d1a23ee97c886f977a73cbed77947711b0f + b462e5aee59a4467be27fd1e5cf5ef1d6998b27d - + https://github.com/dotnet/sdk - c0920d1a23ee97c886f977a73cbed77947711b0f + b462e5aee59a4467be27fd1e5cf5ef1d6998b27d - + https://github.com/dotnet/sdk - c0920d1a23ee97c886f977a73cbed77947711b0f + b462e5aee59a4467be27fd1e5cf5ef1d6998b27d https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 56c003594af2772b8a5f4c58023f239a431154fa - + https://github.com/nuget/nuget.client - 63958aab19b7120862ff55eac32ab6a155596a59 + 39c4f37d4baa00ee0b815fb394de7d51a58b17ab diff --git a/eng/Versions.props b/eng/Versions.props index 9969908dfd36..6c6889b00e57 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24125.3 - 8.0.300-preview.24125.3 - 8.0.300-preview.24125.3 + 8.0.300-preview.24125.10 + 8.0.300-preview.24125.10 + 8.0.300-preview.24125.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.41 + 6.10.0-preview.2.44 From e448282aca0bd7e728df1add51755284a2303111 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 26 Feb 2024 06:30:54 +0000 Subject: [PATCH 265/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240225.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.202 -> To Version 8.0.202 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 773d2a57ebb4..79c285b3111d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,7 +26,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29a5272e6f6a..1d5144786e12 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5089683c8415e19425582bec77c5d91fa38c7b6c + 0ca4fc58fbe9af52a45cdd3dfbe1cf91f0fadf57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5089683c8415e19425582bec77c5d91fa38c7b6c + 0ca4fc58fbe9af52a45cdd3dfbe1cf91f0fadf57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5089683c8415e19425582bec77c5d91fa38c7b6c + 0ca4fc58fbe9af52a45cdd3dfbe1cf91f0fadf57 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5089683c8415e19425582bec77c5d91fa38c7b6c + 0ca4fc58fbe9af52a45cdd3dfbe1cf91f0fadf57 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6de8d862c528..b43f47fd1170 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.202 - 8.0.202-servicing.24121.5 - 8.0.202-servicing.24121.5 + 8.0.202-servicing.24125.11 + 8.0.202-servicing.24125.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 705e64c7048af7ff8381d07350d632d8fd89d7f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Feb 2024 13:24:39 +0000 Subject: [PATCH 266/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240226.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24123.1 -> To Version 1.1.0-beta.24126.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index cc3b1734c6f2..e7da1d6ae9fa 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24123.1", + "version": "1.1.0-beta.24126.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 620efb719ffa..0c53df35ec0d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade da98edc4c3ea539f109ea320672136ceb32591a7 - + https://github.com/dotnet/arcade-services - ad1622f5e314fdb10d6484a9348822a4dd928f98 + a688e34a3c0551eafd9c2ab8b06a3b88faf4141c - + https://github.com/dotnet/arcade-services - ad1622f5e314fdb10d6484a9348822a4dd928f98 + a688e34a3c0551eafd9c2ab8b06a3b88faf4141c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6c6889b00e57..2422e155f381 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24123.1 + 1.1.0-beta.24126.1 From 364aeb4f6cc5e7de3d8213609890b2f952565387 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Feb 2024 13:29:30 +0000 Subject: [PATCH 267/652] Update dependencies from https://github.com/dotnet/sdk build 20240226.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24125.10 -> To Version 8.0.300-preview.24126.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 620efb719ffa..5f461c80bf5a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - b462e5aee59a4467be27fd1e5cf5ef1d6998b27d + 1afe63bff1af6ee2daead33ba732806e59e14f92 - + https://github.com/dotnet/sdk - b462e5aee59a4467be27fd1e5cf5ef1d6998b27d + 1afe63bff1af6ee2daead33ba732806e59e14f92 - + https://github.com/dotnet/sdk - b462e5aee59a4467be27fd1e5cf5ef1d6998b27d + 1afe63bff1af6ee2daead33ba732806e59e14f92 - + https://github.com/dotnet/sdk - b462e5aee59a4467be27fd1e5cf5ef1d6998b27d + 1afe63bff1af6ee2daead33ba732806e59e14f92 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6c6889b00e57..7b59bd0b4824 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24125.10 - 8.0.300-preview.24125.10 - 8.0.300-preview.24125.10 + 8.0.300-preview.24126.2 + 8.0.300-preview.24126.2 + 8.0.300-preview.24126.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24c3cb5deec1cc48bd84ccf9ce0567acf86518b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Feb 2024 16:07:24 +0000 Subject: [PATCH 268/652] Update dependencies from https://github.com/dotnet/sdk build 20240226.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24125.10 -> To Version 8.0.300-preview.24126.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5f461c80bf5a..d6b1c7408e68 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 1afe63bff1af6ee2daead33ba732806e59e14f92 + ae77f375c524f0845d986e24256b3ff0e085e115 - + https://github.com/dotnet/sdk - 1afe63bff1af6ee2daead33ba732806e59e14f92 + ae77f375c524f0845d986e24256b3ff0e085e115 - + https://github.com/dotnet/sdk - 1afe63bff1af6ee2daead33ba732806e59e14f92 + ae77f375c524f0845d986e24256b3ff0e085e115 - + https://github.com/dotnet/sdk - 1afe63bff1af6ee2daead33ba732806e59e14f92 + ae77f375c524f0845d986e24256b3ff0e085e115 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7b59bd0b4824..0f756067fa03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24126.2 - 8.0.300-preview.24126.2 - 8.0.300-preview.24126.2 + 8.0.300-preview.24126.3 + 8.0.300-preview.24126.3 + 8.0.300-preview.24126.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From c771acb27776dc80fbe648e3c7cd40934f8184a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Feb 2024 13:52:58 +0000 Subject: [PATCH 269/652] Update dependencies from https://github.com/dotnet/arcade build 20240223.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24113.2 -> To Version 8.0.0-beta.24123.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/generate-sbom.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5034f5ae351..0dae4bc5b811 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + 042763a811fd94dc3556253d4c64118dd665216e https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d6c5c672c57d..b7ca4e606f06 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24113.2 + 8.0.0-beta.24123.1 diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index a06373f38fa5..2b21eae42732 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 7.0.0 + PackageVersion: 8.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/global.json b/global.json index e46bfeda971c..efeb5c8681b0 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.24113.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24113.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24123.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24123.1" } } From 9854c384d7c63d7238708f3324e35d6923c06279 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 03:13:12 +0000 Subject: [PATCH 270/652] Update dependencies from https://github.com/dotnet/sdk build 20240227.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24126.3 -> To Version 8.0.300-preview.24127.8 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24122.3 -> To Version 12.8.300-beta.24126.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0dae4bc5b811..ba20ec72b712 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ae77f375c524f0845d986e24256b3ff0e085e115 + 83aa33f0d37a7933885453a54aa07abbc870b810 - + https://github.com/dotnet/sdk - ae77f375c524f0845d986e24256b3ff0e085e115 + 83aa33f0d37a7933885453a54aa07abbc870b810 - + https://github.com/dotnet/sdk - ae77f375c524f0845d986e24256b3ff0e085e115 + 83aa33f0d37a7933885453a54aa07abbc870b810 - + https://github.com/dotnet/sdk - ae77f375c524f0845d986e24256b3ff0e085e115 + 83aa33f0d37a7933885453a54aa07abbc870b810 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 02bb351b606468bce98688fccda9d0c8adcd964d + cdbac6ca6ab7670243f69a8fc367bf9538bf3d43 - + https://github.com/dotnet/fsharp - 02bb351b606468bce98688fccda9d0c8adcd964d + cdbac6ca6ab7670243f69a8fc367bf9538bf3d43 diff --git a/eng/Versions.props b/eng/Versions.props index b7ca4e606f06..76293ec08535 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24126.3 - 8.0.300-preview.24126.3 - 8.0.300-preview.24126.3 + 8.0.300-preview.24127.8 + 8.0.300-preview.24127.8 + 8.0.300-preview.24127.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From dc37f9e37aa1e334bbf5bd1193ab2f3541154617 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 04:41:47 +0000 Subject: [PATCH 271/652] Update dependencies from https://github.com/dotnet/sdk build 20240227.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24126.3 -> To Version 8.0.300-preview.24127.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24122.3 -> To Version 12.8.300-beta.24126.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ba20ec72b712..ddaa8e6c735e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 83aa33f0d37a7933885453a54aa07abbc870b810 + c4f15959182fed1b8c69fd24a31daf0203e1f1be - + https://github.com/dotnet/sdk - 83aa33f0d37a7933885453a54aa07abbc870b810 + c4f15959182fed1b8c69fd24a31daf0203e1f1be - + https://github.com/dotnet/sdk - 83aa33f0d37a7933885453a54aa07abbc870b810 + c4f15959182fed1b8c69fd24a31daf0203e1f1be - + https://github.com/dotnet/sdk - 83aa33f0d37a7933885453a54aa07abbc870b810 + c4f15959182fed1b8c69fd24a31daf0203e1f1be https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 76293ec08535..1abe8b48f7a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24127.8 - 8.0.300-preview.24127.8 - 8.0.300-preview.24127.8 + 8.0.300-preview.24127.10 + 8.0.300-preview.24127.10 + 8.0.300-preview.24127.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6b32484a241b22601fe783dd2f5001f65b08dd50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 07:38:29 +0000 Subject: [PATCH 272/652] Update dependencies from https://github.com/dotnet/sdk build 20240227.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24127.10 -> To Version 8.0.300-preview.24127.13 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-2.24124.2 -> To Version 4.10.0-2.24127.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddaa8e6c735e..e30d6bb00b64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c4f15959182fed1b8c69fd24a31daf0203e1f1be + 2b39387b4fa7b448f573a9976185939bf0883f68 - + https://github.com/dotnet/sdk - c4f15959182fed1b8c69fd24a31daf0203e1f1be + 2b39387b4fa7b448f573a9976185939bf0883f68 - + https://github.com/dotnet/sdk - c4f15959182fed1b8c69fd24a31daf0203e1f1be + 2b39387b4fa7b448f573a9976185939bf0883f68 - + https://github.com/dotnet/sdk - c4f15959182fed1b8c69fd24a31daf0203e1f1be + 2b39387b4fa7b448f573a9976185939bf0883f68 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 3059a073c923ae9ee56c4ad012a0f2151583dd16 + b701a39ca8ccec581a7949d3bcc9931a2088deee diff --git a/eng/Versions.props b/eng/Versions.props index 1abe8b48f7a0..0ea37ca8ae02 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24127.10 - 8.0.300-preview.24127.10 - 8.0.300-preview.24127.10 + 8.0.300-preview.24127.13 + 8.0.300-preview.24127.13 + 8.0.300-preview.24127.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24124.2 + 4.10.0-2.24127.1 From e2554cbca4bc4aae8d9a555d89625057df163382 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 09:29:08 +0000 Subject: [PATCH 273/652] Update dependencies from https://github.com/dotnet/sdk build 20240228.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24127.13 -> To Version 8.0.300-preview.24128.1 Dependency coherency updates NuGet.Build.Tasks From Version 6.10.0-preview.2.44 -> To Version 6.10.0-preview.2.47 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e30d6bb00b64..e708d68616cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 2b39387b4fa7b448f573a9976185939bf0883f68 + f95a53c2c765376972f6fda808f6862bdc8dd7e7 - + https://github.com/dotnet/sdk - 2b39387b4fa7b448f573a9976185939bf0883f68 + f95a53c2c765376972f6fda808f6862bdc8dd7e7 - + https://github.com/dotnet/sdk - 2b39387b4fa7b448f573a9976185939bf0883f68 + f95a53c2c765376972f6fda808f6862bdc8dd7e7 - + https://github.com/dotnet/sdk - 2b39387b4fa7b448f573a9976185939bf0883f68 + f95a53c2c765376972f6fda808f6862bdc8dd7e7 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 56c003594af2772b8a5f4c58023f239a431154fa - + https://github.com/nuget/nuget.client - 39c4f37d4baa00ee0b815fb394de7d51a58b17ab + b49d8914861cf18287302ab311fc9d2566e06fe1 diff --git a/eng/Versions.props b/eng/Versions.props index 0ea37ca8ae02..1c4ddb6b36e3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24127.13 - 8.0.300-preview.24127.13 - 8.0.300-preview.24127.13 + 8.0.300-preview.24128.1 + 8.0.300-preview.24128.1 + 8.0.300-preview.24128.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.44 + 6.10.0-preview.2.47 From 7d60b10ace7ffc216c57a525cb5da11bb80b7b5e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 10:06:27 +0000 Subject: [PATCH 274/652] Update dependencies from https://github.com/dotnet/sdk build 20240228.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24127.13 -> To Version 8.0.300-preview.24128.4 Dependency coherency updates Microsoft.Build,NuGet.Build.Tasks From Version 17.10.0-preview-24123-01 -> To Version 17.10.0-preview-24127-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e708d68616cd..982a4069a3e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - f95a53c2c765376972f6fda808f6862bdc8dd7e7 + 315de96caa1a20180bf081b8e2ef5a437637d6d2 - + https://github.com/dotnet/sdk - f95a53c2c765376972f6fda808f6862bdc8dd7e7 + 315de96caa1a20180bf081b8e2ef5a437637d6d2 - + https://github.com/dotnet/sdk - f95a53c2c765376972f6fda808f6862bdc8dd7e7 + 315de96caa1a20180bf081b8e2ef5a437637d6d2 - + https://github.com/dotnet/sdk - f95a53c2c765376972f6fda808f6862bdc8dd7e7 + 315de96caa1a20180bf081b8e2ef5a437637d6d2 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ b701a39ca8ccec581a7949d3bcc9931a2088deee - + https://github.com/dotnet/msbuild - 56c003594af2772b8a5f4c58023f239a431154fa + 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 1c4ddb6b36e3..5ee099660547 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24128.1 - 8.0.300-preview.24128.1 - 8.0.300-preview.24128.1 + 8.0.300-preview.24128.4 + 8.0.300-preview.24128.4 + 8.0.300-preview.24128.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0335725359996f0d25ee7e88dfb75358997a82a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Feb 2024 13:55:03 +0000 Subject: [PATCH 275/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240228.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24126.1 -> To Version 1.1.0-beta.24128.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e7da1d6ae9fa..824bca36214e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24126.1", + "version": "1.1.0-beta.24128.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e30d6bb00b64..5c50d5d01d99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade-services - a688e34a3c0551eafd9c2ab8b06a3b88faf4141c + 10ec9cb0edab107e5679bdecaced06aace901f07 - + https://github.com/dotnet/arcade-services - a688e34a3c0551eafd9c2ab8b06a3b88faf4141c + 10ec9cb0edab107e5679bdecaced06aace901f07 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0ea37ca8ae02..fb229c925749 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24126.1 + 1.1.0-beta.24128.1 From 2e2800c13fb9628dd76415165267805f3ee0aa40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 03:18:59 +0000 Subject: [PATCH 276/652] Update dependencies from https://github.com/dotnet/sdk build 20240228.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24128.4 -> To Version 8.0.300-preview.24128.25 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-2.24127.1 -> To Version 4.10.0-3.24127.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec6dbf5be1d9..6e5a07a34ab1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 315de96caa1a20180bf081b8e2ef5a437637d6d2 + 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 - + https://github.com/dotnet/sdk - 315de96caa1a20180bf081b8e2ef5a437637d6d2 + 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 - + https://github.com/dotnet/sdk - 315de96caa1a20180bf081b8e2ef5a437637d6d2 + 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 - + https://github.com/dotnet/sdk - 315de96caa1a20180bf081b8e2ef5a437637d6d2 + 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - b701a39ca8ccec581a7949d3bcc9931a2088deee + 5e6349e1c07c535ec698b00075d8b4f5babfd2b6 diff --git a/eng/Versions.props b/eng/Versions.props index db5f24edf1ca..c3eaa661bce9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24128.4 - 8.0.300-preview.24128.4 - 8.0.300-preview.24128.4 + 8.0.300-preview.24128.25 + 8.0.300-preview.24128.25 + 8.0.300-preview.24128.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-2.24127.1 + 4.10.0-3.24127.10 From 8b0dcb0a892ff648a243b8e30d606187c54aeec4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 06:31:52 +0000 Subject: [PATCH 277/652] Update dependencies from https://github.com/dotnet/sdk build 20240228.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24128.25 -> To Version 8.0.300-preview.24128.27 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 12.8.300-beta.24126.2 -> To Version 12.8.300-beta.24127.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6e5a07a34ab1..febe08a7ebc1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 + da566e1a5af363c163c1f3445c50b236cdf938f2 - + https://github.com/dotnet/sdk - 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 + da566e1a5af363c163c1f3445c50b236cdf938f2 - + https://github.com/dotnet/sdk - 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 + da566e1a5af363c163c1f3445c50b236cdf938f2 - + https://github.com/dotnet/sdk - 15ab5e74858bb743b06fa4ce2d6156e7d0e7b0e1 + da566e1a5af363c163c1f3445c50b236cdf938f2 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - cdbac6ca6ab7670243f69a8fc367bf9538bf3d43 + b57dee7cec971021547a7b8a36a46d7271fea99e - + https://github.com/dotnet/fsharp - cdbac6ca6ab7670243f69a8fc367bf9538bf3d43 + b57dee7cec971021547a7b8a36a46d7271fea99e - + https://github.com/microsoft/vstest - f2323247155845f00166ebeca5cffdebff410b49 + 39c7dd12c7ec24d0552513e84d95476f2077ca33 @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - b49d8914861cf18287302ab311fc9d2566e06fe1 + 5ecd0be8cb73db807189427eb8e0f7bfd334c1e0 diff --git a/eng/Versions.props b/eng/Versions.props index c3eaa661bce9..2a07f2d62dc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24128.25 - 8.0.300-preview.24128.25 - 8.0.300-preview.24128.25 + 8.0.300-preview.24128.27 + 8.0.300-preview.24128.27 + 8.0.300-preview.24128.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.47 + 6.10.0-preview.2.49 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24123-01 + 17.10.0-preview-24126-02 8.0.0-alpha.1.22557.12 From 6f213a46dd31433d2efcd408e40e8d7641803711 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 08:40:44 +0000 Subject: [PATCH 278/652] Update dependencies from https://github.com/dotnet/sdk build 20240229.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24128.27 -> To Version 8.0.300-preview.24129.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index febe08a7ebc1..b5047210beed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - da566e1a5af363c163c1f3445c50b236cdf938f2 + 16cb8921723b123643fc66c3fb83c38bc90ec894 - + https://github.com/dotnet/sdk - da566e1a5af363c163c1f3445c50b236cdf938f2 + 16cb8921723b123643fc66c3fb83c38bc90ec894 - + https://github.com/dotnet/sdk - da566e1a5af363c163c1f3445c50b236cdf938f2 + 16cb8921723b123643fc66c3fb83c38bc90ec894 - + https://github.com/dotnet/sdk - da566e1a5af363c163c1f3445c50b236cdf938f2 + 16cb8921723b123643fc66c3fb83c38bc90ec894 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 2a07f2d62dc4..f27eb70da373 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24128.27 - 8.0.300-preview.24128.27 - 8.0.300-preview.24128.27 + 8.0.300-preview.24129.1 + 8.0.300-preview.24129.1 + 8.0.300-preview.24129.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0641476cd558970632ef43a76184f096837c164b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 13:47:57 +0000 Subject: [PATCH 279/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240228.3 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24128.1 -> To Version 1.1.0-beta.24128.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 824bca36214e..bc127e205cd7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24128.1", + "version": "1.1.0-beta.24128.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5047210beed..cb57edf9be39 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade-services - 10ec9cb0edab107e5679bdecaced06aace901f07 + 0dcdc1c1157372aeae9ae74757930abaddebb4c6 - + https://github.com/dotnet/arcade-services - 10ec9cb0edab107e5679bdecaced06aace901f07 + 0dcdc1c1157372aeae9ae74757930abaddebb4c6 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f27eb70da373..cdec4873f5fa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24128.1 + 1.1.0-beta.24128.3 From 6f89dca1f3672bde510a20035b4bf3af735c9067 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Feb 2024 23:39:48 +0000 Subject: [PATCH 280/652] Update dependencies from https://github.com/dotnet/sdk build 20240229.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24129.1 -> To Version 8.0.300-preview.24129.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24127.10 -> To Version 4.10.0-3.24128.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5047210beed..98b17149c7eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 16cb8921723b123643fc66c3fb83c38bc90ec894 + 261c1eab018404c9c381bdfae3ac15ebcbe5288f - + https://github.com/dotnet/sdk - 16cb8921723b123643fc66c3fb83c38bc90ec894 + 261c1eab018404c9c381bdfae3ac15ebcbe5288f - + https://github.com/dotnet/sdk - 16cb8921723b123643fc66c3fb83c38bc90ec894 + 261c1eab018404c9c381bdfae3ac15ebcbe5288f - + https://github.com/dotnet/sdk - 16cb8921723b123643fc66c3fb83c38bc90ec894 + 261c1eab018404c9c381bdfae3ac15ebcbe5288f https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 5e6349e1c07c535ec698b00075d8b4f5babfd2b6 + 1d9ee7f5e9b3b6d681ce8d89d4b252619b704088 diff --git a/eng/Versions.props b/eng/Versions.props index f27eb70da373..4e12183e37d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24129.1 - 8.0.300-preview.24129.1 - 8.0.300-preview.24129.1 + 8.0.300-preview.24129.10 + 8.0.300-preview.24129.10 + 8.0.300-preview.24129.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24127.10 + 4.10.0-3.24128.4 From 12afb0c1400db64c3f76d6babfe58d1c9b930101 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 08:10:27 +0000 Subject: [PATCH 281/652] Update dependencies from https://github.com/dotnet/sdk build 20240229.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24129.10 -> To Version 8.0.300-preview.24129.14 Dependency coherency updates NuGet.Build.Tasks From Version 6.10.0-preview.2.49 -> To Version 6.10.0-preview.2.52 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ae6ddf2fa6d..5a52bd5676d2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 261c1eab018404c9c381bdfae3ac15ebcbe5288f + 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c - + https://github.com/dotnet/sdk - 261c1eab018404c9c381bdfae3ac15ebcbe5288f + 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c - + https://github.com/dotnet/sdk - 261c1eab018404c9c381bdfae3ac15ebcbe5288f + 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c - + https://github.com/dotnet/sdk - 261c1eab018404c9c381bdfae3ac15ebcbe5288f + 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - 5ecd0be8cb73db807189427eb8e0f7bfd334c1e0 + 6009531090c927a8e61da9a0f97bdd5eb6f01a47 diff --git a/eng/Versions.props b/eng/Versions.props index 6b5af7061e31..ed42973e6412 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24129.10 - 8.0.300-preview.24129.10 - 8.0.300-preview.24129.10 + 8.0.300-preview.24129.14 + 8.0.300-preview.24129.14 + 8.0.300-preview.24129.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.49 + 6.10.0-preview.2.52 From 78173447fca3c21fc12e2445bb8cbeafc4ef9a6d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 08:50:22 +0000 Subject: [PATCH 282/652] Update dependencies from https://github.com/dotnet/sdk build 20240301.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24129.10 -> To Version 8.0.300-preview.24151.1 Dependency coherency updates NuGet.Build.Tasks From Version 6.10.0-preview.2.49 -> To Version 6.10.0-preview.2.52 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a52bd5676d2..6b9d2cad56bb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c + 5cc5fe81e7587b2925c1478dbe980e30b73287f4 - + https://github.com/dotnet/sdk - 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c + 5cc5fe81e7587b2925c1478dbe980e30b73287f4 - + https://github.com/dotnet/sdk - 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c + 5cc5fe81e7587b2925c1478dbe980e30b73287f4 - + https://github.com/dotnet/sdk - 0dc3260dcf0ba5d5b10e7c533b303353b5cd901c + 5cc5fe81e7587b2925c1478dbe980e30b73287f4 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ed42973e6412..a9a7ea759ab4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24129.14 - 8.0.300-preview.24129.14 - 8.0.300-preview.24129.14 + 8.0.300-preview.24151.1 + 8.0.300-preview.24151.1 + 8.0.300-preview.24151.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 421ada93e26732a742e28f3ad8a94a069afccdc5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 1 Mar 2024 13:55:30 +0000 Subject: [PATCH 283/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240229.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24128.3 -> To Version 1.1.0-beta.24129.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index bc127e205cd7..89ddcab6a237 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24128.3", + "version": "1.1.0-beta.24129.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ae6ddf2fa6d..b7ea3ae19e8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade-services - 0dcdc1c1157372aeae9ae74757930abaddebb4c6 + de6ff482f3e43757677a649c59a056d6275bc655 - + https://github.com/dotnet/arcade-services - 0dcdc1c1157372aeae9ae74757930abaddebb4c6 + de6ff482f3e43757677a649c59a056d6275bc655 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6b5af7061e31..a8b99b5ea3ff 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24128.3 + 1.1.0-beta.24129.1 From c0add199d97b98888580c37105553818521fcf2b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 2 Mar 2024 14:00:28 +0000 Subject: [PATCH 284/652] Update dependencies from https://github.com/dotnet/arcade build 20240301.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24123.1 -> To Version 8.0.0-beta.24151.4 --- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 255 ++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 153 ++++++++++ .../templates-official/job/source-build.yml | 67 ++++ .../job/source-index-stage1.yml | 68 +++++ .../templates-official/jobs/codeql-build.yml | 31 ++ eng/common/templates-official/jobs/jobs.yml | 97 ++++++ .../templates-official/jobs/source-build.yml | 46 +++ .../post-build/common-variables.yml | 22 ++ .../post-build/post-build.yml | 285 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../templates-official/steps/build-reason.yml | 12 + .../steps/component-governance.yml | 13 + .../steps/execute-codeql.yml | 32 ++ .../templates-official/steps/execute-sdl.yml | 88 ++++++ .../steps/generate-sbom.yml | 48 +++ .../templates-official/steps/publish-logs.yml | 23 ++ .../templates-official/steps/retain-build.yml | 28 ++ .../steps/send-to-helix.yml | 91 ++++++ .../templates-official/steps/source-build.yml | 129 ++++++++ .../variables/pool-providers.yml | 45 +++ .../variables/sdl-variables.yml | 7 + global.json | 4 +- 27 files changed, 1757 insertions(+), 9 deletions(-) create mode 100644 eng/common/templates-official/job/job.yml create mode 100644 eng/common/templates-official/job/onelocbuild.yml create mode 100644 eng/common/templates-official/job/publish-build-assets.yml create mode 100644 eng/common/templates-official/job/source-build.yml create mode 100644 eng/common/templates-official/job/source-index-stage1.yml create mode 100644 eng/common/templates-official/jobs/codeql-build.yml create mode 100644 eng/common/templates-official/jobs/jobs.yml create mode 100644 eng/common/templates-official/jobs/source-build.yml create mode 100644 eng/common/templates-official/post-build/common-variables.yml create mode 100644 eng/common/templates-official/post-build/post-build.yml create mode 100644 eng/common/templates-official/post-build/setup-maestro-vars.yml create mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml create mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml create mode 100644 eng/common/templates-official/steps/build-reason.yml create mode 100644 eng/common/templates-official/steps/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.yml create mode 100644 eng/common/templates-official/steps/execute-sdl.yml create mode 100644 eng/common/templates-official/steps/generate-sbom.yml create mode 100644 eng/common/templates-official/steps/publish-logs.yml create mode 100644 eng/common/templates-official/steps/retain-build.yml create mode 100644 eng/common/templates-official/steps/send-to-helix.yml create mode 100644 eng/common/templates-official/steps/source-build.yml create mode 100644 eng/common/templates-official/variables/pool-providers.yml create mode 100644 eng/common/templates-official/variables/sdl-variables.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ae6ddf2fa6d..d17c75ad722b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 042763a811fd94dc3556253d4c64118dd665216e + cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade - 042763a811fd94dc3556253d4c64118dd665216e + cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade - 042763a811fd94dc3556253d4c64118dd665216e + cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 6b5af7061e31..b67e4a4c75ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24123.1 + 8.0.0-beta.24151.4 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000000..9e7bebe9af89 --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,255 @@ +# 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. + +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + condition: '' + container: '' + continueOnError: false + dependsOn: '' + displayName: '' + pool: '' + steps: [] + strategy: '' + timeoutInMinutes: '' + variables: [] + workspace: '' + +# Job base template specific parameters + # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md + artifacts: '' + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishBuildAssets: false + enablePublishTestResults: false + enablePublishUsingPipelines: false + enableBuildRetry: false + disableComponentGovernance: '' + componentGovernanceIgnoreDirectories: '' + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + preSteps: [] + runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + variables: + - ${{ if ne(parameters.enableTelemetry, 'false') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle template variable syntax + # example: + # - template: path/to/template.yml + # parameters: + # [key]: [value] + - ${{ if ne(variable.template, '') }}: + - template: ${{ variable.template }} + ${{ if ne(variable.parameters, '') }}: + parameters: ${{ variable.parameters }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if ne(parameters.preSteps, '') }}: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildSigningPlugin@3 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + TeamName: $(_TeamName) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: + - task: NuGetAuthenticate@1 + + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: current + artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} + targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} + itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} + continueOnError: true + + - template: /eng/common/templates-official/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - task: CopyFiles@2 + displayName: Gather binaries for publish to artifacts + inputs: + SourceFolder: 'artifacts/bin' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' + - task: CopyFiles@2 + displayName: Gather packages for publish to artifacts + inputs: + SourceFolder: 'artifacts/packages' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish pipeline artifacts + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + continueOnError: true + condition: always() + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - publish: artifacts/log + artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: Publish logs + continueOnError: true + condition: always() + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates-official/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} + IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration + artifact: BuildConfiguration + displayName: Publish build retry configuration + continueOnError: true diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000000..ba9ba4930329 --- /dev/null +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -0,0 +1,112 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: '' + + 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) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + JobNameSuffix: '' + +jobs: +- job: OneLocBuild${{ parameters.JobNameSuffix }} + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml new file mode 100644 index 000000000000..ea5104625fac --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,153 @@ +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 + + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry + + variables: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/common-variables.yml + + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download artifact + inputs: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:BuildAssetRegistryToken=$(MaestroAccessToken) + /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:OfficialBuildId=$(Build.BuildNumber) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" + Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - task: powershell@2 + displayName: Check if SymbolPublishingExclusionsFile.txt exists + inputs: + targetType: inline + script: | + $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if(Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" + } + else{ + Write-Host "Symbols Exclusion file does not exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" + } + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - template: /eng/common/templates-official/steps/publish-logs.yml + parameters: + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml new file mode 100644 index 000000000000..8aba3b44bb25 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,67 @@ +parameters: + # This template adds arcade-powered source-build to CI. The template produces a server job with a + # default ID 'Source_Build_Complete' to put in a dependency list if necessary. + + # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. + jobNamePrefix: 'Source_Build' + + # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for + # managed-only repositories. This is an object with these properties: + # + # name: '' + # The name of the job. This is included in the job ID. + # targetRID: '' + # The name of the target RID to use, instead of the one auto-detected by Arcade. + # nonPortable: false + # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than + # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. + # container: '' + # A container to use. Runs in docker. + # pool: {} + # A pool to use. Runs directly on an agent. + # buildScript: '' + # Specifies the build script to invoke to perform the build in the repo. The default + # './build.sh' should work for typical Arcade repositories, but this is customizable for + # difficult situations. + # jobProperties: {} + # A list of job properties to inject at the top level, for potential extensibility beyond + # container and pool. + platform: {} + +jobs: +- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} + displayName: Source-Build (${{ parameters.platform.name }}) + + ${{ each property in parameters.platform.jobProperties }}: + ${{ property.key }}: ${{ property.value }} + + ${{ if ne(parameters.platform.container, '') }}: + container: ${{ parameters.platform.container }} + + ${{ if eq(parameters.platform.pool, '') }}: + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + # /eng/common/templates-official/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] + image: 1es-mariner-2-pt + os: linux + + ${{ if ne(parameters.platform.pool, '') }}: + pool: ${{ parameters.platform.pool }} + + workspace: + clean: all + + steps: + - template: /eng/common/templates-official/steps/source-build.yml + parameters: + platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml new file mode 100644 index 000000000000..4b6337391708 --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,68 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json + sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" + preSteps: [] + binlogPath: artifacts/log/Debug/Build.binlog + condition: '' + dependsOn: '' + pool: '' + +jobs: +- job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} + variables: + - name: SourceIndexPackageVersion + value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexPackageSource + value: ${{ parameters.sourceIndexPackageSource }} + - name: BinlogPath + value: ${{ parameters.binlogPath }} + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: source-dot-net stage1 variables + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core SDK 6 + inputs: + packageType: sdk + version: 6.0.x + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) + + - script: | + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + displayName: Download Tools + # 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: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + displayName: Process Binlog into indexable sln + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + displayName: Upload stage1 artifacts to source index + env: + BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml new file mode 100644 index 000000000000..b68d3c2f3199 --- /dev/null +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -0,0 +1,31 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + +jobs: +- template: /eng/common/templates-official/jobs/jobs.yml + parameters: + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishTestResults: false + enablePublishBuildAssets: false + enablePublishUsingPipelines: false + enableTelemetry: true + + variables: + - group: Publish-Build-Assets + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.109.0 + - name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + + jobs: ${{ parameters.jobs }} + diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml new file mode 100644 index 000000000000..857a0f8ba43e --- /dev/null +++ b/eng/common/templates-official/jobs/jobs.yml @@ -0,0 +1,97 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + # Optional: Enable running the source-build jobs to build repo from source + enableSourceBuild: false + + # Optional: Parameters for source-build template. + # See /eng/common/templates-official/jobs/source-build.yml for options + sourceBuildParameters: [] + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + + # Optional: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + enableSourceIndex: false + sourceIndexParams: {} + +# 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. + +jobs: +- ${{ each job in parameters.jobs }}: + - template: ../job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if eq(parameters.enableSourceBuild, true) }}: + - template: /eng/common/templates-official/jobs/source-build.yml + parameters: + allCompletedJobId: Source_Build_Complete + ${{ each parameter in parameters.sourceBuildParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if eq(parameters.enableSourceIndex, 'true') }}: + - template: ../job/source-index-stage1.yml + parameters: + runAsPublic: ${{ parameters.runAsPublic }} + ${{ each parameter in parameters.sourceIndexParams }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - template: ../job/publish-build-assets.yml + parameters: + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + - ${{ if eq(parameters.enableSourceBuild, true) }}: + - Source_Build_Complete + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml new file mode 100644 index 000000000000..08e5db9bb116 --- /dev/null +++ b/eng/common/templates-official/jobs/source-build.yml @@ -0,0 +1,46 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/templates-official/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # This is the default platform provided by Arcade, intended for use by a managed-only repo. + defaultManagedPlatform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + + # Defines the platforms on which to run build jobs. One job is created for each platform, and the + # object in this array is sent to the job template as 'platform'. If no platforms are specified, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml new file mode 100644 index 000000000000..c24193acfc98 --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,22 @@ +variables: + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro-prod.westus2.cloudapp.azure.com" + - name: MaestroApiAccessToken + value: $(MaestroAccessToken) + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + + - name: runCodesignValidationInjection + value: false diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml new file mode 100644 index 000000000000..5c98fe1c0f3a --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,285 @@ +parameters: + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + + # Which stages should finish execution before post-build stages start + - name: validateDependsOn + type: object + default: + - build + + - name: publishDependsOn + type: object + default: + - Validate + + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + +stages: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + - stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: NuGet Validation + condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - job: + displayName: Signing Validation + condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + itemPattern: | + ** + !**/Microsoft.SourceBuild.Intermediate.*.nupkg + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: ../steps/publish-logs.yml + parameters: + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) + + - job: + displayName: SourceLink Validation + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000000..0c87f149a4ad --- /dev/null +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -0,0 +1,70 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + +steps: + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true + + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + pwsh: true + script: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + + $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $apiHeaders.Add('Accept', 'application/json') + $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") + + $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + + $BarId = $Env:BARBuildId + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId + } + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + MAESTRO_API_TOKEN: $(MaestroApiAccessToken) + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml new file mode 100644 index 000000000000..da669030daf6 --- /dev/null +++ b/eng/common/templates-official/post-build/trigger-subscription.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml new file mode 100644 index 000000000000..f67a210d62f3 --- /dev/null +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/build-reason.yml b/eng/common/templates-official/steps/build-reason.yml new file mode 100644 index 000000000000..eba58109b52c --- /dev/null +++ b/eng/common/templates-official/steps/build-reason.yml @@ -0,0 +1,12 @@ +# build-reason.yml +# Description: runs steps if build.reason condition is valid. conditions is a string of valid build reasons +# to include steps (',' separated). +parameters: + conditions: '' + steps: [] + +steps: + - ${{ if and( not(startsWith(parameters.conditions, 'not')), contains(parameters.conditions, variables['build.reason'])) }}: + - ${{ parameters.steps }} + - ${{ if and( startsWith(parameters.conditions, 'not'), not(contains(parameters.conditions, variables['build.reason']))) }}: + - ${{ parameters.steps }} diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000000..0ecec47b0c91 --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,13 @@ +parameters: + disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-codeql.yml b/eng/common/templates-official/steps/execute-codeql.yml new file mode 100644 index 000000000000..9b4a5ffa30a7 --- /dev/null +++ b/eng/common/templates-official/steps/execute-codeql.yml @@ -0,0 +1,32 @@ +parameters: + # Language that should be analyzed. Defaults to csharp + language: csharp + # Build Commands + buildCommands: '' + overrideParameters: '' # Optional: to override values for parameters. + additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth + # diagnosis of problems with specific tool configurations. + publishGuardianDirectoryToPipeline: false + # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL + # parameters rather than relying on YAML. It may be better to use a local script, because you can + # reproduce results locally without piecing together a command based on the YAML. + executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' + # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named + # 'continueOnError', the parameter value is not correctly picked up. + # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter + # optional: determines whether to continue the build if the step errors; + sdlContinueOnError: false + +steps: +- template: /eng/common/templates-official/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: '${{ parameters.additionalParameters }} + -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")' + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml new file mode 100644 index 000000000000..07426fde05d8 --- /dev/null +++ b/eng/common/templates-official/steps/execute-sdl.yml @@ -0,0 +1,88 @@ +parameters: + overrideGuardianVersion: '' + executeAllSdlToolsScript: '' + overrideParameters: '' + additionalParameters: '' + publishGuardianDirectoryToPipeline: false + sdlContinueOnError: false + condition: '' + +steps: +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect + +- task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian + +- ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} + displayName: Execute SDL (Overridden) + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianCliLocation $(GuardianCliLocation) + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs + condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000000..1bf43bf807af --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,48 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed +# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. + +parameters: + PackageVersion: 8.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + IgnoreDirectories: '' + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + ${{ if ne(parameters.IgnoreDirectories, '') }}: + AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml new file mode 100644 index 000000000000..04012fed182a --- /dev/null +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -0,0 +1,23 @@ +parameters: + StageLabel: '' + JobLabel: '' + +steps: +- task: Powershell@2 + displayName: Prepare Binlogs to Upload + 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}}/ + continueOnError: true + condition: always() + +- task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PublishLocation: Container + ArtifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml new file mode 100644 index 000000000000..83d97a26a01f --- /dev/null +++ b/eng/common/templates-official/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml new file mode 100644 index 000000000000..3eb7e2d5f840 --- /dev/null +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -0,0 +1,91 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml new file mode 100644 index 000000000000..829f17c34d11 --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,129 @@ +parameters: + # This template adds arcade-powered source-build to CI. + + # This is a 'steps' template, and is intended for advanced scenarios where the existing build + # infra has a careful build methodology that must be followed. For example, a repo + # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline + # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to + # GitHub. Using this steps template leaves room for that infra to be included. + + # Defines the platform on which to run the steps. See 'eng/common/templates-official/job/source-build.yml' + # for details. The entire object is described in the 'job' template for simplicity, even though + # the usage of the properties on this object is split between the 'job' and 'steps' templates. + platform: {} + +steps: +# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) +- script: | + set -x + df -h + + # If building on the internal project, the artifact feeds variable may be available (usually only if needed) + # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. + # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those + # changes. + internalRestoreArgs= + if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + # Temporarily work around https://github.com/dotnet/arcade/issues/7709 + chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + buildConfig=Release + # Check if AzDO substitutes in a build config from a variable, and use it if so. + if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then + buildConfig='$(_BuildConfig)' + fi + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + targetRidArgs= + if [ '${{ parameters.platform.targetRID }}' != '' ]; then + targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' + fi + + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + + baseOsArgs= + if [ '${{ parameters.platform.baseOS }}' != '' ]; then + baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' + fi + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + assetManifestFileName=SourceBuild_RidSpecific.xml + if [ '${{ parameters.platform.name }}' != '' ]; then + assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + $baseOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true \ + /p:AssetManifestFileName=$assetManifestFileName + displayName: Build + +# Upload build logs for diagnosis. +- task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: | + **/*.log + **/*.binlog + artifacts/source-build/self/prebuilt-report/** + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish BuildLogs + inputs: + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: succeededOrFailed() + +# Manually inject component detection so that we can ignore the source build upstream cache, which contains +# a nupkg cache of input packages (a local feed). +# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' +# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets +- task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection (Exclude upstream cache) + inputs: + ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml new file mode 100644 index 000000000000..beab7d1bfba0 --- /dev/null +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -0,0 +1,45 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage it can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates-official/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) +# +# pool: +# name: $(DncEngInternalBuildPool) +# image: 1es-windows-2022-pt + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml new file mode 100644 index 000000000000..dbdd66d4a4b3 --- /dev/null +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.109.0 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config \ No newline at end of file diff --git a/global.json b/global.json index efeb5c8681b0..363c757a573d 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.24123.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24123.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24151.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24151.4" } } From 2822b1b71e9e15b59109d5ce437e3cfc881df7ab Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 2 Mar 2024 14:06:12 +0000 Subject: [PATCH 285/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240301.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24128.3 -> To Version 1.1.0-beta.24151.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 89ddcab6a237..414565bfd7fc 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24129.1", + "version": "1.1.0-beta.24151.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7ea3ae19e8f..fc6b85d0b2c5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 042763a811fd94dc3556253d4c64118dd665216e - + https://github.com/dotnet/arcade-services - de6ff482f3e43757677a649c59a056d6275bc655 + 8d492247e5ff57f34f375069dd1c9fb70a26451d - + https://github.com/dotnet/arcade-services - de6ff482f3e43757677a649c59a056d6275bc655 + 8d492247e5ff57f34f375069dd1c9fb70a26451d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a8b99b5ea3ff..967f8ab3811f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24129.1 + 1.1.0-beta.24151.2 From bc8cc04873452fb9ab1335cac88165c72677b2d1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 3 Mar 2024 13:51:42 +0000 Subject: [PATCH 286/652] Update dependencies from https://github.com/dotnet/arcade build 20240301.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24123.1 -> To Version 8.0.0-beta.24151.4 From f952415ca6f76b957492bc6f257a2bd38698985c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 3 Mar 2024 13:57:18 +0000 Subject: [PATCH 287/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240301.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24128.3 -> To Version 1.1.0-beta.24151.2 From cdabc8628f844ff71cd06f775c512227bf644ff1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 06:37:45 +0000 Subject: [PATCH 288/652] Update dependencies from https://github.com/dotnet/sdk build 20240303.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24151.1 -> To Version 8.0.300-preview.24153.4 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24128.4 -> To Version 4.10.0-3.24151.8 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f02dc768caa..4d7cacc1d9e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 5cc5fe81e7587b2925c1478dbe980e30b73287f4 + 993997b90e486db406b6f17a047b396e40198c2e - + https://github.com/dotnet/sdk - 5cc5fe81e7587b2925c1478dbe980e30b73287f4 + 993997b90e486db406b6f17a047b396e40198c2e - + https://github.com/dotnet/sdk - 5cc5fe81e7587b2925c1478dbe980e30b73287f4 + 993997b90e486db406b6f17a047b396e40198c2e - + https://github.com/dotnet/sdk - 5cc5fe81e7587b2925c1478dbe980e30b73287f4 + 993997b90e486db406b6f17a047b396e40198c2e https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 1d9ee7f5e9b3b6d681ce8d89d4b252619b704088 + 8537440d8c831b8533a18f6530945ee91c243e1b diff --git a/eng/Versions.props b/eng/Versions.props index 61fec2bcc5dd..b3bbfedc626f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24151.1 - 8.0.300-preview.24151.1 - 8.0.300-preview.24151.1 + 8.0.300-preview.24153.4 + 8.0.300-preview.24153.4 + 8.0.300-preview.24153.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24128.4 + 4.10.0-3.24151.8 From ed028695da850080ef2bd6d4c3da9f4e5a4a72f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 08:13:13 +0000 Subject: [PATCH 289/652] Update dependencies from https://github.com/dotnet/sdk build 20240303.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24153.4 -> To Version 8.0.300-preview.24153.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4d7cacc1d9e7..c9638c2e005e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 993997b90e486db406b6f17a047b396e40198c2e + f243688a5a2f31b4434f69617685a3725f8e1435 - + https://github.com/dotnet/sdk - 993997b90e486db406b6f17a047b396e40198c2e + f243688a5a2f31b4434f69617685a3725f8e1435 - + https://github.com/dotnet/sdk - 993997b90e486db406b6f17a047b396e40198c2e + f243688a5a2f31b4434f69617685a3725f8e1435 - + https://github.com/dotnet/sdk - 993997b90e486db406b6f17a047b396e40198c2e + f243688a5a2f31b4434f69617685a3725f8e1435 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b3bbfedc626f..b7964c831f61 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24153.4 - 8.0.300-preview.24153.4 - 8.0.300-preview.24153.4 + 8.0.300-preview.24153.6 + 8.0.300-preview.24153.6 + 8.0.300-preview.24153.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 56a3b9a6ab890a4cfde92ade5fdfc28adcf2e6b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 10:38:23 +0000 Subject: [PATCH 290/652] Update dependencies from https://github.com/dotnet/sdk build 20240304.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24153.6 -> To Version 8.0.300-preview.24154.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24127.3 -> To Version 12.8.300-beta.24152.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9638c2e005e..4c301fb77189 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - f243688a5a2f31b4434f69617685a3725f8e1435 + 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 - + https://github.com/dotnet/sdk - f243688a5a2f31b4434f69617685a3725f8e1435 + 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 - + https://github.com/dotnet/sdk - f243688a5a2f31b4434f69617685a3725f8e1435 + 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 - + https://github.com/dotnet/sdk - f243688a5a2f31b4434f69617685a3725f8e1435 + 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - b57dee7cec971021547a7b8a36a46d7271fea99e + ea8ef6edee63929f44026c79f94c9e6ffe6dcd62 - + https://github.com/dotnet/fsharp - b57dee7cec971021547a7b8a36a46d7271fea99e + ea8ef6edee63929f44026c79f94c9e6ffe6dcd62 diff --git a/eng/Versions.props b/eng/Versions.props index b7964c831f61..ce1666199eae 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24153.6 - 8.0.300-preview.24153.6 - 8.0.300-preview.24153.6 + 8.0.300-preview.24154.1 + 8.0.300-preview.24154.1 + 8.0.300-preview.24154.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 96ac4c3b085e89cca4f7810c77a746ce57c1723d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 13:46:45 +0000 Subject: [PATCH 291/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240303.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24151.2 -> To Version 1.1.0-beta.24153.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 414565bfd7fc..f6e69fceb225 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24151.2", + "version": "1.1.0-beta.24153.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c9638c2e005e..e1c5e3a16c08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade-services - 8d492247e5ff57f34f375069dd1c9fb70a26451d + b8bebd21f5a46416b30fa5e9b415003314e9b1d2 - + https://github.com/dotnet/arcade-services - 8d492247e5ff57f34f375069dd1c9fb70a26451d + b8bebd21f5a46416b30fa5e9b415003314e9b1d2 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b7964c831f61..04a3d97b318e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24151.2 + 1.1.0-beta.24153.1 From dfb791b37b3d4ccec7332c4b6259d5fc7abb0890 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 4 Mar 2024 21:48:31 +0000 Subject: [PATCH 292/652] Update dependencies from https://github.com/dotnet/sdk build 20240304.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24153.6 -> To Version 8.0.300-preview.24154.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24127.3 -> To Version 12.8.300-beta.24152.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c301fb77189..c45346b29c64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 + 5e6f737e8412c59c2b57c854838191a87115a007 - + https://github.com/dotnet/sdk - 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 + 5e6f737e8412c59c2b57c854838191a87115a007 - + https://github.com/dotnet/sdk - 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 + 5e6f737e8412c59c2b57c854838191a87115a007 - + https://github.com/dotnet/sdk - 092070a9dc283b3fe3e2fe213d4ba1399b7fbb96 + 5e6f737e8412c59c2b57c854838191a87115a007 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ce1666199eae..352dc94fc7c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24154.1 - 8.0.300-preview.24154.1 - 8.0.300-preview.24154.1 + 8.0.300-preview.24154.11 + 8.0.300-preview.24154.11 + 8.0.300-preview.24154.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d186daf51aeb7d8dbf8390ce92b9cdc90a109f0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Mar 2024 06:21:50 +0000 Subject: [PATCH 293/652] Update dependencies from https://github.com/dotnet/sdk build 20240304.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24154.11 -> To Version 8.0.300-preview.24154.21 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 37953ddae65a..06ba033f1020 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 5e6f737e8412c59c2b57c854838191a87115a007 + 88c675c554b49729f3b26538d4a9bef8d9d8cc09 - + https://github.com/dotnet/sdk - 5e6f737e8412c59c2b57c854838191a87115a007 + 88c675c554b49729f3b26538d4a9bef8d9d8cc09 - + https://github.com/dotnet/sdk - 5e6f737e8412c59c2b57c854838191a87115a007 + 88c675c554b49729f3b26538d4a9bef8d9d8cc09 - + https://github.com/dotnet/sdk - 5e6f737e8412c59c2b57c854838191a87115a007 + 88c675c554b49729f3b26538d4a9bef8d9d8cc09 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b19ff779e291..fd5c5f8b2369 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24154.11 - 8.0.300-preview.24154.11 - 8.0.300-preview.24154.11 + 8.0.300-preview.24154.21 + 8.0.300-preview.24154.21 + 8.0.300-preview.24154.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 40dd71d9c9e1e690e60a21b76d329b31cfe4c746 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 5 Mar 2024 13:56:49 +0000 Subject: [PATCH 294/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240305.3 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24153.1 -> To Version 1.1.0-beta.24155.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index f6e69fceb225..9e98e96a8ec5 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24153.1", + "version": "1.1.0-beta.24155.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06ba033f1020..e95d32395c1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade-services - b8bebd21f5a46416b30fa5e9b415003314e9b1d2 + 288b79e6f16a407054b6620f72685d460573ef45 - + https://github.com/dotnet/arcade-services - b8bebd21f5a46416b30fa5e9b415003314e9b1d2 + 288b79e6f16a407054b6620f72685d460573ef45 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fd5c5f8b2369..4edb1ac1d080 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24153.1 + 1.1.0-beta.24155.3 From c5e158a05c36ae16e7c602b3e7b4bfb2e3da30c5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:31 -0800 Subject: [PATCH 295/652] Update branding to 8.0.203 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9f5353f8e328..1a1aabbdeea0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 2 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From a8fdcd468e92fd97a4b5c46749ad2823c3ba231f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 14:51:30 -0800 Subject: [PATCH 296/652] Update branding to 8.0.204 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1a1aabbdeea0..6ed9cecd22d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 2 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From f8a31f44ba644333b20c840735b3aeeb1fbb71ed Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 5 Mar 2024 23:47:51 +0000 Subject: [PATCH 297/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240305.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.202 -> To Version 8.0.203 --- NuGet.config | 11 +++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 79c285b3111d..03fe9e8dad34 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,14 +8,17 @@ + + + @@ -23,10 +26,11 @@ + - + @@ -47,16 +51,19 @@ + + - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1d5144786e12..b5c15c0ea5b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ca4fc58fbe9af52a45cdd3dfbe1cf91f0fadf57 + a57878640adc93774a36a049b46f4fd9ca865f86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ca4fc58fbe9af52a45cdd3dfbe1cf91f0fadf57 + a57878640adc93774a36a049b46f4fd9ca865f86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ca4fc58fbe9af52a45cdd3dfbe1cf91f0fadf57 + a57878640adc93774a36a049b46f4fd9ca865f86 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ca4fc58fbe9af52a45cdd3dfbe1cf91f0fadf57 + a57878640adc93774a36a049b46f4fd9ca865f86 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b43f47fd1170..2b4ed52a81ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.202 - 8.0.202-servicing.24125.11 - 8.0.202-servicing.24125.11 + 8.0.203 + 8.0.203-servicing.24155.12 + 8.0.203-servicing.24155.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 291963efadf1481e6d6dad32040626f2e437c2e9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 6 Mar 2024 00:19:56 +0000 Subject: [PATCH 298/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240305.14 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.202 -> To Version 8.0.203 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.9.0-3.24081.11 -> To Version 4.9.2-3.24129.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 4 ++-- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03fe9e8dad34..cd498b0c2b03 100644 --- a/NuGet.config +++ b/NuGet.config @@ -30,7 +30,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5c15c0ea5b9..77c7744c1dd5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a57878640adc93774a36a049b46f4fd9ca865f86 + 9992441ffa504a2a429299397b14834d3a4adb92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a57878640adc93774a36a049b46f4fd9ca865f86 + 9992441ffa504a2a429299397b14834d3a4adb92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a57878640adc93774a36a049b46f4fd9ca865f86 + 9992441ffa504a2a429299397b14834d3a4adb92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - a57878640adc93774a36a049b46f4fd9ca865f86 + 9992441ffa504a2a429299397b14834d3a4adb92 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd - + https://github.com/dotnet/roslyn - 989117396f26e5453ff157df610d22ce45b6b0a9 + 9934fb9e3527e1c0c51314e57d4aab30f97e8f9e diff --git a/eng/Versions.props b/eng/Versions.props index 2b4ed52a81ea..dd6915a146d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,15 +86,15 @@ 8.0.203 - 8.0.203-servicing.24155.12 - 8.0.203-servicing.24155.12 + 8.0.203-servicing.24155.14 + 8.0.203-servicing.24155.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.9.0-3.24081.11 + 4.9.2-3.24129.6 From 8c558006cd476d48797367407074d0a4f69d3a5d Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 5 Mar 2024 16:31:00 -0800 Subject: [PATCH 299/652] Downgrade implicit version because of the hotfix --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6ed9cecd22d1..ab1e93fee824 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 26)) - $([MSBuild]::Add($(VersionFeature), 15)) + $([MSBuild]::Add($(VersionFeature), 25)) + $([MSBuild]::Add($(VersionFeature), 14)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From de26d80e7da4d4b30d3aedc6e0e2c5f2802ffdb0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 01:30:54 +0000 Subject: [PATCH 300/652] Update dependencies from https://github.com/dotnet/sdk build 20240305.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24154.21 -> To Version 8.0.300-preview.24155.22 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24152.1 -> To Version 12.8.300-beta.24154.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 06ba033f1020..79dbf230e66d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 88c675c554b49729f3b26538d4a9bef8d9d8cc09 + ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b - + https://github.com/dotnet/sdk - 88c675c554b49729f3b26538d4a9bef8d9d8cc09 + ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b - + https://github.com/dotnet/sdk - 88c675c554b49729f3b26538d4a9bef8d9d8cc09 + ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b - + https://github.com/dotnet/sdk - 88c675c554b49729f3b26538d4a9bef8d9d8cc09 + ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - ea8ef6edee63929f44026c79f94c9e6ffe6dcd62 + ca66024e6da7cced9921216763386bd43f400fbf - + https://github.com/dotnet/fsharp - ea8ef6edee63929f44026c79f94c9e6ffe6dcd62 + ca66024e6da7cced9921216763386bd43f400fbf @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 8537440d8c831b8533a18f6530945ee91c243e1b + c88057e6c3be0d2b85b33e8e3cfb481f5d1d504b diff --git a/eng/Versions.props b/eng/Versions.props index fd5c5f8b2369..c3e935006001 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24154.21 - 8.0.300-preview.24154.21 - 8.0.300-preview.24154.21 + 8.0.300-preview.24155.22 + 8.0.300-preview.24155.22 + 8.0.300-preview.24155.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24151.8 + 4.10.0-3.24155.1 From 0d4a607550503114d3709fb8fe34adcfc92c7eaf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 09:23:13 +0000 Subject: [PATCH 301/652] Update dependencies from https://github.com/dotnet/sdk build 20240306.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24155.22 -> To Version 8.0.300-preview.24156.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7e945960fb39..9df3f01a5a31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b + ac6c241073485db169f773fcb1d010bff9e7df25 - + https://github.com/dotnet/sdk - ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b + ac6c241073485db169f773fcb1d010bff9e7df25 - + https://github.com/dotnet/sdk - ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b + ac6c241073485db169f773fcb1d010bff9e7df25 - + https://github.com/dotnet/sdk - ea5aa246199e66d74b7c6b9c77ff4708f24e5b9b + ac6c241073485db169f773fcb1d010bff9e7df25 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3bf3b899b172..e6b529f14848 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24155.22 - 8.0.300-preview.24155.22 - 8.0.300-preview.24155.22 + 8.0.300-preview.24156.3 + 8.0.300-preview.24156.3 + 8.0.300-preview.24156.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fe05a93ae5d3c6feb9e432490972fcd9ceed2f59 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 16:45:23 +0000 Subject: [PATCH 302/652] Update dependencies from https://github.com/dotnet/sdk build 20240306.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24155.22 -> To Version 8.0.300-preview.24156.11 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9df3f01a5a31..b368624895d7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ac6c241073485db169f773fcb1d010bff9e7df25 + 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d - + https://github.com/dotnet/sdk - ac6c241073485db169f773fcb1d010bff9e7df25 + 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d - + https://github.com/dotnet/sdk - ac6c241073485db169f773fcb1d010bff9e7df25 + 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d - + https://github.com/dotnet/sdk - ac6c241073485db169f773fcb1d010bff9e7df25 + 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e6b529f14848..26139a148311 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24156.3 - 8.0.300-preview.24156.3 - 8.0.300-preview.24156.3 + 8.0.300-preview.24156.11 + 8.0.300-preview.24156.11 + 8.0.300-preview.24156.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f484e7323382ecd7cc7dcbeea780e75022991bf2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 6 Mar 2024 22:13:40 +0000 Subject: [PATCH 303/652] Update dependencies from https://github.com/dotnet/sdk build 20240306.20 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24155.22 -> To Version 8.0.300-preview.24156.20 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b368624895d7..fb71134de889 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d + 511c121de5aed91d455ef512dc83cf83e125965b - + https://github.com/dotnet/sdk - 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d + 511c121de5aed91d455ef512dc83cf83e125965b - + https://github.com/dotnet/sdk - 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d + 511c121de5aed91d455ef512dc83cf83e125965b - + https://github.com/dotnet/sdk - 6c1ba2f2a0abedfd5969afc38bc4ebc16531336d + 511c121de5aed91d455ef512dc83cf83e125965b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 26139a148311..b8039b7442f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24156.11 - 8.0.300-preview.24156.11 - 8.0.300-preview.24156.11 + 8.0.300-preview.24156.20 + 8.0.300-preview.24156.20 + 8.0.300-preview.24156.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0d6c2be7dd659162e61b55c144439e8cafea1739 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 08:00:08 +0000 Subject: [PATCH 304/652] Update dependencies from https://github.com/dotnet/sdk build 20240306.50 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24156.20 -> To Version 8.0.300-preview.24156.50 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24154.4 -> To Version 12.8.300-beta.24155.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb71134de889..7ac3a937ec31 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 511c121de5aed91d455ef512dc83cf83e125965b + c4ad01672fd1f8370655810c9fa540a0f2d3a71d - + https://github.com/dotnet/sdk - 511c121de5aed91d455ef512dc83cf83e125965b + c4ad01672fd1f8370655810c9fa540a0f2d3a71d - + https://github.com/dotnet/sdk - 511c121de5aed91d455ef512dc83cf83e125965b + c4ad01672fd1f8370655810c9fa540a0f2d3a71d - + https://github.com/dotnet/sdk - 511c121de5aed91d455ef512dc83cf83e125965b + c4ad01672fd1f8370655810c9fa540a0f2d3a71d https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - ca66024e6da7cced9921216763386bd43f400fbf + 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 - + https://github.com/dotnet/fsharp - ca66024e6da7cced9921216763386bd43f400fbf + 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 diff --git a/eng/Versions.props b/eng/Versions.props index b8039b7442f3..f20e391cacb7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24156.20 - 8.0.300-preview.24156.20 - 8.0.300-preview.24156.20 + 8.0.300-preview.24156.50 + 8.0.300-preview.24156.50 + 8.0.300-preview.24156.50 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From effde0542624b84ddf895b404667234d1897ddaa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 08:41:59 +0000 Subject: [PATCH 305/652] Update dependencies from https://github.com/dotnet/sdk build 20240307.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24156.20 -> To Version 8.0.300-preview.24157.1 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24154.4 -> To Version 12.8.300-beta.24155.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ac3a937ec31..581707ce6abc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c4ad01672fd1f8370655810c9fa540a0f2d3a71d + ed2df70e71b4af18a94bf21c99ac9d560dc5b99b - + https://github.com/dotnet/sdk - c4ad01672fd1f8370655810c9fa540a0f2d3a71d + ed2df70e71b4af18a94bf21c99ac9d560dc5b99b - + https://github.com/dotnet/sdk - c4ad01672fd1f8370655810c9fa540a0f2d3a71d + ed2df70e71b4af18a94bf21c99ac9d560dc5b99b - + https://github.com/dotnet/sdk - c4ad01672fd1f8370655810c9fa540a0f2d3a71d + ed2df70e71b4af18a94bf21c99ac9d560dc5b99b https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - c88057e6c3be0d2b85b33e8e3cfb481f5d1d504b + 99fbf1bddce825ee6b146cf5591c143b216ed88b diff --git a/eng/Versions.props b/eng/Versions.props index f20e391cacb7..6dc32fcbb734 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24156.50 - 8.0.300-preview.24156.50 - 8.0.300-preview.24156.50 + 8.0.300-preview.24157.1 + 8.0.300-preview.24157.1 + 8.0.300-preview.24157.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24155.1 + 4.10.0-3.24155.13 From 1e73c4c65d34d21962e47fbfa2bc4bd5a3dbba26 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 14:00:37 +0000 Subject: [PATCH 306/652] Update dependencies from https://github.com/dotnet/arcade build 20240305.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24151.4 -> To Version 8.0.0-beta.24155.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 581707ce6abc..fc41ba2d613a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 + fb20e40883718b93d6d60eb0a2446e876ffa3d32 - + https://github.com/dotnet/arcade - cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 + fb20e40883718b93d6d60eb0a2446e876ffa3d32 - + https://github.com/dotnet/arcade - cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 + fb20e40883718b93d6d60eb0a2446e876ffa3d32 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 6dc32fcbb734..d38db9bebc5d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24151.4 + 8.0.0-beta.24155.2 diff --git a/global.json b/global.json index 363c757a573d..ba0b414256d3 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.24151.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24151.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24155.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24155.2" } } From 3951c40c5d9b51dacb7e704cf875c9224aa4f273 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 14:10:47 +0000 Subject: [PATCH 307/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240307.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24155.3 -> To Version 1.1.0-beta.24157.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9e98e96a8ec5..d0376f567c52 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24155.3", + "version": "1.1.0-beta.24157.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 581707ce6abc..e63f52eded52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cbb61c3a9a42e7c3cce17ee453ff5ecdc7f69282 - + https://github.com/dotnet/arcade-services - 288b79e6f16a407054b6620f72685d460573ef45 + 049ed7fcb1a7038d20e160b798606c64f743058c - + https://github.com/dotnet/arcade-services - 288b79e6f16a407054b6620f72685d460573ef45 + 049ed7fcb1a7038d20e160b798606c64f743058c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6dc32fcbb734..52f31ef1709b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24155.3 + 1.1.0-beta.24157.2 From ff479e32b8d80489f91c652c8b061c0018b4bae7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Mar 2024 15:27:00 +0000 Subject: [PATCH 308/652] Update dependencies from https://github.com/dotnet/sdk build 20240307.3 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24157.1 -> To Version 8.0.300-preview.24157.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 581707ce6abc..c041676ad272 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ed2df70e71b4af18a94bf21c99ac9d560dc5b99b + 9eda7b302f8ae230123bd0e0924d7094adf04c37 - + https://github.com/dotnet/sdk - ed2df70e71b4af18a94bf21c99ac9d560dc5b99b + 9eda7b302f8ae230123bd0e0924d7094adf04c37 - + https://github.com/dotnet/sdk - ed2df70e71b4af18a94bf21c99ac9d560dc5b99b + 9eda7b302f8ae230123bd0e0924d7094adf04c37 - + https://github.com/dotnet/sdk - ed2df70e71b4af18a94bf21c99ac9d560dc5b99b + 9eda7b302f8ae230123bd0e0924d7094adf04c37 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6dc32fcbb734..632b1a913056 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24157.1 - 8.0.300-preview.24157.1 - 8.0.300-preview.24157.1 + 8.0.300-preview.24157.3 + 8.0.300-preview.24157.3 + 8.0.300-preview.24157.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 800f432715b8f59c939acbc6cab7bfe2df33a938 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 06:24:46 +0000 Subject: [PATCH 309/652] Update dependencies from https://github.com/dotnet/sdk build 20240307.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24157.1 -> To Version 8.0.300-preview.24157.38 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 12.8.300-beta.24155.6 -> To Version 12.8.300-beta.24157.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c041676ad272..72be87c5f9d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 9eda7b302f8ae230123bd0e0924d7094adf04c37 + 74d2c416b20b35bff3e0b5c947295403ec32fef9 - + https://github.com/dotnet/sdk - 9eda7b302f8ae230123bd0e0924d7094adf04c37 + 74d2c416b20b35bff3e0b5c947295403ec32fef9 - + https://github.com/dotnet/sdk - 9eda7b302f8ae230123bd0e0924d7094adf04c37 + 74d2c416b20b35bff3e0b5c947295403ec32fef9 - + https://github.com/dotnet/sdk - 9eda7b302f8ae230123bd0e0924d7094adf04c37 + 74d2c416b20b35bff3e0b5c947295403ec32fef9 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 + d143cc18f506c455e4e4e86a78fccae2a0ee1acf - + https://github.com/dotnet/fsharp - 641c6a0e65bac6f7809e4e2415b9d60c11dcf493 + d143cc18f506c455e4e4e86a78fccae2a0ee1acf @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 99fbf1bddce825ee6b146cf5591c143b216ed88b + d24b5bb8debd2e89df8db13c84694f2982cc41b1 https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - 6009531090c927a8e61da9a0f97bdd5eb6f01a47 + e49fa71580778b8d9c3352ea5ed15ef204f0389f diff --git a/eng/Versions.props b/eng/Versions.props index 632b1a913056..074cda2d574a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24157.3 - 8.0.300-preview.24157.3 - 8.0.300-preview.24157.3 + 8.0.300-preview.24157.38 + 8.0.300-preview.24157.38 + 8.0.300-preview.24157.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24155.13 + 4.10.0-3.24156.11 @@ -127,7 +127,7 @@ - 6.10.0-preview.2.52 + 6.10.0-preview.2.73 From 08959426b25c6af53581ebac2bf4263a605dea32 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 7 Mar 2024 23:50:49 -0800 Subject: [PATCH 310/652] [release/8.0.3xx] Add -pr version of pipeline --- .vsts-pr.yml | 361 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000000..429c53be0639 --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,361 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/* + +variables: +- name: _PublishUsingPipelines + value: false +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +- template: /eng/common/templates/variables/pool-providers.yml + +stages: +- stage: Build + jobs: + # This job is for build retry configuration. + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\buildConfiguration + artifact: buildConfiguration + displayName: Publish Build Config + + ## PR-only jobs + + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Debug_x64 + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: true + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Ubuntu_22_04_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Fedora_39_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_CentOS_8_Stream_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Debian_11_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64' + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:BuildSdkDeb=true' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Debug + buildConfiguration: Debug + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + # Never run tests on arm64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' + buildConfiguration: Debug + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: true + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: true + + ## Official/PGO instrumentation Builds + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm_Release + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-arm' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Release + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine' + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-musl-arm' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-musl-arm64' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' + buildConfiguration: Release + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Deb_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_Arm64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_arm64 + runtimeIdentifier: 'osx-arm64' + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Windows PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + linuxPortable: true + runTests: false + + - template: /eng/common/templates/jobs/source-build.yml + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Publish + dependsOn: + - Build + jobs: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + publishUsingPipelines: true + publishAssetsImmediately: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 From 3746f1b7476875d90f310c9c7a6c85120e4c5daf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:37:40 +0000 Subject: [PATCH 311/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#18925) [release/8.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9061d9f39c26..b9241c6e561b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 74d2c416b20b35bff3e0b5c947295403ec32fef9 + 33bf1fb49767c788ad8ee8754024fb4ea6c1323c - + https://github.com/dotnet/sdk - 74d2c416b20b35bff3e0b5c947295403ec32fef9 + 33bf1fb49767c788ad8ee8754024fb4ea6c1323c - + https://github.com/dotnet/sdk - 74d2c416b20b35bff3e0b5c947295403ec32fef9 + 33bf1fb49767c788ad8ee8754024fb4ea6c1323c - + https://github.com/dotnet/sdk - 74d2c416b20b35bff3e0b5c947295403ec32fef9 + 33bf1fb49767c788ad8ee8754024fb4ea6c1323c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3ab4a0071546..c627a55628ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24157.38 - 8.0.300-preview.24157.38 - 8.0.300-preview.24157.38 + 8.0.300-preview.24158.5 + 8.0.300-preview.24158.5 + 8.0.300-preview.24158.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8846e045b9cc4d70311475e82d93248f32826c43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:38:48 +0000 Subject: [PATCH 312/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#18928) [release/8.0.3xx] Update dependencies from dotnet/arcade --- 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 b9241c6e561b..2e3049e61f69 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - fb20e40883718b93d6d60eb0a2446e876ffa3d32 + 1307d3e675219bf384f17764651f46767a07960b - + https://github.com/dotnet/arcade - fb20e40883718b93d6d60eb0a2446e876ffa3d32 + 1307d3e675219bf384f17764651f46767a07960b - + https://github.com/dotnet/arcade - fb20e40883718b93d6d60eb0a2446e876ffa3d32 + 1307d3e675219bf384f17764651f46767a07960b https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index c627a55628ac..f1eb553e04ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24155.2 + 8.0.0-beta.24156.1 diff --git a/global.json b/global.json index ba0b414256d3..60454d5991c1 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.24155.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24155.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24156.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24156.1" } } From 4cb7c4b6042011301285588c140f3372785a146c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 Mar 2024 22:39:51 +0000 Subject: [PATCH 313/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18929) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d0376f567c52..0c0eadbaf014 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24157.2", + "version": "1.1.0-beta.24157.4", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2e3049e61f69..cfe692e075db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 1307d3e675219bf384f17764651f46767a07960b - + https://github.com/dotnet/arcade-services - 049ed7fcb1a7038d20e160b798606c64f743058c + 99db9f39d5eb1b0fd05c20ce5a3147a622972dfd - + https://github.com/dotnet/arcade-services - 049ed7fcb1a7038d20e160b798606c64f743058c + 99db9f39d5eb1b0fd05c20ce5a3147a622972dfd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index f1eb553e04ed..9b335c42ed92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24157.2 + 1.1.0-beta.24157.4 From 811b43400caead41d1743c194aabd0e918f10965 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:20:23 +0000 Subject: [PATCH 314/652] Update dependencies from https://github.com/dotnet/sdk build 20240308.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24158.5 -> To Version 8.0.300-preview.24158.7 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.8.300-beta.24157.2 -> To Version 12.8.300-beta.24157.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe692e075db..9d11baff6f35 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 33bf1fb49767c788ad8ee8754024fb4ea6c1323c + d09d757b92250229b11ab486946c8ad3ed818be9 - + https://github.com/dotnet/sdk - 33bf1fb49767c788ad8ee8754024fb4ea6c1323c + d09d757b92250229b11ab486946c8ad3ed818be9 - + https://github.com/dotnet/sdk - 33bf1fb49767c788ad8ee8754024fb4ea6c1323c + d09d757b92250229b11ab486946c8ad3ed818be9 - + https://github.com/dotnet/sdk - 33bf1fb49767c788ad8ee8754024fb4ea6c1323c + d09d757b92250229b11ab486946c8ad3ed818be9 https://github.com/dotnet/test-templates @@ -132,18 +132,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - d143cc18f506c455e4e4e86a78fccae2a0ee1acf + 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/dotnet/fsharp - d143cc18f506c455e4e4e86a78fccae2a0ee1acf + 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/microsoft/vstest - 39c7dd12c7ec24d0552513e84d95476f2077ca33 + 316167369cea59e0ad6ece2a39d94a3a6d49cf12 diff --git a/eng/Versions.props b/eng/Versions.props index 9b335c42ed92..3b0a93a6de53 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24158.5 - 8.0.300-preview.24158.5 - 8.0.300-preview.24158.5 + 8.0.300-preview.24158.7 + 8.0.300-preview.24158.7 + 8.0.300-preview.24158.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24126-02 + 17.10.0-preview-24158-02 8.0.0-alpha.1.22557.12 From e334e4f42c18e51ad78635cc49071afeb5314dc3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 8 Mar 2024 23:58:22 +0000 Subject: [PATCH 315/652] Update dependencies from https://github.com/dotnet/sdk build 20240308.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24158.5 -> To Version 8.0.300-preview.24158.11 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,NuGet.Build.Tasks From Version 12.8.300-beta.24157.2 -> To Version 12.8.300-beta.24157.6 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9d11baff6f35..5ea216184385 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - d09d757b92250229b11ab486946c8ad3ed818be9 + 114884c8584583b36402efbbfbe342edb652e4e9 - + https://github.com/dotnet/sdk - d09d757b92250229b11ab486946c8ad3ed818be9 + 114884c8584583b36402efbbfbe342edb652e4e9 - + https://github.com/dotnet/sdk - d09d757b92250229b11ab486946c8ad3ed818be9 + 114884c8584583b36402efbbfbe342edb652e4e9 - + https://github.com/dotnet/sdk - d09d757b92250229b11ab486946c8ad3ed818be9 + 114884c8584583b36402efbbfbe342edb652e4e9 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - e49fa71580778b8d9c3352ea5ed15ef204f0389f + 309f2e302dff9e6ba8a2f48ddf28133d68ff7eae diff --git a/eng/Versions.props b/eng/Versions.props index 3b0a93a6de53..920e9ab51d59 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24158.7 - 8.0.300-preview.24158.7 - 8.0.300-preview.24158.7 + 8.0.300-preview.24158.11 + 8.0.300-preview.24158.11 + 8.0.300-preview.24158.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.73 + 6.10.0-preview.2.76 From 554a285753c68b009408bc646d9ce05de803a18c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Mar 2024 13:55:01 +0000 Subject: [PATCH 316/652] Update dependencies from https://github.com/dotnet/arcade build 20240308.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24156.1 -> To Version 8.0.0-beta.24158.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +++++++++++++------------- global.json | 4 ++-- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe692e075db..449afb2f493b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 1307d3e675219bf384f17764651f46767a07960b + 334436593593431d9dfe13538a8f745f31b3dd59 - + https://github.com/dotnet/arcade - 1307d3e675219bf384f17764651f46767a07960b + 334436593593431d9dfe13538a8f745f31b3dd59 - + https://github.com/dotnet/arcade - 1307d3e675219bf384f17764651f46767a07960b + 334436593593431d9dfe13538a8f745f31b3dd59 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 9b335c42ed92..91304b80ecfb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24156.1 + 8.0.0-beta.24158.1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6c65e81925f2..efa2fd72bfaa 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,13 +144,13 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - 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 -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + 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') @@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/global.json b/global.json index 60454d5991c1..2fd95804114c 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.24156.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24156.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24158.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24158.1" } } From 5400dda0c8863a0f80164ebc4e9f0dd25e640743 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 9 Mar 2024 14:00:32 +0000 Subject: [PATCH 317/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.3 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24059.4 -> To Version 8.0.0-alpha.1.24158.3 --- 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 cfe692e075db..e8beca7f0e3b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7134e53b6b1210a1ce8838b12b8f6071e0a3433b + 7a9b99e457a2b9792a3c17ccaf95d80038725108 From f5679a5abb754b0ca3a7dbe018b2f778e3090fda Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Mar 2024 12:49:44 +0000 Subject: [PATCH 318/652] Update dependencies from https://github.com/dotnet/arcade build 20240308.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24156.1 -> To Version 8.0.0-beta.24158.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 4 ++++ eng/common/templates/job/job.yml | 4 ++++ global.json | 4 ++-- 5 files changed, 17 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 449afb2f493b..b7af015767fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 334436593593431d9dfe13538a8f745f31b3dd59 + 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 - + https://github.com/dotnet/arcade - 334436593593431d9dfe13538a8f745f31b3dd59 + 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 - + https://github.com/dotnet/arcade - 334436593593431d9dfe13538a8f745f31b3dd59 + 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 91304b80ecfb..597eb5de857c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24158.1 + 8.0.0-beta.24158.4 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 9e7bebe9af89..647e3f92e5f3 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -15,6 +15,7 @@ parameters: timeoutInMinutes: '' variables: [] workspace: '' + templateContext: '' # Job base template specific parameters # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md @@ -68,6 +69,9 @@ jobs: ${{ if ne(parameters.timeoutInMinutes, '') }}: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + variables: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e24ca2f46f98..8ec5c4f2d9f9 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -15,6 +15,7 @@ parameters: timeoutInMinutes: '' variables: [] workspace: '' + templateContext: '' # Job base template specific parameters # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md @@ -68,6 +69,9 @@ jobs: ${{ if ne(parameters.timeoutInMinutes, '') }}: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + variables: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE diff --git a/global.json b/global.json index 2fd95804114c..51b94e804d66 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.24158.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24158.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24158.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24158.4" } } From 03967076f6e8b524ab76102135cee13c24a34f7f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 10 Mar 2024 12:55:40 +0000 Subject: [PATCH 319/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240308.3 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24059.4 -> To Version 8.0.0-alpha.1.24158.3 From 22740c816291c0e346cc796c12643c8bd893d837 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 02:53:15 +0000 Subject: [PATCH 320/652] Update dependencies from https://github.com/dotnet/sdk build 20240310.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24158.11 -> To Version 8.0.300-preview.24160.4 Dependency coherency updates NuGet.Build.Tasks From Version 6.10.0-preview.2.76 -> To Version 6.10.0-preview.2.78 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c14ef53f161..44b395b7dc8e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 114884c8584583b36402efbbfbe342edb652e4e9 + f5790d85c82426fa0527c3f71cbb9e277d5630e4 - + https://github.com/dotnet/sdk - 114884c8584583b36402efbbfbe342edb652e4e9 + f5790d85c82426fa0527c3f71cbb9e277d5630e4 - + https://github.com/dotnet/sdk - 114884c8584583b36402efbbfbe342edb652e4e9 + f5790d85c82426fa0527c3f71cbb9e277d5630e4 - + https://github.com/dotnet/sdk - 114884c8584583b36402efbbfbe342edb652e4e9 + f5790d85c82426fa0527c3f71cbb9e277d5630e4 https://github.com/dotnet/test-templates @@ -159,9 +159,9 @@ https://github.com/dotnet/msbuild 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 - + https://github.com/nuget/nuget.client - 309f2e302dff9e6ba8a2f48ddf28133d68ff7eae + 2fdd0d41e33c3354de2750fe154b56751a6682aa diff --git a/eng/Versions.props b/eng/Versions.props index a1b8a3ede82a..bd9ac43720d1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24158.11 - 8.0.300-preview.24158.11 - 8.0.300-preview.24158.11 + 8.0.300-preview.24160.4 + 8.0.300-preview.24160.4 + 8.0.300-preview.24160.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -127,7 +127,7 @@ - 6.10.0-preview.2.76 + 6.10.0-preview.2.78 From 9e7c27684add4019ea3516fa52454b691033a676 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 03:39:48 +0000 Subject: [PATCH 321/652] Update dependencies from https://github.com/dotnet/sdk build 20240310.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24158.11 -> To Version 8.0.300-preview.24160.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.10.0-3.24156.11 -> To Version 4.10.0-3.24158.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44b395b7dc8e..6bd250ed515c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - f5790d85c82426fa0527c3f71cbb9e277d5630e4 + 70abd290ddc5cbac9a18568dce4d56d0d0f85ced - + https://github.com/dotnet/sdk - f5790d85c82426fa0527c3f71cbb9e277d5630e4 + 70abd290ddc5cbac9a18568dce4d56d0d0f85ced - + https://github.com/dotnet/sdk - f5790d85c82426fa0527c3f71cbb9e277d5630e4 + 70abd290ddc5cbac9a18568dce4d56d0d0f85ced - + https://github.com/dotnet/sdk - f5790d85c82426fa0527c3f71cbb9e277d5630e4 + 70abd290ddc5cbac9a18568dce4d56d0d0f85ced https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - d24b5bb8debd2e89df8db13c84694f2982cc41b1 + 026c96327b02c5ce4d3208f821e02d2ffa825312 diff --git a/eng/Versions.props b/eng/Versions.props index bd9ac43720d1..93f3fc340e0e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24160.4 - 8.0.300-preview.24160.4 - 8.0.300-preview.24160.4 + 8.0.300-preview.24160.8 + 8.0.300-preview.24160.8 + 8.0.300-preview.24160.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24156.11 + 4.10.0-3.24158.5 From 5adee1f8f13d85380afcd378a9ce8ca5719a4028 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 06:26:37 +0000 Subject: [PATCH 322/652] Update dependencies from https://github.com/dotnet/sdk build 20240310.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24160.8 -> To Version 8.0.300-preview.24160.11 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-preview-24158-02 -> To Version 17.10.0-preview-24158-06 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 8 ++++---- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6bd250ed515c..be996551ec28 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 70abd290ddc5cbac9a18568dce4d56d0d0f85ced + 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 - + https://github.com/dotnet/sdk - 70abd290ddc5cbac9a18568dce4d56d0d0f85ced + 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 - + https://github.com/dotnet/sdk - 70abd290ddc5cbac9a18568dce4d56d0d0f85ced + 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 - + https://github.com/dotnet/sdk - 70abd290ddc5cbac9a18568dce4d56d0d0f85ced + 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 https://github.com/dotnet/test-templates @@ -141,7 +141,7 @@ 661d88ab1975665fbe8c580e7e2dab01bf264c27 - + https://github.com/microsoft/vstest 316167369cea59e0ad6ece2a39d94a3a6d49cf12 diff --git a/eng/Versions.props b/eng/Versions.props index 93f3fc340e0e..c886d907042a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24160.8 - 8.0.300-preview.24160.8 - 8.0.300-preview.24160.8 + 8.0.300-preview.24160.11 + 8.0.300-preview.24160.11 + 8.0.300-preview.24160.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24158-02 + 17.10.0-preview-24158-06 8.0.0-alpha.1.22557.12 From 98f7abfc33173777d7d78222f84ef16048cb1cdd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 07:59:05 +0000 Subject: [PATCH 323/652] Update dependencies from https://github.com/dotnet/sdk build 20240311.1 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24160.8 -> To Version 8.0.300-preview.24161.1 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-preview-24158-02 -> To Version 17.10.0-preview-24158-06 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be996551ec28..b340382e6e91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 + 8c5f20568edfe9d265cdf48c40f62007ef0f7215 - + https://github.com/dotnet/sdk - 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 + 8c5f20568edfe9d265cdf48c40f62007ef0f7215 - + https://github.com/dotnet/sdk - 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 + 8c5f20568edfe9d265cdf48c40f62007ef0f7215 - + https://github.com/dotnet/sdk - 8eb45ed11be2198d484e1bcc56bc917dd601e3c9 + 8c5f20568edfe9d265cdf48c40f62007ef0f7215 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c886d907042a..18f59255e3be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24160.11 - 8.0.300-preview.24160.11 - 8.0.300-preview.24160.11 + 8.0.300-preview.24161.1 + 8.0.300-preview.24161.1 + 8.0.300-preview.24161.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 11e8d7af5e06499a2541a8a1971a9621c2d8a66d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:22:23 -0700 Subject: [PATCH 324/652] [release/8.0.2xx] Add -pr version of pipeline --- .vsts-pr.yml | 361 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 361 insertions(+) create mode 100644 .vsts-pr.yml diff --git a/.vsts-pr.yml b/.vsts-pr.yml new file mode 100644 index 000000000000..d14d1293e29d --- /dev/null +++ b/.vsts-pr.yml @@ -0,0 +1,361 @@ +trigger: + batch: true + branches: + include: + - main + - master + - release/* + - internal/release/* + +variables: +- name: _PublishUsingPipelines + value: false +- ${{ if or(startswith(variables['Build.SourceBranch'], 'refs/heads/release/'), startswith(variables['Build.SourceBranch'], 'refs/heads/internal/release/'), eq(variables['Build.Reason'], 'Manual')) }}: + - name: PostBuildSign + value: false +- ${{ else }}: + - name: PostBuildSign + value: true +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - name: Codeql.Enabled + value: true + - group: DotNet-DotNetCli-Storage + - group: DotNet-Installer-SDLValidation-Params + - name: _PublishUsingPipelines + value: true + +- name: _InternalRuntimeDownloadArgs + value: '' + +- ${{ if eq(variables['System.TeamProject'], 'internal') }}: + - group: DotNetBuilds storage account read tokens + - name: _InternalRuntimeDownloadArgs + value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal + /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) + /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) + +- template: /eng/common/templates/variables/pool-providers.yml + +stages: +- stage: Build + jobs: + # This job is for build retry configuration. + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022preview.amd64 + steps: + - publish: $(Build.SourcesDirectory)\eng\buildConfiguration + artifact: buildConfiguration + displayName: Publish Build Config + + ## PR-only jobs + + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Debug_x64 + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: true + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Ubuntu_22_04_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Fedora_36_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_CentOS_8_Stream_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Debian_Stretch_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:BuildSdkDeb=true' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Debug + buildConfiguration: Debug + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + # Never run tests on arm64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Debug_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + buildConfiguration: Debug + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: true + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: true + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: true + + ## Official/PGO instrumentation Builds + + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + + ## Windows + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux + + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm_Release + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-arm' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Arm64_Release + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross' + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-musl-arm' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-musl-arm64' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' + buildConfiguration: Release + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Deb_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_x64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_Arm64 + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + # MacOS + + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Darwin + jobName: Build_Release_arm64 + runtimeIdentifier: 'osx-arm64' + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Windows PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false + + ## Linux PGO Instrumentation builds + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + + - template: eng/build.yml + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + linuxPortable: true + runTests: false + + - template: /eng/common/templates/jobs/source-build.yml + +- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Publish + dependsOn: + - Build + jobs: + - template: /eng/common/templates/job/publish-build-assets.yml + parameters: + publishUsingPipelines: true + publishAssetsImmediately: true + pool: + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 From d0ff04c65dc1954ffed84d42eac9f3a3e7527976 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 12:44:26 +0000 Subject: [PATCH 325/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240310.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24157.4 -> To Version 1.1.0-beta.24160.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0c0eadbaf014..0ee817aa4556 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24157.4", + "version": "1.1.0-beta.24160.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b340382e6e91..aae9e92548e2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 - + https://github.com/dotnet/arcade-services - 99db9f39d5eb1b0fd05c20ce5a3147a622972dfd + a134ac1e0ea0b38cc4c45b6c48bc14f81e513d82 - + https://github.com/dotnet/arcade-services - 99db9f39d5eb1b0fd05c20ce5a3147a622972dfd + a134ac1e0ea0b38cc4c45b6c48bc14f81e513d82 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 18f59255e3be..fb6a5da547ad 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24157.4 + 1.1.0-beta.24160.1 From 351e213e732ecf03b57ec1a55123725c5c360fbb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 11 Mar 2024 21:20:43 +0000 Subject: [PATCH 326/652] Update dependencies from https://github.com/dotnet/sdk build 20240311.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.1 -> To Version 8.0.300-preview.24161.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24158.5 -> To Version 4.10.0-3.24161.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aae9e92548e2..e58fcdfac07c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 8c5f20568edfe9d265cdf48c40f62007ef0f7215 + c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c - + https://github.com/dotnet/sdk - 8c5f20568edfe9d265cdf48c40f62007ef0f7215 + c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c - + https://github.com/dotnet/sdk - 8c5f20568edfe9d265cdf48c40f62007ef0f7215 + c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c - + https://github.com/dotnet/sdk - 8c5f20568edfe9d265cdf48c40f62007ef0f7215 + c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 026c96327b02c5ce4d3208f821e02d2ffa825312 + 01b7c233fdda946c1a5628d4692ed827a07e33dd diff --git a/eng/Versions.props b/eng/Versions.props index fb6a5da547ad..53ae7132b804 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24161.1 - 8.0.300-preview.24161.1 - 8.0.300-preview.24161.1 + 8.0.300-preview.24161.10 + 8.0.300-preview.24161.10 + 8.0.300-preview.24161.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24158.5 + 4.10.0-3.24161.2 From bcece68b898b77f7afd18c9c2f60974c16e46cea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 02:53:12 +0000 Subject: [PATCH 327/652] Update dependencies from https://github.com/dotnet/sdk build 20240311.18 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.10 -> To Version 8.0.300-preview.24161.18 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e58fcdfac07c..d83188815dfc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c + 83d7cb1e63964c3b647b834ca59f8775fd34760e - + https://github.com/dotnet/sdk - c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c + 83d7cb1e63964c3b647b834ca59f8775fd34760e - + https://github.com/dotnet/sdk - c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c + 83d7cb1e63964c3b647b834ca59f8775fd34760e - + https://github.com/dotnet/sdk - c205d8a8f0b4a331dcac9fe9e19d09443aa43c9c + 83d7cb1e63964c3b647b834ca59f8775fd34760e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 53ae7132b804..f51710b35cc8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24161.10 - 8.0.300-preview.24161.10 - 8.0.300-preview.24161.10 + 8.0.300-preview.24161.18 + 8.0.300-preview.24161.18 + 8.0.300-preview.24161.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1ef7899704b2ba4c729c37f5a5bdaa0d2a748cfa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:59:10 +0000 Subject: [PATCH 328/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#18983) [release/8.0.3xx] Update dependencies from dotnet/arcade --- 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 d83188815dfc..3df338fdafcc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 + 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 - + https://github.com/dotnet/arcade - 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 + 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 - + https://github.com/dotnet/arcade - 052a4b9e7a9bdb9744c86c05665f1b46e4d59b15 + 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f51710b35cc8..170c07ce27a2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24158.4 + 8.0.0-beta.24161.1 diff --git a/global.json b/global.json index 51b94e804d66..93a6e87ff52d 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.24158.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24158.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24161.1" } } From 2b4d22dc5775ff687d7bc15b910516d760477f55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 16:59:57 +0000 Subject: [PATCH 329/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#18984) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0ee817aa4556..2d9cfe51966d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24160.1", + "version": "1.1.0-beta.24161.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3df338fdafcc..bbabe5805491 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 - + https://github.com/dotnet/arcade-services - a134ac1e0ea0b38cc4c45b6c48bc14f81e513d82 + d88cdaf3c0fe2dfb47d89eb6fc860597954d6a10 - + https://github.com/dotnet/arcade-services - a134ac1e0ea0b38cc4c45b6c48bc14f81e513d82 + d88cdaf3c0fe2dfb47d89eb6fc860597954d6a10 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 170c07ce27a2..927fa34db5a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24160.1 + 1.1.0-beta.24161.3 From bbdd0d1b091c2f704273ef6ea36b24ca1983d2d7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:00:20 +0000 Subject: [PATCH 330/652] [release/8.0.3xx] Update dependencies from dotnet/source-build-externals (#18985) [release/8.0.3xx] Update dependencies from dotnet/source-build-externals --- 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 bbabe5805491..796f64689be7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 7a9b99e457a2b9792a3c17ccaf95d80038725108 + 00fb7841c80b44262646e57bcfbe90a1b7bc3151 From 76b780c23558d17e9be56edd0312b86a14b31ea2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 20:46:14 +0000 Subject: [PATCH 331/652] Update dependencies from https://github.com/dotnet/sdk build 20240312.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.17 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24161.2 -> To Version 4.10.0-3.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 796f64689be7..208e4acb2257 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 83d7cb1e63964c3b647b834ca59f8775fd34760e + 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 - + https://github.com/dotnet/sdk - 83d7cb1e63964c3b647b834ca59f8775fd34760e + 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 - + https://github.com/dotnet/sdk - 83d7cb1e63964c3b647b834ca59f8775fd34760e + 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 - + https://github.com/dotnet/sdk - 83d7cb1e63964c3b647b834ca59f8775fd34760e + 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 01b7c233fdda946c1a5628d4692ed827a07e33dd + c3565da812d99adf841cb96a764a27d8a93e22ef diff --git a/eng/Versions.props b/eng/Versions.props index 927fa34db5a7..9b1b6f3b72e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24161.18 - 8.0.300-preview.24161.18 - 8.0.300-preview.24161.18 + 8.0.300-preview.24162.17 + 8.0.300-preview.24162.17 + 8.0.300-preview.24162.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24161.2 + 4.10.0-3.24161.10 From d2aceffaeec34468a641cc50b24de264394ab353 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 21:13:23 +0000 Subject: [PATCH 332/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240312.27 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.202 -> To Version 8.0.204 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.9.0-3.24081.11 -> To Version 4.9.2-3.24129.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 +++--- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index cd498b0c2b03..a61fa6503613 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -59,7 +59,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 77c7744c1dd5..de8f1f5a9d6c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9992441ffa504a2a429299397b14834d3a4adb92 + 69ff768b503cb5106ee4dc650daa37c5479476ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9992441ffa504a2a429299397b14834d3a4adb92 + 69ff768b503cb5106ee4dc650daa37c5479476ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9992441ffa504a2a429299397b14834d3a4adb92 + 69ff768b503cb5106ee4dc650daa37c5479476ab - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 9992441ffa504a2a429299397b14834d3a4adb92 + 69ff768b503cb5106ee4dc650daa37c5479476ab https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 9934fb9e3527e1c0c51314e57d4aab30f97e8f9e - + https://github.com/dotnet/msbuild - a4ecab324c0586fe69b6bdcc062264b244dd8cd0 + ae275ff04ccdbf064a4a4ceef086d0a20221045c https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index dd6915a146d8..0b65be5f939a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.203 - 8.0.203-servicing.24155.14 - 8.0.203-servicing.24155.14 + 8.0.204 + 8.0.204-servicing.24162.27 + 8.0.204-servicing.24162.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e90afd832a1a4008737917bce71fcc21f2310b5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 21:43:09 +0000 Subject: [PATCH 333/652] Update dependencies from https://github.com/dotnet/sdk build 20240312.33 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.33 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24161.2 -> To Version 4.10.0-3.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 208e4acb2257..2f290b1d4cd0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 + 1e4f16b8e573b7d4b19be30cab4dc5d2053875de - + https://github.com/dotnet/sdk - 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 + 1e4f16b8e573b7d4b19be30cab4dc5d2053875de - + https://github.com/dotnet/sdk - 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 + 1e4f16b8e573b7d4b19be30cab4dc5d2053875de - + https://github.com/dotnet/sdk - 51f0991b7526efa8c32ec765f4f7d5dd522fcf48 + 1e4f16b8e573b7d4b19be30cab4dc5d2053875de https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9b1b6f3b72e5..2b2174bade80 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.17 - 8.0.300-preview.24162.17 - 8.0.300-preview.24162.17 + 8.0.300-preview.24162.33 + 8.0.300-preview.24162.33 + 8.0.300-preview.24162.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eb3dd11e4de8bc46b213ae20ebc315ae87014923 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 22:27:56 +0000 Subject: [PATCH 334/652] Update dependencies from https://github.com/dotnet/sdk build 20240312.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.40 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24157.6 -> To Version 12.8.300-beta.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f290b1d4cd0..4feed6bce7a4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 1e4f16b8e573b7d4b19be30cab4dc5d2053875de + c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 - + https://github.com/dotnet/sdk - 1e4f16b8e573b7d4b19be30cab4dc5d2053875de + c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 - + https://github.com/dotnet/sdk - 1e4f16b8e573b7d4b19be30cab4dc5d2053875de + c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 - + https://github.com/dotnet/sdk - 1e4f16b8e573b7d4b19be30cab4dc5d2053875de + c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 661d88ab1975665fbe8c580e7e2dab01bf264c27 + 212eaf7fac2d837c51dc49e477a599ebea68338b - + https://github.com/dotnet/fsharp - 661d88ab1975665fbe8c580e7e2dab01bf264c27 + 212eaf7fac2d837c51dc49e477a599ebea68338b diff --git a/eng/Versions.props b/eng/Versions.props index 2b2174bade80..779817287096 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.33 - 8.0.300-preview.24162.33 - 8.0.300-preview.24162.33 + 8.0.300-preview.24162.40 + 8.0.300-preview.24162.40 + 8.0.300-preview.24162.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From bc66c0beaee77f2ab1aa27674232338491850f2c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 12 Mar 2024 23:36:46 +0000 Subject: [PATCH 335/652] Update dependencies from https://github.com/dotnet/sdk build 20240312.42 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.42 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24157.6 -> To Version 12.8.300-beta.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4feed6bce7a4..e504729b0cea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 + a878c46bc4b96f3912903af71892cd9ccbbfcce6 - + https://github.com/dotnet/sdk - c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 + a878c46bc4b96f3912903af71892cd9ccbbfcce6 - + https://github.com/dotnet/sdk - c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 + a878c46bc4b96f3912903af71892cd9ccbbfcce6 - + https://github.com/dotnet/sdk - c2ab19f9dd9db6d8aedd7d37922ee841a23f7973 + a878c46bc4b96f3912903af71892cd9ccbbfcce6 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 779817287096..b51a88cb5b3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.40 - 8.0.300-preview.24162.40 - 8.0.300-preview.24162.40 + 8.0.300-preview.24162.42 + 8.0.300-preview.24162.42 + 8.0.300-preview.24162.42 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 372ba70df3b8b496fef20461d01b49972278719c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 00:49:58 +0000 Subject: [PATCH 336/652] Update dependencies from https://github.com/dotnet/sdk build 20240312.49 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24161.18 -> To Version 8.0.300-preview.24162.49 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24157.6 -> To Version 12.8.300-beta.24161.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e504729b0cea..509ae9ac518e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - a878c46bc4b96f3912903af71892cd9ccbbfcce6 + a723fc24d8b0870cd61f04dd944588799209b00f - + https://github.com/dotnet/sdk - a878c46bc4b96f3912903af71892cd9ccbbfcce6 + a723fc24d8b0870cd61f04dd944588799209b00f - + https://github.com/dotnet/sdk - a878c46bc4b96f3912903af71892cd9ccbbfcce6 + a723fc24d8b0870cd61f04dd944588799209b00f - + https://github.com/dotnet/sdk - a878c46bc4b96f3912903af71892cd9ccbbfcce6 + a723fc24d8b0870cd61f04dd944588799209b00f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b51a88cb5b3c..e5c83c629f15 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.42 - 8.0.300-preview.24162.42 - 8.0.300-preview.24162.42 + 8.0.300-preview.24162.49 + 8.0.300-preview.24162.49 + 8.0.300-preview.24162.49 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 52bb95a0a1b409f09aa669b0ad07665fea6180b1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 07:06:34 +0000 Subject: [PATCH 337/652] Update dependencies from https://github.com/dotnet/sdk build 20240312.55 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24162.49 -> To Version 8.0.300-preview.24162.55 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 509ae9ac518e..ec886562e1ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - a723fc24d8b0870cd61f04dd944588799209b00f + 74ac925497752d0a7449d7a9e42b12bd08d60001 - + https://github.com/dotnet/sdk - a723fc24d8b0870cd61f04dd944588799209b00f + 74ac925497752d0a7449d7a9e42b12bd08d60001 - + https://github.com/dotnet/sdk - a723fc24d8b0870cd61f04dd944588799209b00f + 74ac925497752d0a7449d7a9e42b12bd08d60001 - + https://github.com/dotnet/sdk - a723fc24d8b0870cd61f04dd944588799209b00f + 74ac925497752d0a7449d7a9e42b12bd08d60001 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e5c83c629f15..71de2c7215fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.49 - 8.0.300-preview.24162.49 - 8.0.300-preview.24162.49 + 8.0.300-preview.24162.55 + 8.0.300-preview.24162.55 + 8.0.300-preview.24162.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b27c880578dc595dead766f9b5a574c08ee448e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 12:37:16 +0000 Subject: [PATCH 338/652] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24161.1 -> To Version 8.0.0-beta.24161.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 18 +++++++++++------- global.json | 4 ++-- 4 files changed, 20 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ec886562e1ef..8b1b847a53c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 + cd10e5d3748676d70ae2b4d9c84f073eeb203cac - + https://github.com/dotnet/arcade - 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 + cd10e5d3748676d70ae2b4d9c84f073eeb203cac - + https://github.com/dotnet/arcade - 5c3fdd3b5aaaa32b24383ec12a60b37ebff13079 + cd10e5d3748676d70ae2b4d9c84f073eeb203cac https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 71de2c7215fc..f42a394716a3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24161.1 + 8.0.0-beta.24161.7 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 647e3f92e5f3..a2709d10562c 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -206,9 +206,11 @@ jobs: continueOnError: true condition: always() - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - - publish: artifacts/log - artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} - displayName: Publish logs + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' continueOnError: true condition: always() @@ -253,7 +255,9 @@ jobs: IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableBuildRetry, 'true') }}: - - publish: $(Build.SourcesDirectory)\eng\common\BuildConfiguration - artifact: BuildConfiguration - displayName: Publish build retry configuration - continueOnError: true + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 93a6e87ff52d..f156f942006c 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.24161.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24161.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24161.7", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24161.7" } } From 8bec184cd2e4e476adcde9323d0b11b8cc58b04b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 12:37:38 +0000 Subject: [PATCH 339/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24061.1 -> To Version 8.0.0-alpha.1.24162.3 --- 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 ec886562e1ef..9bab52ba64d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 453a37ef7ae6c335cd49b3b9ab7713c87faeb265 + c08ec59adcf8b56cd1b4de2090c320496566b5c6 From 6e01c1ac60fcd0263304fa951c83fdd13a712759 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 18:01:36 +0000 Subject: [PATCH 340/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24162.55 -> To Version 8.0.300-preview.24163.12 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 16e7ae6ef4e7..3c304d6308d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 74ac925497752d0a7449d7a9e42b12bd08d60001 + 35c742da690af19799aad14468773d7de628ab17 - + https://github.com/dotnet/sdk - 74ac925497752d0a7449d7a9e42b12bd08d60001 + 35c742da690af19799aad14468773d7de628ab17 - + https://github.com/dotnet/sdk - 74ac925497752d0a7449d7a9e42b12bd08d60001 + 35c742da690af19799aad14468773d7de628ab17 - + https://github.com/dotnet/sdk - 74ac925497752d0a7449d7a9e42b12bd08d60001 + 35c742da690af19799aad14468773d7de628ab17 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f42a394716a3..48c1d9588913 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24162.55 - 8.0.300-preview.24162.55 - 8.0.300-preview.24162.55 + 8.0.300-preview.24163.12 + 8.0.300-preview.24163.12 + 8.0.300-preview.24163.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From efde4c82ce48c6155b0959aaffbf75b5264570c7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 19:22:33 +0000 Subject: [PATCH 341/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24162.55 -> To Version 8.0.300-preview.24163.22 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24161.10 -> To Version 4.10.0-3.24163.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3c304d6308d8..05ceb7b5186b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 35c742da690af19799aad14468773d7de628ab17 + 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 - + https://github.com/dotnet/sdk - 35c742da690af19799aad14468773d7de628ab17 + 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 - + https://github.com/dotnet/sdk - 35c742da690af19799aad14468773d7de628ab17 + 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 - + https://github.com/dotnet/sdk - 35c742da690af19799aad14468773d7de628ab17 + 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - c3565da812d99adf841cb96a764a27d8a93e22ef + 9be4c180382a6981a2738f2174f79c5cea967634 diff --git a/eng/Versions.props b/eng/Versions.props index 48c1d9588913..367e69f1741e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24163.12 - 8.0.300-preview.24163.12 - 8.0.300-preview.24163.12 + 8.0.300-preview.24163.22 + 8.0.300-preview.24163.22 + 8.0.300-preview.24163.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24161.10 + 4.10.0-3.24163.2 From 0e12e8ec52a51d11fd2ef2c0a05d7978836239be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 13 Mar 2024 21:25:26 +0000 Subject: [PATCH 342/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24162.55 -> To Version 8.0.300-preview.24163.27 Dependency coherency updates Microsoft.Net.Compilers.Toolset,Microsoft.Build From Version 4.10.0-3.24161.10 -> To Version 4.10.0-3.24163.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 05ceb7b5186b..1b86999df07d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 + b1509b85f3fa791d491eae45d4e21450026dcd92 - + https://github.com/dotnet/sdk - 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 + b1509b85f3fa791d491eae45d4e21450026dcd92 - + https://github.com/dotnet/sdk - 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 + b1509b85f3fa791d491eae45d4e21450026dcd92 - + https://github.com/dotnet/sdk - 6cd00d5260179c8e81aa0bc84c8fac50f4898ae3 + b1509b85f3fa791d491eae45d4e21450026dcd92 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 9be4c180382a6981a2738f2174f79c5cea967634 - + https://github.com/dotnet/msbuild - 6f44380e4fdea6ddf5c11f48efeb25c2bf181e62 + 0326fd7c9e131c4c26bac3c0f72a43ef9fd2812c https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 367e69f1741e..0d63e0750aa3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24163.22 - 8.0.300-preview.24163.22 - 8.0.300-preview.24163.22 + 8.0.300-preview.24163.27 + 8.0.300-preview.24163.27 + 8.0.300-preview.24163.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7dab7e0eed9e73955ea63df479d1aa00f5c29553 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 12:34:16 +0000 Subject: [PATCH 343/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24162.3 -> To Version 8.0.0-alpha.1.24163.3 --- 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 1b86999df07d..b7e53f30efe4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - c08ec59adcf8b56cd1b4de2090c320496566b5c6 + 79827eed138fd2575a8b24820b4f385ee4ffb6e6 From dd24f3247fcb146d0f4e2b0ad1873246b874b406 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 12:38:17 +0000 Subject: [PATCH 344/652] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24161.3 -> To Version 1.1.0-beta.24163.7 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 2d9cfe51966d..98dfd99e6b73 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24161.3", + "version": "1.1.0-beta.24163.7", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1b86999df07d..7ed1ad700b10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cd10e5d3748676d70ae2b4d9c84f073eeb203cac - + https://github.com/dotnet/arcade-services - d88cdaf3c0fe2dfb47d89eb6fc860597954d6a10 + ba165e6aa0bf16decf19e19292107458e12f89c3 - + https://github.com/dotnet/arcade-services - d88cdaf3c0fe2dfb47d89eb6fc860597954d6a10 + ba165e6aa0bf16decf19e19292107458e12f89c3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 0d63e0750aa3..ac6336264d40 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24161.3 + 1.1.0-beta.24163.7 From 1653b55f3479e223053ecb4fb0ca00de4920d126 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 18:22:41 +0000 Subject: [PATCH 345/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24163.27 -> To Version 8.0.300-preview.24164.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24161.10 -> To Version 12.8.300-beta.24163.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 10 +++++----- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7f008fa2d9b1..7650459aa08e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - b1509b85f3fa791d491eae45d4e21450026dcd92 + 3c9ce20b0168f65a6f374336fe75bddda5daa992 - + https://github.com/dotnet/sdk - b1509b85f3fa791d491eae45d4e21450026dcd92 + 3c9ce20b0168f65a6f374336fe75bddda5daa992 - + https://github.com/dotnet/sdk - b1509b85f3fa791d491eae45d4e21450026dcd92 + 3c9ce20b0168f65a6f374336fe75bddda5daa992 - + https://github.com/dotnet/sdk - b1509b85f3fa791d491eae45d4e21450026dcd92 + 3c9ce20b0168f65a6f374336fe75bddda5daa992 https://github.com/dotnet/test-templates @@ -132,27 +132,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 212eaf7fac2d837c51dc49e477a599ebea68338b + 2c03643199368f07a3326709fc68abcbfc482a06 - + https://github.com/dotnet/fsharp - 212eaf7fac2d837c51dc49e477a599ebea68338b + 2c03643199368f07a3326709fc68abcbfc482a06 - + https://github.com/microsoft/vstest - 316167369cea59e0ad6ece2a39d94a3a6d49cf12 + c609e2c022b0087b227436a4debf45525eed00e9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 9be4c180382a6981a2738f2174f79c5cea967634 + 26b809df38356d4fe1ee376f703dc8832a7ce461 diff --git a/eng/Versions.props b/eng/Versions.props index ac6336264d40..213b05e694c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24163.27 - 8.0.300-preview.24163.27 - 8.0.300-preview.24163.27 + 8.0.300-preview.24164.6 + 8.0.300-preview.24164.6 + 8.0.300-preview.24164.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24163.2 + 4.10.0-3.24164.1 @@ -235,7 +235,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24158-06 + 17.10.0-preview-24163-01 8.0.0-alpha.1.22557.12 From d46b0b67d1fcfc6e4d375cf9316d63f2e707d5d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 14 Mar 2024 19:54:20 +0000 Subject: [PATCH 346/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24163.27 -> To Version 8.0.300-preview.24164.18 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24161.10 -> To Version 12.8.300-beta.24163.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7650459aa08e..2c4cbd72ce6d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 3c9ce20b0168f65a6f374336fe75bddda5daa992 + 3aaa5010a3834aa8504b83e46836f8fa41684fd8 - + https://github.com/dotnet/sdk - 3c9ce20b0168f65a6f374336fe75bddda5daa992 + 3aaa5010a3834aa8504b83e46836f8fa41684fd8 - + https://github.com/dotnet/sdk - 3c9ce20b0168f65a6f374336fe75bddda5daa992 + 3aaa5010a3834aa8504b83e46836f8fa41684fd8 - + https://github.com/dotnet/sdk - 3c9ce20b0168f65a6f374336fe75bddda5daa992 + 3aaa5010a3834aa8504b83e46836f8fa41684fd8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 213b05e694c4..ac87cef1c816 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24164.6 - 8.0.300-preview.24164.6 - 8.0.300-preview.24164.6 + 8.0.300-preview.24164.18 + 8.0.300-preview.24164.18 + 8.0.300-preview.24164.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3f56159d2873152b31964505ce39ca789adba29c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Mar 2024 18:03:25 +0000 Subject: [PATCH 347/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24164.18 -> To Version 8.0.300-preview.24165.8 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24164.1 -> To Version 4.10.0-3.24164.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c4cbd72ce6d..cb8e9dd89f14 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 3aaa5010a3834aa8504b83e46836f8fa41684fd8 + c2d085dc4d5eb7117a4fb169a1d5210624cb2977 - + https://github.com/dotnet/sdk - 3aaa5010a3834aa8504b83e46836f8fa41684fd8 + c2d085dc4d5eb7117a4fb169a1d5210624cb2977 - + https://github.com/dotnet/sdk - 3aaa5010a3834aa8504b83e46836f8fa41684fd8 + c2d085dc4d5eb7117a4fb169a1d5210624cb2977 - + https://github.com/dotnet/sdk - 3aaa5010a3834aa8504b83e46836f8fa41684fd8 + c2d085dc4d5eb7117a4fb169a1d5210624cb2977 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 26b809df38356d4fe1ee376f703dc8832a7ce461 + 711e122c86db37658d2924f2499c775ce6007b68 diff --git a/eng/Versions.props b/eng/Versions.props index ac87cef1c816..ecb2e1e48cbe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24164.18 - 8.0.300-preview.24164.18 - 8.0.300-preview.24164.18 + 8.0.300-preview.24165.8 + 8.0.300-preview.24165.8 + 8.0.300-preview.24165.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24164.1 + 4.10.0-3.24164.3 From ada7faa3cb11c49337ece21565ea542585eb964d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 15 Mar 2024 18:51:24 +0000 Subject: [PATCH 348/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24164.18 -> To Version 8.0.300-preview.24165.10 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24164.1 -> To Version 4.10.0-3.24164.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb8e9dd89f14..4aba38806efb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c2d085dc4d5eb7117a4fb169a1d5210624cb2977 + 9927abb44564390c24941a631592034a47c9bbee - + https://github.com/dotnet/sdk - c2d085dc4d5eb7117a4fb169a1d5210624cb2977 + 9927abb44564390c24941a631592034a47c9bbee - + https://github.com/dotnet/sdk - c2d085dc4d5eb7117a4fb169a1d5210624cb2977 + 9927abb44564390c24941a631592034a47c9bbee - + https://github.com/dotnet/sdk - c2d085dc4d5eb7117a4fb169a1d5210624cb2977 + 9927abb44564390c24941a631592034a47c9bbee https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ecb2e1e48cbe..5d81005dce7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24165.8 - 8.0.300-preview.24165.8 - 8.0.300-preview.24165.8 + 8.0.300-preview.24165.10 + 8.0.300-preview.24165.10 + 8.0.300-preview.24165.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4e61e7f95658c1f98a61fe155ec70897363f13ad Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Mar 2024 12:29:21 +0000 Subject: [PATCH 349/652] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24161.7 -> To Version 8.0.0-beta.24165.4 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/job/publish-build-assets.yml | 10 ++++++---- global.json | 4 ++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c4cbd72ce6d..036e8565c378 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - cd10e5d3748676d70ae2b4d9c84f073eeb203cac + f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade - cd10e5d3748676d70ae2b4d9c84f073eeb203cac + f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade - cd10e5d3748676d70ae2b4d9c84f073eeb203cac + f311667e0587f19c3fa9553a909975662107a351 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index ac87cef1c816..48bab6f2f956 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24161.7 + 8.0.0-beta.24165.4 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index ea5104625fac..53138622fe7a 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -94,14 +94,16 @@ jobs: inputs: targetType: inline script: | - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(BARBuildId) - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value "$(DefaultChannels)" - Add-Content -Path "$(Build.StagingDirectory)/ReleaseConfigs.txt" -Value $(IsStableBuild) + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) - task: 1ES.PublishBuildArtifacts@1 displayName: Publish ReleaseConfigs Artifact inputs: - PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs.txt' + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' PublishLocation: Container ArtifactName: ReleaseConfigs diff --git a/global.json b/global.json index f156f942006c..b967bd08e9e1 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.24161.7", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24161.7" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24165.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24165.4" } } From 729c284649ed495a0178604c7897b5c9e997fd50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 16 Mar 2024 12:33:51 +0000 Subject: [PATCH 350/652] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24163.7 -> To Version 1.1.0-beta.24165.3 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 98dfd99e6b73..77356e8dd960 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24163.7", + "version": "1.1.0-beta.24165.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2c4cbd72ce6d..8358ff18d6fe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade cd10e5d3748676d70ae2b4d9c84f073eeb203cac - + https://github.com/dotnet/arcade-services - ba165e6aa0bf16decf19e19292107458e12f89c3 + f3aa3b006c333af65c49ee69dc0594132981a8d3 - + https://github.com/dotnet/arcade-services - ba165e6aa0bf16decf19e19292107458e12f89c3 + f3aa3b006c333af65c49ee69dc0594132981a8d3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index ac87cef1c816..15b12896db0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24163.7 + 1.1.0-beta.24165.3 From 7bc0cb37ef9e7d97080a002dfede1002722af60d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Mar 2024 01:29:58 +0000 Subject: [PATCH 351/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24164.18 -> To Version 8.0.300-preview.24166.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24164.1 -> To Version 4.10.0-3.24164.3 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4aba38806efb..769566d6aed1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 9927abb44564390c24941a631592034a47c9bbee + 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 - + https://github.com/dotnet/sdk - 9927abb44564390c24941a631592034a47c9bbee + 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 - + https://github.com/dotnet/sdk - 9927abb44564390c24941a631592034a47c9bbee + 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 - + https://github.com/dotnet/sdk - 9927abb44564390c24941a631592034a47c9bbee + 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5d81005dce7f..acb42c98505d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24165.10 - 8.0.300-preview.24165.10 - 8.0.300-preview.24165.10 + 8.0.300-preview.24166.1 + 8.0.300-preview.24166.1 + 8.0.300-preview.24166.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d1e9a7fcd23e6bd4963155e73d656531e72a5915 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Mar 2024 12:21:54 +0000 Subject: [PATCH 352/652] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24161.7 -> To Version 8.0.0-beta.24165.4 From 15eb24360be3011af5ebd4b760fb83657a3d753d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 17 Mar 2024 12:26:37 +0000 Subject: [PATCH 353/652] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24163.7 -> To Version 1.1.0-beta.24165.3 From 8b8ababc0e9deada13d260c5edfe365e90cbaf21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Mar 2024 02:46:26 +0000 Subject: [PATCH 354/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24166.1 -> To Version 8.0.300-preview.24167.1 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.10.0-3.24164.3 -> To Version 4.10.0-3.24165.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 10 +++++----- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1747f48ae374..d9b085261be2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 + 291ad6b22643e23288f10c1751b3ece73fa19a15 - + https://github.com/dotnet/sdk - 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 + 291ad6b22643e23288f10c1751b3ece73fa19a15 - + https://github.com/dotnet/sdk - 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 + 291ad6b22643e23288f10c1751b3ece73fa19a15 - + https://github.com/dotnet/sdk - 2e7c5850d85165bc84a9c66107b81d0fef3c1b37 + 291ad6b22643e23288f10c1751b3ece73fa19a15 https://github.com/dotnet/test-templates @@ -150,18 +150,18 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 711e122c86db37658d2924f2499c775ce6007b68 + 93fb58100f90efe96051fe8531a008823f39c81b https://github.com/dotnet/msbuild 0326fd7c9e131c4c26bac3c0f72a43ef9fd2812c - + https://github.com/nuget/nuget.client - 2fdd0d41e33c3354de2750fe154b56751a6682aa + 1845d6bd450a7453d573035371c9fec43683d1ef diff --git a/eng/Versions.props b/eng/Versions.props index 3dc4b8ee158c..14d5ebcad882 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24166.1 - 8.0.300-preview.24166.1 - 8.0.300-preview.24166.1 + 8.0.300-preview.24167.1 + 8.0.300-preview.24167.1 + 8.0.300-preview.24167.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24164.3 + 4.10.0-3.24165.5 @@ -127,7 +127,7 @@ - 6.10.0-preview.2.78 + 6.10.0-preview.2.81 From 3e5621b0dcbd355bc885a21e7af9a283c3cd5625 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 18 Mar 2024 17:56:02 +0000 Subject: [PATCH 355/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24167.1 -> To Version 8.0.300-preview.24168.3 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24163.4 -> To Version 12.8.300-beta.24165.2 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d9b085261be2..07e1452639d6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 291ad6b22643e23288f10c1751b3ece73fa19a15 + e33d9e61d2ccdc158b2d725c471fede831871d14 - + https://github.com/dotnet/sdk - 291ad6b22643e23288f10c1751b3ece73fa19a15 + e33d9e61d2ccdc158b2d725c471fede831871d14 - + https://github.com/dotnet/sdk - 291ad6b22643e23288f10c1751b3ece73fa19a15 + e33d9e61d2ccdc158b2d725c471fede831871d14 - + https://github.com/dotnet/sdk - 291ad6b22643e23288f10c1751b3ece73fa19a15 + e33d9e61d2ccdc158b2d725c471fede831871d14 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 2c03643199368f07a3326709fc68abcbfc482a06 + a0081443628b0c582abe66f83944519378d2a5dd - + https://github.com/dotnet/fsharp - 2c03643199368f07a3326709fc68abcbfc482a06 + a0081443628b0c582abe66f83944519378d2a5dd @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 93fb58100f90efe96051fe8531a008823f39c81b + 2348a50bb566b39305c474793b43edb5635db6f4 diff --git a/eng/Versions.props b/eng/Versions.props index 14d5ebcad882..e98c9fbe92d6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,16 +85,16 @@ - 8.0.300-preview.24167.1 - 8.0.300-preview.24167.1 - 8.0.300-preview.24167.1 + 8.0.300-preview.24168.3 + 8.0.300-preview.24168.3 + 8.0.300-preview.24168.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24165.5 + 4.10.0-3.24168.1 From 104ed88ea2b93911b799a0723b2c1d7839c38dae Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Mar 2024 00:13:16 -0700 Subject: [PATCH 356/652] Remove 2.1 template --- eng/Signing.props | 6 ------ eng/Versions.props | 6 ------ src/redist/targets/BundledTemplates.targets | 9 --------- 3 files changed, 21 deletions(-) diff --git a/eng/Signing.props b/eng/Signing.props index 0d49f78d18ad..852eea4b0bae 100644 --- a/eng/Signing.props +++ b/eng/Signing.props @@ -39,12 +39,6 @@ - - - - - - - 1.0.2-beta4.22406.1 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 @@ -225,11 +224,6 @@ 2.0.0-preview8.19373.1 $(MicrosoftDotNetCommonItemTemplates30PackageVersion) 3.0.3 - - 1.5.3 - 1.0.2-beta3 - $(MicrosoftDotNetCommonItemTemplates21PackageVersion) - 2.1.34 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 4ab2c37a7287..6b145c6fc146 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -94,14 +94,6 @@ - - - - - - - - @@ -114,7 +106,6 @@ - From ce007b0b84f404bebcaaddd1b3ed8e995f968594 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Mar 2024 00:25:35 -0700 Subject: [PATCH 357/652] Remove 3.0 template --- eng/Versions.props | 9 --------- src/redist/targets/BundledTemplates.targets | 13 ------------- 2 files changed, 22 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3b8b6a60735f..bcd6f83cce8b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,8 +56,6 @@ - - 1.0.2-beta4.22406.1 1.1.0-rc.22558.1 1.1.0-rc.23410.2 @@ -217,13 +215,6 @@ $(MicrosoftDotNetCommonItemTemplates31PackageVersion) 3.1.32 3.2.1 - - 4.8.0-rc2.19462.10 - 3.0.0 - 1.6.5 - 2.0.0-preview8.19373.1 - $(MicrosoftDotNetCommonItemTemplates30PackageVersion) - 3.0.3 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 6b145c6fc146..e05f128010c3 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -83,18 +83,6 @@ - - - - - - - - - - - - @@ -105,7 +93,6 @@ - From afa95c6d2a3f2941c8539c4393c46e957c046667 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Mar 2024 00:58:01 -0700 Subject: [PATCH 358/652] Remove 3.1 template --- eng/Versions.props | 9 --------- src/redist/targets/BundledTemplates.targets | 15 --------------- 2 files changed, 24 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index bcd6f83cce8b..0b557516259e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,6 @@ - 1.1.0-rc.22558.1 1.1.0-rc.23410.2 1.1.0-rc.24059.1 1.1.0-rc.24059.1 @@ -207,14 +206,6 @@ $(MicrosoftDotNetCommonItemTemplates50PackageVersion) $(MicrosoftDotNetCommonItemTemplates50PackageVersion) 5.0.17 - - 4.8.1-servicing.19605.5 - 3.1.2-servicing.20066.4 - 1.7.2 - 3.1.27 - $(MicrosoftDotNetCommonItemTemplates31PackageVersion) - 3.1.32 - 3.2.1 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index e05f128010c3..477abf21bfc7 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -69,20 +69,6 @@ - - - - - - - - - - - - - - @@ -92,7 +78,6 @@ - From 82afe53846016d915998308e442be99af8407ecb Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 19 Mar 2024 02:42:14 -0700 Subject: [PATCH 359/652] Remove 5.0 template --- eng/Versions.props | 12 ------------ src/redist/targets/BundledTemplates.targets | 13 ------------- 2 files changed, 25 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 0b557516259e..fb1c4ac1473a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,7 +57,6 @@ - 1.1.0-rc.23410.2 1.1.0-rc.24059.1 1.1.0-rc.24059.1 1.1.0-rc.24059.1 @@ -156,14 +155,10 @@ - 5.0.403 6.0.302 7.0.100 - 5.0.17 6.0.14 7.0.3 - 5.0.17-servicing.22215.4 - 5.0.17-servicing.22218.2 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 7.0.0-rtm.22518.7 @@ -199,13 +194,6 @@ $(MicrosoftDotNetCommonItemTemplates60PackageVersion) $(MicrosoftDotNetCommonItemTemplates60PackageVersion) 6.0.$(AspNetCoreTemplateFeature60) - - $(MicrosoftWinFormsProjectTemplates50PackageVersion) - $(MicrosoftWPFProjectTemplates50PackageVersion) - $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - $(MicrosoftDotNetCommonItemTemplates50PackageVersion) - 5.0.17 diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index 477abf21bfc7..fab8b99fac5d 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -58,18 +58,6 @@ - - - - - - - - - - - - @@ -77,7 +65,6 @@ - From 26f84804757ec4080dce1d30894a41d5a6cb1d1f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 12:30:21 +0000 Subject: [PATCH 360/652] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24165.3 -> To Version 1.1.0-beta.24168.5 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 77356e8dd960..0cd5b7816c9e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24165.3", + "version": "1.1.0-beta.24168.5", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07e1452639d6..87ece51263c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade-services - f3aa3b006c333af65c49ee69dc0594132981a8d3 + 55716bbf779395f1c33ea1eb1f688b5081223d49 - + https://github.com/dotnet/arcade-services - f3aa3b006c333af65c49ee69dc0594132981a8d3 + 55716bbf779395f1c33ea1eb1f688b5081223d49 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e98c9fbe92d6..28e78f35bcc9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24165.3 + 1.1.0-beta.24168.5 From 2b78d126e7346e3598b998f18d6deec005ae2a72 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 12:30:47 +0000 Subject: [PATCH 361/652] Update dependencies from https://github.com/dotnet/source-build-externals build Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24161.1 -> To Version 8.0.0-alpha.1.24168.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 07e1452639d6..d3a4ecc6167c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 00fb7841c80b44262646e57bcfbe90a1b7bc3151 + 0fac378047750fa8bd850a98b159560f9f7627c3 From 9cef9b814cfcdfffd4393324197da7590417eb50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 15:29:43 +0000 Subject: [PATCH 362/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24168.3 -> To Version 8.0.300-preview.24169.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 07e1452639d6..5ea221423cc2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - e33d9e61d2ccdc158b2d725c471fede831871d14 + 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d - + https://github.com/dotnet/sdk - e33d9e61d2ccdc158b2d725c471fede831871d14 + 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d - + https://github.com/dotnet/sdk - e33d9e61d2ccdc158b2d725c471fede831871d14 + 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d - + https://github.com/dotnet/sdk - e33d9e61d2ccdc158b2d725c471fede831871d14 + 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index e98c9fbe92d6..11bab9beb986 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24168.3 - 8.0.300-preview.24168.3 - 8.0.300-preview.24168.3 + 8.0.300-preview.24169.2 + 8.0.300-preview.24169.2 + 8.0.300-preview.24169.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5a6d696e84de785a0be25b1ffae27e63546d3d6a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 17:03:38 +0000 Subject: [PATCH 363/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24168.3 -> To Version 8.0.300-preview.24169.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b5e21ffe7676..1a35c5f646dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d + 449664383f57f4bd974ec2a6c522137850fbe17c - + https://github.com/dotnet/sdk - 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d + 449664383f57f4bd974ec2a6c522137850fbe17c - + https://github.com/dotnet/sdk - 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d + 449664383f57f4bd974ec2a6c522137850fbe17c - + https://github.com/dotnet/sdk - 8ed3fc73dbaf61f8b2fb0bcb01d82b70ff1f4c7d + 449664383f57f4bd974ec2a6c522137850fbe17c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1f7379d7a180..96e1a0322194 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24169.2 - 8.0.300-preview.24169.2 - 8.0.300-preview.24169.2 + 8.0.300-preview.24169.3 + 8.0.300-preview.24169.3 + 8.0.300-preview.24169.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 456eb7f619e02fafb9362cf361c28956f9546d0d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 20:36:08 +0000 Subject: [PATCH 364/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.204 -> To Version 8.0.204 Dependency coherency updates Microsoft.Build From Version 17.9.7 -> To Version 17.9.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 27 +++------------------------ eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 14 insertions(+), 35 deletions(-) diff --git a/NuGet.config b/NuGet.config index a61fa6503613..31b7ad1b4539 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,30 +7,18 @@ - - - - - - - - - - + - - - - + @@ -50,21 +38,12 @@ - - - - - - - + - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de8f1f5a9d6c..be47b899c05e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 69ff768b503cb5106ee4dc650daa37c5479476ab + 938898a918381d28544cbd6b267285d924d34927 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 69ff768b503cb5106ee4dc650daa37c5479476ab + 938898a918381d28544cbd6b267285d924d34927 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 69ff768b503cb5106ee4dc650daa37c5479476ab + 938898a918381d28544cbd6b267285d924d34927 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 69ff768b503cb5106ee4dc650daa37c5479476ab + 938898a918381d28544cbd6b267285d924d34927 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 9934fb9e3527e1c0c51314e57d4aab30f97e8f9e - + https://github.com/dotnet/msbuild - ae275ff04ccdbf064a4a4ceef086d0a20221045c + b34f75857bacf5ecd5531f7ff763a5739d3ae435 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted diff --git a/eng/Versions.props b/eng/Versions.props index 0950bd2fa1fa..bd55c6e668e0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.204 - 8.0.204-servicing.24162.27 - 8.0.204-servicing.24162.27 + 8.0.204-servicing.24165.3 + 8.0.204-servicing.24165.3 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From edf8d5199c8775fe1e3916861610b0724856a6d1 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 21:20:52 +0000 Subject: [PATCH 365/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.204 -> To Version 8.0.204 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.3-servicing.24114.23 -> To Version 8.0.4-servicing.24168.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 7 ++++-- eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 42 insertions(+), 39 deletions(-) diff --git a/NuGet.config b/NuGet.config index 31b7ad1b4539..ed7ce6032dca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + @@ -16,9 +17,10 @@ + - + @@ -40,8 +42,9 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be47b899c05e..de0c3061086e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop baf3c0df45e13d065884f7e84260f645295f219e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + a1a9440b48374c6d400287abbb56a4ac54d9b02f @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 938898a918381d28544cbd6b267285d924d34927 + ed29889e35fc1e169e0e94a41017b01ff3fcb2ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 938898a918381d28544cbd6b267285d924d34927 + ed29889e35fc1e169e0e94a41017b01ff3fcb2ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 938898a918381d28544cbd6b267285d924d34927 + ed29889e35fc1e169e0e94a41017b01ff3fcb2ec - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 938898a918381d28544cbd6b267285d924d34927 + ed29889e35fc1e169e0e94a41017b01ff3fcb2ec https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ a77b8d5b4aa89504bbff10e2880c27fd55adc55b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9f4b1f5d664afdfc80e1508ab7ed099dff210fbd + a1a9440b48374c6d400287abbb56a4ac54d9b02f https://github.com/dotnet/roslyn @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 08a90ca2c88b17f1b5d081318354a41db0882cff - + https://github.com/dotnet/emsdk - 9a29abdd764a4de0f253ed368871877a47725247 + 08a90ca2c88b17f1b5d081318354a41db0882cff diff --git a/eng/Versions.props b/eng/Versions.props index bd55c6e668e0..f9ad8ef553ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.204 - 8.0.204-servicing.24165.3 - 8.0.204-servicing.24165.3 + 8.0.204-servicing.24169.14 + 8.0.204-servicing.24169.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,16 +98,16 @@ - 8.0.3-servicing.24114.23 + 8.0.4-servicing.24168.10 - 8.0.3-servicing.24114.23 - 8.0.3-servicing.24114.23 - 8.0.3 - 8.0.3 - 8.0.3 - 8.0.3 + 8.0.4-servicing.24168.10 + 8.0.4-servicing.24168.10 + 8.0.4 + 8.0.4 + 8.0.4 + 8.0.4 2.1.0 @@ -250,7 +250,7 @@ 14.0.8478 17.0.8478 - 8.0.3 + 8.0.4 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 30c9885d8943158806dd1667a8831eeae121d3ed Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 19 Mar 2024 14:30:57 -0700 Subject: [PATCH 366/652] We shouldn't need the eol feed either so trying to remove it --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 76d6c5c5e705..1b9167e7c3a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,7 +24,6 @@ - From 3f9cf68649a0a0a73ba518ccff86192b2e150775 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 19 Mar 2024 21:36:26 +0000 Subject: [PATCH 367/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24169.3 -> To Version 8.0.300-preview.24169.27 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1a35c5f646dd..edde09e2f30d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 449664383f57f4bd974ec2a6c522137850fbe17c + 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee - + https://github.com/dotnet/sdk - 449664383f57f4bd974ec2a6c522137850fbe17c + 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee - + https://github.com/dotnet/sdk - 449664383f57f4bd974ec2a6c522137850fbe17c + 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee - + https://github.com/dotnet/sdk - 449664383f57f4bd974ec2a6c522137850fbe17c + 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 96e1a0322194..f0f5c97d07d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,9 +85,9 @@ - 8.0.300-preview.24169.3 - 8.0.300-preview.24169.3 - 8.0.300-preview.24169.3 + 8.0.300-preview.24169.27 + 8.0.300-preview.24169.27 + 8.0.300-preview.24169.27 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f7cc5781a0fdd2b9a8120f507dc6d34f20200fcd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 22:05:23 +0000 Subject: [PATCH 368/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.204 -> To Version 8.0.204 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.3-servicing.24114.23 -> To Version 8.0.4-servicing.24168.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index ed7ce6032dca..bacb52ece094 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -20,7 +21,7 @@ - + @@ -40,11 +41,12 @@ + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de0c3061086e..af8f1542fdbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime a1a9440b48374c6d400287abbb56a4ac54d9b02f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 88ec3bc3f37e76fbcc932a25f9f0c1c29fe2b343 + 497c82b842ba5f2bcee747393c166210f62ec45f https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed29889e35fc1e169e0e94a41017b01ff3fcb2ec + deb3b400f316607f22a7d8cdbf129c08e7cfe9b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed29889e35fc1e169e0e94a41017b01ff3fcb2ec + deb3b400f316607f22a7d8cdbf129c08e7cfe9b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed29889e35fc1e169e0e94a41017b01ff3fcb2ec + deb3b400f316607f22a7d8cdbf129c08e7cfe9b7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed29889e35fc1e169e0e94a41017b01ff3fcb2ec + deb3b400f316607f22a7d8cdbf129c08e7cfe9b7 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index f9ad8ef553ea..56e87e455392 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,13 +72,13 @@ - 8.0.3 - 8.0.3 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 - 8.0.3-servicing.24116.15 + 8.0.4 + 8.0.4 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 + 8.0.4-servicing.24164.2 0.2.0 @@ -86,8 +86,8 @@ 8.0.204 - 8.0.204-servicing.24169.14 - 8.0.204-servicing.24169.14 + 8.0.204-servicing.24169.31 + 8.0.204-servicing.24169.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5b9983e91a5c841353034dbcdb9c1ced38e33de7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 19 Mar 2024 23:33:17 +0000 Subject: [PATCH 369/652] [release/8.0.2xx] Update dependencies from dotnet/arcade (#19106) [release/8.0.2xx] Update dependencies from dotnet/arcade --- NuGet.config | 11 +- eng/Version.Details.xml | 12 +- eng/Versions.props | 2 +- eng/common/SetupNugetSources.ps1 | 26 +- eng/common/templates-official/job/job.yml | 263 ++++++++++++++++ .../templates-official/job/onelocbuild.yml | 112 +++++++ .../job/publish-build-assets.yml | 155 ++++++++++ .../templates-official/job/source-build.yml | 67 ++++ .../job/source-index-stage1.yml | 68 +++++ .../templates-official/jobs/codeql-build.yml | 31 ++ eng/common/templates-official/jobs/jobs.yml | 97 ++++++ .../templates-official/jobs/source-build.yml | 46 +++ .../post-build/common-variables.yml | 22 ++ .../post-build/post-build.yml | 285 ++++++++++++++++++ .../post-build/setup-maestro-vars.yml | 70 +++++ .../post-build/trigger-subscription.yml | 13 + .../steps/add-build-to-channel.yml | 13 + .../templates-official/steps/build-reason.yml | 12 + .../steps/component-governance.yml | 13 + .../steps/execute-codeql.yml | 32 ++ .../templates-official/steps/execute-sdl.yml | 88 ++++++ .../steps/generate-sbom.yml | 48 +++ .../templates-official/steps/publish-logs.yml | 23 ++ .../templates-official/steps/retain-build.yml | 28 ++ .../steps/send-to-helix.yml | 91 ++++++ .../templates-official/steps/source-build.yml | 129 ++++++++ .../variables/pool-providers.yml | 45 +++ .../variables/sdl-variables.yml | 7 + eng/common/templates/job/job.yml | 4 + eng/common/templates/steps/generate-sbom.yml | 2 +- global.json | 4 +- 31 files changed, 1786 insertions(+), 33 deletions(-) create mode 100644 eng/common/templates-official/job/job.yml create mode 100644 eng/common/templates-official/job/onelocbuild.yml create mode 100644 eng/common/templates-official/job/publish-build-assets.yml create mode 100644 eng/common/templates-official/job/source-build.yml create mode 100644 eng/common/templates-official/job/source-index-stage1.yml create mode 100644 eng/common/templates-official/jobs/codeql-build.yml create mode 100644 eng/common/templates-official/jobs/jobs.yml create mode 100644 eng/common/templates-official/jobs/source-build.yml create mode 100644 eng/common/templates-official/post-build/common-variables.yml create mode 100644 eng/common/templates-official/post-build/post-build.yml create mode 100644 eng/common/templates-official/post-build/setup-maestro-vars.yml create mode 100644 eng/common/templates-official/post-build/trigger-subscription.yml create mode 100644 eng/common/templates-official/steps/add-build-to-channel.yml create mode 100644 eng/common/templates-official/steps/build-reason.yml create mode 100644 eng/common/templates-official/steps/component-governance.yml create mode 100644 eng/common/templates-official/steps/execute-codeql.yml create mode 100644 eng/common/templates-official/steps/execute-sdl.yml create mode 100644 eng/common/templates-official/steps/generate-sbom.yml create mode 100644 eng/common/templates-official/steps/publish-logs.yml create mode 100644 eng/common/templates-official/steps/retain-build.yml create mode 100644 eng/common/templates-official/steps/send-to-helix.yml create mode 100644 eng/common/templates-official/steps/source-build.yml create mode 100644 eng/common/templates-official/variables/pool-providers.yml create mode 100644 eng/common/templates-official/variables/sdl-variables.yml diff --git a/NuGet.config b/NuGet.config index 9bf35989ec7d..b883b67bf4fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,22 +7,17 @@ - - - - + - - @@ -42,15 +37,11 @@ - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7edb5ad45ea..bea9b2c4d77c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade - da98edc4c3ea539f109ea320672136ceb32591a7 + f311667e0587f19c3fa9553a909975662107a351 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index e5ba2f15ed62..bc4ec5c75b71 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24113.2 + 8.0.0-beta.24165.4 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 6c65e81925f2..efa2fd72bfaa 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -35,7 +35,7 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 # Add source entry to PackageSources -function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $Password) { +function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) @@ -48,12 +48,11 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern else { Write-Host "Package source $SourceName already present." } - - AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $Password + AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd } # Add a credential node for the specified source -function AddCredential($creds, $source, $username, $password) { +function AddCredential($creds, $source, $username, $pwd) { # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -82,17 +81,18 @@ function AddCredential($creds, $source, $username, $password) { $passwordElement.SetAttribute("key", "ClearTextPassword") $sourceElement.AppendChild($passwordElement) | Out-Null } - $passwordElement.SetAttribute("value", $Password) + + $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) { +function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." ForEach ($PackageSource in $maestroPrivateSources) { Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -Password $Password + AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd } } @@ -144,13 +144,13 @@ if ($disabledSources -ne $null) { $userName = "dn-bot" # Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password +InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password # 3.1 uses a different feed url format so it's handled differently here $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - 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 -Password $Password + AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + 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') @@ -159,9 +159,9 @@ foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password } } -$doc.Save($filename) +$doc.Save($filename) \ No newline at end of file diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml new file mode 100644 index 000000000000..a2709d10562c --- /dev/null +++ b/eng/common/templates-official/job/job.yml @@ -0,0 +1,263 @@ +# 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. + +parameters: +# Job schema parameters - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + cancelTimeoutInMinutes: '' + condition: '' + container: '' + continueOnError: false + dependsOn: '' + displayName: '' + pool: '' + steps: [] + strategy: '' + timeoutInMinutes: '' + variables: [] + workspace: '' + templateContext: '' + +# Job base template specific parameters + # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md + artifacts: '' + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishBuildAssets: false + enablePublishTestResults: false + enablePublishUsingPipelines: false + enableBuildRetry: false + disableComponentGovernance: '' + componentGovernanceIgnoreDirectories: '' + mergeTestResults: false + testRunTitle: '' + testResultsFormat: '' + name: '' + preSteps: [] + runAsPublic: false +# Sbom related params + enableSbom: true + PackageVersion: 7.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + +jobs: +- job: ${{ parameters.name }} + + ${{ if ne(parameters.cancelTimeoutInMinutes, '') }}: + cancelTimeoutInMinutes: ${{ parameters.cancelTimeoutInMinutes }} + + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} + + ${{ if ne(parameters.container, '') }}: + container: ${{ parameters.container }} + + ${{ if ne(parameters.continueOnError, '') }}: + continueOnError: ${{ parameters.continueOnError }} + + ${{ if ne(parameters.dependsOn, '') }}: + dependsOn: ${{ parameters.dependsOn }} + + ${{ if ne(parameters.displayName, '') }}: + displayName: ${{ parameters.displayName }} + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + + ${{ if ne(parameters.strategy, '') }}: + strategy: ${{ parameters.strategy }} + + ${{ if ne(parameters.timeoutInMinutes, '') }}: + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + + variables: + - ${{ if ne(parameters.enableTelemetry, 'false') }}: + - name: DOTNET_CLI_TELEMETRY_PROFILE + value: '$(Build.Repository.Uri)' + - ${{ if eq(parameters.enableRichCodeNavigation, 'true') }}: + - name: EnableRichCodeNavigation + value: 'true' + # Retry signature validation up to three times, waiting 2 seconds between attempts. + # See https://learn.microsoft.com/en-us/nuget/reference/errors-and-warnings/nu3028#retry-untrusted-root-failures + - name: NUGET_EXPERIMENTAL_CHAIN_BUILD_RETRY_POLICY + value: 3,2000 + - ${{ each variable in parameters.variables }}: + # handle name-value variable syntax + # example: + # - name: [key] + # value: [value] + - ${{ if ne(variable.name, '') }}: + - name: ${{ variable.name }} + value: ${{ variable.value }} + + # handle variable groups + - ${{ if ne(variable.group, '') }}: + - group: ${{ variable.group }} + + # handle template variable syntax + # example: + # - template: path/to/template.yml + # parameters: + # [key]: [value] + - ${{ if ne(variable.template, '') }}: + - template: ${{ variable.template }} + ${{ if ne(variable.parameters, '') }}: + parameters: ${{ variable.parameters }} + + # handle key-value variable syntax. + # example: + # - [key]: [value] + - ${{ if and(eq(variable.name, ''), eq(variable.group, ''), eq(variable.template, '')) }}: + - ${{ each pair in variable }}: + - name: ${{ pair.key }} + value: ${{ pair.value }} + + # DotNet-HelixApi-Access provides 'HelixApiAccessToken' for internal builds + - ${{ if and(eq(parameters.enableTelemetry, 'true'), eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + + ${{ if ne(parameters.workspace, '') }}: + workspace: ${{ parameters.workspace }} + + steps: + - ${{ if ne(parameters.preSteps, '') }}: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - task: MicroBuildSigningPlugin@3 + displayName: Install MicroBuild plugin + inputs: + signType: $(_SignType) + zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json + env: + TeamName: $(_TeamName) + continueOnError: ${{ parameters.continueOnError }} + condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + + - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: + - task: NuGetAuthenticate@1 + + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: + - task: DownloadPipelineArtifact@2 + inputs: + buildType: current + artifactName: ${{ coalesce(parameters.artifacts.download.name, 'Artifacts_$(Agent.OS)_$(_BuildConfig)') }} + targetPath: ${{ coalesce(parameters.artifacts.download.path, 'artifacts') }} + itemPattern: ${{ coalesce(parameters.artifacts.download.pattern, '**') }} + + - ${{ each step in parameters.steps }}: + - ${{ step }} + + - ${{ if eq(parameters.enableRichCodeNavigation, true) }}: + - task: RichCodeNavIndexer@0 + displayName: RichCodeNav Upload + inputs: + languages: ${{ coalesce(parameters.richCodeNavigationLanguage, 'csharp') }} + environment: ${{ coalesce(parameters.richCodeNavigationEnvironment, 'production') }} + richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin + uploadRichNavArtifacts: ${{ coalesce(parameters.richCodeNavigationUploadArtifacts, false) }} + continueOnError: true + + - template: /eng/common/templates-official/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(startsWith(variables['Build.SourceBranch'], 'refs/heads/release/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/dotnet/'), startsWith(variables['Build.SourceBranch'], 'refs/heads/microsoft/'), eq(variables['Build.SourceBranch'], 'refs/heads/main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: MicroBuildCleanup@1 + displayName: Execute Microbuild cleanup tasks + condition: and(always(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + env: + TeamName: $(_TeamName) + + - ${{ if ne(parameters.artifacts.publish, '') }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - task: CopyFiles@2 + displayName: Gather binaries for publish to artifacts + inputs: + SourceFolder: 'artifacts/bin' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/bin' + - task: CopyFiles@2 + displayName: Gather packages for publish to artifacts + inputs: + SourceFolder: 'artifacts/packages' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/artifacts/packages' + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish pipeline artifacts + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/artifacts' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} + continueOnError: true + condition: always() + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: 'artifacts/log' + artifactName: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} + displayName: 'Publish logs' + continueOnError: true + condition: always() + + - ${{ if ne(parameters.enablePublishBuildArtifacts, 'false') }}: + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)' + PublishLocation: Container + ArtifactName: ${{ coalesce(parameters.enablePublishBuildArtifacts.artifactName, '$(Agent.Os)_$(Agent.JobName)' ) }} + continueOnError: true + condition: always() + + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'xunit')) }}: + - task: PublishTestResults@2 + displayName: Publish XUnit Test Results + inputs: + testResultsFormat: 'xUnit' + testResultsFiles: '*.xml' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-xunit + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + - ${{ if or(and(eq(parameters.enablePublishTestResults, 'true'), eq(parameters.testResultsFormat, '')), eq(parameters.testResultsFormat, 'vstest')) }}: + - task: PublishTestResults@2 + displayName: Publish TRX Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '*.trx' + searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)' + testRunTitle: ${{ coalesce(parameters.testRunTitle, parameters.name, '$(System.JobName)') }}-trx + mergeTestResults: ${{ parameters.mergeTestResults }} + continueOnError: true + condition: always() + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.enableSbom, 'true')) }}: + - template: /eng/common/templates-official/steps/generate-sbom.yml + parameters: + PackageVersion: ${{ parameters.packageVersion}} + BuildDropPath: ${{ parameters.buildDropPath }} + IgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} + + - ${{ if eq(parameters.enableBuildRetry, 'true') }}: + - task: 1ES.PublishPipelineArtifact@1 + inputs: + targetPath: '$(Build.SourcesDirectory)\eng\common\BuildConfiguration' + artifactName: 'BuildConfiguration' + displayName: 'Publish build retry configuration' + continueOnError: true \ No newline at end of file diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml new file mode 100644 index 000000000000..ba9ba4930329 --- /dev/null +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -0,0 +1,112 @@ +parameters: + # Optional: dependencies of the job + dependsOn: '' + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: '' + + 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) + CreatePr: true + AutoCompletePr: false + ReusePr: true + UseLfLineEndings: true + UseCheckedInLocProjectJson: false + SkipLocProjectJsonGeneration: false + LanguageSet: VS_Main_Languages + LclSource: lclFilesInRepo + LclPackageId: '' + RepoType: gitHub + GitHubOrg: dotnet + MirrorRepo: '' + MirrorBranch: main + condition: '' + JobNameSuffix: '' + +jobs: +- job: OneLocBuild${{ parameters.JobNameSuffix }} + + dependsOn: ${{ parameters.dependsOn }} + + displayName: OneLocBuild${{ parameters.JobNameSuffix }} + + variables: + - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat + - name: _GenerateLocProjectArguments + value: -SourcesDirectory ${{ parameters.SourcesDirectory }} + -LanguageSet "${{ parameters.LanguageSet }}" + -CreateNeutralXlfs + - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: + - name: _GenerateLocProjectArguments + value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: + - task: Powershell@2 + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/generate-locproject.ps1 + arguments: $(_GenerateLocProjectArguments) + displayName: Generate LocProject.json + condition: ${{ parameters.condition }} + + - task: OneLocBuild@2 + displayName: OneLocBuild + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + inputs: + locProj: eng/Localize/LocProject.json + outDir: $(Build.ArtifactStagingDirectory) + lclSource: ${{ parameters.LclSource }} + lclPackageId: ${{ parameters.LclPackageId }} + isCreatePrSelected: ${{ parameters.CreatePr }} + isAutoCompletePrSelected: ${{ parameters.AutoCompletePr }} + ${{ if eq(parameters.CreatePr, true) }}: + isUseLfLineEndingsSelected: ${{ parameters.UseLfLineEndings }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + isShouldReusePrSelected: ${{ parameters.ReusePr }} + packageSourceAuth: patAuth + patVariable: ${{ parameters.CeapexPat }} + ${{ if eq(parameters.RepoType, 'gitHub') }}: + repoType: ${{ parameters.RepoType }} + gitHubPatVariable: "${{ parameters.GithubPat }}" + ${{ if ne(parameters.MirrorRepo, '') }}: + isMirrorRepoSelected: true + gitHubOrganization: ${{ parameters.GitHubOrg }} + mirrorRepo: ${{ parameters.MirrorRepo }} + mirrorBranch: ${{ parameters.MirrorBranch }} + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Localization Files + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)/loc' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish LocProject.json + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/Localize/' + PublishLocation: Container + ArtifactName: Loc + condition: ${{ parameters.condition }} \ No newline at end of file diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml new file mode 100644 index 000000000000..53138622fe7a --- /dev/null +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -0,0 +1,155 @@ +parameters: + configuration: 'Debug' + + # Optional: condition for the job to run + condition: '' + + # Optional: 'true' if future jobs should run even if this job fails + continueOnError: false + + # Optional: dependencies of the job + dependsOn: '' + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool + pool: {} + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishUsingPipelines: false + + # Optional: whether the build's artifacts will be published using release pipelines or direct feed publishing + publishAssetsImmediately: false + + artifactsPublishingAdditionalParameters: '' + + signingValidationAdditionalParameters: '' + +jobs: +- job: Asset_Registry_Publish + + dependsOn: ${{ parameters.dependsOn }} + timeoutInMinutes: 150 + + ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + displayName: Publish Assets + ${{ else }}: + displayName: Publish to Build Asset Registry + + variables: + - template: /eng/common/templates-official/variables/pool-providers.yml + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: Publish-Build-Assets + - group: AzureDevOps-Artifact-Feeds-Pats + - name: runCodesignValidationInjection + value: false + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/common-variables.yml + + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download artifact + inputs: + artifactName: AssetManifests + downloadPath: '$(Build.StagingDirectory)/Download' + checkDownloadedFiles: true + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Build Assets + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' + /p:BuildAssetRegistryToken=$(MaestroAccessToken) + /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com + /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} + /p:OfficialBuildId=$(Build.BuildNumber) + condition: ${{ parameters.condition }} + continueOnError: ${{ parameters.continueOnError }} + + - task: powershell@2 + displayName: Create ReleaseConfigs Artifact + inputs: + targetType: inline + script: | + New-Item -Path "$(Build.StagingDirectory)/ReleaseConfigs" -ItemType Directory -Force + $filePath = "$(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt" + Add-Content -Path $filePath -Value $(BARBuildId) + Add-Content -Path $filePath -Value "$(DefaultChannels)" + Add-Content -Path $filePath -Value $(IsStableBuild) + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish ReleaseConfigs Artifact + inputs: + PathtoPublish: '$(Build.StagingDirectory)/ReleaseConfigs' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - task: powershell@2 + displayName: Check if SymbolPublishingExclusionsFile.txt exists + inputs: + targetType: inline + script: | + $symbolExclusionfile = "$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt" + if(Test-Path -Path $symbolExclusionfile) + { + Write-Host "SymbolExclusionFile exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]true" + } + else{ + Write-Host "Symbols Exclusion file does not exists" + Write-Host "##vso[task.setvariable variable=SymbolExclusionFile]false" + } + + - task: 1ES.PublishBuildArtifacts@1 + displayName: Publish SymbolPublishingExclusionsFile Artifact + condition: eq(variables['SymbolExclusionFile'], 'true') + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/eng/SymbolPublishingExclusionsFile.txt' + PublishLocation: Container + ArtifactName: ReleaseConfigs + + - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: + - template: /eng/common/templates-official/post-build/setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion 3 + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' + + - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}: + - template: /eng/common/templates-official/steps/publish-logs.yml + parameters: + JobLabel: 'Publish_Artifacts_Logs' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml new file mode 100644 index 000000000000..8aba3b44bb25 --- /dev/null +++ b/eng/common/templates-official/job/source-build.yml @@ -0,0 +1,67 @@ +parameters: + # This template adds arcade-powered source-build to CI. The template produces a server job with a + # default ID 'Source_Build_Complete' to put in a dependency list if necessary. + + # Specifies the prefix for source-build jobs added to pipeline. Use this if disambiguation needed. + jobNamePrefix: 'Source_Build' + + # Defines the platform on which to run the job. By default, a linux-x64 machine, suitable for + # managed-only repositories. This is an object with these properties: + # + # name: '' + # The name of the job. This is included in the job ID. + # targetRID: '' + # The name of the target RID to use, instead of the one auto-detected by Arcade. + # nonPortable: false + # Enables non-portable mode. This means a more specific RID (e.g. fedora.32-x64 rather than + # linux-x64), and compiling against distro-provided packages rather than portable ones. + # skipPublishValidation: false + # Disables publishing validation. By default, a check is performed to ensure no packages are + # published by source-build. + # container: '' + # A container to use. Runs in docker. + # pool: {} + # A pool to use. Runs directly on an agent. + # buildScript: '' + # Specifies the build script to invoke to perform the build in the repo. The default + # './build.sh' should work for typical Arcade repositories, but this is customizable for + # difficult situations. + # jobProperties: {} + # A list of job properties to inject at the top level, for potential extensibility beyond + # container and pool. + platform: {} + +jobs: +- job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} + displayName: Source-Build (${{ parameters.platform.name }}) + + ${{ each property in parameters.platform.jobProperties }}: + ${{ property.key }}: ${{ property.value }} + + ${{ if ne(parameters.platform.container, '') }}: + container: ${{ parameters.platform.container }} + + ${{ if eq(parameters.platform.pool, '') }}: + # The default VM host AzDO pool. This should be capable of running Docker containers: almost all + # source-build builds run in Docker, including the default managed platform. + # /eng/common/templates-official/variables/pool-providers.yml can't be used here (some customers declare variables already), so duplicate its logic + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore-Svc-Public' ), False, 'NetCore-Public')] + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] + image: 1es-mariner-2-pt + os: linux + + ${{ if ne(parameters.platform.pool, '') }}: + pool: ${{ parameters.platform.pool }} + + workspace: + clean: all + + steps: + - template: /eng/common/templates-official/steps/source-build.yml + parameters: + platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml new file mode 100644 index 000000000000..4b6337391708 --- /dev/null +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -0,0 +1,68 @@ +parameters: + runAsPublic: false + sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json + sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" + preSteps: [] + binlogPath: artifacts/log/Debug/Build.binlog + condition: '' + dependsOn: '' + pool: '' + +jobs: +- job: SourceIndexStage1 + dependsOn: ${{ parameters.dependsOn }} + condition: ${{ parameters.condition }} + variables: + - name: SourceIndexPackageVersion + value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexPackageSource + value: ${{ parameters.sourceIndexPackageSource }} + - name: BinlogPath + value: ${{ parameters.binlogPath }} + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: source-dot-net stage1 variables + - template: /eng/common/templates-official/variables/pool-providers.yml + + ${{ if ne(parameters.pool, '') }}: + pool: ${{ parameters.pool }} + ${{ if eq(parameters.pool, '') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - ${{ each preStep in parameters.preSteps }}: + - ${{ preStep }} + + - task: UseDotNet@2 + displayName: Use .NET Core SDK 6 + inputs: + packageType: sdk + version: 6.0.x + installationPath: $(Agent.TempDirectory)/dotnet + workingDirectory: $(Agent.TempDirectory) + + - script: | + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + displayName: Download Tools + # 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: ${{ parameters.sourceIndexBuildCommand }} + displayName: Build Repository + + - script: $(Agent.TempDirectory)/.source-index/tools/BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output + displayName: Process Binlog into indexable sln + + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) + displayName: Upload stage1 artifacts to source index + env: + BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) diff --git a/eng/common/templates-official/jobs/codeql-build.yml b/eng/common/templates-official/jobs/codeql-build.yml new file mode 100644 index 000000000000..b68d3c2f3199 --- /dev/null +++ b/eng/common/templates-official/jobs/codeql-build.yml @@ -0,0 +1,31 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + +jobs: +- template: /eng/common/templates-official/jobs/jobs.yml + parameters: + enableMicrobuild: false + enablePublishBuildArtifacts: false + enablePublishTestResults: false + enablePublishBuildAssets: false + enablePublishUsingPipelines: false + enableTelemetry: true + + variables: + - group: Publish-Build-Assets + # The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in + # sync with the packages.config file. + - name: DefaultGuardianVersion + value: 0.109.0 + - name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config + - name: GuardianVersion + value: ${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }} + + jobs: ${{ parameters.jobs }} + diff --git a/eng/common/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml new file mode 100644 index 000000000000..857a0f8ba43e --- /dev/null +++ b/eng/common/templates-official/jobs/jobs.yml @@ -0,0 +1,97 @@ +parameters: + # See schema documentation in /Documentation/AzureDevOps/TemplateSchema.md + continueOnError: false + + # Optional: Include PublishBuildArtifacts task + enablePublishBuildArtifacts: false + + # Optional: Enable publishing using release pipelines + enablePublishUsingPipelines: false + + # Optional: Enable running the source-build jobs to build repo from source + enableSourceBuild: false + + # Optional: Parameters for source-build template. + # See /eng/common/templates-official/jobs/source-build.yml for options + sourceBuildParameters: [] + + graphFileGeneration: + # Optional: Enable generating the graph files at the end of the build + enabled: false + # Optional: Include toolset dependencies in the generated graph files + includeToolset: false + + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job + jobs: [] + + # Optional: Override automatically derived dependsOn value for "publish build assets" job + publishBuildAssetsDependsOn: '' + + # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. + publishAssetsImmediately: false + + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) + artifactsPublishingAdditionalParameters: '' + signingValidationAdditionalParameters: '' + + # Optional: should run as a public build even in the internal project + # if 'true', the build won't run any of the internal only steps, even if it is running in non-public projects. + runAsPublic: false + + enableSourceIndex: false + sourceIndexParams: {} + +# 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. + +jobs: +- ${{ each job in parameters.jobs }}: + - template: ../job/job.yml + parameters: + # pass along parameters + ${{ each parameter in parameters }}: + ${{ if ne(parameter.key, 'jobs') }}: + ${{ parameter.key }}: ${{ parameter.value }} + + # pass along job properties + ${{ each property in job }}: + ${{ if ne(property.key, 'job') }}: + ${{ property.key }}: ${{ property.value }} + + name: ${{ job.job }} + +- ${{ if eq(parameters.enableSourceBuild, true) }}: + - template: /eng/common/templates-official/jobs/source-build.yml + parameters: + allCompletedJobId: Source_Build_Complete + ${{ each parameter in parameters.sourceBuildParameters }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if eq(parameters.enableSourceIndex, 'true') }}: + - template: ../job/source-index-stage1.yml + parameters: + runAsPublic: ${{ parameters.runAsPublic }} + ${{ each parameter in parameters.sourceIndexParams }}: + ${{ parameter.key }}: ${{ parameter.value }} + +- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - template: ../job/publish-build-assets.yml + parameters: + continueOnError: ${{ parameters.continueOnError }} + dependsOn: + - ${{ if ne(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.publishBuildAssetsDependsOn }}: + - ${{ job.job }} + - ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}: + - ${{ each job in parameters.jobs }}: + - ${{ job.job }} + - ${{ if eq(parameters.enableSourceBuild, true) }}: + - Source_Build_Complete + + runAsPublic: ${{ parameters.runAsPublic }} + publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} + publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} + artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} + signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml new file mode 100644 index 000000000000..08e5db9bb116 --- /dev/null +++ b/eng/common/templates-official/jobs/source-build.yml @@ -0,0 +1,46 @@ +parameters: + # This template adds arcade-powered source-build to CI. A job is created for each platform, as + # well as an optional server job that completes when all platform jobs complete. + + # The name of the "join" job for all source-build platforms. If set to empty string, the job is + # not included. Existing repo pipelines can use this job depend on all source-build jobs + # completing without maintaining a separate list of every single job ID: just depend on this one + # server job. By default, not included. Recommended name if used: 'Source_Build_Complete'. + allCompletedJobId: '' + + # See /eng/common/templates-official/job/source-build.yml + jobNamePrefix: 'Source_Build' + + # This is the default platform provided by Arcade, intended for use by a managed-only repo. + defaultManagedPlatform: + name: 'Managed' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' + + # Defines the platforms on which to run build jobs. One job is created for each platform, and the + # object in this array is sent to the job template as 'platform'. If no platforms are specified, + # one job runs on 'defaultManagedPlatform'. + platforms: [] + +jobs: + +- ${{ if ne(parameters.allCompletedJobId, '') }}: + - job: ${{ parameters.allCompletedJobId }} + displayName: Source-Build Complete + pool: server + dependsOn: + - ${{ each platform in parameters.platforms }}: + - ${{ parameters.jobNamePrefix }}_${{ platform.name }} + - ${{ if eq(length(parameters.platforms), 0) }}: + - ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }} + +- ${{ each platform in parameters.platforms }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ platform }} + +- ${{ if eq(length(parameters.platforms), 0) }}: + - template: /eng/common/templates-official/job/source-build.yml + parameters: + jobNamePrefix: ${{ parameters.jobNamePrefix }} + platform: ${{ parameters.defaultManagedPlatform }} diff --git a/eng/common/templates-official/post-build/common-variables.yml b/eng/common/templates-official/post-build/common-variables.yml new file mode 100644 index 000000000000..c24193acfc98 --- /dev/null +++ b/eng/common/templates-official/post-build/common-variables.yml @@ -0,0 +1,22 @@ +variables: + - group: Publish-Build-Assets + + # Whether the build is internal or not + - name: IsInternalBuild + value: ${{ and(ne(variables['System.TeamProject'], 'public'), contains(variables['Build.SourceBranch'], 'internal')) }} + + # Default Maestro++ API Endpoint and API Version + - name: MaestroApiEndPoint + value: "https://maestro-prod.westus2.cloudapp.azure.com" + - name: MaestroApiAccessToken + value: $(MaestroAccessToken) + - name: MaestroApiVersion + value: "2020-02-20" + + - name: SourceLinkCLIVersion + value: 3.0.0 + - name: SymbolToolVersion + value: 1.0.1 + + - name: runCodesignValidationInjection + value: false diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml new file mode 100644 index 000000000000..5c98fe1c0f3a --- /dev/null +++ b/eng/common/templates-official/post-build/post-build.yml @@ -0,0 +1,285 @@ +parameters: + # Which publishing infra should be used. THIS SHOULD MATCH THE VERSION ON THE BUILD MANIFEST. + # Publishing V1 is no longer supported + # Publishing V2 is no longer supported + # Publishing V3 is the default + - name: publishingInfraVersion + displayName: Which version of publishing should be used to promote the build definition? + type: number + default: 3 + values: + - 3 + + - name: BARBuildId + displayName: BAR Build Id + type: number + default: 0 + + - name: PromoteToChannelIds + displayName: Channel to promote BARBuildId to + type: string + default: '' + + - name: enableSourceLinkValidation + displayName: Enable SourceLink validation + type: boolean + default: false + + - name: enableSigningValidation + displayName: Enable signing validation + type: boolean + default: true + + - name: enableSymbolValidation + displayName: Enable symbol validation + type: boolean + default: false + + - name: enableNugetValidation + displayName: Enable NuGet validation + type: boolean + default: true + + - name: publishInstallersAndChecksums + displayName: Publish installers and checksums + type: boolean + default: true + + - name: SDLValidationParameters + type: object + default: + enable: false + publishGdn: false + continueOnError: false + params: '' + artifactNames: '' + downloadArtifacts: true + + # These parameters let the user customize the call to sdk-task.ps1 for publishing + # symbols & general artifacts as well as for signing validation + - name: symbolPublishingAdditionalParameters + displayName: Symbol publishing additional parameters + type: string + default: '' + + - name: artifactsPublishingAdditionalParameters + displayName: Artifact publishing additional parameters + type: string + default: '' + + - name: signingValidationAdditionalParameters + displayName: Signing validation additional parameters + type: string + default: '' + + # Which stages should finish execution before post-build stages start + - name: validateDependsOn + type: object + default: + - build + + - name: publishDependsOn + type: object + default: + - Validate + + # Optional: Call asset publishing rather than running in a separate stage + - name: publishAssetsImmediately + type: boolean + default: false + +stages: +- ${{ if or(eq( parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + - stage: Validate + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Validate Build Assets + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: NuGet Validation + condition: and(succeededOrFailed(), eq( ${{ parameters.enableNugetValidation }}, 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + + - job: + displayName: Signing Validation + condition: and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true')) + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Package Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: PackageArtifacts + checkDownloadedFiles: true + itemPattern: | + ** + !**/Microsoft.SourceBuild.Intermediate.*.nupkg + + # This is necessary whenever we want to publish/restore to an AzDO private feed + # Since sdk-task.ps1 tries to restore packages we need to do this authentication here + # otherwise it'll complain about accessing a private feed. + - task: NuGetAuthenticate@1 + displayName: 'Authenticate to AzDO Feeds' + + # Signing validation will optionally work with the buildmanifest file which is downloaded from + # Azure DevOps above. + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: eng\common\sdk-task.ps1 + arguments: -task SigningValidation -restore -msbuildEngine vs + /p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts' + /p:SignCheckExclusionsFile='$(Build.SourcesDirectory)/eng/SignCheckExclusionsFile.txt' + ${{ parameters.signingValidationAdditionalParameters }} + + - template: ../steps/publish-logs.yml + parameters: + StageLabel: 'Validation' + JobLabel: 'Signing' + BinlogToolVersion: $(BinlogToolVersion) + + - job: + displayName: SourceLink Validation + condition: eq( ${{ parameters.enableSourceLinkValidation }}, 'true') + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: DownloadBuildArtifacts@0 + displayName: Download Blob Artifacts + inputs: + buildType: specific + buildVersionToDownload: specific + project: $(AzDOProjectName) + pipeline: $(AzDOPipelineId) + buildId: $(AzDOBuildId) + artifactName: BlobArtifacts + checkDownloadedFiles: true + + - task: PowerShell@2 + displayName: Validate + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) + -GHCommit $(Build.SourceVersion) + -SourcelinkCliVersion $(SourceLinkCLIVersion) + continueOnError: true + +- ${{ if ne(parameters.publishAssetsImmediately, 'true') }}: + - stage: publish_using_darc + ${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}: + dependsOn: ${{ parameters.publishDependsOn }} + ${{ else }}: + dependsOn: ${{ parameters.validateDependsOn }} + displayName: Publish using Darc + variables: + - template: common-variables.yml + - template: /eng/common/templates-official/variables/pool-providers.yml + jobs: + - job: + displayName: Publish Using Darc + timeoutInMinutes: 120 + pool: + # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) + ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: + name: AzurePipelines-EO + image: 1ESPT-Windows2022 + demands: Cmd + os: windows + # If it's not devdiv, it's dnceng + ${{ else }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022-pt + os: windows + steps: + - template: setup-maestro-vars.yml + parameters: + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} + + - task: NuGetAuthenticate@1 + + - task: PowerShell@2 + displayName: Publish Using Darc + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) + -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} + -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -MaestroToken '$(MaestroApiAccessToken)' + -WaitPublishingFinish true + -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' + -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml new file mode 100644 index 000000000000..0c87f149a4ad --- /dev/null +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -0,0 +1,70 @@ +parameters: + BARBuildId: '' + PromoteToChannelIds: '' + +steps: + - ${{ if eq(coalesce(parameters.PromoteToChannelIds, 0), 0) }}: + - task: DownloadBuildArtifacts@0 + displayName: Download Release Configs + inputs: + buildType: current + artifactName: ReleaseConfigs + checkDownloadedFiles: true + + - task: PowerShell@2 + name: setReleaseVars + displayName: Set Release Configs Vars + inputs: + targetType: inline + pwsh: true + script: | + try { + if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { + $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt + + $BarId = $Content | Select -Index 0 + $Channels = $Content | Select -Index 1 + $IsStableBuild = $Content | Select -Index 2 + + $AzureDevOpsProject = $Env:System_TeamProject + $AzureDevOpsBuildDefinitionId = $Env:System_DefinitionId + $AzureDevOpsBuildId = $Env:Build_BuildId + } + else { + $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + + $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' + $apiHeaders.Add('Accept', 'application/json') + $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") + + $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + + $BarId = $Env:BARBuildId + $Channels = $Env:PromoteToMaestroChannels -split "," + $Channels = $Channels -join "][" + $Channels = "[$Channels]" + + $IsStableBuild = $buildInfo.stable + $AzureDevOpsProject = $buildInfo.azureDevOpsProject + $AzureDevOpsBuildDefinitionId = $buildInfo.azureDevOpsBuildDefinitionId + $AzureDevOpsBuildId = $buildInfo.azureDevOpsBuildId + } + + Write-Host "##vso[task.setvariable variable=BARBuildId]$BarId" + Write-Host "##vso[task.setvariable variable=TargetChannels]$Channels" + Write-Host "##vso[task.setvariable variable=IsStableBuild]$IsStableBuild" + + Write-Host "##vso[task.setvariable variable=AzDOProjectName]$AzureDevOpsProject" + Write-Host "##vso[task.setvariable variable=AzDOPipelineId]$AzureDevOpsBuildDefinitionId" + Write-Host "##vso[task.setvariable variable=AzDOBuildId]$AzureDevOpsBuildId" + } + catch { + Write-Host $_ + Write-Host $_.Exception + Write-Host $_.ScriptStackTrace + exit 1 + } + env: + MAESTRO_API_TOKEN: $(MaestroApiAccessToken) + BARBuildId: ${{ parameters.BARBuildId }} + PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates-official/post-build/trigger-subscription.yml b/eng/common/templates-official/post-build/trigger-subscription.yml new file mode 100644 index 000000000000..da669030daf6 --- /dev/null +++ b/eng/common/templates-official/post-build/trigger-subscription.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Triggering subscriptions + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/trigger-subscriptions.ps1 + arguments: -SourceRepo $(Build.Repository.Uri) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/add-build-to-channel.yml b/eng/common/templates-official/steps/add-build-to-channel.yml new file mode 100644 index 000000000000..f67a210d62f3 --- /dev/null +++ b/eng/common/templates-official/steps/add-build-to-channel.yml @@ -0,0 +1,13 @@ +parameters: + ChannelId: 0 + +steps: +- task: PowerShell@2 + displayName: Add Build to Channel + inputs: + filePath: $(Build.SourcesDirectory)/eng/common/post-build/add-build-to-channel.ps1 + arguments: -BuildId $(BARBuildId) + -ChannelId ${{ parameters.ChannelId }} + -MaestroApiAccessToken $(MaestroApiAccessToken) + -MaestroApiEndPoint $(MaestroApiEndPoint) + -MaestroApiVersion $(MaestroApiVersion) diff --git a/eng/common/templates-official/steps/build-reason.yml b/eng/common/templates-official/steps/build-reason.yml new file mode 100644 index 000000000000..eba58109b52c --- /dev/null +++ b/eng/common/templates-official/steps/build-reason.yml @@ -0,0 +1,12 @@ +# build-reason.yml +# Description: runs steps if build.reason condition is valid. conditions is a string of valid build reasons +# to include steps (',' separated). +parameters: + conditions: '' + steps: [] + +steps: + - ${{ if and( not(startsWith(parameters.conditions, 'not')), contains(parameters.conditions, variables['build.reason'])) }}: + - ${{ parameters.steps }} + - ${{ if and( startsWith(parameters.conditions, 'not'), not(contains(parameters.conditions, variables['build.reason']))) }}: + - ${{ parameters.steps }} diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml new file mode 100644 index 000000000000..0ecec47b0c91 --- /dev/null +++ b/eng/common/templates-official/steps/component-governance.yml @@ -0,0 +1,13 @@ +parameters: + disableComponentGovernance: false + componentGovernanceIgnoreDirectories: '' + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true + inputs: + ignoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-codeql.yml b/eng/common/templates-official/steps/execute-codeql.yml new file mode 100644 index 000000000000..9b4a5ffa30a7 --- /dev/null +++ b/eng/common/templates-official/steps/execute-codeql.yml @@ -0,0 +1,32 @@ +parameters: + # Language that should be analyzed. Defaults to csharp + language: csharp + # Build Commands + buildCommands: '' + overrideParameters: '' # Optional: to override values for parameters. + additionalParameters: '' # Optional: parameters that need user specific values eg: '-SourceToolsList @("abc","def") -ArtifactToolsList @("ghi","jkl")' + # Optional: if specified, restore and use this version of Guardian instead of the default. + overrideGuardianVersion: '' + # Optional: if true, publish the '.gdn' folder as a pipeline artifact. This can help with in-depth + # diagnosis of problems with specific tool configurations. + publishGuardianDirectoryToPipeline: false + # The script to run to execute all SDL tools. Use this if you want to use a script to define SDL + # parameters rather than relying on YAML. It may be better to use a local script, because you can + # reproduce results locally without piecing together a command based on the YAML. + executeAllSdlToolsScript: 'eng/common/sdl/execute-all-sdl-tools.ps1' + # There is some sort of bug (has been reported) in Azure DevOps where if this parameter is named + # 'continueOnError', the parameter value is not correctly picked up. + # This can also be remedied by the caller (post-build.yml) if it does not use a nested parameter + # optional: determines whether to continue the build if the step errors; + sdlContinueOnError: false + +steps: +- template: /eng/common/templates-official/steps/execute-sdl.yml + parameters: + overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} + executeAllSdlToolsScript: ${{ parameters.executeAllSdlToolsScript }} + overrideParameters: ${{ parameters.overrideParameters }} + additionalParameters: '${{ parameters.additionalParameters }} + -CodeQLAdditionalRunConfigParams @("BuildCommands < ${{ parameters.buildCommands }}", "Language < ${{ parameters.language }}")' + publishGuardianDirectoryToPipeline: ${{ parameters.publishGuardianDirectoryToPipeline }} + sdlContinueOnError: ${{ parameters.sdlContinueOnError }} \ No newline at end of file diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml new file mode 100644 index 000000000000..07426fde05d8 --- /dev/null +++ b/eng/common/templates-official/steps/execute-sdl.yml @@ -0,0 +1,88 @@ +parameters: + overrideGuardianVersion: '' + executeAllSdlToolsScript: '' + overrideParameters: '' + additionalParameters: '' + publishGuardianDirectoryToPipeline: false + sdlContinueOnError: false + condition: '' + +steps: +- task: NuGetAuthenticate@1 + inputs: + nuGetServiceConnections: GuardianConnect + +- task: NuGetToolInstaller@1 + displayName: 'Install NuGet.exe' + +- ${{ if ne(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts -Version ${{ parameters.overrideGuardianVersion }} + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian (Overridden) + +- ${{ if eq(parameters.overrideGuardianVersion, '') }}: + - pwsh: | + Set-Location -Path $(Build.SourcesDirectory)\eng\common\sdl + . .\sdl.ps1 + $guardianCliLocation = Install-Gdn -Path $(Build.SourcesDirectory)\.artifacts + Write-Host "##vso[task.setvariable variable=GuardianCliLocation]$guardianCliLocation" + displayName: Install Guardian + +- ${{ if ne(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} ${{ parameters.overrideParameters }} + displayName: Execute SDL (Overridden) + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if eq(parameters.overrideParameters, '') }}: + - powershell: ${{ parameters.executeAllSdlToolsScript }} + -GuardianCliLocation $(GuardianCliLocation) + -NugetPackageDirectory $(Build.SourcesDirectory)\.packages + -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) + ${{ parameters.additionalParameters }} + displayName: Execute SDL + continueOnError: ${{ parameters.sdlContinueOnError }} + condition: ${{ parameters.condition }} + +- ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: + # We want to publish the Guardian results and configuration for easy diagnosis. However, the + # '.gdn' dir is a mix of configuration, results, extracted dependencies, and Guardian default + # tooling files. Some of these files are large and aren't useful during an investigation, so + # exclude them by simply deleting them before publishing. (As of writing, there is no documented + # way to selectively exclude a dir from the pipeline artifact publish task.) + - task: DeleteFiles@1 + displayName: Delete Guardian dependencies to avoid uploading + inputs: + SourceFolder: $(Agent.BuildDirectory)/.gdn + Contents: | + c + i + condition: succeededOrFailed() + + - publish: $(Agent.BuildDirectory)/.gdn + artifact: GuardianConfiguration + displayName: Publish GuardianConfiguration + condition: succeededOrFailed() + + # Publish the SARIF files in a container named CodeAnalysisLogs to enable integration + # with the "SARIF SAST Scans Tab" Azure DevOps extension + - task: CopyFiles@2 + displayName: Copy SARIF files + inputs: + flattenFolders: true + sourceFolder: $(Agent.BuildDirectory)/.gdn/rc/ + contents: '**/*.sarif' + targetFolder: $(Build.SourcesDirectory)/CodeAnalysisLogs + condition: succeededOrFailed() + + # Use PublishBuildArtifacts because the SARIF extension only checks this case + # see microsoft/sarif-azuredevops-extension#4 + - task: PublishBuildArtifacts@1 + displayName: Publish SARIF files to CodeAnalysisLogs container + inputs: + pathToPublish: $(Build.SourcesDirectory)/CodeAnalysisLogs + artifactName: CodeAnalysisLogs + condition: succeededOrFailed() \ No newline at end of file diff --git a/eng/common/templates-official/steps/generate-sbom.yml b/eng/common/templates-official/steps/generate-sbom.yml new file mode 100644 index 000000000000..1bf43bf807af --- /dev/null +++ b/eng/common/templates-official/steps/generate-sbom.yml @@ -0,0 +1,48 @@ +# BuildDropPath - The root folder of the drop directory for which the manifest file will be generated. +# PackageName - The name of the package this SBOM represents. +# PackageVersion - The version of the package this SBOM represents. +# ManifestDirPath - The path of the directory where the generated manifest files will be placed +# IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. + +parameters: + PackageVersion: 8.0.0 + BuildDropPath: '$(Build.SourcesDirectory)/artifacts' + PackageName: '.NET' + ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom + IgnoreDirectories: '' + sbomContinueOnError: true + +steps: +- task: PowerShell@2 + displayName: Prep for SBOM generation in (Non-linux) + condition: or(eq(variables['Agent.Os'], 'Windows_NT'), eq(variables['Agent.Os'], 'Darwin')) + inputs: + filePath: ./eng/common/generate-sbom-prep.ps1 + arguments: ${{parameters.manifestDirPath}} + +# Chmodding is a workaround for https://github.com/dotnet/arcade/issues/8461 +- script: | + chmod +x ./eng/common/generate-sbom-prep.sh + ./eng/common/generate-sbom-prep.sh ${{parameters.manifestDirPath}} + displayName: Prep for SBOM generation in (Linux) + condition: eq(variables['Agent.Os'], 'Linux') + continueOnError: ${{ parameters.sbomContinueOnError }} + +- task: AzureArtifacts.manifest-generator-task.manifest-generator-task.ManifestGeneratorTask@0 + displayName: 'Generate SBOM manifest' + continueOnError: ${{ parameters.sbomContinueOnError }} + inputs: + PackageName: ${{ parameters.packageName }} + BuildDropPath: ${{ parameters.buildDropPath }} + PackageVersion: ${{ parameters.packageVersion }} + ManifestDirPath: ${{ parameters.manifestDirPath }} + ${{ if ne(parameters.IgnoreDirectories, '') }}: + AdditionalComponentDetectorArgs: '--IgnoreDirectories ${{ parameters.IgnoreDirectories }}' + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish SBOM manifest + continueOnError: ${{parameters.sbomContinueOnError}} + inputs: + targetPath: '${{parameters.manifestDirPath}}' + artifactName: $(ARTIFACT_NAME) + diff --git a/eng/common/templates-official/steps/publish-logs.yml b/eng/common/templates-official/steps/publish-logs.yml new file mode 100644 index 000000000000..04012fed182a --- /dev/null +++ b/eng/common/templates-official/steps/publish-logs.yml @@ -0,0 +1,23 @@ +parameters: + StageLabel: '' + JobLabel: '' + +steps: +- task: Powershell@2 + displayName: Prepare Binlogs to Upload + 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}}/ + continueOnError: true + condition: always() + +- task: 1ES.PublishBuildArtifacts@1 + displayName: Publish Logs + inputs: + PathtoPublish: '$(Build.SourcesDirectory)/PostBuildLogs' + PublishLocation: Container + ArtifactName: PostBuildLogs + continueOnError: true + condition: always() diff --git a/eng/common/templates-official/steps/retain-build.yml b/eng/common/templates-official/steps/retain-build.yml new file mode 100644 index 000000000000..83d97a26a01f --- /dev/null +++ b/eng/common/templates-official/steps/retain-build.yml @@ -0,0 +1,28 @@ +parameters: + # Optional azure devops PAT with build execute permissions for the build's organization, + # only needed if the build that should be retained ran on a different organization than + # the pipeline where this template is executing from + Token: '' + # Optional BuildId to retain, defaults to the current running build + BuildId: '' + # Azure devops Organization URI for the build in the https://dev.azure.com/ format. + # Defaults to the organization the current pipeline is running on + AzdoOrgUri: '$(System.CollectionUri)' + # Azure devops project for the build. Defaults to the project the current pipeline is running on + AzdoProject: '$(System.TeamProject)' + +steps: + - task: powershell@2 + inputs: + targetType: 'filePath' + filePath: eng/common/retain-build.ps1 + pwsh: true + arguments: > + -AzdoOrgUri: ${{parameters.AzdoOrgUri}} + -AzdoProject ${{parameters.AzdoProject}} + -Token ${{coalesce(parameters.Token, '$env:SYSTEM_ACCESSTOKEN') }} + -BuildId ${{coalesce(parameters.BuildId, '$env:BUILD_ID')}} + displayName: Enable permanent build retention + env: + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + BUILD_ID: $(Build.BuildId) \ No newline at end of file diff --git a/eng/common/templates-official/steps/send-to-helix.yml b/eng/common/templates-official/steps/send-to-helix.yml new file mode 100644 index 000000000000..3eb7e2d5f840 --- /dev/null +++ b/eng/common/templates-official/steps/send-to-helix.yml @@ -0,0 +1,91 @@ +# Please remember to update the documentation if you make changes to these parameters! +parameters: + HelixSource: 'pr/default' # required -- sources must start with pr/, official/, prodcon/, or agent/ + HelixType: 'tests/default/' # required -- Helix telemetry which identifies what type of data this is; should include "test" for clarity and must end in '/' + HelixBuild: $(Build.BuildNumber) # required -- the build number Helix will use to identify this -- automatically set to the AzDO build number + HelixTargetQueues: '' # required -- semicolon-delimited list of Helix queues to test on; see https://helix.dot.net/ for a list of queues + HelixAccessToken: '' # required -- access token to make Helix API requests; should be provided by the appropriate variable group + HelixConfiguration: '' # optional -- additional property attached to a job + HelixPreCommands: '' # optional -- commands to run before Helix work item execution + HelixPostCommands: '' # optional -- commands to run after Helix work item execution + WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects + WorkItemCommand: '' # optional -- a command to execute on the payload; requires WorkItemDirectory; incompatible with XUnitProjects + WorkItemTimeout: '' # optional -- a timeout in TimeSpan.Parse-ready value (e.g. 00:02:00) for the work item command; requires WorkItemDirectory; incompatible with XUnitProjects + CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload + XUnitProjects: '' # optional -- semicolon-delimited list of XUnitProjects to parse and send to Helix; requires XUnitRuntimeTargetFramework, XUnitPublishTargetFramework, XUnitRunnerVersion, and IncludeDotNetCli=true + XUnitWorkItemTimeout: '' # optional -- the workitem timeout in seconds for all workitems created from the xUnit projects specified by XUnitProjects + XUnitPublishTargetFramework: '' # optional -- framework to use to publish your xUnit projects + XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner + XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects + IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." + IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set + HelixBaseUri: 'https://helix.dot.net/' # optional -- sets the Helix API base URI (allows targeting https://helix.int-dot.net ) + Creator: '' # optional -- if the build is external, use this to specify who is sending the job + DisplayNamePrefix: 'Run Tests' # optional -- rename the beginning of the displayName of the steps in AzDO + condition: succeeded() # optional -- condition for step to execute; defaults to succeeded() + continueOnError: false # optional -- determines whether to continue the build if the step errors; defaults to false + +steps: + - powershell: 'powershell "$env:BUILD_SOURCESDIRECTORY\eng\common\msbuild.ps1 $env:BUILD_SOURCESDIRECTORY\eng\common\helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$env:BUILD_SOURCESDIRECTORY\artifacts\log\$env:BuildConfig\SendToHelix.binlog"' + displayName: ${{ parameters.DisplayNamePrefix }} (Windows) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, eq(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} + - script: $BUILD_SOURCESDIRECTORY/eng/common/msbuild.sh $BUILD_SOURCESDIRECTORY/eng/common/helixpublish.proj /restore /p:TreatWarningsAsErrors=false /t:Test /bl:$BUILD_SOURCESDIRECTORY/artifacts/log/$BuildConfig/SendToHelix.binlog + displayName: ${{ parameters.DisplayNamePrefix }} (Unix) + env: + BuildConfig: $(_BuildConfig) + HelixSource: ${{ parameters.HelixSource }} + HelixType: ${{ parameters.HelixType }} + HelixBuild: ${{ parameters.HelixBuild }} + HelixConfiguration: ${{ parameters.HelixConfiguration }} + HelixTargetQueues: ${{ parameters.HelixTargetQueues }} + HelixAccessToken: ${{ parameters.HelixAccessToken }} + HelixPreCommands: ${{ parameters.HelixPreCommands }} + HelixPostCommands: ${{ parameters.HelixPostCommands }} + WorkItemDirectory: ${{ parameters.WorkItemDirectory }} + WorkItemCommand: ${{ parameters.WorkItemCommand }} + WorkItemTimeout: ${{ parameters.WorkItemTimeout }} + CorrelationPayloadDirectory: ${{ parameters.CorrelationPayloadDirectory }} + XUnitProjects: ${{ parameters.XUnitProjects }} + XUnitWorkItemTimeout: ${{ parameters.XUnitWorkItemTimeout }} + XUnitPublishTargetFramework: ${{ parameters.XUnitPublishTargetFramework }} + XUnitRuntimeTargetFramework: ${{ parameters.XUnitRuntimeTargetFramework }} + XUnitRunnerVersion: ${{ parameters.XUnitRunnerVersion }} + IncludeDotNetCli: ${{ parameters.IncludeDotNetCli }} + DotNetCliPackageType: ${{ parameters.DotNetCliPackageType }} + DotNetCliVersion: ${{ parameters.DotNetCliVersion }} + WaitForWorkItemCompletion: ${{ parameters.WaitForWorkItemCompletion }} + HelixBaseUri: ${{ parameters.HelixBaseUri }} + Creator: ${{ parameters.Creator }} + SYSTEM_ACCESSTOKEN: $(System.AccessToken) + condition: and(${{ parameters.condition }}, ne(variables['Agent.Os'], 'Windows_NT')) + continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml new file mode 100644 index 000000000000..829f17c34d11 --- /dev/null +++ b/eng/common/templates-official/steps/source-build.yml @@ -0,0 +1,129 @@ +parameters: + # This template adds arcade-powered source-build to CI. + + # This is a 'steps' template, and is intended for advanced scenarios where the existing build + # infra has a careful build methodology that must be followed. For example, a repo + # (dotnet/runtime) might choose to clone the GitHub repo only once and store it as a pipeline + # artifact for all subsequent jobs to use, to reduce dependence on a strong network connection to + # GitHub. Using this steps template leaves room for that infra to be included. + + # Defines the platform on which to run the steps. See 'eng/common/templates-official/job/source-build.yml' + # for details. The entire object is described in the 'job' template for simplicity, even though + # the usage of the properties on this object is split between the 'job' and 'steps' templates. + platform: {} + +steps: +# Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) +- script: | + set -x + df -h + + # If building on the internal project, the artifact feeds variable may be available (usually only if needed) + # In that case, call the feed setup script to add internal feeds corresponding to public ones. + # In addition, add an msbuild argument to copy the WIP from the repo to the target build location. + # This is because SetupNuGetSources.sh will alter the current NuGet.config file, and we need to preserve those + # changes. + internalRestoreArgs= + if [ '$(dn-bot-dnceng-artifact-feeds-rw)' != '$''(dn-bot-dnceng-artifact-feeds-rw)' ]; then + # Temporarily work around https://github.com/dotnet/arcade/issues/7709 + chmod +x $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh + $(Build.SourcesDirectory)/eng/common/SetupNugetSources.sh $(Build.SourcesDirectory)/NuGet.config $(dn-bot-dnceng-artifact-feeds-rw) + internalRestoreArgs='/p:CopyWipIntoInnerSourceBuildRepo=true' + + # The 'Copy WIP' feature of source build uses git stash to apply changes from the original repo. + # This only works if there is a username/email configured, which won't be the case in most CI runs. + git config --get user.email + if [ $? -ne 0 ]; then + git config user.email dn-bot@microsoft.com + git config user.name dn-bot + fi + fi + + # If building on the internal project, the internal storage variable may be available (usually only if needed) + # In that case, add variables to allow the download of internal runtimes if the specified versions are not found + # in the default public locations. + internalRuntimeDownloadArgs= + if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + fi + + buildConfig=Release + # Check if AzDO substitutes in a build config from a variable, and use it if so. + if [ '$(_BuildConfig)' != '$''(_BuildConfig)' ]; then + buildConfig='$(_BuildConfig)' + fi + + officialBuildArgs= + if [ '${{ and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}' = 'True' ]; then + officialBuildArgs='/p:DotNetPublishUsingPipelines=true /p:OfficialBuildId=$(BUILD.BUILDNUMBER)' + fi + + targetRidArgs= + if [ '${{ parameters.platform.targetRID }}' != '' ]; then + targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' + fi + + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + + baseOsArgs= + if [ '${{ parameters.platform.baseOS }}' != '' ]; then + baseOsArgs='/p:BaseOS=${{ parameters.platform.baseOS }}' + fi + + publishArgs= + if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then + publishArgs='--publish' + fi + + assetManifestFileName=SourceBuild_RidSpecific.xml + if [ '${{ parameters.platform.name }}' != '' ]; then + assetManifestFileName=SourceBuild_${{ parameters.platform.name }}.xml + fi + + ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ + --configuration $buildConfig \ + --restore --build --pack $publishArgs -bl \ + $officialBuildArgs \ + $internalRuntimeDownloadArgs \ + $internalRestoreArgs \ + $targetRidArgs \ + $runtimeOsArgs \ + $baseOsArgs \ + /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ + /p:ArcadeBuildFromSource=true \ + /p:AssetManifestFileName=$assetManifestFileName + displayName: Build + +# Upload build logs for diagnosis. +- task: CopyFiles@2 + displayName: Prepare BuildLogs staging directory + inputs: + SourceFolder: '$(Build.SourcesDirectory)' + Contents: | + **/*.log + **/*.binlog + artifacts/source-build/self/prebuilt-report/** + TargetFolder: '$(Build.StagingDirectory)/BuildLogs' + CleanTargetFolder: true + continueOnError: true + condition: succeededOrFailed() + +- task: 1ES.PublishPipelineArtifact@1 + displayName: Publish BuildLogs + inputs: + targetPath: '$(Build.StagingDirectory)/BuildLogs' + artifactName: BuildLogs_SourceBuild_${{ parameters.platform.name }}_Attempt$(System.JobAttempt) + continueOnError: true + condition: succeededOrFailed() + +# Manually inject component detection so that we can ignore the source build upstream cache, which contains +# a nupkg cache of input packages (a local feed). +# This path must match the upstream cache path in property 'CurrentRepoSourceBuiltNupkgCacheDir' +# in src\Microsoft.DotNet.Arcade.Sdk\tools\SourceBuild\SourceBuildArcade.targets +- task: ComponentGovernanceComponentDetection@0 + displayName: Component Detection (Exclude upstream cache) + inputs: + ignoreDirectories: '$(Build.SourcesDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml new file mode 100644 index 000000000000..beab7d1bfba0 --- /dev/null +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -0,0 +1,45 @@ +# Select a pool provider based off branch name. Anything with branch name containing 'release' must go into an -Svc pool, +# otherwise it should go into the "normal" pools. This separates out the queueing and billing of released branches. + +# Motivation: +# Once a given branch of a repository's output has been officially "shipped" once, it is then considered to be COGS +# (Cost of goods sold) and should be moved to a servicing pool provider. This allows both separation of queueing +# (allowing release builds and main PR builds to not intefere with each other) and billing (required for COGS. +# Additionally, the pool provider name itself may be subject to change when the .NET Core Engineering Services +# team needs to move resources around and create new and potentially differently-named pools. Using this template +# file from an Arcade-ified repo helps guard against both having to update one's release/* branches and renaming. + +# How to use: +# This yaml assumes your shipped product branches use the naming convention "release/..." (which many do). +# If we find alternate naming conventions in broad usage it can be added to the condition below. +# +# First, import the template in an arcade-ified repo to pick up the variables, e.g.: +# +# variables: +# - template: /eng/common/templates-official/variables/pool-providers.yml +# +# ... then anywhere specifying the pool provider use the runtime variables, +# $(DncEngInternalBuildPool) +# +# pool: +# name: $(DncEngInternalBuildPool) +# image: 1es-windows-2022-pt + +variables: + # Coalesce the target and source branches so we know when a PR targets a release branch + # If these variables are somehow missing, fall back to main (tends to have more capacity) + + # Any new -Svc alternative pools should have variables added here to allow for splitting work + + - name: DncEngInternalBuildPool + value: $[ + replace( + replace( + eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), + True, + 'NetCore1ESPool-Svc-Internal' + ), + False, + 'NetCore1ESPool-Internal' + ) + ] \ No newline at end of file diff --git a/eng/common/templates-official/variables/sdl-variables.yml b/eng/common/templates-official/variables/sdl-variables.yml new file mode 100644 index 000000000000..dbdd66d4a4b3 --- /dev/null +++ b/eng/common/templates-official/variables/sdl-variables.yml @@ -0,0 +1,7 @@ +variables: +# The Guardian version specified in 'eng/common/sdl/packages.config'. This value must be kept in +# sync with the packages.config file. +- name: DefaultGuardianVersion + value: 0.109.0 +- name: GuardianPackagesConfigFile + value: $(Build.SourcesDirectory)\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 e24ca2f46f98..8ec5c4f2d9f9 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -15,6 +15,7 @@ parameters: timeoutInMinutes: '' variables: [] workspace: '' + templateContext: '' # Job base template specific parameters # See schema documentation - https://github.com/dotnet/arcade/blob/master/Documentation/AzureDevOps/TemplateSchema.md @@ -68,6 +69,9 @@ jobs: ${{ if ne(parameters.timeoutInMinutes, '') }}: timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if ne(parameters.templateContext, '') }}: + templateContext: ${{ parameters.templateContext }} + variables: - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE diff --git a/eng/common/templates/steps/generate-sbom.yml b/eng/common/templates/steps/generate-sbom.yml index a06373f38fa5..2b21eae42732 100644 --- a/eng/common/templates/steps/generate-sbom.yml +++ b/eng/common/templates/steps/generate-sbom.yml @@ -5,7 +5,7 @@ # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector. parameters: - PackageVersion: 7.0.0 + PackageVersion: 8.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' PackageName: '.NET' ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom diff --git a/global.json b/global.json index e46bfeda971c..b967bd08e9e1 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.24113.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24113.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24165.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24165.4" } } From 0535d499bf23824fcef2cfc5a35cfadbc2a8be20 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 00:01:11 +0000 Subject: [PATCH 370/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.204 -> To Version 8.0.204 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.3 -> To Version 8.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 31 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index bacb52ece094..922af3334d18 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,6 +13,7 @@ + @@ -21,7 +22,7 @@ - + @@ -46,9 +47,10 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af8f1542fdbb..f364701d31ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - baf3c0df45e13d065884f7e84260f645295f219e + 46b32935e3cfb625735564f8db5719df3186daa2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - deb3b400f316607f22a7d8cdbf129c08e7cfe9b7 + eb964c9ca88aaee3f5611c7c6c654521975d64e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - deb3b400f316607f22a7d8cdbf129c08e7cfe9b7 + eb964c9ca88aaee3f5611c7c6c654521975d64e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - deb3b400f316607f22a7d8cdbf129c08e7cfe9b7 + eb964c9ca88aaee3f5611c7c6c654521975d64e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - deb3b400f316607f22a7d8cdbf129c08e7cfe9b7 + eb964c9ca88aaee3f5611c7c6c654521975d64e4 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd280bbb5c9699bb93097206f076ad2f330ea8e1 + f37bd9d71f3baa2b2f47389aa2d2fa17324d714b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 46fb08cfa8160d0885b74c7f28a7b187ab86efed + 3e809dd609fe55ed129b89efaec03baa86ff539d https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 56e87e455392..2178ad78218a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.3-servicing.24116.3 + 8.0.4-servicing.24164.3 - 8.0.3-servicing.24116.6 + 8.0.4-servicing.24168.11 @@ -86,8 +86,8 @@ 8.0.204 - 8.0.204-servicing.24169.31 - 8.0.204-servicing.24169.31 + 8.0.204-servicing.24169.45 + 8.0.204-servicing.24169.45 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,10 +112,10 @@ - 8.0.3-servicing.24116.9 - 8.0.3-servicing.24116.9 - 8.0.3 - 8.0.3 + 8.0.4-servicing.24169.14 + 8.0.4-servicing.24169.14 + 8.0.4 + 8.0.4 From ffcbb798b18c886154fd0d467fedceecaa4c863d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 01:02:20 +0000 Subject: [PATCH 371/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.204 -> To Version 8.0.204 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.4-servicing.24168.10 -> To Version 8.0.4-servicing.24169.9 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index 922af3334d18..c417f07b3518 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,10 +19,10 @@ - + - + @@ -42,12 +42,12 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f364701d31ac..18363008a4d4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 46b32935e3cfb625735564f8db5719df3186daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 497c82b842ba5f2bcee747393c166210f62ec45f + e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb964c9ca88aaee3f5611c7c6c654521975d64e4 + 880f35e17887ac6e4146e493b585b3be633bdc48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb964c9ca88aaee3f5611c7c6c654521975d64e4 + 880f35e17887ac6e4146e493b585b3be633bdc48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb964c9ca88aaee3f5611c7c6c654521975d64e4 + 880f35e17887ac6e4146e493b585b3be633bdc48 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eb964c9ca88aaee3f5611c7c6c654521975d64e4 + 880f35e17887ac6e4146e493b585b3be633bdc48 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a1a9440b48374c6d400287abbb56a4ac54d9b02f + 2d7eea252964e69be94cb9c847b371b23e4dd470 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2178ad78218a..191ecc9ce760 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.4 8.0.4 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 - 8.0.4-servicing.24164.2 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.10 0.2.0 @@ -86,8 +86,8 @@ 8.0.204 - 8.0.204-servicing.24169.45 - 8.0.204-servicing.24169.45 + 8.0.204-servicing.24169.55 + 8.0.204-servicing.24169.55 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -98,12 +98,12 @@ - 8.0.4-servicing.24168.10 + 8.0.4-servicing.24169.9 - 8.0.4-servicing.24168.10 - 8.0.4-servicing.24168.10 + 8.0.4-servicing.24169.9 + 8.0.4-servicing.24169.9 8.0.4 8.0.4 8.0.4 From 1efda7657ba686dbf341663a345c2e4a1d827186 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 04:43:51 +0000 Subject: [PATCH 372/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.204 -> To Version 8.0.204 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.4 -> To Version 8.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++----- eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 46 insertions(+), 46 deletions(-) diff --git a/NuGet.config b/NuGet.config index c417f07b3518..12ee76ca7653 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,13 @@ - + - + @@ -22,7 +22,7 @@ - + @@ -42,15 +42,15 @@ - + - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfe8dcbaab01..8df2871c1c9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 46b32935e3cfb625735564f8db5719df3186daa2 + 161450e0bd8de91351085bf794ef73018105b2bc https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e3fa4f53ccf34d5a3dc5c1a86df3968348cca633 + e58e9f9e30b4729c06a7af05889cc7f2fb276192 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 880f35e17887ac6e4146e493b585b3be633bdc48 + 6014bdfcba82dddd840b2eca2eb75883cf8d2aa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 880f35e17887ac6e4146e493b585b3be633bdc48 + 6014bdfcba82dddd840b2eca2eb75883cf8d2aa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 880f35e17887ac6e4146e493b585b3be633bdc48 + 6014bdfcba82dddd840b2eca2eb75883cf8d2aa1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 880f35e17887ac6e4146e493b585b3be633bdc48 + 6014bdfcba82dddd840b2eca2eb75883cf8d2aa1 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f37bd9d71f3baa2b2f47389aa2d2fa17324d714b + 1575d7056e8952d90f592553e9f00661bc94e81a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 3e809dd609fe55ed129b89efaec03baa86ff539d + 29ccbeca12c26d35acfea8fd4033168fdc2edcb8 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 9022ff6cb569..d5c95e99450f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.4-servicing.24164.3 + 8.0.4-servicing.24169.7 - 8.0.4-servicing.24168.11 + 8.0.4-servicing.24169.8 @@ -74,11 +74,11 @@ 8.0.4 8.0.4 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 - 8.0.4-servicing.24169.10 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 + 8.0.4-servicing.24169.15 0.2.0 @@ -86,8 +86,8 @@ 8.0.204 - 8.0.204-servicing.24169.55 - 8.0.204-servicing.24169.55 + 8.0.204-servicing.24169.85 + 8.0.204-servicing.24169.85 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.4-servicing.24169.14 - 8.0.4-servicing.24169.14 + 8.0.4-servicing.24169.21 + 8.0.4-servicing.24169.21 8.0.4 8.0.4 From 2a46ebf8c2bb35652639fbaa4df652b452f32c85 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 05:32:21 +0000 Subject: [PATCH 373/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.204 -> To Version 8.0.204 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/NuGet.config b/NuGet.config index 12ee76ca7653..dd07efd45a76 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,7 +22,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8df2871c1c9e..b99812f240c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6014bdfcba82dddd840b2eca2eb75883cf8d2aa1 + 8feff2d0bed3088a695515ee4e8e0027784410f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6014bdfcba82dddd840b2eca2eb75883cf8d2aa1 + 8feff2d0bed3088a695515ee4e8e0027784410f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6014bdfcba82dddd840b2eca2eb75883cf8d2aa1 + 8feff2d0bed3088a695515ee4e8e0027784410f3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6014bdfcba82dddd840b2eca2eb75883cf8d2aa1 + 8feff2d0bed3088a695515ee4e8e0027784410f3 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d5c95e99450f..13e1f83f10a0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,8 +86,8 @@ 8.0.204 - 8.0.204-servicing.24169.85 - 8.0.204-servicing.24169.85 + 8.0.204-servicing.24169.92 + 8.0.204-servicing.24169.92 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7a4238395afd8a8e862b0917cb1616125b78143d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 20 Mar 2024 06:15:04 +0000 Subject: [PATCH 374/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.204 -> To Version 8.0.204 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.4 -> To Version 8.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd07efd45a76..b1a41062200b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -47,10 +47,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b99812f240c0..d06665c57726 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 161450e0bd8de91351085bf794ef73018105b2bc + 04094d116496e0bd1d376fd346397ec7900141f8 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8feff2d0bed3088a695515ee4e8e0027784410f3 + ed102c8e33e1ae3d731c4fc22ad54b2e3daad504 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8feff2d0bed3088a695515ee4e8e0027784410f3 + ed102c8e33e1ae3d731c4fc22ad54b2e3daad504 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8feff2d0bed3088a695515ee4e8e0027784410f3 + ed102c8e33e1ae3d731c4fc22ad54b2e3daad504 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8feff2d0bed3088a695515ee4e8e0027784410f3 + ed102c8e33e1ae3d731c4fc22ad54b2e3daad504 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 81349c13c2b8e8babf1cdd4e7ab350fbb1b193a4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 1575d7056e8952d90f592553e9f00661bc94e81a + 41a4bd690229661e3ec74276ce3f93863b22435b - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 29ccbeca12c26d35acfea8fd4033168fdc2edcb8 + ebbf01f54996755566db36e2e962ba6364da2ecc https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 13e1f83f10a0..9e58cfab13b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,11 +48,11 @@ - 8.0.4-servicing.24169.7 + 8.0.4-servicing.24169.11 - 8.0.4-servicing.24169.8 + 8.0.4-servicing.24169.10 @@ -86,8 +86,8 @@ 8.0.204 - 8.0.204-servicing.24169.92 - 8.0.204-servicing.24169.92 + 8.0.204-servicing.24169.95 + 8.0.204-servicing.24169.95 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -112,8 +112,8 @@ - 8.0.4-servicing.24169.21 - 8.0.4-servicing.24169.21 + 8.0.4-servicing.24169.24 + 8.0.4-servicing.24169.24 8.0.4 8.0.4 From 4b1d5fa6516788ff4bf6faf26592f3b7c07b11f7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Mar 2024 06:32:33 +0000 Subject: [PATCH 375/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24169.27 -> To Version 8.0.300-preview.24169.98 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24165.2 -> To Version 12.8.300-beta.24168.9 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index edde09e2f30d..930a85a98bf6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee + 516f4356d420569c38e6bccd6c651d7b80165bf1 - + https://github.com/dotnet/sdk - 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee + 516f4356d420569c38e6bccd6c651d7b80165bf1 - + https://github.com/dotnet/sdk - 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee + 516f4356d420569c38e6bccd6c651d7b80165bf1 - + https://github.com/dotnet/sdk - 5a9a5a3e863a2357c6aa9b888c50dd2e44ea76ee + 516f4356d420569c38e6bccd6c651d7b80165bf1 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - a0081443628b0c582abe66f83944519378d2a5dd + e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 - + https://github.com/dotnet/fsharp - a0081443628b0c582abe66f83944519378d2a5dd + e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 2348a50bb566b39305c474793b43edb5635db6f4 + 134bc2e6f0edbe13c7cc465d97592d75f9d1a197 diff --git a/eng/Versions.props b/eng/Versions.props index 76b47f06d43e..02e031bdad9b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24169.27 - 8.0.300-preview.24169.27 - 8.0.300-preview.24169.27 + 8.0.300-preview.24169.98 + 8.0.300-preview.24169.98 + 8.0.300-preview.24169.98 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24168.1 + 4.10.0-3.24168.9 From 4304228b0bac6adb9b462d28350eceb0c13d3849 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 20 Mar 2024 12:53:41 +0000 Subject: [PATCH 376/652] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24168.5 -> To Version 1.1.0-beta.24170.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 0cd5b7816c9e..1e0f09827a37 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24168.5", + "version": "1.1.0-beta.24170.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 930a85a98bf6..2311d776fb04 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade-services - 55716bbf779395f1c33ea1eb1f688b5081223d49 + 55e81b518005f98514643c16abc090c60937f2cd - + https://github.com/dotnet/arcade-services - 55716bbf779395f1c33ea1eb1f688b5081223d49 + 55e81b518005f98514643c16abc090c60937f2cd https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 02e031bdad9b..41c4a12dd936 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24168.5 + 1.1.0-beta.24170.1 From 4c8fb55b04712a5d7800d9ad6f46be8e2b24a819 Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Wed, 20 Mar 2024 16:34:57 +0100 Subject: [PATCH 377/652] Revert "[release/8.0.2xx] NGEN Microsoft.DotNet.MSBuildSdkResolver.dll and its dependencies (#17750)" (#19112) This reverts commit f0c4e4e14ca748d9c489562cfc32f29e8d5b0afe. Fixes [AB#1994786](https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1994786/) The MSBuild change which took advantage of this was reverted in 17.9 because it introduced issues in installations that don't have the .NET SDK component installed. We are fixing the bug in 9.0 by making changes to the dependencies of `Microsoft.DotNet.MSBuildSdkResolver` (see https://github.com/dotnet/sdk/pull/39573) so this should stay in main. I am reverting it only in 8.0.3xx / 17.10 to fix the `Build_Ngen_InvalidAssemblyCount` counter which was flagged as a regression by PerfDDRITs. --- .../GenerateMSBuildExtensionsSWR.cs | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index 81f3943d2aae..eab79f2b7230 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -24,8 +24,7 @@ public override bool Execute() AddFolder(sb, @"MSBuildSdkResolver", - @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver", - ngenAssemblies: true); + @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver"); AddFolder(sb, @"msbuildExtensions", @@ -40,7 +39,7 @@ public override bool Execute() return true; } - private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir, bool ngenAssemblies = false) + private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir) { string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath); var files = Directory.GetFiles(sourceFolder) @@ -56,16 +55,7 @@ private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrIn { sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); - sb.Append('"'); - - if (ngenAssemblies && file.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) - { - sb.Append(@" vs.file.ngenApplications=""[installDir]\Common7\IDE\vsn.exe"""); - sb.Append(@" vs.file.ngenApplications=""[installDir]\MSBuild\Current\Bin\MSBuild.exe"""); - sb.Append(" vs.file.ngenArchitecture=all"); - } - - sb.AppendLine(); + sb.AppendLine("\""); } sb.AppendLine(); @@ -77,7 +67,6 @@ private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrIn string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName); string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName); - // Don't propagate ngenAssemblies to subdirectories. AddFolder(sb, newRelativeSourcePath, newSwrInstallDir); } } From 7cfea26553ff7a860e58985b683233a211d3df5d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 21 Mar 2024 01:53:09 +0000 Subject: [PATCH 378/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.204 -> To Version 8.0.204 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.4 -> To Version 8.0.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 30 insertions(+), 30 deletions(-) diff --git a/NuGet.config b/NuGet.config index b1a41062200b..573a49220a1f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -42,12 +42,12 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d06665c57726..95565205a355 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - e58e9f9e30b4729c06a7af05889cc7f2fb276192 + 8486d31e24f30e3fa1809a95699a0adc16f448d7 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed102c8e33e1ae3d731c4fc22ad54b2e3daad504 + ceea22879533370683ed8d17de5a17e8e6df1d68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed102c8e33e1ae3d731c4fc22ad54b2e3daad504 + ceea22879533370683ed8d17de5a17e8e6df1d68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed102c8e33e1ae3d731c4fc22ad54b2e3daad504 + ceea22879533370683ed8d17de5a17e8e6df1d68 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ed102c8e33e1ae3d731c4fc22ad54b2e3daad504 + ceea22879533370683ed8d17de5a17e8e6df1d68 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9e58cfab13b3..b92b77abda6a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -74,11 +74,11 @@ 8.0.4 8.0.4 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 - 8.0.4-servicing.24169.15 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 + 8.0.4-servicing.24170.14 0.2.0 @@ -86,8 +86,8 @@ 8.0.204 - 8.0.204-servicing.24169.95 - 8.0.204-servicing.24169.95 + 8.0.204-servicing.24170.23 + 8.0.204-servicing.24170.23 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f4fdbfe1a11cf234c39b2e82182c4e2b382aab8a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 03:43:59 +0000 Subject: [PATCH 379/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24169.98 -> To Version 8.0.300-preview.24170.28 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-preview-24163-01 -> To Version 17.10.0-preview-24169-03 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2311d776fb04..00e4b6fb6675 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 516f4356d420569c38e6bccd6c651d7b80165bf1 + b4d072aeabb46d8126f6716db40a6df31a3df227 - + https://github.com/dotnet/sdk - 516f4356d420569c38e6bccd6c651d7b80165bf1 + b4d072aeabb46d8126f6716db40a6df31a3df227 - + https://github.com/dotnet/sdk - 516f4356d420569c38e6bccd6c651d7b80165bf1 + b4d072aeabb46d8126f6716db40a6df31a3df227 - + https://github.com/dotnet/sdk - 516f4356d420569c38e6bccd6c651d7b80165bf1 + b4d072aeabb46d8126f6716db40a6df31a3df227 https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 - + https://github.com/microsoft/vstest - c609e2c022b0087b227436a4debf45525eed00e9 + fb859a78be3d76ee38d5630ad86a17ab124ebbcf diff --git a/eng/Versions.props b/eng/Versions.props index 41c4a12dd936..98c50f946026 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24169.98 - 8.0.300-preview.24169.98 - 8.0.300-preview.24169.98 + 8.0.300-preview.24170.28 + 8.0.300-preview.24170.28 + 8.0.300-preview.24170.28 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24163-01 + 17.10.0-preview-24169-03 8.0.0-alpha.1.22557.12 From 7ac1ee98a53ce13dafc3cc50cb72c5b8e942ef7a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 21 Mar 2024 12:49:57 +0000 Subject: [PATCH 380/652] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24170.1 -> To Version 1.1.0-beta.24170.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1e0f09827a37..37d8783e658c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24170.1", + "version": "1.1.0-beta.24170.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 00e4b6fb6675..29497a303af4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade-services - 55e81b518005f98514643c16abc090c60937f2cd + 965d0ab5145b11952f3fd725735a273be45a47b5 - + https://github.com/dotnet/arcade-services - 55e81b518005f98514643c16abc090c60937f2cd + 965d0ab5145b11952f3fd725735a273be45a47b5 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 98c50f946026..230e84521cb3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24170.1 + 1.1.0-beta.24170.2 From bbf08d77bcd32a142d5961ff5d35c097c2c8cef0 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Thu, 21 Mar 2024 13:01:44 -0700 Subject: [PATCH 381/652] Changes to support 1ES templates for internal build. --- .vsts-ci.yml | 656 ++++++++++++++++++++++++----------------------- .vsts-pr.yml | 58 +++-- eng/build-pr.yml | 261 +++++++++++++++++++ eng/build.yml | 40 +-- 4 files changed, 655 insertions(+), 360 deletions(-) create mode 100644 eng/build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 429c53be0639..40a268589ddc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -23,339 +25,363 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) +- template: /eng/common/templates-official/variables/pool-providers.yml -- template: /eng/common/templates/variables/pool-providers.yml +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release -stages: -- stage: Build - jobs: - # This job is for build retry configuration. - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + alpine319WithNode: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode + cblMariner20Fpm: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm + centosStream8: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + debian11Amd64: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64 + fedora39: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39 + ubuntu2204: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 + ubuntu2204CrossArmAlpine: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine + ubuntu2204DebPkg: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg + sdl: + sourceAnalysisPool: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\buildConfiguration - artifact: buildConfiguration - displayName: Publish Build Config - - ## PR-only jobs - - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - - ## Windows - - - template: eng/build.yml - parameters: - agentOs: Windows_NT - jobName: Build_Debug_x64 - buildConfiguration: Debug - buildArchitecture: x64 - additionalBuildParameters: '/p:PublishInternalAsset=true' - runTests: true - - ## Linux - - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Ubuntu_22_04_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04' - buildConfiguration: Debug - buildArchitecture: x64 - linuxPortable: true - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Fedora_39_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39' - buildConfiguration: Debug - buildArchitecture: x64 - linuxPortable: true - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_CentOS_8_Stream_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' - buildConfiguration: Debug - buildArchitecture: x64 - linuxPortable: false - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Debian_11_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-amd64' - buildConfiguration: Debug - buildArchitecture: x64 - additionalBuildParameters: '/p:BuildSdkDeb=true' - linuxPortable: false - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Arm64_Debug - buildConfiguration: Debug - buildArchitecture: arm64 - runtimeIdentifier: 'linux-arm64' - linuxPortable: true - # Never run tests on arm64 - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_musl_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' - buildConfiguration: Debug - buildArchitecture: x64 - runtimeIdentifier: 'linux-musl-x64' - # Pass in HostOSName when running on alpine - additionalBuildParameters: '/p:HostOSName="linux-musl"' - linuxPortable: false - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_LinuxPortable_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - linuxPortable: true - runTests: true - - # MacOS - - - template: eng/build.yml - parameters: - agentOs: Darwin - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - runTests: true - - ## Official/PGO instrumentation Builds - - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ## Windows - - - template: eng/build.yml - parameters: - agentOs: Windows_NT - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - additionalBuildParameters: '/p:PublishInternalAsset=true' - runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - jobName: Build_Release_x86 - buildConfiguration: Release - buildArchitecture: x86 - runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - runTests: false - - ## Linux + image: 1es-windows-2022 + os: windows + stages: + - stage: Build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2022-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\buildConfiguration + artifactName: buildConfiguration - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Arm_Release - buildConfiguration: Release - buildArchitecture: arm - runtimeIdentifier: 'linux-arm' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Arm64_Release - buildConfiguration: Release - buildArchitecture: arm64 - runtimeIdentifier: 'linux-arm64' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-cross-arm-alpine' - buildConfiguration: Release - buildArchitecture: arm - runtimeIdentifier: 'linux-musl-arm' - additionalBuildParameters: '/p:OSName="linux-musl"' - linuxPortable: false - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_musl_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - runtimeIdentifier: 'linux-musl-arm64' - additionalBuildParameters: '/p:OSName="linux-musl"' - linuxPortable: false - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_musl_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode' - buildConfiguration: Release - buildArchitecture: x64 - runtimeIdentifier: 'linux-musl-x64' - # Pass in HostOSName when running on alpine - additionalBuildParameters: '/p:HostOSName="linux-musl"' - linuxPortable: false - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_Portable_Deb_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg' - buildConfiguration: Release - buildArchitecture: x64 - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_Portable_Rpm_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' - buildConfiguration: Release - buildArchitecture: x64 - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_Portable_Rpm_Release_Arm64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' - buildConfiguration: Release - buildArchitecture: arm64 - runtimeIdentifier: 'linux-arm64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_LinuxPortable_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - linuxPortable: true - runTests: false + # PR-only jobs + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + # Windows + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Debug_x64 + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: true - # MacOS + # Linux + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Ubuntu_22_04_Debug_x64 + container: ubuntu2204 + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Fedora_39_Debug_x64 + container: fedora39 + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_CentOS_8_Stream_Debug_x64 + container: centosStream8 + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: false + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Debian_11_Debug_x64 + container: debian11Amd64 + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:BuildSdkDeb=true' + linuxPortable: false + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Arm64_Debug + buildConfiguration: Debug + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + # Never run tests on arm64 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Debug_x64 + container: alpine319WithNode + buildConfiguration: Debug + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: true - - template: eng/build.yml - parameters: - agentOs: Darwin - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - runTests: false - - template: eng/build.yml - parameters: - agentOs: Darwin - jobName: Build_Release_arm64 - runtimeIdentifier: 'osx-arm64' - buildConfiguration: Release - buildArchitecture: arm64 - runTests: false + # MacOS + - template: eng/build.yml@self + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: true - ## Windows PGO Instrumentation builds + # Official/PGO instrumentation Builds + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + # Windows + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - additionalBuildParameters: '/p:PublishInternalAsset=true' - runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_x86 - buildConfiguration: Release - buildArchitecture: x86 - runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - runTests: false + # Linux + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Arm_Release + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-arm' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Arm64_Release + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm + container: ubuntu2204CrossArmAlpine + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-musl-arm' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-musl-arm64' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_x64 + container: alpine319WithNode + buildConfiguration: Release + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Deb_Release_x64 + container: ubuntu2204DebPkg + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_x64 + container: cblMariner20Fpm + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_Arm64 + container: cblMariner20Fpm + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false - ## Linux PGO Instrumentation builds + # MacOS + - template: eng/build.yml@self + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Darwin + jobName: Build_Release_arm64 + runtimeIdentifier: 'osx-arm64' + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - pgoInstrument: true - jobName: Build_LinuxPortable_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - linuxPortable: true - runTests: false + # Windows PGO Instrumentation + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - pgoInstrument: true - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - linuxPortable: true - runTests: false + # Linux PGO Instrumentation + - template: eng/build.yml@self + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + linuxPortable: true + runTests: false - - template: /eng/common/templates/jobs/source-build.yml + # Source Build + - template: /eng/common/templates-official/jobs/source-build.yml@self -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - stage: Publish - dependsOn: - - Build - jobs: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - publishUsingPipelines: true - publishAssetsImmediately: true - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Publish + dependsOn: + - Build + jobs: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + publishUsingPipelines: true + publishAssetsImmediately: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 429c53be0639..2a762dd9a52b 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dev.azure.com/dnceng-public/public/_build?definitionId=20 + trigger: batch: true branches: @@ -59,7 +61,7 @@ stages: ## Windows - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Debug_x64 @@ -70,7 +72,7 @@ stages: ## Linux - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Ubuntu_22_04_Debug_x64 @@ -79,7 +81,7 @@ stages: buildArchitecture: x64 linuxPortable: true runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Fedora_39_Debug_x64 @@ -88,7 +90,7 @@ stages: buildArchitecture: x64 linuxPortable: true runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_CentOS_8_Stream_Debug_x64 @@ -97,7 +99,7 @@ stages: buildArchitecture: x64 linuxPortable: false runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Debian_11_Debug_x64 @@ -107,7 +109,7 @@ stages: additionalBuildParameters: '/p:BuildSdkDeb=true' linuxPortable: false runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Arm64_Debug @@ -117,7 +119,7 @@ stages: linuxPortable: true # Never run tests on arm64 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 @@ -129,7 +131,7 @@ stages: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_LinuxPortable_Release_x64 @@ -140,7 +142,7 @@ stages: # MacOS - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Darwin jobName: Build_Release_x64 @@ -154,7 +156,7 @@ stages: ## Windows - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Release_x64 @@ -162,14 +164,14 @@ stages: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Release_x86 buildConfiguration: Release buildArchitecture: x86 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Release_arm64 @@ -179,7 +181,7 @@ stages: ## Linux - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Arm_Release @@ -188,7 +190,7 @@ stages: runtimeIdentifier: 'linux-arm' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Arm64_Release @@ -197,7 +199,7 @@ stages: runtimeIdentifier: 'linux-arm64' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm @@ -208,7 +210,7 @@ stages: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm64 @@ -218,7 +220,7 @@ stages: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 @@ -230,7 +232,7 @@ stages: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Deb_Release_x64 @@ -242,7 +244,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_x64 @@ -254,7 +256,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_Arm64 @@ -267,7 +269,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_LinuxPortable_Release_x64 @@ -278,14 +280,14 @@ stages: # MacOS - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Darwin jobName: Build_Release_x64 buildConfiguration: Release buildArchitecture: x64 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Darwin jobName: Build_Release_arm64 @@ -296,7 +298,7 @@ stages: ## Windows PGO Instrumentation builds - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -305,7 +307,7 @@ stages: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -313,7 +315,7 @@ stages: buildConfiguration: Release buildArchitecture: x86 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -324,7 +326,7 @@ stages: ## Linux PGO Instrumentation builds - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux pgoInstrument: true @@ -334,7 +336,7 @@ stages: linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux pgoInstrument: true diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000000..21393e242d40 --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,261 @@ +parameters: + # Agent OS identifier and used as job name +- name: agentOs + type: string + + # Job name +- name: jobName + type: string + +# Container to run the build in, if any +- name: container + type: string + default: '' + + # Job timeout +- name: timeoutInMinutes + type: number + default: 180 + +# Build configuration (Debug, Release) +- name: buildConfiguration + type: string + values: + - Debug + - Release + +# Build architecture +- name: buildArchitecture + type: string + values: + - arm + - arm64 + - x64 + - x86 + +# Linux portable. If true, passes portable switch to build +- name: linuxPortable + type: boolean + default: false + +# Runtime Identifier +- name: runtimeIdentifier + type: string + default: '' + +# UI lang +- name: dotnetCLIUILanguage + type: string + default: '' + +# Additional parameters +- name: additionalBuildParameters + type: string + default: '' + +# Run tests +- name: runTests + type: boolean + default: true + +# PGO instrumentation jobs +- name: pgoInstrument + type: boolean + default: false + +- name: isBuiltFromVmr + displayName: True when build is running from dotnet/dotnet + type: boolean + default: false + +jobs: +- template: common/templates/job/job.yml + parameters: + # Set up the name of the job. + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }}_${{ parameters.jobName }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }}_${{ parameters.jobName }} + + ## Set up the pool/machine info to be used based on the Agent OS + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2022.amd64 + ${{ if eq(parameters.agentOs, 'Linux') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + container: ${{ parameters.container }} + ${{ if eq(parameters.agentOs, 'Darwin') }}: + pool: + vmImage: 'macOS-latest' + + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if parameters.isBuiltFromVmr }}: + enableSbom: false + ${{ else }}: + enablePublishBuildAssets: true + enablePublishUsingPipelines: true + enableTelemetry: true + helixRepo: dotnet/installer + workspace: + clean: all + +# Test parameters + variables: + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if parameters.runTests }}: + - _TestArg: '-test' + - ${{ else }}: + - _TestArg: '' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.runTests }}: + - _TestArg: '--test' + - ${{ else }}: + - _TestArg: '' + + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - ${{ else }}: + - _PgoInstrument: '' + + - ${{ if parameters.linuxPortable }}: + - _LinuxPortable: '--linux-portable' + - ${{ else }}: + - _LinuxPortable: '' + + - ${{ if ne(parameters.runtimeIdentifier, '') }}: + - _RuntimeIdentifier: '--runtime-id ${{ parameters.runtimeIdentifier }}' + - ${{ else }}: + - _RuntimeIdentifier: '' + + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + + - ${{ if parameters.isBuiltFromVmr }}: + - installerRoot: '$(Build.SourcesDirectory)/src/installer' + - _SignType: test + - _PushToVSFeed: false + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=true + /p:PublishToSymbolServer=false + $(_PgoInstrument) + - ${{ else }}: + - installerRoot: '$(Build.SourcesDirectory)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + - template: /eng/common/templates/variables/pool-providers.yml + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerRoot)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(installerRoot)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: $(installerRoot)/build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration ${{ parameters.buildConfiguration }} + -Architecture ${{ parameters.buildArchitecture }} + $(_BuildArgs) + ${{ parameters.additionalBuildParameters }} + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: ${{ parameters.dotnetCLIUILanguage }} + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerRoot)/eng/common/SetupNugetSources.sh + arguments: $(installerRoot)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: $(installerRoot)/build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration ${{ parameters.buildConfiguration }} + --architecture ${{ parameters.buildArchitecture }} + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + ${{ parameters.additionalBuildParameters }} + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: $(installerRoot)/build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration ${{ parameters.buildConfiguration }} + --architecture ${{ parameters.buildArchitecture }} + $(_RuntimeIdentifier) + $(_BuildArgs) + ${{ parameters.additionalBuildParameters }} + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '${{ parameters.buildConfiguration }}' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(installerRoot)/artifacts' + Contents: | + log/${{ parameters.buildConfiguration }}/**/* + TestResults/${{ parameters.buildConfiguration }}/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index ea389797cc3e..3d2a6869c956 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -1,9 +1,9 @@ parameters: - # Agent OS identifier and used as job name +# Agent OS identifier and used as job name - name: agentOs type: string - # Job name +# Job name - name: jobName type: string @@ -12,7 +12,7 @@ parameters: type: string default: '' - # Job timeout +# Job timeout - name: timeoutInMinutes type: number default: 180 @@ -32,7 +32,7 @@ parameters: - arm64 - x64 - x86 - + # Linux portable. If true, passes portable switch to build - name: linuxPortable type: boolean @@ -69,36 +69,42 @@ parameters: default: false jobs: -- template: common/templates/job/job.yml +- template: common/templates-official/job/job.yml parameters: # Set up the name of the job. ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }}_${{ parameters.jobName }} ${{ if not(parameters.pgoInstrument) }}: name: ${{ parameters.agentOs }}_${{ parameters.jobName }} - - ## Set up the pool/machine info to be used based on the Agent OS + + # Set up the pool/machine info to be used based on the Agent OS ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open + image: 1es-windows-2022-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + image: 1es-windows-2022 + os: windows ${{ if eq(parameters.agentOs, 'Linux') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2204 + os: linux container: ${{ parameters.container }} ${{ if eq(parameters.agentOs, 'Darwin') }}: pool: - vmImage: 'macOS-latest' + name: Azure Pipelines + image: macOS-latest + os: macOS timeoutInMinutes: ${{ parameters.timeoutInMinutes }} ${{ if parameters.isBuiltFromVmr }}: @@ -111,8 +117,8 @@ jobs: workspace: clean: all -# Test parameters variables: + # Test variables - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - _PackArg: '-pack' - ${{ if parameters.runTests }}: @@ -168,7 +174,7 @@ jobs: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) $(_PgoInstrument) - - template: /eng/common/templates/variables/pool-providers.yml + - template: /eng/common/templates-official/variables/pool-providers.yml steps: - checkout: self @@ -245,13 +251,13 @@ jobs: inputs: SourceFolder: '$(installerRoot)/artifacts' Contents: | - log/${{ parameters.buildConfiguration }}/**/* - TestResults/${{ parameters.buildConfiguration }}/**/* + log/${{ parameters.buildConfiguration }}/**/* + TestResults/${{ parameters.buildConfiguration }}/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' From 1394de7931dd028632439760f0fa4bbd8fc751ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 05:06:57 +0000 Subject: [PATCH 382/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24170.28 -> To Version 8.0.300-preview.24171.18 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-preview-24169-03 -> To Version 17.10.0-preview-24170-01 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 29497a303af4..2d4d9097f268 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - b4d072aeabb46d8126f6716db40a6df31a3df227 + 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb - + https://github.com/dotnet/sdk - b4d072aeabb46d8126f6716db40a6df31a3df227 + 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb - + https://github.com/dotnet/sdk - b4d072aeabb46d8126f6716db40a6df31a3df227 + 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb - + https://github.com/dotnet/sdk - b4d072aeabb46d8126f6716db40a6df31a3df227 + 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 - + https://github.com/microsoft/vstest - fb859a78be3d76ee38d5630ad86a17ab124ebbcf + 6957756d70d6ade74e239a38ad709db5cb39fe0d diff --git a/eng/Versions.props b/eng/Versions.props index 230e84521cb3..607e4eac5443 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24170.28 - 8.0.300-preview.24170.28 - 8.0.300-preview.24170.28 + 8.0.300-preview.24171.18 + 8.0.300-preview.24171.18 + 8.0.300-preview.24171.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24169-03 + 17.10.0-preview-24170-01 8.0.0-alpha.1.22557.12 From 65eecbb634733e5713c1c46f7b41b37d01827ee5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 22 Mar 2024 09:50:08 +0000 Subject: [PATCH 383/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19138) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.10.0-3.24168.9 to 4.10.0-3.24171.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.10.0-preview-24162-02 to 17.10.0-preview-24171-01 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2d4d9097f268..833e05be6685 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb + fcede4935686478b9ff1a6d66c99768fa04ad225 - + https://github.com/dotnet/sdk - 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb + fcede4935686478b9ff1a6d66c99768fa04ad225 - + https://github.com/dotnet/sdk - 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb + fcede4935686478b9ff1a6d66c99768fa04ad225 - + https://github.com/dotnet/sdk - 0f4c6e5e90d450fc38b08c6674a59db3c4a6d6bb + fcede4935686478b9ff1a6d66c99768fa04ad225 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 134bc2e6f0edbe13c7cc465d97592d75f9d1a197 + c8dd474b73167a0f1b07514082d162c7febdf33f - + https://github.com/dotnet/msbuild - 0326fd7c9e131c4c26bac3c0f72a43ef9fd2812c + de776177f6d540e656e6b0c6d5bb07f2ff518c19 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 607e4eac5443..6d0601dff21a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24171.18 - 8.0.300-preview.24171.18 - 8.0.300-preview.24171.18 + 8.0.300-preview.24172.7 + 8.0.300-preview.24172.7 + 8.0.300-preview.24172.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24168.9 + 4.10.0-3.24171.1 From 3d274caac34ec5b9f28a9eb70ba1ed719f8788f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 12:58:55 +0000 Subject: [PATCH 384/652] Update dependencies from https://github.com/dotnet/arcade build Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24165.4 -> To Version 8.0.0-beta.24170.6 --- 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 833e05be6685..da932bd2dad4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 6d0601dff21a..fb2ec4394343 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24165.4 + 8.0.0-beta.24170.6 diff --git a/global.json b/global.json index b967bd08e9e1..421a15a16f4d 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.24165.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24165.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24170.6", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24170.6" } } From f1314e05546a5162cc3fd83dd3fbc4e223dfd5da Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 13:04:22 +0000 Subject: [PATCH 385/652] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24170.2 -> To Version 1.1.0-beta.24171.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 37d8783e658c..e068b7ff4dba 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24170.2", + "version": "1.1.0-beta.24171.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 833e05be6685..19aa260218fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f311667e0587f19c3fa9553a909975662107a351 - + https://github.com/dotnet/arcade-services - 965d0ab5145b11952f3fd725735a273be45a47b5 + 925452cfdeaf03801bc9b2d096420853d3ba991c - + https://github.com/dotnet/arcade-services - 965d0ab5145b11952f3fd725735a273be45a47b5 + 925452cfdeaf03801bc9b2d096420853d3ba991c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6d0601dff21a..5c2f659f0e2b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24170.2 + 1.1.0-beta.24171.1 From fd45c75781cdaae445ec82bfeaa1cffc9bf30278 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 22 Mar 2024 18:01:55 +0000 Subject: [PATCH 386/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24172.7 -> To Version 8.0.300-preview.24172.17 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24168.9 -> To Version 12.8.300-beta.24171.7 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2b2351f97d2..c5bf1d2214eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - fcede4935686478b9ff1a6d66c99768fa04ad225 + 6b5f92d3761f994edfb954524f3745422465ee22 - + https://github.com/dotnet/sdk - fcede4935686478b9ff1a6d66c99768fa04ad225 + 6b5f92d3761f994edfb954524f3745422465ee22 - + https://github.com/dotnet/sdk - fcede4935686478b9ff1a6d66c99768fa04ad225 + 6b5f92d3761f994edfb954524f3745422465ee22 - + https://github.com/dotnet/sdk - fcede4935686478b9ff1a6d66c99768fa04ad225 + 6b5f92d3761f994edfb954524f3745422465ee22 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 + 891a53ae87f77e25d42d4abe7f26822024f18bb4 - + https://github.com/dotnet/fsharp - e18404fcaf90b0ee9bbf588ec32d07f466f16fe7 + 891a53ae87f77e25d42d4abe7f26822024f18bb4 diff --git a/eng/Versions.props b/eng/Versions.props index fd94652bf1d6..37192a7bed3c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24172.7 - 8.0.300-preview.24172.7 - 8.0.300-preview.24172.7 + 8.0.300-preview.24172.17 + 8.0.300-preview.24172.17 + 8.0.300-preview.24172.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From f827ff4b7e9422d5be60f08c7c61433ca7a3bdfc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Mar 2024 12:57:03 +0000 Subject: [PATCH 387/652] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24171.1 -> To Version 1.1.0-beta.24172.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e068b7ff4dba..373bd69b0b95 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24171.1", + "version": "1.1.0-beta.24172.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c2b2351f97d2..5dd7191705c6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 - + https://github.com/dotnet/arcade-services - 925452cfdeaf03801bc9b2d096420853d3ba991c + 0542b0f13dc8ec39cb864564ba08a33b4af7035d - + https://github.com/dotnet/arcade-services - 925452cfdeaf03801bc9b2d096420853d3ba991c + 0542b0f13dc8ec39cb864564ba08a33b4af7035d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index fd94652bf1d6..d985ca00595c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24171.1 + 1.1.0-beta.24172.2 From 79c1c4cc9aaddaad1688b6d2d18ae50dc5036cbd Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Fri, 22 Mar 2024 11:43:18 -0500 Subject: [PATCH 388/652] Generate a props file that can be used to detect MSBuild version mismatches. We know the minimum and 'bundled' MSbuild versions, but users may build a project with newer SDKs than we expected (specifically when full-framework MSBuild is starting the build of an SDK-style project). When this occurs, we'd like to automatically condition the use of PackageReferences meant to ensure compatibility of the Roslyn toolchain, so we need to know if we are in this mismatched situation. A fast and simple way to do this is to 'stamp' the 'expected' version of MSBuild during product construction and compare that to the 'current' version being used during the actual build. --- .../targets/GenerateBundledVersions.targets | 48 ++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 299a76d5eb71..958d3a97d1df 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -2,7 +2,7 @@ + DependsOnTargets="GenerateBundledVersionsProps;GenerateBundledCliToolsProps;GenerateBundledMSBuildProps" > + + + Microsoft.NETCoreSdk.BundledMSBuildInformation.props + %(SDKInternalFiles.Identity) + $(MSBuildVersion) + + + + + + + + <_BundledMSBuildVersionMajorMinor>$([System.Version]::Parse('$(BundledMSBuildVersion)').ToString(2)) + + + + + + + + $(MinimumMSBuildVersion) + $(BundledMSBuildVersion) + <_MSBuildVersionMajorMinor>%24([System.Version]::Parse('%24(MSBuildVersion)').ToString(2)) + <_IsDisjointMSBuildVersion>%24([MSBuild]::VersionGreaterThan('%24(_MSBuildVersionMajorMinor)', '$(_BundledMSBuildVersionMajorMinor)')) + + +]]> + + + + + + From ee91cb14ff4e3cf7d4a355d4cee7356216dcda7e Mon Sep 17 00:00:00 2001 From: Chet Husk Date: Fri, 22 Mar 2024 13:22:46 -0500 Subject: [PATCH 389/652] Fix reading of minimum MSBuild version --- src/redist/targets/GenerateBundledVersions.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 958d3a97d1df..8dc085a42c34 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -1207,11 +1207,13 @@ Copyright (c) .NET Foundation. All rights reserved. + $(RedistLayoutPath)sdk/$(Version)/minimumMSBuildVersion Microsoft.NETCoreSdk.BundledMSBuildInformation.props - %(SDKInternalFiles.Identity) $(MSBuildVersion) + + From e53f57d99c17ae6e84ce4676e88f9a77889c2062 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 24 Mar 2024 12:49:21 +0000 Subject: [PATCH 390/652] Update dependencies from https://github.com/dotnet/arcade-services build Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24171.1 -> To Version 1.1.0-beta.24172.2 From 4fb1686c2a3fe7c778b6169bbea251a409b57309 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Mar 2024 03:23:13 +0000 Subject: [PATCH 391/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24172.17 -> To Version 8.0.300-preview.24174.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 312b7bd69978..5b6efcbeb274 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 6b5f92d3761f994edfb954524f3745422465ee22 + c7630919267d4acf40d249468aa2b548708d2ab8 - + https://github.com/dotnet/sdk - 6b5f92d3761f994edfb954524f3745422465ee22 + c7630919267d4acf40d249468aa2b548708d2ab8 - + https://github.com/dotnet/sdk - 6b5f92d3761f994edfb954524f3745422465ee22 + c7630919267d4acf40d249468aa2b548708d2ab8 - + https://github.com/dotnet/sdk - 6b5f92d3761f994edfb954524f3745422465ee22 + c7630919267d4acf40d249468aa2b548708d2ab8 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index d2a240e87a0a..c6696af60634 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24172.17 - 8.0.300-preview.24172.17 - 8.0.300-preview.24172.17 + 8.0.300-preview.24174.2 + 8.0.300-preview.24174.2 + 8.0.300-preview.24174.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2c943af61ca33a202e5f61ac904be3a2e4c748af Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 25 Mar 2024 06:25:29 +0000 Subject: [PATCH 392/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24174.2 -> To Version 8.0.300-preview.24174.6 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24171.7 -> To Version 12.8.300-beta.24172.5 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b6efcbeb274..9e38a6912358 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c7630919267d4acf40d249468aa2b548708d2ab8 + b0a41e210b495e22b8f54e97f3643848fc89ae72 - + https://github.com/dotnet/sdk - c7630919267d4acf40d249468aa2b548708d2ab8 + b0a41e210b495e22b8f54e97f3643848fc89ae72 - + https://github.com/dotnet/sdk - c7630919267d4acf40d249468aa2b548708d2ab8 + b0a41e210b495e22b8f54e97f3643848fc89ae72 - + https://github.com/dotnet/sdk - c7630919267d4acf40d249468aa2b548708d2ab8 + b0a41e210b495e22b8f54e97f3643848fc89ae72 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 891a53ae87f77e25d42d4abe7f26822024f18bb4 + 8d852e43d35fdac96b1ba52e3bd4b35350035914 - + https://github.com/dotnet/fsharp - 891a53ae87f77e25d42d4abe7f26822024f18bb4 + 8d852e43d35fdac96b1ba52e3bd4b35350035914 diff --git a/eng/Versions.props b/eng/Versions.props index c6696af60634..1d6eac7d2301 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24174.2 - 8.0.300-preview.24174.2 - 8.0.300-preview.24174.2 + 8.0.300-preview.24174.6 + 8.0.300-preview.24174.6 + 8.0.300-preview.24174.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 15f3a065502952e8a6e3352124df6be4839232d3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 25 Mar 2024 20:32:32 +0000 Subject: [PATCH 393/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19176) [release/8.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e38a6912358..b470e3c4cf08 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 + ceb071c1060b8e6de404c065b4045442570caa18 - + https://github.com/dotnet/arcade - 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 + ceb071c1060b8e6de404c065b4045442570caa18 - + https://github.com/dotnet/arcade - 8e3e00a76f467cc262dc14f6466ab884b2c4eb96 + ceb071c1060b8e6de404c065b4045442570caa18 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 1d6eac7d2301..32c34bcccb26 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24170.6 + 8.0.0-beta.24172.5 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a2709d10562c..0604277a2ff5 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/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 421a15a16f4d..82ca059599e2 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.24170.6", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24170.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24172.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24172.5" } } From cfc4dae37e8b2b6b08d51ff933843e762579fd8d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 03:40:28 +0000 Subject: [PATCH 394/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24174.6 -> To Version 8.0.300-preview.24175.21 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b470e3c4cf08..f89fe0a821fb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - b0a41e210b495e22b8f54e97f3643848fc89ae72 + c28f2a19d56ee38d358560e3d0b02f574146c5d0 - + https://github.com/dotnet/sdk - b0a41e210b495e22b8f54e97f3643848fc89ae72 + c28f2a19d56ee38d358560e3d0b02f574146c5d0 - + https://github.com/dotnet/sdk - b0a41e210b495e22b8f54e97f3643848fc89ae72 + c28f2a19d56ee38d358560e3d0b02f574146c5d0 - + https://github.com/dotnet/sdk - b0a41e210b495e22b8f54e97f3643848fc89ae72 + c28f2a19d56ee38d358560e3d0b02f574146c5d0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 32c34bcccb26..3dd9688be4c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24174.6 - 8.0.300-preview.24174.6 - 8.0.300-preview.24174.6 + 8.0.300-preview.24175.21 + 8.0.300-preview.24175.21 + 8.0.300-preview.24175.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 24f1a04c6cca5de78047727e347e98de0c977157 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 21:06:32 +0000 Subject: [PATCH 395/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24175.21 -> To Version 8.0.300-preview.24176.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f89fe0a821fb..e64a096ed0b7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - c28f2a19d56ee38d358560e3d0b02f574146c5d0 + 5157609e360b5c2dd41ac1c1f08250a9641485a0 - + https://github.com/dotnet/sdk - c28f2a19d56ee38d358560e3d0b02f574146c5d0 + 5157609e360b5c2dd41ac1c1f08250a9641485a0 - + https://github.com/dotnet/sdk - c28f2a19d56ee38d358560e3d0b02f574146c5d0 + 5157609e360b5c2dd41ac1c1f08250a9641485a0 - + https://github.com/dotnet/sdk - c28f2a19d56ee38d358560e3d0b02f574146c5d0 + 5157609e360b5c2dd41ac1c1f08250a9641485a0 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3dd9688be4c1..7cdb15be6251 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24175.21 - 8.0.300-preview.24175.21 - 8.0.300-preview.24175.21 + 8.0.300-preview.24176.4 + 8.0.300-preview.24176.4 + 8.0.300-preview.24176.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 01e8297374014cbcff5ac7c5f67e2ae4ff3f7e8d Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 26 Mar 2024 14:28:58 -0700 Subject: [PATCH 396/652] Using MicroBuildOutputFolderOverride to move the MicroBuild plugin install directory. --- .vsts-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 40a268589ddc..8e4f528e53fa 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -34,6 +34,9 @@ variables: /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) - template: /eng/common/templates-official/variables/pool-providers.yml +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) resources: repositories: From 479f0b85231b23811afee4a9285f2ec1d4a3a95e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 21:47:34 +0000 Subject: [PATCH 397/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24175.21 -> To Version 8.0.300-preview.24176.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e64a096ed0b7..a533b05403da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 5157609e360b5c2dd41ac1c1f08250a9641485a0 + e0b5b445062fd2c45385daa0e4d9c6c251966d7c - + https://github.com/dotnet/sdk - 5157609e360b5c2dd41ac1c1f08250a9641485a0 + e0b5b445062fd2c45385daa0e4d9c6c251966d7c - + https://github.com/dotnet/sdk - 5157609e360b5c2dd41ac1c1f08250a9641485a0 + e0b5b445062fd2c45385daa0e4d9c6c251966d7c - + https://github.com/dotnet/sdk - 5157609e360b5c2dd41ac1c1f08250a9641485a0 + e0b5b445062fd2c45385daa0e4d9c6c251966d7c https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7cdb15be6251..303e99b3f84e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24176.4 - 8.0.300-preview.24176.4 - 8.0.300-preview.24176.4 + 8.0.300-preview.24176.6 + 8.0.300-preview.24176.6 + 8.0.300-preview.24176.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fdfdd66f383b8669fc4839e8c760fdf4490a0eb5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 26 Mar 2024 22:57:31 +0000 Subject: [PATCH 398/652] Update dependencies from https://github.com/dotnet/sdk build Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24175.21 -> To Version 8.0.300-preview.24176.8 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a533b05403da..eb41c0952bed 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - e0b5b445062fd2c45385daa0e4d9c6c251966d7c + f2f59be833e7e2ab508f649ddeb6e39d64255660 - + https://github.com/dotnet/sdk - e0b5b445062fd2c45385daa0e4d9c6c251966d7c + f2f59be833e7e2ab508f649ddeb6e39d64255660 - + https://github.com/dotnet/sdk - e0b5b445062fd2c45385daa0e4d9c6c251966d7c + f2f59be833e7e2ab508f649ddeb6e39d64255660 - + https://github.com/dotnet/sdk - e0b5b445062fd2c45385daa0e4d9c6c251966d7c + f2f59be833e7e2ab508f649ddeb6e39d64255660 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 303e99b3f84e..d5cea1574982 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24176.6 - 8.0.300-preview.24176.6 - 8.0.300-preview.24176.6 + 8.0.300-preview.24176.8 + 8.0.300-preview.24176.8 + 8.0.300-preview.24176.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 644b23721f1b4bfa941735372896a57d2b8c73a9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:29:22 -0700 Subject: [PATCH 399/652] [release/8.0.3xx] Update dependencies from dotnet/source-build-externals (#19215) 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 eb41c0952bed..02b2049997d5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 0fac378047750fa8bd850a98b159560f9f7627c3 + 300e99190e6ae1983681694dbdd5f75f0c692081 From 355e31b3c7ec2868b6acb9333859d81e445fc8f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:29:46 -0700 Subject: [PATCH 400/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19214) Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 373bd69b0b95..8d5f9e516e3a 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24172.2", + "version": "1.1.0-beta.24177.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 02b2049997d5..91dfe27154eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade ceb071c1060b8e6de404c065b4045442570caa18 - + https://github.com/dotnet/arcade-services - 0542b0f13dc8ec39cb864564ba08a33b4af7035d + 14f50f9823318da5868f614dae868278165718d8 - + https://github.com/dotnet/arcade-services - 0542b0f13dc8ec39cb864564ba08a33b4af7035d + 14f50f9823318da5868f614dae868278165718d8 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d5cea1574982..280546b2b1f3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24172.2 + 1.1.0-beta.24177.1 From 5c3b5c0b8593ca6aca44c1deb9bc5f8f30af02f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 27 Mar 2024 12:30:07 -0700 Subject: [PATCH 401/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19213) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/job.yml | 1 + global.json | 4 ++-- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 91dfe27154eb..6ccaaa5652ce 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - ceb071c1060b8e6de404c065b4045442570caa18 + 48e9e0d2164de0535446809364724da8962123a6 - + https://github.com/dotnet/arcade - ceb071c1060b8e6de404c065b4045442570caa18 + 48e9e0d2164de0535446809364724da8962123a6 - + https://github.com/dotnet/arcade - ceb071c1060b8e6de404c065b4045442570caa18 + 48e9e0d2164de0535446809364724da8962123a6 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 280546b2b1f3..91c6d8976bd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24172.5 + 8.0.0-beta.24176.8 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 0604277a2ff5..1f035fee73f4 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -136,6 +136,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/global.json b/global.json index 82ca059599e2..598e3f960078 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.24172.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24172.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24176.8", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24176.8" } } From a8f78057e3e11e057c27ded2b255ec0ce917a3dc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Mar 2024 20:00:12 +0000 Subject: [PATCH 402/652] Update dependencies from https://github.com/dotnet/sdk build 20240327.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24176.8 -> To Version 8.0.300-preview.24177.16 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.300-beta.24172.5 -> To Version 12.8.300-beta.24175.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6ccaaa5652ce..e3db405bd487 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - f2f59be833e7e2ab508f649ddeb6e39d64255660 + 4162c312b090e8f31a85bb7ac3f59db8fbe1e94c - + https://github.com/dotnet/sdk - f2f59be833e7e2ab508f649ddeb6e39d64255660 + 4162c312b090e8f31a85bb7ac3f59db8fbe1e94c - + https://github.com/dotnet/sdk - f2f59be833e7e2ab508f649ddeb6e39d64255660 + 4162c312b090e8f31a85bb7ac3f59db8fbe1e94c - + https://github.com/dotnet/sdk - f2f59be833e7e2ab508f649ddeb6e39d64255660 + 4162c312b090e8f31a85bb7ac3f59db8fbe1e94c https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 8d852e43d35fdac96b1ba52e3bd4b35350035914 + 4a394198efadc455334ae272954ece372aea4de2 - + https://github.com/dotnet/fsharp - 8d852e43d35fdac96b1ba52e3bd4b35350035914 + 4a394198efadc455334ae272954ece372aea4de2 @@ -155,13 +155,13 @@ c8dd474b73167a0f1b07514082d162c7febdf33f - + https://github.com/dotnet/msbuild - de776177f6d540e656e6b0c6d5bb07f2ff518c19 + 6064d9c8fe7beb06ffc10f8ff27ce967039a2c0d - + https://github.com/nuget/nuget.client - 1845d6bd450a7453d573035371c9fec43683d1ef + fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf diff --git a/eng/Versions.props b/eng/Versions.props index 91c6d8976bd9..f2cb2c8d199f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24176.8 - 8.0.300-preview.24176.8 - 8.0.300-preview.24176.8 + 8.0.300-preview.24177.16 + 8.0.300-preview.24177.16 + 8.0.300-preview.24177.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -122,7 +122,7 @@ - 6.10.0-preview.2.81 + 6.10.0-preview.2.97 From 6ba3d99ddd421307358828dc42854ae58d910d78 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 27 Mar 2024 22:16:23 +0000 Subject: [PATCH 403/652] Update dependencies from https://github.com/dotnet/sdk build 20240327.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24176.8 -> To Version 8.0.300-preview.24177.17 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Net.Compilers.Toolset,Microsoft.Build,NuGet.Build.Tasks From Version 12.8.300-beta.24172.5 -> To Version 12.8.300-beta.24175.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3db405bd487..11d142b67ff8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 4162c312b090e8f31a85bb7ac3f59db8fbe1e94c + 049918f85f5485e0f827709aeb36f5dc61810429 - + https://github.com/dotnet/sdk - 4162c312b090e8f31a85bb7ac3f59db8fbe1e94c + 049918f85f5485e0f827709aeb36f5dc61810429 - + https://github.com/dotnet/sdk - 4162c312b090e8f31a85bb7ac3f59db8fbe1e94c + 049918f85f5485e0f827709aeb36f5dc61810429 - + https://github.com/dotnet/sdk - 4162c312b090e8f31a85bb7ac3f59db8fbe1e94c + 049918f85f5485e0f827709aeb36f5dc61810429 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - c8dd474b73167a0f1b07514082d162c7febdf33f + 5fae9589875f09f3e77c9480f5f3cb1d12f5a02f diff --git a/eng/Versions.props b/eng/Versions.props index f2cb2c8d199f..1645b9737030 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24177.16 - 8.0.300-preview.24177.16 - 8.0.300-preview.24177.16 + 8.0.300-preview.24177.17 + 8.0.300-preview.24177.17 + 8.0.300-preview.24177.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24171.1 + 4.11.0-1.24176.16 From 15ae230e43f888e1421b0206fa65d01e037161f9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Mar 2024 13:10:28 +0000 Subject: [PATCH 404/652] Update dependencies from https://github.com/dotnet/arcade build 20240327.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24176.8 -> To Version 8.0.0-beta.24177.1 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11d142b67ff8..af69f926d5f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 48e9e0d2164de0535446809364724da8962123a6 + b17b2a1bb7da23253043dee059f374b00f3e321a - + https://github.com/dotnet/arcade - 48e9e0d2164de0535446809364724da8962123a6 + b17b2a1bb7da23253043dee059f374b00f3e321a - + https://github.com/dotnet/arcade - 48e9e0d2164de0535446809364724da8962123a6 + b17b2a1bb7da23253043dee059f374b00f3e321a https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 1645b9737030..0fcbed8a290a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24176.8 + 8.0.0-beta.24177.1 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f5c1ec7eafeb..2d5660642b8d 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then # Set default versions if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" + if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do diff --git a/global.json b/global.json index 598e3f960078..8fc73666be2f 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.24176.8", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24176.8" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24177.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24177.1" } } From 41c06e683b5f403bea87c69128cfd1e31d447195 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Mar 2024 16:37:43 +0000 Subject: [PATCH 405/652] Update dependencies from https://github.com/dotnet/sdk build 20240328.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24177.17 -> To Version 8.0.300-preview.24178.21 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11d142b67ff8..a0722e0cc99a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 049918f85f5485e0f827709aeb36f5dc61810429 + dba01f7749cf1f0b74c922db0743c0573390968e - + https://github.com/dotnet/sdk - 049918f85f5485e0f827709aeb36f5dc61810429 + dba01f7749cf1f0b74c922db0743c0573390968e - + https://github.com/dotnet/sdk - 049918f85f5485e0f827709aeb36f5dc61810429 + dba01f7749cf1f0b74c922db0743c0573390968e - + https://github.com/dotnet/sdk - 049918f85f5485e0f827709aeb36f5dc61810429 + dba01f7749cf1f0b74c922db0743c0573390968e https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1645b9737030..2018349cbbee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24177.17 - 8.0.300-preview.24177.17 - 8.0.300-preview.24177.17 + 8.0.300-preview.24178.21 + 8.0.300-preview.24178.21 + 8.0.300-preview.24178.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 4dd97fbe5d2a652a3e73cd49cce6618570bb868d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Mar 2024 02:57:47 +0000 Subject: [PATCH 406/652] Update dependencies from https://github.com/dotnet/sdk build 20240328.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24178.21 -> To Version 8.0.300-preview.24178.25 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.11.0-1.24176.16 -> To Version 4.11.0-1.24177.10 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f28a822b9bca..bf62d2321ae1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - dba01f7749cf1f0b74c922db0743c0573390968e + 59d899b815d4cd518ee328f05aea0d61a2bed711 - + https://github.com/dotnet/sdk - dba01f7749cf1f0b74c922db0743c0573390968e + 59d899b815d4cd518ee328f05aea0d61a2bed711 - + https://github.com/dotnet/sdk - dba01f7749cf1f0b74c922db0743c0573390968e + 59d899b815d4cd518ee328f05aea0d61a2bed711 - + https://github.com/dotnet/sdk - dba01f7749cf1f0b74c922db0743c0573390968e + 59d899b815d4cd518ee328f05aea0d61a2bed711 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 5fae9589875f09f3e77c9480f5f3cb1d12f5a02f + 70c173446a3b354fb586e51301fc79aa809fafb4 diff --git a/eng/Versions.props b/eng/Versions.props index 657b0ac9f349..aa8f46a5b90e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24178.21 - 8.0.300-preview.24178.21 - 8.0.300-preview.24178.21 + 8.0.300-preview.24178.25 + 8.0.300-preview.24178.25 + 8.0.300-preview.24178.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24176.16 + 4.11.0-1.24177.10 From 217070ec5ee3fabfe6ecfe6644dfcb03d764de43 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Mar 2024 07:24:38 +0000 Subject: [PATCH 407/652] Update dependencies from https://github.com/dotnet/sdk build 20240328.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24178.25 -> To Version 8.0.300-preview.24178.29 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.10.0-preview-24170-01 -> To Version 17.10.0-release-24177-07 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf62d2321ae1..db9c688396c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 59d899b815d4cd518ee328f05aea0d61a2bed711 + 692aff4f922bdd90b221b7678ae2118c571605ff - + https://github.com/dotnet/sdk - 59d899b815d4cd518ee328f05aea0d61a2bed711 + 692aff4f922bdd90b221b7678ae2118c571605ff - + https://github.com/dotnet/sdk - 59d899b815d4cd518ee328f05aea0d61a2bed711 + 692aff4f922bdd90b221b7678ae2118c571605ff - + https://github.com/dotnet/sdk - 59d899b815d4cd518ee328f05aea0d61a2bed711 + 692aff4f922bdd90b221b7678ae2118c571605ff https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ 4a394198efadc455334ae272954ece372aea4de2 - + https://github.com/microsoft/vstest - 6957756d70d6ade74e239a38ad709db5cb39fe0d + 1cd0d8998250d36c95ed65a76304ef5d1b33e98f @@ -155,9 +155,9 @@ 70c173446a3b354fb586e51301fc79aa809fafb4 - + https://github.com/dotnet/msbuild - 6064d9c8fe7beb06ffc10f8ff27ce967039a2c0d + 1e513b346acdf40dd2586a463e38f89fa72a69e9 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index aa8f46a5b90e..c67e7aaff3a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24178.25 - 8.0.300-preview.24178.25 - 8.0.300-preview.24178.25 + 8.0.300-preview.24178.29 + 8.0.300-preview.24178.29 + 8.0.300-preview.24178.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-preview-24170-01 + 17.10.0-release-24177-07 8.0.0-alpha.1.22557.12 From 4029b565718d10d134181e9c2569bd0017a047e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 29 Mar 2024 08:41:28 +0000 Subject: [PATCH 408/652] Update dependencies from https://github.com/dotnet/sdk build 20240329.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24178.25 -> To Version 8.0.300-preview.24179.2 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Build From Version 17.10.0-preview-24170-01 -> To Version 17.10.0-release-24177-07 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db9c688396c4..52ffe21dcf91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 692aff4f922bdd90b221b7678ae2118c571605ff + 68118be2a4bca991bf02d7896d296229fee2076d - + https://github.com/dotnet/sdk - 692aff4f922bdd90b221b7678ae2118c571605ff + 68118be2a4bca991bf02d7896d296229fee2076d - + https://github.com/dotnet/sdk - 692aff4f922bdd90b221b7678ae2118c571605ff + 68118be2a4bca991bf02d7896d296229fee2076d - + https://github.com/dotnet/sdk - 692aff4f922bdd90b221b7678ae2118c571605ff + 68118be2a4bca991bf02d7896d296229fee2076d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c67e7aaff3a8..cdb2f480cdc4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24178.29 - 8.0.300-preview.24178.29 - 8.0.300-preview.24178.29 + 8.0.300-preview.24179.2 + 8.0.300-preview.24179.2 + 8.0.300-preview.24179.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 87f8986ea8389437e6f6a0bed91231155bebf1d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 06:21:56 +0000 Subject: [PATCH 409/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19241) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.11.0-1.24177.10 to 4.10.0-3.24179.15 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.11.0-preview-24178-07 to 17.10.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 1 + eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1b9167e7c3a7..5286a1cc54d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,6 +15,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 52ffe21dcf91..6c48285c2b21 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 68118be2a4bca991bf02d7896d296229fee2076d + 53a5c8429c688cb6295d7754360831af755dfc05 - + https://github.com/dotnet/sdk - 68118be2a4bca991bf02d7896d296229fee2076d + 53a5c8429c688cb6295d7754360831af755dfc05 - + https://github.com/dotnet/sdk - 68118be2a4bca991bf02d7896d296229fee2076d + 53a5c8429c688cb6295d7754360831af755dfc05 - + https://github.com/dotnet/sdk - 68118be2a4bca991bf02d7896d296229fee2076d + 53a5c8429c688cb6295d7754360831af755dfc05 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 70c173446a3b354fb586e51301fc79aa809fafb4 + 3d8fee7fc84f6488f053bdc9ab7717b6822a8166 - + https://github.com/dotnet/msbuild - 1e513b346acdf40dd2586a463e38f89fa72a69e9 + 4f6b1bb283f7418cc8c342d9f91aabb428357715 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index cdb2f480cdc4..5aa485820cfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24179.2 - 8.0.300-preview.24179.2 - 8.0.300-preview.24179.2 + 8.0.300-preview.24201.10 + 8.0.300-preview.24201.10 + 8.0.300-preview.24201.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.11.0-1.24177.10 + 4.10.0-3.24179.15 From a07c61f6c83b62d2b326aea4722bcb26a135dbb1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:56:05 -0700 Subject: [PATCH 410/652] Update branding to 8.0.205 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index bc4ec5c75b71..56b8d4bd4e7b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 2 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 75fa53133edb56be50bf80e473fb60b2d990e799 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 21:43:50 +0000 Subject: [PATCH 411/652] [release/8.0.2xx] Update dependencies from dotnet/arcade (#19255) [release/8.0.2xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/native/init-compiler.sh | 2 +- eng/common/templates-official/job/job.yml | 3 ++- eng/common/templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/publish-build-assets.yml | 4 ++-- eng/common/templates-official/job/source-build.yml | 2 +- .../templates-official/job/source-index-stage1.yml | 2 +- .../templates-official/post-build/post-build.yml | 10 +++++----- .../templates-official/variables/pool-providers.yml | 2 +- global.json | 4 ++-- 11 files changed, 23 insertions(+), 22 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bea9b2c4d77c..98359c2ea216 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + fc2b7849b25c4a21457feb6da5fc7c9806a80976 - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + fc2b7849b25c4a21457feb6da5fc7c9806a80976 - + https://github.com/dotnet/arcade - f311667e0587f19c3fa9553a909975662107a351 + fc2b7849b25c4a21457feb6da5fc7c9806a80976 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 56b8d4bd4e7b..488ae9347785 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24165.4 + 8.0.0-beta.24179.4 diff --git a/eng/common/native/init-compiler.sh b/eng/common/native/init-compiler.sh index f5c1ec7eafeb..2d5660642b8d 100644 --- a/eng/common/native/init-compiler.sh +++ b/eng/common/native/init-compiler.sh @@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then # Set default versions if [ -z "$majorVersion" ]; then # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. - if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" + if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi for version in $versions; do diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index a2709d10562c..1f035fee73f4 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/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) @@ -136,6 +136,7 @@ jobs: feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json env: TeamName: $(_TeamName) + MicroBuildOutputFolderOverride: '$(Agent.TempDirectory)' continueOnError: ${{ parameters.continueOnError }} condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index ba9ba4930329..52b4d05d3f8d 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 53138622fe7a..589ac80a18b7 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -60,8 +60,8 @@ jobs: os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 8aba3b44bb25..f193dfbe2366 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 4b6337391708..f0513aee5b0d 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -33,7 +33,7 @@ jobs: demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: windows.vs2022.amd64 os: windows steps: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 5c98fe1c0f3a..da1f40958b45 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -261,8 +261,8 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bfba0..1f308b24efc4 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index b967bd08e9e1..31d5f24b1937 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.24165.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24165.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24179.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24179.4" } } From 6fe25df28726a7c8600c4e4152dd740c1023fa41 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Tue, 2 Apr 2024 15:07:34 -0700 Subject: [PATCH 412/652] [8.0.2xx] Migrate to 1ES templates for internal builds (#19129) --- .vsts-ci.yml | 659 +++++++++++++++++++++++++---------------------- .vsts-pr.yml | 56 ++-- eng/build-pr.yml | 261 +++++++++++++++++++ eng/build.yml | 38 +-- 4 files changed, 655 insertions(+), 359 deletions(-) create mode 100644 eng/build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d14d1293e29d..e94f2b8560dc 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -1,3 +1,5 @@ +# Pipeline: https://dnceng.visualstudio.com/internal/_build?definitionId=286 + trigger: batch: true branches: @@ -23,339 +25,366 @@ variables: - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - - name: _InternalRuntimeDownloadArgs value: '' - - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) /p:dotnetbuilds-internal-container-read-token-base64=$(dotnetbuilds-internal-container-read-token-base64) - - template: /eng/common/templates/variables/pool-providers.yml +# Set the MicroBuild plugin installation directory to the agent temp directory to avoid SDL tool scanning. +- name: MicroBuildOutputFolderOverride + value: $(Agent.TempDirectory) -stages: -- stage: Build - jobs: - # This job is for build retry configuration. - - job: Publish_Build_Configuration - pool: - ${{ if eq(variables['System.TeamProject'], 'public') }}: - name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64.open - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022preview.amd64 - steps: - - publish: $(Build.SourcesDirectory)\eng\buildConfiguration - artifact: buildConfiguration - displayName: Publish Build Config - - ## PR-only jobs - - - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: - - ## Windows - - - template: eng/build.yml - parameters: - agentOs: Windows_NT - jobName: Build_Debug_x64 - buildConfiguration: Debug - buildArchitecture: x64 - additionalBuildParameters: '/p:PublishInternalAsset=true' - runTests: true - - ## Linux - - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Ubuntu_22_04_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04' - buildConfiguration: Debug - buildArchitecture: x64 - linuxPortable: true - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Fedora_36_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36' - buildConfiguration: Debug - buildArchitecture: x64 - linuxPortable: true - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_CentOS_8_Stream_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8' - buildConfiguration: Debug - buildArchitecture: x64 - linuxPortable: false - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Debian_Stretch_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch' - buildConfiguration: Debug - buildArchitecture: x64 - additionalBuildParameters: '/p:BuildSdkDeb=true' - linuxPortable: false - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Arm64_Debug - buildConfiguration: Debug - buildArchitecture: arm64 - runtimeIdentifier: 'linux-arm64' - linuxPortable: true - # Never run tests on arm64 - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_musl_Debug_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' - buildConfiguration: Debug - buildArchitecture: x64 - runtimeIdentifier: 'linux-musl-x64' - # Pass in HostOSName when running on alpine - additionalBuildParameters: '/p:HostOSName="linux-musl"' - linuxPortable: false - runTests: true - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_LinuxPortable_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - linuxPortable: true - runTests: true - - # MacOS - - - template: eng/build.yml - parameters: - agentOs: Darwin - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - runTests: true +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release - ## Official/PGO instrumentation Builds - - - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ## Windows - - - template: eng/build.yml - parameters: - agentOs: Windows_NT - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - additionalBuildParameters: '/p:PublishInternalAsset=true' - runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - jobName: Build_Release_x86 - buildConfiguration: Release - buildArchitecture: x86 - runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - runTests: false - - ## Linux +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + parameters: + containers: + alpine315WithNode: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode + cblMariner20Fpm: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm + centosStream8: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:centos-stream8 + debianStretch: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:debian-stretch + fedora36: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-36 + ubuntu2204: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 + ubuntu1804Cross: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross + ubuntu2204DebPkg: + image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg + sdl: + sourceAnalysisPool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + stages: + - stage: Build + jobs: + # Build Retry Configuration + - job: Publish_Build_Configuration + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + image: 1es-windows-2022-open + os: windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\buildConfiguration + artifactName: buildConfiguration - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Arm_Release - buildConfiguration: Release - buildArchitecture: arm - runtimeIdentifier: 'linux-arm' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Arm64_Release - buildConfiguration: Release - buildArchitecture: arm64 - runtimeIdentifier: 'linux-arm64' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-cross' - buildConfiguration: Release - buildArchitecture: arm - runtimeIdentifier: 'linux-musl-arm' - additionalBuildParameters: '/p:OSName="linux-musl"' - linuxPortable: false - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_musl_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - runtimeIdentifier: 'linux-musl-arm64' - additionalBuildParameters: '/p:OSName="linux-musl"' - linuxPortable: false - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_musl_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.15-WithNode' - buildConfiguration: Release - buildArchitecture: x64 - runtimeIdentifier: 'linux-musl-x64' - # Pass in HostOSName when running on alpine - additionalBuildParameters: '/p:HostOSName="linux-musl"' - linuxPortable: false - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_Portable_Deb_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg' - buildConfiguration: Release - buildArchitecture: x64 - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_Portable_Rpm_Release_x64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' - buildConfiguration: Release - buildArchitecture: x64 - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_Linux_Portable_Rpm_Release_Arm64 - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-fpm' - buildConfiguration: Release - buildArchitecture: arm64 - runtimeIdentifier: 'linux-arm64' - # Do not publish zips and tarballs. The linux-x64 binaries are - # already published by Build_LinuxPortable_Release_x64 - additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' - linuxPortable: true - runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - jobName: Build_LinuxPortable_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - linuxPortable: true - runTests: false + # PR-only jobs + - ${{ if or(eq(variables['System.TeamProject'], 'public'), in(variables['Build.Reason'], 'PullRequest')) }}: + # Windows + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Debug_x64 + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: true - # MacOS + # Linux + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Ubuntu_22_04_Debug_x64 + container: ubuntu2204 + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Fedora_36_Debug_x64 + container: fedora36 + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: true + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_CentOS_8_Stream_Debug_x64 + container: centosStream8 + buildConfiguration: Debug + buildArchitecture: x64 + linuxPortable: false + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Debian_Stretch_Debug_x64 + container: debianStretch + buildConfiguration: Debug + buildArchitecture: x64 + additionalBuildParameters: '/p:BuildSdkDeb=true' + linuxPortable: false + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Arm64_Debug + buildConfiguration: Debug + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + # Never run tests on arm64 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Debug_x64 + container: alpine315WithNode + buildConfiguration: Debug + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: true + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: true - - template: eng/build.yml - parameters: - agentOs: Darwin - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - runTests: false - - template: eng/build.yml - parameters: - agentOs: Darwin - jobName: Build_Release_arm64 - runtimeIdentifier: 'osx-arm64' - buildConfiguration: Release - buildArchitecture: arm64 - runTests: false + # MacOS + - template: eng/build.yml@self + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: true - ## Windows PGO Instrumentation builds + # Official/PGO instrumentation Builds + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + # Windows + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - additionalBuildParameters: '/p:PublishInternalAsset=true' - runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_x86 - buildConfiguration: Release - buildArchitecture: x86 - runTests: false - - template: eng/build.yml - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - runTests: false + # Linux + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Arm_Release + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-arm' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Arm64_Release + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm + container: ubuntu1804Cross + buildConfiguration: Release + buildArchitecture: arm + runtimeIdentifier: 'linux-musl-arm' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-musl-arm64' + additionalBuildParameters: '/p:OSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_musl_Release_x64 + container: alpine315WithNode + buildConfiguration: Release + buildArchitecture: x64 + runtimeIdentifier: 'linux-musl-x64' + # Pass in HostOSName when running on alpine + additionalBuildParameters: '/p:HostOSName="linux-musl"' + linuxPortable: false + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Deb_Release_x64 + container: ubuntu2204DebPkg + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_x64 + container: cblMariner20Fpm + buildConfiguration: Release + buildArchitecture: x64 + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_Linux_Portable_Rpm_Release_Arm64 + container: cblMariner20Fpm + buildConfiguration: Release + buildArchitecture: arm64 + runtimeIdentifier: 'linux-arm64' + # Do not publish zips and tarballs. The linux-x64 binaries are + # already published by Build_LinuxPortable_Release_x64 + additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false - ## Linux PGO Instrumentation builds + # MacOS + - template: eng/build.yml@self + parameters: + agentOs: Darwin + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Darwin + jobName: Build_Release_arm64 + runtimeIdentifier: 'osx-arm64' + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - pgoInstrument: true - jobName: Build_LinuxPortable_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - linuxPortable: true - runTests: false + # Windows PGO Instrumentation builds + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + additionalBuildParameters: '/p:PublishInternalAsset=true' + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_x86 + buildConfiguration: Release + buildArchitecture: x86 + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Windows_NT + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + runTests: false - - template: eng/build.yml - parameters: - agentOs: Linux - pgoInstrument: true - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - linuxPortable: true - runTests: false + # Linux PGO Instrumentation builds + - template: eng/build.yml@self + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_LinuxPortable_Release_x64 + buildConfiguration: Release + buildArchitecture: x64 + linuxPortable: true + runTests: false + - template: eng/build.yml@self + parameters: + agentOs: Linux + pgoInstrument: true + jobName: Build_Release_arm64 + buildConfiguration: Release + buildArchitecture: arm64 + linuxPortable: true + runTests: false - - template: /eng/common/templates/jobs/source-build.yml + # Source Build + - template: /eng/common/templates-official/jobs/source-build.yml@self -- ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - stage: Publish - dependsOn: - - Build - jobs: - - template: /eng/common/templates/job/publish-build-assets.yml - parameters: - publishUsingPipelines: true - publishAssetsImmediately: true - pool: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - stage: Publish + dependsOn: + - Build + jobs: + - template: /eng/common/templates-official/job/publish-build-assets.yml@self + parameters: + publishUsingPipelines: true + publishAssetsImmediately: true + pool: + name: $(DncEngInternalBuildPool) + image: 1es-windows-2022 + os: windows diff --git a/.vsts-pr.yml b/.vsts-pr.yml index d14d1293e29d..f5c697babe36 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -59,7 +59,7 @@ stages: ## Windows - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Debug_x64 @@ -70,7 +70,7 @@ stages: ## Linux - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Ubuntu_22_04_Debug_x64 @@ -79,7 +79,7 @@ stages: buildArchitecture: x64 linuxPortable: true runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Fedora_36_Debug_x64 @@ -88,7 +88,7 @@ stages: buildArchitecture: x64 linuxPortable: true runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_CentOS_8_Stream_Debug_x64 @@ -97,7 +97,7 @@ stages: buildArchitecture: x64 linuxPortable: false runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Debian_Stretch_Debug_x64 @@ -107,7 +107,7 @@ stages: additionalBuildParameters: '/p:BuildSdkDeb=true' linuxPortable: false runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Arm64_Debug @@ -117,7 +117,7 @@ stages: linuxPortable: true # Never run tests on arm64 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Debug_x64 @@ -129,7 +129,7 @@ stages: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: true - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_LinuxPortable_Release_x64 @@ -140,7 +140,7 @@ stages: # MacOS - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Darwin jobName: Build_Release_x64 @@ -154,7 +154,7 @@ stages: ## Windows - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Release_x64 @@ -162,14 +162,14 @@ stages: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Release_x86 buildConfiguration: Release buildArchitecture: x86 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT jobName: Build_Release_arm64 @@ -179,7 +179,7 @@ stages: ## Linux - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Arm_Release @@ -188,7 +188,7 @@ stages: runtimeIdentifier: 'linux-arm' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Arm64_Release @@ -197,7 +197,7 @@ stages: runtimeIdentifier: 'linux-arm64' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm @@ -208,7 +208,7 @@ stages: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm64 @@ -218,7 +218,7 @@ stages: additionalBuildParameters: '/p:OSName="linux-musl"' linuxPortable: false runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_musl_Release_x64 @@ -230,7 +230,7 @@ stages: additionalBuildParameters: '/p:HostOSName="linux-musl"' linuxPortable: false runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Deb_Release_x64 @@ -242,7 +242,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:BuildSdkDeb=true' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_x64 @@ -254,7 +254,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_Linux_Portable_Rpm_Release_Arm64 @@ -267,7 +267,7 @@ stages: additionalBuildParameters: '/p:PublishBinariesAndBadge=false /p:CLIBUILD_SKIP_TESTS=true /p:IsRPMBasedDistro=true' linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux jobName: Build_LinuxPortable_Release_x64 @@ -278,14 +278,14 @@ stages: # MacOS - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Darwin jobName: Build_Release_x64 buildConfiguration: Release buildArchitecture: x64 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Darwin jobName: Build_Release_arm64 @@ -296,7 +296,7 @@ stages: ## Windows PGO Instrumentation builds - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -305,7 +305,7 @@ stages: buildArchitecture: x64 additionalBuildParameters: '/p:PublishInternalAsset=true' runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -313,7 +313,7 @@ stages: buildConfiguration: Release buildArchitecture: x86 runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Windows_NT pgoInstrument: true @@ -324,7 +324,7 @@ stages: ## Linux PGO Instrumentation builds - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux pgoInstrument: true @@ -334,7 +334,7 @@ stages: linuxPortable: true runTests: false - - template: eng/build.yml + - template: eng/build-pr.yml parameters: agentOs: Linux pgoInstrument: true diff --git a/eng/build-pr.yml b/eng/build-pr.yml new file mode 100644 index 000000000000..831d96781f0a --- /dev/null +++ b/eng/build-pr.yml @@ -0,0 +1,261 @@ +parameters: +# Agent OS identifier and used as job name +- name: agentOs + type: string + +# Job name +- name: jobName + type: string + +# Container to run the build in, if any +- name: container + type: string + default: '' + +# Job timeout +- name: timeoutInMinutes + type: number + default: 180 + +# Build configuration (Debug, Release) +- name: buildConfiguration + type: string + values: + - Debug + - Release + +# Build architecture +- name: buildArchitecture + type: string + values: + - arm + - arm64 + - x64 + - x86 + +# Linux portable. If true, passes portable switch to build +- name: linuxPortable + type: boolean + default: false + +# Runtime Identifier +- name: runtimeIdentifier + type: string + default: '' + +# UI lang +- name: dotnetCLIUILanguage + type: string + default: '' + +# Additional parameters +- name: additionalBuildParameters + type: string + default: '' + +# Run tests +- name: runTests + type: boolean + default: true + +# PGO instrumentation jobs +- name: pgoInstrument + type: boolean + default: false + +- name: isBuiltFromVmr + displayName: True when build is running from dotnet/dotnet + type: boolean + default: false + +jobs: +- template: common/templates/job/job.yml + parameters: + # Set up the name of the job. + ${{ if parameters.pgoInstrument }}: + name: PGO_${{ parameters.agentOs }}_${{ parameters.jobName }} + ${{ if not(parameters.pgoInstrument) }}: + name: ${{ parameters.agentOs }}_${{ parameters.jobName }} + + # Set up the pool/machine info to be used based on the Agent OS + ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + enableMicrobuild: true + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64.open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals windows.vs2019.amd64 + ${{ if eq(parameters.agentOs, 'Linux') }}: + pool: + ${{ if eq(variables['System.TeamProject'], 'public') }}: + name: $(DncEngPublicBuildPool) + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: $(DncEngInternalBuildPool) + demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + container: ${{ parameters.container }} + ${{ if eq(parameters.agentOs, 'Darwin') }}: + pool: + vmImage: 'macOS-latest' + + timeoutInMinutes: ${{ parameters.timeoutInMinutes }} + ${{ if parameters.isBuiltFromVmr }}: + enableSbom: false + ${{ else }}: + enablePublishBuildAssets: true + enablePublishUsingPipelines: true + enableTelemetry: true + helixRepo: dotnet/installer + workspace: + clean: all + + variables: + # Test variables + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '-pack' + - ${{ if parameters.runTests }}: + - _TestArg: '-test' + - ${{ else }}: + - _TestArg: '' + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - _PackArg: '--pack' + - ${{ if parameters.runTests }}: + - _TestArg: '--test' + - ${{ else }}: + - _TestArg: '' + + - ${{ if parameters.pgoInstrument }}: + - _PgoInstrument: '/p:PgoInstrument=true' + - _PackArg: '' + - ${{ else }}: + - _PgoInstrument: '' + + - ${{ if parameters.linuxPortable }}: + - _LinuxPortable: '--linux-portable' + - ${{ else }}: + - _LinuxPortable: '' + + - ${{ if ne(parameters.runtimeIdentifier, '') }}: + - _RuntimeIdentifier: '--runtime-id ${{ parameters.runtimeIdentifier }}' + - ${{ else }}: + - _RuntimeIdentifier: '' + + - _AgentOSName: ${{ parameters.agentOs }} + - _TeamName: Roslyn-Project-System + - _SignType: test + - _BuildArgs: '/p:DotNetSignType=$(_SignType) $(_PgoInstrument)' + + - ${{ if parameters.isBuiltFromVmr }}: + - installerRoot: '$(Build.SourcesDirectory)/src/installer' + - _SignType: test + - _PushToVSFeed: false + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=true + /p:PublishToSymbolServer=false + $(_PgoInstrument) + - ${{ else }}: + - installerRoot: '$(Build.SourcesDirectory)' + - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: + - group: DotNet-HelixApi-Access + - _PushToVSFeed: true + - _SignType: real + - _BuildArgs: /p:OfficialBuildId=$(BUILD.BUILDNUMBER) + /p:DotNetSignType=$(_SignType) + /p:TeamName=$(_TeamName) + /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) + $(_PgoInstrument) + + - template: /eng/common/templates/variables/pool-providers.yml + + steps: + - checkout: self + clean: true + - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: + - task: PowerShell@2 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerRoot)/eng/common/SetupNugetSources.ps1 + arguments: -ConfigFile $(installerRoot)/NuGet.config -Password $Env:Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - script: $(installerRoot)/build.cmd + $(_TestArg) $(_PackArg) + -publish -ci -sign + -Configuration ${{ parameters.buildConfiguration }} + -Architecture ${{ parameters.buildArchitecture }} + $(_BuildArgs) + ${{ parameters.additionalBuildParameters }} + $(_InternalRuntimeDownloadArgs) + displayName: Build + env: + DOTNET_CLI_UI_LANGUAGE: ${{ parameters.dotnetCLIUILanguage }} + + - ${{ if ne(parameters.agentOs, 'Windows_NT') }}: + - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: + - task: Bash@3 + displayName: Setup Private Feeds Credentials + inputs: + filePath: $(installerRoot)/eng/common/SetupNugetSources.sh + arguments: $(installerRoot)/NuGet.config $Token + env: + Token: $(dn-bot-dnceng-artifact-feeds-rw) + - ${{ if eq(parameters.agentOs, 'Linux') }}: + - script: $(installerRoot)/build.sh + $(_TestArg) $(_PackArg) + --publish --ci + --noprettyprint + --configuration ${{ parameters.buildConfiguration }} + --architecture ${{ parameters.buildArchitecture }} + $(_LinuxPortable) + $(_RuntimeIdentifier) + $(_BuildArgs) + ${{ parameters.additionalBuildParameters }} + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - ${{ if or(eq(parameters.agentOs, 'Darwin'), eq(parameters.agentOs, 'FreeBSD')) }}: + - script: $(installerRoot)/build.sh + $(_TestArg) + --pack --publish --ci + --noprettyprint + --configuration ${{ parameters.buildConfiguration }} + --architecture ${{ parameters.buildArchitecture }} + $(_RuntimeIdentifier) + $(_BuildArgs) + ${{ parameters.additionalBuildParameters }} + $(_InternalRuntimeDownloadArgs) + displayName: Build + + - task: PublishTestResults@2 + displayName: Publish Test Results + inputs: + testRunner: XUnit + testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml' + testRunTitle: '$(_AgentOSName)_$(Agent.JobName)' + platform: '$(BuildPlatform)' + configuration: '${{ parameters.buildConfiguration }}' + condition: ne(variables['_TestArg'], '') + + - task: CopyFiles@2 + displayName: Gather Logs + inputs: + SourceFolder: '$(installerRoot)/artifacts' + Contents: | + log/${{ parameters.buildConfiguration }}/**/* + TestResults/${{ parameters.buildConfiguration }}/**/* + TargetFolder: '$(Build.ArtifactStagingDirectory)' + continueOnError: true + condition: always() + + - task: PublishBuildArtifacts@1 + displayName: Publish Logs to VSTS + inputs: + PathtoPublish: '$(Build.ArtifactStagingDirectory)' + ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)' + publishLocation: Container + continueOnError: true + condition: always() diff --git a/eng/build.yml b/eng/build.yml index ea389797cc3e..4f947ea8f7ea 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -1,9 +1,9 @@ parameters: - # Agent OS identifier and used as job name +# Agent OS identifier and used as job name - name: agentOs type: string - # Job name +# Job name - name: jobName type: string @@ -12,7 +12,7 @@ parameters: type: string default: '' - # Job timeout +# Job timeout - name: timeoutInMinutes type: number default: 180 @@ -69,36 +69,42 @@ parameters: default: false jobs: -- template: common/templates/job/job.yml +- template: common/templates-official/job/job.yml parameters: # Set up the name of the job. ${{ if parameters.pgoInstrument }}: name: PGO_${{ parameters.agentOs }}_${{ parameters.jobName }} ${{ if not(parameters.pgoInstrument) }}: name: ${{ parameters.agentOs }}_${{ parameters.jobName }} - - ## Set up the pool/machine info to be used based on the Agent OS + + # Set up the pool/machine info to be used based on the Agent OS ${{ if eq(parameters.agentOs, 'Windows_NT') }}: enableMicrobuild: true pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open + image: 1es-windows-2019-open + os: windows ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + image: 1es-windows-2019 + os: windows ${{ if eq(parameters.agentOs, 'Linux') }}: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64.Open + image: 1es-ubuntu-2004-open + os: linux ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-ubuntu-2004 + os: linux container: ${{ parameters.container }} ${{ if eq(parameters.agentOs, 'Darwin') }}: pool: - vmImage: 'macOS-latest' + name: Azure Pipelines + image: macOS-latest + os: macOS timeoutInMinutes: ${{ parameters.timeoutInMinutes }} ${{ if parameters.isBuiltFromVmr }}: @@ -111,8 +117,8 @@ jobs: workspace: clean: all -# Test parameters variables: + # Test variables - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - _PackArg: '-pack' - ${{ if parameters.runTests }}: @@ -168,7 +174,7 @@ jobs: /p:DotNetPublishUsingPipelines=$(_PublishUsingPipelines) $(_PgoInstrument) - - template: /eng/common/templates/variables/pool-providers.yml + - template: /eng/common/templates-official/variables/pool-providers.yml steps: - checkout: self @@ -245,13 +251,13 @@ jobs: inputs: SourceFolder: '$(installerRoot)/artifacts' Contents: | - log/${{ parameters.buildConfiguration }}/**/* - TestResults/${{ parameters.buildConfiguration }}/**/* + log/${{ parameters.buildConfiguration }}/**/* + TestResults/${{ parameters.buildConfiguration }}/**/* TargetFolder: '$(Build.ArtifactStagingDirectory)' continueOnError: true condition: always() - - task: PublishBuildArtifacts@1 + - task: 1ES.PublishBuildArtifacts@1 displayName: Publish Logs to VSTS inputs: PathtoPublish: '$(Build.ArtifactStagingDirectory)' From 0fbd1cb569f27dea30f56ca72dc09752622e6240 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 2 Apr 2024 15:10:45 -0700 Subject: [PATCH 413/652] Make SDK previews be in the preview.0 band (#19231) --- eng/Versions.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 5aa485820cfc..e54b5c65c8be 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,7 @@ preview rtm servicing - - + 0 30 From 1867bf2b1eabe57a1c3d6ce6f498be2412c6b82e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 3 Apr 2024 09:29:11 -0700 Subject: [PATCH 414/652] Revert "Make SDK previews be in the preview.0 band (#19231)" This reverts commit 0fbd1cb569f27dea30f56ca72dc09752622e6240. --- eng/Versions.props | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e54b5c65c8be..5aa485820cfc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,8 @@ preview rtm servicing - 0 + + 30 From 4431f0f31a7fc39cd86cbbf389b335750833a150 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 3 Apr 2024 17:21:21 +0000 Subject: [PATCH 415/652] Update dependencies from https://github.com/dotnet/sdk build 20240403.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24201.10 -> To Version 8.0.300-preview.24203.4 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24179.15 -> To Version 4.10.0-3.24202.15 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c48285c2b21..1bef8fbfa2d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 53a5c8429c688cb6295d7754360831af755dfc05 + 3f731f29b0cc7f1b98239b12ae9ed0c3de2ac5f0 - + https://github.com/dotnet/sdk - 53a5c8429c688cb6295d7754360831af755dfc05 + 3f731f29b0cc7f1b98239b12ae9ed0c3de2ac5f0 - + https://github.com/dotnet/sdk - 53a5c8429c688cb6295d7754360831af755dfc05 + 3f731f29b0cc7f1b98239b12ae9ed0c3de2ac5f0 - + https://github.com/dotnet/sdk - 53a5c8429c688cb6295d7754360831af755dfc05 + 3f731f29b0cc7f1b98239b12ae9ed0c3de2ac5f0 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 3d8fee7fc84f6488f053bdc9ab7717b6822a8166 + cbca41cad4e21c29548e9e57d7135740b6f78df9 diff --git a/eng/Versions.props b/eng/Versions.props index e54b5c65c8be..8ddcba5304ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.300-preview.24201.10 - 8.0.300-preview.24201.10 - 8.0.300-preview.24201.10 + 8.0.300-preview.24203.4 + 8.0.300-preview.24203.4 + 8.0.300-preview.24203.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24179.15 + 4.10.0-3.24202.15 From 5c62ec0c753e0e7882cff6f9eaaa6346765f7e38 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 3 Apr 2024 11:09:14 -0700 Subject: [PATCH 416/652] Revert "Revert "Make SDK previews be in the preview.0 band"" --- eng/Versions.props | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1edec14de86a..8ddcba5304ed 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,8 +19,7 @@ preview rtm servicing - - + 0 30 From 59a6429e2b0a0ceb20b49c52d270e1b4234efd40 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 20:18:08 +0000 Subject: [PATCH 417/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19289) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 8d5f9e516e3a..d7a01284eb17 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24177.1", + "version": "1.1.0-beta.24204.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1bef8fbfa2d9..bd881e5b64cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade b17b2a1bb7da23253043dee059f374b00f3e321a - + https://github.com/dotnet/arcade-services - 14f50f9823318da5868f614dae868278165718d8 + 247a84fbea23b9b3b5750c657fead727cd4c910c - + https://github.com/dotnet/arcade-services - 14f50f9823318da5868f614dae868278165718d8 + 247a84fbea23b9b3b5750c657fead727cd4c910c https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 1edec14de86a..5cbd9e4f3e3b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24177.1 + 1.1.0-beta.24204.2 From 3ffc4ae4f8ee8089e9c765c5b15d52e10aca2ee0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 20:18:29 +0000 Subject: [PATCH 418/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19306) [release/8.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd881e5b64cc..cb91aca54f33 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 3f731f29b0cc7f1b98239b12ae9ed0c3de2ac5f0 + ef92a8a370bcd7a20cdc6cbeb9c96036900f327a - + https://github.com/dotnet/sdk - 3f731f29b0cc7f1b98239b12ae9ed0c3de2ac5f0 + ef92a8a370bcd7a20cdc6cbeb9c96036900f327a - + https://github.com/dotnet/sdk - 3f731f29b0cc7f1b98239b12ae9ed0c3de2ac5f0 + ef92a8a370bcd7a20cdc6cbeb9c96036900f327a - + https://github.com/dotnet/sdk - 3f731f29b0cc7f1b98239b12ae9ed0c3de2ac5f0 + ef92a8a370bcd7a20cdc6cbeb9c96036900f327a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5cbd9e4f3e3b..a28d5539ff94 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24203.4 - 8.0.300-preview.24203.4 - 8.0.300-preview.24203.4 + 8.0.300-preview.24204.1 + 8.0.300-preview.24204.1 + 8.0.300-preview.24204.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 19ca959a4270a80a1f28f34ed63c3f2290c50364 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 4 Apr 2024 20:22:42 +0000 Subject: [PATCH 419/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19247) [release/8.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates-official/job/onelocbuild.yml | 2 +- .../templates-official/job/publish-build-assets.yml | 4 ++-- eng/common/templates-official/job/source-build.yml | 2 +- .../templates-official/job/source-index-stage1.yml | 2 +- .../templates-official/post-build/post-build.yml | 10 +++++----- .../templates-official/variables/pool-providers.yml | 2 +- global.json | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cb91aca54f33..b4675ec6dfb8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - b17b2a1bb7da23253043dee059f374b00f3e321a + fc2b7849b25c4a21457feb6da5fc7c9806a80976 - + https://github.com/dotnet/arcade - b17b2a1bb7da23253043dee059f374b00f3e321a + fc2b7849b25c4a21457feb6da5fc7c9806a80976 - + https://github.com/dotnet/arcade - b17b2a1bb7da23253043dee059f374b00f3e321a + fc2b7849b25c4a21457feb6da5fc7c9806a80976 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index a28d5539ff94..670c484ead55 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24177.1 + 8.0.0-beta.24179.4 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index ba9ba4930329..52b4d05d3f8d 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 53138622fe7a..589ac80a18b7 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -60,8 +60,8 @@ jobs: os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 8aba3b44bb25..f193dfbe2366 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 4b6337391708..f0513aee5b0d 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -33,7 +33,7 @@ jobs: demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: windows.vs2022.amd64 os: windows steps: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 5c98fe1c0f3a..da1f40958b45 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -261,8 +261,8 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bfba0..1f308b24efc4 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index 8fc73666be2f..31d5f24b1937 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.24177.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24177.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24179.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24179.4" } } From 75078fe216d3a2bbca1ae336e43562e54577309c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 20:14:06 +0000 Subject: [PATCH 420/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19323) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index d7a01284eb17..198bb44b2e41 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24204.2", + "version": "1.1.0-beta.24205.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b4675ec6dfb8..1445dbbbda47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade fc2b7849b25c4a21457feb6da5fc7c9806a80976 - + https://github.com/dotnet/arcade-services - 247a84fbea23b9b3b5750c657fead727cd4c910c + 196a30e0e90a80f5ea37259969b6c64885b6176b - + https://github.com/dotnet/arcade-services - 247a84fbea23b9b3b5750c657fead727cd4c910c + 196a30e0e90a80f5ea37259969b6c64885b6176b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 670c484ead55..4a66cd8db35f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24204.2 + 1.1.0-beta.24205.1 From a8d47efde2fc7acfb4af1e64bb64fdbda7cc3c06 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 20:17:17 +0000 Subject: [PATCH 421/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19314) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.10.0 to 17.10.0 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5286a1cc54d0..06d25339bf9a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1445dbbbda47..b7388829e0de 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ef92a8a370bcd7a20cdc6cbeb9c96036900f327a + 54e3a1c1ee79611c144f283d79708cc7f92c2669 - + https://github.com/dotnet/sdk - ef92a8a370bcd7a20cdc6cbeb9c96036900f327a + 54e3a1c1ee79611c144f283d79708cc7f92c2669 - + https://github.com/dotnet/sdk - ef92a8a370bcd7a20cdc6cbeb9c96036900f327a + 54e3a1c1ee79611c144f283d79708cc7f92c2669 - + https://github.com/dotnet/sdk - ef92a8a370bcd7a20cdc6cbeb9c96036900f327a + 54e3a1c1ee79611c144f283d79708cc7f92c2669 https://github.com/dotnet/test-templates @@ -157,7 +157,7 @@ https://github.com/dotnet/msbuild - 4f6b1bb283f7418cc8c342d9f91aabb428357715 + dbf652edbedb4e6c612a79cc6907d211c74329d6 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 4a66cd8db35f..215a88580544 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24204.1 - 8.0.300-preview.24204.1 - 8.0.300-preview.24204.1 + 8.0.300-preview.24204.18 + 8.0.300-preview.24204.18 + 8.0.300-preview.24204.18 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 82bbe3df163d6b165031aeaaf6d31fa5801048bd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Apr 2024 21:52:38 +0000 Subject: [PATCH 422/652] Update dependencies from https://github.com/dotnet/sdk build 20240405.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24204.18 -> To Version 8.0.300-preview.24205.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.8.300-beta.24175.1 -> To Version 12.8.300-beta.24205.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7388829e0de..5a01350f6af8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 54e3a1c1ee79611c144f283d79708cc7f92c2669 + 73f55634ccad1ddfbb46ba8e62a7450992af9d2f - + https://github.com/dotnet/sdk - 54e3a1c1ee79611c144f283d79708cc7f92c2669 + 73f55634ccad1ddfbb46ba8e62a7450992af9d2f - + https://github.com/dotnet/sdk - 54e3a1c1ee79611c144f283d79708cc7f92c2669 + 73f55634ccad1ddfbb46ba8e62a7450992af9d2f - + https://github.com/dotnet/sdk - 54e3a1c1ee79611c144f283d79708cc7f92c2669 + 73f55634ccad1ddfbb46ba8e62a7450992af9d2f https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 4a394198efadc455334ae272954ece372aea4de2 + b2b9c946d36e8174c4a7d8e675d2c65f9f2a47c9 - + https://github.com/dotnet/fsharp - 4a394198efadc455334ae272954ece372aea4de2 + b2b9c946d36e8174c4a7d8e675d2c65f9f2a47c9 diff --git a/eng/Versions.props b/eng/Versions.props index 215a88580544..ff8827ebd858 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24204.18 - 8.0.300-preview.24204.18 - 8.0.300-preview.24204.18 + 8.0.300-preview.24205.5 + 8.0.300-preview.24205.5 + 8.0.300-preview.24205.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 721a2526d2ce8e319f3f9bc087b9837623cae68c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Apr 2024 13:05:41 +0000 Subject: [PATCH 423/652] Update dependencies from https://github.com/dotnet/arcade build 20240404.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24179.4 -> To Version 8.0.0-beta.24204.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../steps/component-governance.yml | 2 +- eng/common/templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b7388829e0de..846a21481e59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 215a88580544..19b7fd1f75a4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24179.4 + 8.0.0-beta.24204.3 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index 0ecec47b0c91..cbba0596709d 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index 0ecec47b0c91..cbba0596709d 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index 31d5f24b1937..f4af7d9ef540 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.24179.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24179.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24204.3" } } From c040f5a893ac17509aea5a44dfc5bb38215a49a2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Apr 2024 09:16:43 +0000 Subject: [PATCH 424/652] Update dependencies from https://github.com/dotnet/sdk build 20240407.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24205.5 -> To Version 8.0.300-preview.24207.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db46aadfd127..ae9d3552d24e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 73f55634ccad1ddfbb46ba8e62a7450992af9d2f + 8b594c7410879a9460e099cdca1d3cca6e71cd32 - + https://github.com/dotnet/sdk - 73f55634ccad1ddfbb46ba8e62a7450992af9d2f + 8b594c7410879a9460e099cdca1d3cca6e71cd32 - + https://github.com/dotnet/sdk - 73f55634ccad1ddfbb46ba8e62a7450992af9d2f + 8b594c7410879a9460e099cdca1d3cca6e71cd32 - + https://github.com/dotnet/sdk - 73f55634ccad1ddfbb46ba8e62a7450992af9d2f + 8b594c7410879a9460e099cdca1d3cca6e71cd32 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7798f75cf882..1d0abd074612 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24205.5 - 8.0.300-preview.24205.5 - 8.0.300-preview.24205.5 + 8.0.300-preview.24207.6 + 8.0.300-preview.24207.6 + 8.0.300-preview.24207.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 73a17cc827feb926951045f968e3feaa37a14ea9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Apr 2024 10:06:06 +0000 Subject: [PATCH 425/652] Update dependencies from https://github.com/dotnet/sdk build 20240407.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24205.5 -> To Version 8.0.300-preview.24207.7 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-release-24177-07 -> To Version 17.10.0-release-24203-04 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ae9d3552d24e..4e0540d22789 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 8b594c7410879a9460e099cdca1d3cca6e71cd32 + b0590605d5e9cbd4af52e6a90c6ff2d7a00695ca - + https://github.com/dotnet/sdk - 8b594c7410879a9460e099cdca1d3cca6e71cd32 + b0590605d5e9cbd4af52e6a90c6ff2d7a00695ca - + https://github.com/dotnet/sdk - 8b594c7410879a9460e099cdca1d3cca6e71cd32 + b0590605d5e9cbd4af52e6a90c6ff2d7a00695ca - + https://github.com/dotnet/sdk - 8b594c7410879a9460e099cdca1d3cca6e71cd32 + b0590605d5e9cbd4af52e6a90c6ff2d7a00695ca https://github.com/dotnet/test-templates @@ -141,9 +141,9 @@ b2b9c946d36e8174c4a7d8e675d2c65f9f2a47c9 - + https://github.com/microsoft/vstest - 1cd0d8998250d36c95ed65a76304ef5d1b33e98f + 56d28849af08dc3143d019694aa92f186b89d2ac diff --git a/eng/Versions.props b/eng/Versions.props index 1d0abd074612..95760156db14 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24207.6 - 8.0.300-preview.24207.6 - 8.0.300-preview.24207.6 + 8.0.300-preview.24207.7 + 8.0.300-preview.24207.7 + 8.0.300-preview.24207.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -199,7 +199,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-release-24177-07 + 17.10.0-release-24203-04 8.0.0-alpha.1.22557.12 From 8cc946b24423039f40325622adf5d03e5abae8c3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Apr 2024 11:39:51 +0000 Subject: [PATCH 426/652] Update dependencies from https://github.com/dotnet/sdk build 20240407.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24205.5 -> To Version 8.0.300-preview.24207.8 Dependency coherency updates Microsoft.NET.Test.Sdk From Version 17.10.0-release-24177-07 -> To Version 17.10.0-release-24203-04 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4e0540d22789..3cf70ab039ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - b0590605d5e9cbd4af52e6a90c6ff2d7a00695ca + 45571b5104036012cc5d1590b4d78ecaca619c57 - + https://github.com/dotnet/sdk - b0590605d5e9cbd4af52e6a90c6ff2d7a00695ca + 45571b5104036012cc5d1590b4d78ecaca619c57 - + https://github.com/dotnet/sdk - b0590605d5e9cbd4af52e6a90c6ff2d7a00695ca + 45571b5104036012cc5d1590b4d78ecaca619c57 - + https://github.com/dotnet/sdk - b0590605d5e9cbd4af52e6a90c6ff2d7a00695ca + 45571b5104036012cc5d1590b4d78ecaca619c57 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 95760156db14..73df1c359997 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24207.7 - 8.0.300-preview.24207.7 - 8.0.300-preview.24207.7 + 8.0.300-preview.24207.8 + 8.0.300-preview.24207.8 + 8.0.300-preview.24207.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e4cedd7c173eac8b1077f417e8f4e1d730a9f500 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Apr 2024 12:21:45 +0000 Subject: [PATCH 427/652] Update dependencies from https://github.com/dotnet/sdk build 20240407.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24205.5 -> To Version 8.0.300-preview.24207.9 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk From Version 12.8.300-beta.24205.1 -> To Version 12.8.300-beta.24205.4 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cf70ab039ba..28132c38df03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 45571b5104036012cc5d1590b4d78ecaca619c57 + d868780276cffe5333ad0095d34d0305e1f0d739 - + https://github.com/dotnet/sdk - 45571b5104036012cc5d1590b4d78ecaca619c57 + d868780276cffe5333ad0095d34d0305e1f0d739 - + https://github.com/dotnet/sdk - 45571b5104036012cc5d1590b4d78ecaca619c57 + d868780276cffe5333ad0095d34d0305e1f0d739 - + https://github.com/dotnet/sdk - 45571b5104036012cc5d1590b4d78ecaca619c57 + d868780276cffe5333ad0095d34d0305e1f0d739 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - b2b9c946d36e8174c4a7d8e675d2c65f9f2a47c9 + 838941fa57f6c200e4cbb47e6d32575828b398f5 - + https://github.com/dotnet/fsharp - b2b9c946d36e8174c4a7d8e675d2c65f9f2a47c9 + 838941fa57f6c200e4cbb47e6d32575828b398f5 diff --git a/eng/Versions.props b/eng/Versions.props index 73df1c359997..9b115305a4a8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24207.8 - 8.0.300-preview.24207.8 - 8.0.300-preview.24207.8 + 8.0.300-preview.24207.9 + 8.0.300-preview.24207.9 + 8.0.300-preview.24207.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 02c6c15ab460e54e2b170f46fb83e3c72fb25088 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 8 Apr 2024 03:07:56 +0000 Subject: [PATCH 428/652] Update dependencies from https://github.com/dotnet/sdk build 20240407.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24207.9 -> To Version 8.0.300-preview.24207.11 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28132c38df03..79cdfc964ed8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - d868780276cffe5333ad0095d34d0305e1f0d739 + ec8e16d7763bd1fa66536f408761b7bceed21282 - + https://github.com/dotnet/sdk - d868780276cffe5333ad0095d34d0305e1f0d739 + ec8e16d7763bd1fa66536f408761b7bceed21282 - + https://github.com/dotnet/sdk - d868780276cffe5333ad0095d34d0305e1f0d739 + ec8e16d7763bd1fa66536f408761b7bceed21282 - + https://github.com/dotnet/sdk - d868780276cffe5333ad0095d34d0305e1f0d739 + ec8e16d7763bd1fa66536f408761b7bceed21282 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9b115305a4a8..0ab08d0dcceb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24207.9 - 8.0.300-preview.24207.9 - 8.0.300-preview.24207.9 + 8.0.300-preview.24207.11 + 8.0.300-preview.24207.11 + 8.0.300-preview.24207.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 76b04d80562b0dbb5e72a7f7ff4db6881bff39b2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 10:47:44 -0700 Subject: [PATCH 429/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19350) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79cdfc964ed8..10967cf74abb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - ec8e16d7763bd1fa66536f408761b7bceed21282 + 87d560023dbba640b0d869de6117a4613ae193f3 - + https://github.com/dotnet/sdk - ec8e16d7763bd1fa66536f408761b7bceed21282 + 87d560023dbba640b0d869de6117a4613ae193f3 - + https://github.com/dotnet/sdk - ec8e16d7763bd1fa66536f408761b7bceed21282 + 87d560023dbba640b0d869de6117a4613ae193f3 - + https://github.com/dotnet/sdk - ec8e16d7763bd1fa66536f408761b7bceed21282 + 87d560023dbba640b0d869de6117a4613ae193f3 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0ab08d0dcceb..b6301b558e77 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24207.11 - 8.0.300-preview.24207.11 - 8.0.300-preview.24207.11 + 8.0.300-preview.24208.1 + 8.0.300-preview.24208.1 + 8.0.300-preview.24208.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 5e64dc58f01a798f439b70eee4cc084f26585558 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 19:56:18 +0000 Subject: [PATCH 430/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19351) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 198bb44b2e41..e792603c7c96 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24205.1", + "version": "1.1.0-beta.24208.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10967cf74abb..1873bc8620d1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 196a30e0e90a80f5ea37259969b6c64885b6176b + cff04bde94007169a8b7ae6692995e22e078b511 - + https://github.com/dotnet/arcade-services - 196a30e0e90a80f5ea37259969b6c64885b6176b + cff04bde94007169a8b7ae6692995e22e078b511 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index b6301b558e77..52283047c598 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24205.1 + 1.1.0-beta.24208.1 From 8b5d2badccde63a7c2f9a1643ceabac067c73ba3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 22:05:34 +0000 Subject: [PATCH 431/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19359) [release/8.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1873bc8620d1..44b11f1f4901 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 87d560023dbba640b0d869de6117a4613ae193f3 + cdd883744d684856f78120e34010a1529bd02c8a - + https://github.com/dotnet/sdk - 87d560023dbba640b0d869de6117a4613ae193f3 + cdd883744d684856f78120e34010a1529bd02c8a - + https://github.com/dotnet/sdk - 87d560023dbba640b0d869de6117a4613ae193f3 + cdd883744d684856f78120e34010a1529bd02c8a - + https://github.com/dotnet/sdk - 87d560023dbba640b0d869de6117a4613ae193f3 + cdd883744d684856f78120e34010a1529bd02c8a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 52283047c598..5e22741b0729 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24208.1 - 8.0.300-preview.24208.1 - 8.0.300-preview.24208.1 + 8.0.300-preview.24208.6 + 8.0.300-preview.24208.6 + 8.0.300-preview.24208.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1a777bdb296ca41012f8f5b66562840c5f700187 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 18:09:03 +0000 Subject: [PATCH 432/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19368) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index e792603c7c96..3595801c2d93 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24208.1", + "version": "1.1.0-beta.24208.3", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44b11f1f4901..bf4ffebd8798 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - cff04bde94007169a8b7ae6692995e22e078b511 + 3a0d5e04424eefa18ad67064c74a100b2c2bfece - + https://github.com/dotnet/arcade-services - cff04bde94007169a8b7ae6692995e22e078b511 + 3a0d5e04424eefa18ad67064c74a100b2c2bfece https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5e22741b0729..343c162830f2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24208.1 + 1.1.0-beta.24208.3 From a29c5fa3babd26496c30befb9ac5bee6bcdbc1fb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 9 Apr 2024 22:47:54 +0000 Subject: [PATCH 433/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19388) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.300-beta.24205.4 to 12.8.300-beta.24208.5 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.300-beta.24205.4 to 8.0.300-beta.24208.5 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf4ffebd8798..9645b857baa1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - cdd883744d684856f78120e34010a1529bd02c8a + b37d2a86193bcd5179d791cc833912fdc0b48fa3 - + https://github.com/dotnet/sdk - cdd883744d684856f78120e34010a1529bd02c8a + b37d2a86193bcd5179d791cc833912fdc0b48fa3 - + https://github.com/dotnet/sdk - cdd883744d684856f78120e34010a1529bd02c8a + b37d2a86193bcd5179d791cc833912fdc0b48fa3 - + https://github.com/dotnet/sdk - cdd883744d684856f78120e34010a1529bd02c8a + b37d2a86193bcd5179d791cc833912fdc0b48fa3 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 838941fa57f6c200e4cbb47e6d32575828b398f5 + 111eeb61b14b3453342b135733cc571cd1dcec3f - + https://github.com/dotnet/fsharp - 838941fa57f6c200e4cbb47e6d32575828b398f5 + 111eeb61b14b3453342b135733cc571cd1dcec3f diff --git a/eng/Versions.props b/eng/Versions.props index 343c162830f2..d1ef3e3612c4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24208.6 - 8.0.300-preview.24208.6 - 8.0.300-preview.24208.6 + 8.0.300-preview.24209.5 + 8.0.300-preview.24209.5 + 8.0.300-preview.24209.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 7eb8b6fe920c9b64d88f2fe80c1f9b7d4bf773c2 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 9 Apr 2024 19:43:36 -0700 Subject: [PATCH 434/652] Update implicit versions for April --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d1ef3e3612c4..16779d02e27a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,8 +26,8 @@ 30 32 17 - 27 - 16 + 29 + 18 <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 9912725110c8c36ee71554b86d9fe1dfec62fbed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 12:55:17 +0000 Subject: [PATCH 435/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240410.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24208.3 -> To Version 1.1.0-beta.24210.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 3595801c2d93..034bb9016f12 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24208.3", + "version": "1.1.0-beta.24210.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9645b857baa1..46fa91fa5f58 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 3a0d5e04424eefa18ad67064c74a100b2c2bfece + 9ec07c3673acf5602234c244d9465bca48f49969 - + https://github.com/dotnet/arcade-services - 3a0d5e04424eefa18ad67064c74a100b2c2bfece + 9ec07c3673acf5602234c244d9465bca48f49969 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d1ef3e3612c4..3e0d19617de0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24208.3 + 1.1.0-beta.24210.2 From 1a17989bf13cf5211e199c1e3543186ab2329cf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 17:56:36 +0000 Subject: [PATCH 436/652] Update dependencies from https://github.com/dotnet/arcade build 20240404.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24179.4 -> To Version 8.0.0-beta.24204.3 --- NuGet.config | 16 ++++++++++++++-- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../steps/component-governance.yml | 2 +- eng/common/templates/jobs/jobs.yml | 4 ++-- .../templates/steps/component-governance.yml | 2 +- global.json | 4 ++-- 7 files changed, 27 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 9d97a617a983..c3e750405695 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,28 @@ + + + + + + - + + @@ -41,14 +48,19 @@ + + - + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bad36cc840a7..b0659e89cce2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade - fc2b7849b25c4a21457feb6da5fc7c9806a80976 + 188340e12c0a372b1681ad6a5e72c608021efdba https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 3e43417d0296..4b0f294a28f9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -40,7 +40,7 @@ - 8.0.0-beta.24179.4 + 8.0.0-beta.24204.3 diff --git a/eng/common/templates-official/steps/component-governance.yml b/eng/common/templates-official/steps/component-governance.yml index 0ecec47b0c91..cbba0596709d 100644 --- a/eng/common/templates-official/steps/component-governance.yml +++ b/eng/common/templates-official/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 67a2e2c747cf..289bb2396ce8 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: false - + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job jobs: [] @@ -47,7 +47,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml index 0ecec47b0c91..cbba0596709d 100644 --- a/eng/common/templates/steps/component-governance.yml +++ b/eng/common/templates/steps/component-governance.yml @@ -4,7 +4,7 @@ parameters: steps: - ${{ if eq(parameters.disableComponentGovernance, 'true') }}: - - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + - script: echo "##vso[task.setvariable variable=skipComponentGovernanceDetection]true" displayName: Set skipComponentGovernanceDetection variable - ${{ if ne(parameters.disableComponentGovernance, 'true') }}: - task: ComponentGovernanceComponentDetection@0 diff --git a/global.json b/global.json index 31d5f24b1937..f4af7d9ef540 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.24179.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24179.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24204.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24204.3" } } From 13c999fe5e582f741377aec0c147e161a8a38d3a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Apr 2024 12:54:35 +0000 Subject: [PATCH 437/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240411.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24210.2 -> To Version 1.1.0-beta.24211.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 034bb9016f12..a248bef175ec 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24210.2", + "version": "1.1.0-beta.24211.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 46fa91fa5f58..081386c66322 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 9ec07c3673acf5602234c244d9465bca48f49969 + 34b9da4037396a18587c0b1a612ac9ea3846fae1 - + https://github.com/dotnet/arcade-services - 9ec07c3673acf5602234c244d9465bca48f49969 + 34b9da4037396a18587c0b1a612ac9ea3846fae1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 3e0d19617de0..eac72eec1269 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24210.2 + 1.1.0-beta.24211.1 From 2698071df1dec9e50d7af081cee7377ed3686ca0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 21:03:58 +0000 Subject: [PATCH 438/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19444) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.FSharp.Compiler: from 12.8.300-beta.24208.5 to 12.8.300-beta.24211.1 (parent: Microsoft.NET.Sdk) - Microsoft.SourceBuild.Intermediate.fsharp: from 8.0.300-beta.24208.5 to 8.0.300-beta.24211.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 081386c66322..3e6e89196cf7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3459153da3548fa307f765378d4dc580fbe5811c - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3459153da3548fa307f765378d4dc580fbe5811c - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3459153da3548fa307f765378d4dc580fbe5811c - + https://github.com/dotnet/sdk - b37d2a86193bcd5179d791cc833912fdc0b48fa3 + 3459153da3548fa307f765378d4dc580fbe5811c https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 472140dd926227876848e48f41cfc9acb9275492 - + https://github.com/dotnet/fsharp - 111eeb61b14b3453342b135733cc571cd1dcec3f + 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 - + https://github.com/dotnet/fsharp - 111eeb61b14b3453342b135733cc571cd1dcec3f + 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 diff --git a/eng/Versions.props b/eng/Versions.props index eac72eec1269..2d86f71a2679 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24209.5 - 8.0.300-preview.24209.5 - 8.0.300-preview.24209.5 + 8.0.300-preview.24211.8 + 8.0.300-preview.24211.8 + 8.0.300-preview.24211.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2e4e62f639352404ec7def004491ae1d3a77038e Mon Sep 17 00:00:00 2001 From: Ladi Prosek Date: Fri, 12 Apr 2024 16:20:24 +0200 Subject: [PATCH 439/652] Redo "NGEN Microsoft.DotNet.MSBuildSdkResolver.dll and its dependencies" for devenv only (#19399) Fixes: [AB#2014670](https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2014670) ### Description A change was made in 8.0.2xx to register MSBuildSdkResolver for NGEN (#17732), against both devenv.exe and MSBuild.exe. Later a bug was found in the way MSBuild.exe loads the resolver so the change was reverted in 8.0.3xx (#19112). However, because the change had a measurable positive perf effect, the revert was effectively a regression for devenv.exe and got flagged so by PerfDDRITs. This PR is a re-do of the original change, only this time with MSBuild.exe omitted, i.e. we're NGENing the resolver only for the default architecture of devenv.exe. ### Customer Impact Startup perf regression, about 5% more methods JITted in scenarios measured by Visual Studio PerfDDRITs. ### Regression Yes, perf regression in VS 17.10. ### Risk Low --- .../GenerateMSBuildExtensionsSWR.cs | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs index eab79f2b7230..bac9ad0d8b66 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -24,7 +24,8 @@ public override bool Execute() AddFolder(sb, @"MSBuildSdkResolver", - @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver"); + @"MSBuild\Current\Bin\SdkResolvers\Microsoft.DotNet.MSBuildSdkResolver", + ngenAssemblies: true); AddFolder(sb, @"msbuildExtensions", @@ -39,7 +40,7 @@ public override bool Execute() return true; } - private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir) + private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrInstallDir, bool ngenAssemblies = false) { string sourceFolder = Path.Combine(MSBuildExtensionsLayoutDirectory, relativeSourcePath); var files = Directory.GetFiles(sourceFolder) @@ -55,7 +56,14 @@ private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrIn { sb.Append(@" file source=""$(PkgVS_Redist_Common_Net_Core_SDK_MSBuildExtensions)\"); sb.Append(Path.Combine(relativeSourcePath, Path.GetFileName(file))); - sb.AppendLine("\""); + sb.Append('"'); + + if (ngenAssemblies && file.EndsWith(".dll", StringComparison.OrdinalIgnoreCase)) + { + sb.Append(@" vs.file.ngenApplications=""[installDir]\Common7\IDE\vsn.exe"""); + } + + sb.AppendLine(); } sb.AppendLine(); @@ -67,6 +75,7 @@ private void AddFolder(StringBuilder sb, string relativeSourcePath, string swrIn string newRelativeSourcePath = Path.Combine(relativeSourcePath, subfolderName); string newSwrInstallDir = Path.Combine(swrInstallDir, subfolderName); + // Don't propagate ngenAssemblies to subdirectories. AddFolder(sb, newRelativeSourcePath, newSwrInstallDir); } } From f85dc05c462cc26f1d31dcd4f47c6a8d817b761b Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Apr 2024 10:15:41 -0700 Subject: [PATCH 440/652] Update WiX to 3.14.1.8722 (#19417) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2d86f71a2679..d7faa56365ca 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,7 +170,7 @@ - 3.14.0.8606 + 3.14.1.8722 From a97cad6749b9934f8cf5639b92754a8f371333a3 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Apr 2024 10:15:49 -0700 Subject: [PATCH 441/652] Update WiX to 3.14.1.8722 (#19416) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4b0f294a28f9..239b4349da0a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,7 +169,7 @@ - 3.14.0.8606 + 3.14.1.8722 From eb9c6ccd16260f62518cdad19d3d5d4786f17fd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 05:56:16 +0000 Subject: [PATCH 442/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19470) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Net.Compilers.Toolset: from 4.10.0-3.24202.15 to 4.10.0-3.24212.1 (parent: Microsoft.NET.Sdk) - Microsoft.Build: from 17.10.0 to 17.10.2 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 8 ++++---- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 06d25339bf9a..5c075cd2dc49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e6e89196cf7..bb5dfa4be471 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 3459153da3548fa307f765378d4dc580fbe5811c + e79b11b8c2a258d32e8b0cd09166c0475c486715 - + https://github.com/dotnet/sdk - 3459153da3548fa307f765378d4dc580fbe5811c + e79b11b8c2a258d32e8b0cd09166c0475c486715 - + https://github.com/dotnet/sdk - 3459153da3548fa307f765378d4dc580fbe5811c + e79b11b8c2a258d32e8b0cd09166c0475c486715 - + https://github.com/dotnet/sdk - 3459153da3548fa307f765378d4dc580fbe5811c + e79b11b8c2a258d32e8b0cd09166c0475c486715 https://github.com/dotnet/test-templates @@ -150,14 +150,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - cbca41cad4e21c29548e9e57d7135740b6f78df9 + 0b1fefc344701f2669b2190fbfda5ca588083605 - + https://github.com/dotnet/msbuild - dbf652edbedb4e6c612a79cc6907d211c74329d6 + d08d5e4155f737845380a75b3cfcb68b5a9f05c5 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 714250e65d00..6e843f361f00 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,16 +80,16 @@ - 8.0.300-preview.24211.8 - 8.0.300-preview.24211.8 - 8.0.300-preview.24211.8 + 8.0.300-preview.24214.1 + 8.0.300-preview.24214.1 + 8.0.300-preview.24214.1 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24202.15 + 4.10.0-3.24212.1 From 7049dd83d0ab4cdae82124a54e1ff575336ad815 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 17:32:39 +0000 Subject: [PATCH 443/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19482) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index a248bef175ec..301ab22febd7 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24211.1", + "version": "1.1.0-beta.24216.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bb5dfa4be471..c155c443883d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 34b9da4037396a18587c0b1a612ac9ea3846fae1 + b33d9acaedeaeebe974accd4b5abb6049b93f186 - + https://github.com/dotnet/arcade-services - 34b9da4037396a18587c0b1a612ac9ea3846fae1 + b33d9acaedeaeebe974accd4b5abb6049b93f186 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 6e843f361f00..01f8092dfb87 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -44,7 +44,7 @@ - 1.1.0-beta.24211.1 + 1.1.0-beta.24216.1 From 271f40ea713314542ca9c205e761fca8d68b680b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 19:55:16 +0000 Subject: [PATCH 444/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19484) [release/8.0.3xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.Build: from 17.10.2 to 17.10.3 (parent: Microsoft.NET.Sdk) --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5c075cd2dc49..0e369ee7c128 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c155c443883d..c27bfde76e73 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 - + https://github.com/dotnet/sdk - e79b11b8c2a258d32e8b0cd09166c0475c486715 + 852d18c6c97580c035b6ba5faa6acce15cfdc611 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 0b1fefc344701f2669b2190fbfda5ca588083605 - + https://github.com/dotnet/msbuild - d08d5e4155f737845380a75b3cfcb68b5a9f05c5 + fc97b2d1f7c2309d0069dfbd4ab73e4779ad6989 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 01f8092dfb87..57b42abf60ee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24214.1 - 8.0.300-preview.24214.1 - 8.0.300-preview.24214.1 + 8.0.300-preview.24216.6 + 8.0.300-preview.24216.6 + 8.0.300-preview.24216.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1bc5958c2a47e2399fdfb0c4efc417ecadb7da73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 21:35:38 +0000 Subject: [PATCH 445/652] [release/8.0.3xx] Update dependencies from dotnet/sdk (#19489) [release/8.0.3xx] Update dependencies from dotnet/sdk --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c27bfde76e73..14061d1159c0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 - + https://github.com/dotnet/sdk - 852d18c6c97580c035b6ba5faa6acce15cfdc611 + a4af7b00da163a356204de3712940539608acb57 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 57b42abf60ee..ca992d8fff6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -80,9 +80,9 @@ - 8.0.300-preview.24216.6 - 8.0.300-preview.24216.6 - 8.0.300-preview.24216.6 + 8.0.300-preview.24216.14 + 8.0.300-preview.24216.14 + 8.0.300-preview.24216.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 886fe0399b30014d2968313d1711cd1895544fc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 12:51:38 +0000 Subject: [PATCH 446/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240417.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24216.1 -> To Version 1.1.0-beta.24217.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 301ab22febd7..ee44ff80255c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24216.1", + "version": "1.1.0-beta.24217.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 14061d1159c0..0bc97664fb0f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - b33d9acaedeaeebe974accd4b5abb6049b93f186 + cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d - + https://github.com/dotnet/arcade-services - b33d9acaedeaeebe974accd4b5abb6049b93f186 + cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 25f1fe0dabd8..07889fc98ebb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24216.1 + 1.1.0-beta.24217.1 From 7754e3376e954ee6b985e3e4f3c272f08d4f01a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 12:52:00 +0000 Subject: [PATCH 447/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240416.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24175.3 -> To Version 8.0.0-alpha.1.24216.1 --- 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 14061d1159c0..84e197dfe627 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 300e99190e6ae1983681694dbdd5f75f0c692081 + 908177a58a41532b3302c17f1e1a8cf1c1234545 From 4198fdf67c99d49b7671c6afabfcd9a3d12282a6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 16:41:35 +0000 Subject: [PATCH 448/652] Update dependencies from https://github.com/dotnet/sdk build 20240417.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24216.14 -> To Version 8.0.300-preview.24217.7 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 379ef6d07507..a483f6f5e80c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 - + https://github.com/dotnet/sdk - a4af7b00da163a356204de3712940539608acb57 + 51173319a80b7c2ddbfec352e55060020be516e9 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 07889fc98ebb..0a9e35583319 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.300-preview.24216.14 - 8.0.300-preview.24216.14 - 8.0.300-preview.24216.14 + 8.0.300-preview.24217.7 + 8.0.300-preview.24217.7 + 8.0.300-preview.24217.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 12bf51b3175123ecb0b00b18a239172273fa4fde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Apr 2024 17:41:17 +0000 Subject: [PATCH 449/652] Update dependencies from https://github.com/dotnet/sdk build 20240417.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24216.14 -> To Version 8.0.300-preview.24217.11 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24212.1 -> To Version 4.10.0-3.24216.12 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a483f6f5e80c..e82a2a9792b2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 - + https://github.com/dotnet/sdk - 51173319a80b7c2ddbfec352e55060020be516e9 + d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 1381d5ebd2ab1f292848d5b19b80cf71ac332508 - + https://github.com/dotnet/roslyn - 0b1fefc344701f2669b2190fbfda5ca588083605 + 3af0081a6e811b78d37c62e479914f7f4cfb0d1a diff --git a/eng/Versions.props b/eng/Versions.props index 0a9e35583319..7a95b55f3346 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,16 +79,16 @@ - 8.0.300-preview.24217.7 - 8.0.300-preview.24217.7 - 8.0.300-preview.24217.7 + 8.0.300-preview.24217.11 + 8.0.300-preview.24217.11 + 8.0.300-preview.24217.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24212.1 + 4.10.0-3.24216.12 From 2bacdd194b4cb966054d3aff5c0eaf66af23f9f1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2024 12:46:00 +0000 Subject: [PATCH 450/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240417.2 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24217.1 -> To Version 1.1.0-beta.24217.2 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index ee44ff80255c..6ea86b69981b 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24217.1", + "version": "1.1.0-beta.24217.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e82a2a9792b2..481690b95016 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d + 14a0472100fa9180aca3d178de0b2893ecb22f14 - + https://github.com/dotnet/arcade-services - cc2739e402ad66e1a3a03bbbfbf13bf30cd3d77d + 14a0472100fa9180aca3d178de0b2893ecb22f14 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 7a95b55f3346..8a397962ec2e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24217.1 + 1.1.0-beta.24217.2 From 7df35f99cc54dcf97a479efb1745ccb3c68ab2cc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Apr 2024 17:22:27 +0000 Subject: [PATCH 451/652] Update dependencies from https://github.com/dotnet/sdk build 20240418.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300-preview.24217.11 -> To Version 8.0.300-preview.24218.5 Dependency coherency updates Microsoft.Build From Version 17.10.3 -> To Version 17.10.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 2 +- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e369ee7c128..4e27eeb09904 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 481690b95016..60a7e1a6b0bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 - + https://github.com/dotnet/sdk - d8c64264eeff1bc6aa543d064ba1bc74cabf06d6 + 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 https://github.com/dotnet/test-templates @@ -155,9 +155,9 @@ 3af0081a6e811b78d37c62e479914f7f4cfb0d1a - + https://github.com/dotnet/msbuild - fc97b2d1f7c2309d0069dfbd4ab73e4779ad6989 + 10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 8a397962ec2e..95ec56196491 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,9 +79,9 @@ - 8.0.300-preview.24217.11 - 8.0.300-preview.24217.11 - 8.0.300-preview.24217.11 + 8.0.300-preview.24218.5 + 8.0.300-preview.24218.5 + 8.0.300-preview.24218.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From e66b57623baf342aaf5f7af76f292f5a076ca21b Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 10:40:53 -0700 Subject: [PATCH 452/652] Stabilize branding --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 8a397962ec2e..122dec0087e6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -13,7 +13,7 @@ $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) - false + true release preview From 872c0349abe8a1d2bf3dbffbb44bf7b3fb1991c0 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 10:49:56 -0700 Subject: [PATCH 453/652] Use MSBuild Add Logic to add to the version feature automatically. We dont need to update the implicit versions as 29 and 18 are the newest At least per the releases when downloading the .NET SDK. --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 122dec0087e6..6a626b0a393e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,8 +25,8 @@ 30 32 17 - 29 - 18 + $([MSBuild]::Add($(VersionFeature), 29)) + $([MSBuild]::Add($(VersionFeature), 18)) <_NET70ILLinkPackVersion>7.0.100-1.23211.1 From 0ab0b7ba476404c2ba9ad0ecb867339b75b41232 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 10:55:02 -0700 Subject: [PATCH 454/652] Update ILLink https://github.com/dotnet/linker/pull/3217 this fix has not been included in 8.0.xx which is not ideal! You can see https://github.com/dotnet/sdk/blob/78a907eaec7496e7c09010b83fb126178c29c0bb/eng/Version.Details.xml#L126C12-L126C52 it is in 7.0, but somehow it didnt get ported to 8.0. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6a626b0a393e..04fd5cd0f801 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -29,7 +29,7 @@ $([MSBuild]::Add($(VersionFeature), 18)) - <_NET70ILLinkPackVersion>7.0.100-1.23211.1 + <_NET70ILLinkPackVersion>7.0.100-1.23401.1 From 7c3029438df7f0435a1bf886c42f7c488b1b2e85 Mon Sep 17 00:00:00 2001 From: Noah Gilson Date: Thu, 18 Apr 2024 15:42:22 -0700 Subject: [PATCH 455/652] Update implicit versions by 1, because they should be +1 to the existing release, not the no of the existing release --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 04fd5cd0f801..9c25125f7dd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,8 +25,8 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 29)) - $([MSBuild]::Add($(VersionFeature), 18)) + $([MSBuild]::Add($(VersionFeature), 30)) + $([MSBuild]::Add($(VersionFeature), 19)) <_NET70ILLinkPackVersion>7.0.100-1.23401.1 From 21345f55b7eb12ff472cc7dcd7e4b33afc5280e0 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 18 Apr 2024 23:36:20 -0700 Subject: [PATCH 456/652] Fix buildName --- eng/pipelines/templates/stages/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/stages/vmr-build.yml b/eng/pipelines/templates/stages/vmr-build.yml index 6ee12e92e66e..51597c437c40 100644 --- a/eng/pipelines/templates/stages/vmr-build.yml +++ b/eng/pipelines/templates/stages/vmr-build.yml @@ -112,7 +112,7 @@ stages: - template: ../jobs/vmr-build.yml parameters: # Changing the build name requires updating the referenced name in the source-build-sdk-diff-tests.yml pipeline - buildName: Alpine317_Offline_MsftSdk + buildName: Alpine319_Offline_MsftSdk isBuiltFromVmr: ${{ parameters.isBuiltFromVmr }} vmrBranch: ${{ variables.VmrBranch }} architecture: x64 From 1cd8a406af146dc655070bbecaae17039bf14d3f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Apr 2024 12:49:49 +0000 Subject: [PATCH 457/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240419.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24217.2 -> To Version 1.1.0-beta.24219.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6ea86b69981b..5ac60fd57d91 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24217.2", + "version": "1.1.0-beta.24219.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 60a7e1a6b0bc..65c328f715b4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 14a0472100fa9180aca3d178de0b2893ecb22f14 + 611a6bbd68d99a312d688b49733edc894ea0c3c1 - + https://github.com/dotnet/arcade-services - 14a0472100fa9180aca3d178de0b2893ecb22f14 + 611a6bbd68d99a312d688b49733edc894ea0c3c1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index c531515e2636..8c1771a99edb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24217.2 + 1.1.0-beta.24219.1 From b7485080588e29890da9156dde0037049245fb0e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Sun, 21 Apr 2024 10:58:07 -0700 Subject: [PATCH 458/652] skip downlevel targeting tests --- test/SdkTests/TestsToSkipStableSDK.xml | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/test/SdkTests/TestsToSkipStableSDK.xml b/test/SdkTests/TestsToSkipStableSDK.xml index 550025aa6779..e0f5b37b784b 100644 --- a/test/SdkTests/TestsToSkipStableSDK.xml +++ b/test/SdkTests/TestsToSkipStableSDK.xml @@ -187,10 +187,26 @@ + Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> + Reason="Cannot run with non-existent LastRuntimeFrameworkVersion"/> + + + + From e87ec7118f901c50bfdf95e5819aff873981e4f3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 13:19:08 -0700 Subject: [PATCH 459/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19564) Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 5ac60fd57d91..175642a6da64 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24219.1", + "version": "1.1.0-beta.24223.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 65c328f715b4..adb9cdacfffb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 611a6bbd68d99a312d688b49733edc894ea0c3c1 + 0c89e9cbde00179871f262673c78893f1ce5b688 - + https://github.com/dotnet/arcade-services - 611a6bbd68d99a312d688b49733edc894ea0c3c1 + 0c89e9cbde00179871f262673c78893f1ce5b688 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 8f57d7e4bf3a..1b8dcefd5c58 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24219.1 + 1.1.0-beta.24223.1 From a865228cb6dba76d0b03dcc48227b2125d317aa9 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 24 Apr 2024 00:27:53 +0000 Subject: [PATCH 460/652] Merged PR 39174: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 8.0.2 to 8.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.2-servicing.24068.6 to 8.0.5-servicing.24217.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.2-servicing.24068.6 to 8.0.5-servicing.24217.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.2-servicing.24067.11 to 8.0.5-servicing.24216.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.2 to 8.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.2-servicing.24067.11 to 8.0.5-servicing.24216.15 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.2 to 8.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.2 to 8.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.2-servicing.24067.11 to 8.0.5-servicing.24216.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.2 to 8.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.2 to 8.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.2-servicing.24068.4 to 8.0.5-servicing.24217.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.2 to 8.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.2-servicing.24068.3 to 8.0.5-servicing.24217.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.2 to 8.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.2-servicing.24068.6 to 8.0.5-servicing.24217.2 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.2 to 8.0.5 (parent: Microsoft.NET.Sdk) - *... --- NuGet.config | 11 ++++ eng/Version.Details.xml | 116 ++++++++++++++++++++-------------------- eng/Versions.props | 48 ++++++++--------- 3 files changed, 93 insertions(+), 82 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4e27eeb09904..e1915e330bf2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,13 @@ + + + @@ -18,8 +21,11 @@ + + + @@ -38,11 +44,16 @@ + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adb9cdacfffb..9aae3e4fe3eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 593444ad8328a5a933c006c6564469666f45ad2e + dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - da7e9894ce22ef8cc02e5acc56e95a6f8cf8f644 + 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 - - https://github.com/dotnet/sdk - 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 41cc4535199ed7d3ceb126f3588fee7fb31fa720 - - https://github.com/dotnet/sdk - 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 41cc4535199ed7d3ceb126f3588fee7fb31fa720 - - https://github.com/dotnet/sdk - 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 41cc4535199ed7d3ceb126f3588fee7fb31fa720 - - https://github.com/dotnet/sdk - 738bfb1d41ed4dcbdbf59be8f7ae2fe11dbba9e0 + + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk + 41cc4535199ed7d3ceb126f3588fee7fb31fa720 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - c58fa00bd16b92aab1d7fb2b93e71af6a7768139 + 6c37c986b6c8fc0669b38a03a03445a75b8227a6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 472140dd926227876848e48f41cfc9acb9275492 + b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ 56d28849af08dc3143d019694aa92f186b89d2ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 1381d5ebd2ab1f292848d5b19b80cf71ac332508 + 087e15321bb712ef6fe8b0ba6f8bd12facf92629 https://github.com/dotnet/roslyn @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 71359b18c2d83c01a68bf155244a65962a7e8c8e - + https://github.com/dotnet/emsdk - 2fc2ffd960930318f33fcaa690cbdbc55d72f52d + 71359b18c2d83c01a68bf155244a65962a7e8c8e diff --git a/eng/Versions.props b/eng/Versions.props index 1b8dcefd5c58..bfb1bd98ef7f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.2-servicing.24068.3 + 8.0.5-servicing.24217.4 - 8.0.2-servicing.24068.6 + 8.0.5-servicing.24217.2 @@ -66,22 +66,22 @@ - 8.0.2 - 8.0.2 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 - 8.0.2-servicing.24068.4 + 8.0.5 + 8.0.5 + 8.0.5-servicing.24217.6 + 8.0.5-servicing.24217.6 + 8.0.5-servicing.24217.6 + 8.0.5-servicing.24217.6 + 8.0.5-servicing.24217.6 0.2.0 - 8.0.300-preview.24218.5 - 8.0.300-preview.24218.5 - 8.0.300-preview.24218.5 + 8.0.300 + 8.0.300-rtm.24223.20 + 8.0.300-rtm.24223.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -92,24 +92,24 @@ - 8.0.2-servicing.24067.11 + 8.0.5-servicing.24216.15 - 8.0.2-servicing.24067.11 - 8.0.2-servicing.24067.11 - 8.0.2 - 8.0.2 - 8.0.2 - 8.0.2 + 8.0.5-servicing.24216.15 + 8.0.5-servicing.24216.15 + 8.0.5 + 8.0.5 + 8.0.5 + 8.0.5 2.1.0 - 8.0.2-servicing.24068.6 - 8.0.2-servicing.24068.6 - 8.0.2 - 8.0.2 + 8.0.5-servicing.24217.5 + 8.0.5-servicing.24217.5 + 8.0.5 + 8.0.5 @@ -213,7 +213,7 @@ 14.0.8478 17.0.8478 - 8.0.2 + 8.0.5 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 24c8ce7000cc1181412354eb111e9a5c658bd660 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 24 Apr 2024 18:21:45 +0000 Subject: [PATCH 461/652] Merged PR 39205: ci and pr build: Update linux musl arm image to 'cbl-mariner-2.0-cross-arm-al... ci and pr build: Update linux musl arm image to 'cbl-mariner-2.0-cross-arm-alpine' --- .vsts-ci.yml | 2 +- .vsts-pr.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 3fd03fcc1bef..9efb421fd9eb 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -65,7 +65,7 @@ extends: ubuntu2204: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04 mariner20CrossArm: - image: mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm + image: mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine ubuntu2204DebPkg: image: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-debpkg sdl: diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 0121668617d8..3df1cf509d1b 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -203,7 +203,7 @@ stages: parameters: agentOs: Linux jobName: Build_Linux_musl_Release_arm - container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:mariner-2.0-cross-arm' + container: 'mcr.microsoft.com/dotnet-buildtools/prereqs:cbl-mariner-2.0-cross-arm-alpine' buildConfiguration: Release buildArchitecture: arm runtimeIdentifier: 'linux-musl-arm' From 326f6e68b2eaac0cff202f1c9834047e45fad5cb Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 24 Apr 2024 21:57:36 +0000 Subject: [PATCH 462/652] Merged PR 39215: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.AspNetCore.App.Ref**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.5 to 8.0.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ff23b01e-599f-4f7c-8bf3-08dc11e0a92e - **Build**: 20240424.16 - **Date Produced**: April 24, 2024 9:33:53 PM UTC - **Commit**: 5c2ea7348fe2457b5187dce990b10bda9bb1902b - **Branch**: refs/heads/internal/release/8.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.300 to 8.0.300][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.300-rtm.24223.20 to 8.0.300-rtm.24224.16][1] - **Microsoft.NET.Sdk**: [from 8.0.300-rtm.24223.20 to 8.0.300-rtm.24224.16][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.300-rtm.24223.20 to 8.0.300-rtm.24224.16][1] - **Microsoft.AspNetCore.App.Ref**: [from 8.0.5 to 8.0.5][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.5 to 8.0.5][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2] - **dotnet-dev-certs**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2] - **dotnet-user-jwts**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2] - **dotnet-user-secrets**: [from 8.0.5-servicing.24217.6 to 8.0.5-servicing.24224.4][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC41cc4535199ed7d3ceb126f3588fee7fb31fa720&targetVersion=GC5c2ea7348fe2457b5187dce990b10bda9bb1902b&_a=files [2]: https://de... --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index e1915e330bf2..a37718f02c01 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -24,8 +24,8 @@ - - + + @@ -44,13 +44,13 @@ - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9aae3e4fe3eb..69d23285fef0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 1681d9acf750c1f1ba8f89d54796c99fbfbfb8b2 + c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41cc4535199ed7d3ceb126f3588fee7fb31fa720 + 5c2ea7348fe2457b5187dce990b10bda9bb1902b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41cc4535199ed7d3ceb126f3588fee7fb31fa720 + 5c2ea7348fe2457b5187dce990b10bda9bb1902b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41cc4535199ed7d3ceb126f3588fee7fb31fa720 + 5c2ea7348fe2457b5187dce990b10bda9bb1902b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 41cc4535199ed7d3ceb126f3588fee7fb31fa720 + 5c2ea7348fe2457b5187dce990b10bda9bb1902b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index bfb1bd98ef7f..c107469ffb45 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,11 +68,11 @@ 8.0.5 8.0.5 - 8.0.5-servicing.24217.6 - 8.0.5-servicing.24217.6 - 8.0.5-servicing.24217.6 - 8.0.5-servicing.24217.6 - 8.0.5-servicing.24217.6 + 8.0.5-servicing.24224.4 + 8.0.5-servicing.24224.4 + 8.0.5-servicing.24224.4 + 8.0.5-servicing.24224.4 + 8.0.5-servicing.24224.4 0.2.0 @@ -80,8 +80,8 @@ 8.0.300 - 8.0.300-rtm.24223.20 - 8.0.300-rtm.24223.20 + 8.0.300-rtm.24224.16 + 8.0.300-rtm.24224.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d2410b5834c2657ed64755c27b498b6a06d13afe Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 1 May 2024 14:46:45 -0700 Subject: [PATCH 463/652] Update branding to 8.0.301 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 1b8dcefd5c58..2b04cfa38444 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 00 + 01 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From ec11b89ded748fb5997b365e4443562df18b3145 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 2 May 2024 13:42:16 -0700 Subject: [PATCH 464/652] Stabilize the 7.0 runtime pack Remove the 7.0 templates --- eng/Versions.props | 17 +---------------- src/redist/targets/BundledTemplates.targets | 14 -------------- 2 files changed, 1 insertion(+), 30 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2b04cfa38444..47e5098825b2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 32 17 $([MSBuild]::Add($(VersionFeature), 30)) - $([MSBuild]::Add($(VersionFeature), 19)) + 19 <_NET70ILLinkPackVersion>7.0.100-1.23401.1 @@ -57,7 +57,6 @@ 1.1.0-rc.24059.1 - 1.1.0-rc.24059.1 1.1.0-rc.24059.1 @@ -146,22 +145,15 @@ true true $([MSBuild]::Subtract($(VersionFeature60), 1)) - $([MSBuild]::Subtract($(VersionFeature70), 1)) $(VersionFeature60) - $(VersionFeature70) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) - $([MSBuild]::Subtract($(AspNetCoreTemplateFeature70), 1)) 6.0.302 - 7.0.100 6.0.14 - 7.0.3 6.0.7-servicing.22322.3 6.0.7-servicing.22322.2 - 7.0.0-rtm.22518.7 - 7.0.0-rtm.22518.2 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -179,13 +171,6 @@ $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftAspNetCoreAppRuntimePackageVersion) - - $(MicrosoftWinFormsProjectTemplates70PackageVersion) - $(MicrosoftWPFProjectTemplates70PackageVersion) - $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplates70PackageVersion) - $(MicrosoftDotNetCommonItemTemplates70PackageVersion) - 7.0.$(AspNetCoreTemplateFeature70) $(MicrosoftWinFormsProjectTemplates60PackageVersion) $(MicrosoftWPFProjectTemplates60PackageVersion) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index fab8b99fac5d..d6e428bb3eb2 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -32,19 +32,6 @@ - - - - - - - - - - - - - @@ -63,7 +50,6 @@ - From 5263b6ef0bf7e69b8e416baa1cdce136b9f7dff7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 3 May 2024 12:57:26 +0000 Subject: [PATCH 465/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 --- 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 adb9cdacfffb..4cfc3f872521 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 79827eed138fd2575a8b24820b4f385ee4ffb6e6 + 6f814daa935e08b578b1c0c65a1f26ea3317f517 From d1994e4914bb1750b0562de22c71528e58ebffe7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 17:13:47 +0000 Subject: [PATCH 466/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19596) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 175642a6da64..1fd4c8b21bd2 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24223.1", + "version": "1.1.0-beta.24253.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index adb9cdacfffb..f22482dca1bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 188340e12c0a372b1681ad6a5e72c608021efdba - + https://github.com/dotnet/arcade-services - 0c89e9cbde00179871f262673c78893f1ce5b688 + 27d7e19521190350568160c486bf9126a7daf1c4 - + https://github.com/dotnet/arcade-services - 0c89e9cbde00179871f262673c78893f1ce5b688 + 27d7e19521190350568160c486bf9126a7daf1c4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 2b04cfa38444..63af17c0b707 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24223.1 + 1.1.0-beta.24253.1 From 8c84835f12c6b7a4089e0347ff4cfe1ddb6cfc33 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 3 May 2024 17:15:16 +0000 Subject: [PATCH 467/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19595) [release/8.0.3xx] Update dependencies from dotnet/arcade --- 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 f22482dca1bc..8dc1ffec8298 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade - 188340e12c0a372b1681ad6a5e72c608021efdba + 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 63af17c0b707..be68cc5fbc47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24204.3 + 8.0.0-beta.24225.1 diff --git a/global.json b/global.json index f4af7d9ef540..f84be2571b83 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.24204.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24204.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24225.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24225.1" } } From 2b6d140f4f9a4d15a0007bfaf32b1686b14ffbd8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 May 2024 12:38:43 +0000 Subject: [PATCH 468/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 From 9c01d5ded2ed7fb63be762cd64a59445eab3c739 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 May 2024 12:41:16 +0000 Subject: [PATCH 469/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240503.7 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24253.1 -> To Version 1.1.0-beta.24253.7 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 1fd4c8b21bd2..9af81c6f32e6 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24253.1", + "version": "1.1.0-beta.24253.7", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8dc1ffec8298..cadc6fe544d0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 27d7e19521190350568160c486bf9126a7daf1c4 + 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 - + https://github.com/dotnet/arcade-services - 27d7e19521190350568160c486bf9126a7daf1c4 + 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index be68cc5fbc47..927f7452047d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24253.1 + 1.1.0-beta.24253.7 From 5f257c68983692ab201ca5c9fbd6d0f3ec87cce5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 May 2024 12:38:20 +0000 Subject: [PATCH 470/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240501.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24163.3 -> To Version 8.0.0-alpha.1.24251.1 From 6d799e6219a1cd963fa8c27967f8934fc1a4ffc9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 5 May 2024 12:40:57 +0000 Subject: [PATCH 471/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240503.7 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24253.1 -> To Version 1.1.0-beta.24253.7 From 373f8b99222de603149a8a375325ac0570436776 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 6 May 2024 12:37:13 +0000 Subject: [PATCH 472/652] Update dependencies from https://github.com/dotnet/arcade-services build 20240506.1 Microsoft.DotNet.Darc , Microsoft.DotNet.DarcLib From Version 1.1.0-beta.24253.7 -> To Version 1.1.0-beta.24256.1 --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9af81c6f32e6..b8ea939446c0 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24253.7", + "version": "1.1.0-beta.24256.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1abcfb71ee7..124ad661da25 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 + 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e - + https://github.com/dotnet/arcade-services - 05bd6da6bde53f18a8f1e8c516b778e3f86a5433 + 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 927f7452047d..69b6bfe5c0de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24253.7 + 1.1.0-beta.24256.1 From fcf4d71dc0b695ce134f77a0e8012d1420f42bdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 21:01:00 +0000 Subject: [PATCH 473/652] [release/8.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#19702) [release/8.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- 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 124ad661da25..fdeedc78606e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 6f814daa935e08b578b1c0c65a1f26ea3317f517 + 704a4d36dce09e9915c9916731392c4e6eeeb487 From c471945331a9933636028beb770eede7b9115c7c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 7 May 2024 21:02:49 +0000 Subject: [PATCH 474/652] [release/8.0.3xx] Update dependencies from dotnet/source-build-externals (#19703) [release/8.0.3xx] Update dependencies from dotnet/source-build-externals --- 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 fdeedc78606e..35e61a69b4ad 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 908177a58a41532b3302c17f1e1a8cf1c1234545 + 2b7510ccda2be01e2a2b48598498dca24fb69c3a From 78ebee4a309aafd448e47617ba0c957512f6e003 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 8 May 2024 12:51:16 +0000 Subject: [PATCH 475/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240507.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24256.1 -> To Version 8.0.0-alpha.1.24257.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 35e61a69b4ad..e9d1430ea428 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 704a4d36dce09e9915c9916731392c4e6eeeb487 + 6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb From 9a578c7dfd4984373429bc2ad4757b8e03984bdf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 18:54:13 +0000 Subject: [PATCH 476/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19722) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index b8ea939446c0..35b2fdb74301 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24256.1", + "version": "1.1.0-beta.24263.2", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e9d1430ea428..4a64e2bf9848 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 - + https://github.com/dotnet/arcade-services - 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e + 1e87b738062df027a2d4687b07e04ee7a18c55a3 - + https://github.com/dotnet/arcade-services - 1d98f4c0a5b25b72465fe075dd5f24b45ef15c8e + 1e87b738062df027a2d4687b07e04ee7a18c55a3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 69b6bfe5c0de..209471807e47 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24256.1 + 1.1.0-beta.24263.2 From cdbe9a95045428cb65c7f7c2d80a0a89a7e7d03d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 May 2024 18:58:06 +0000 Subject: [PATCH 477/652] [release/8.0.3xx] Update dependencies from dotnet/source-build-externals (#19735) [release/8.0.3xx] Update dependencies from dotnet/source-build-externals --- 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 4a64e2bf9848..4e8ab0cfc704 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 2b7510ccda2be01e2a2b48598498dca24fb69c3a + a3021ef9ed72d7bdf799092a47d2d024fc13bfcd From 5664d9571fbc4bfb1e9d3355dbb06331055a1469 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 20:02:18 +0000 Subject: [PATCH 478/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.300 -> To Version 8.0.301 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.5 -> To Version 8.0.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 +++++----- eng/Version.Details.xml | 86 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++-------- 3 files changed, 68 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index a37718f02c01..5754f75e2446 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,12 @@ - - + - + @@ -21,11 +20,11 @@ - + - - + + @@ -44,16 +43,15 @@ - - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de3c7ff27016..ecb44d9c63c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + b83ccbcf1fd06f65ec23cca17b4fdd809b784394 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + b83ccbcf1fd06f65ec23cca17b4fdd809b784394 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + b83ccbcf1fd06f65ec23cca17b4fdd809b784394 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - dda23bbe00c4a4bfdd3732783f0cce37c11a4f40 + b83ccbcf1fd06f65ec23cca17b4fdd809b784394 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 014f53e139e2d5e17395d5e71f68ea1c331e96f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 014f53e139e2d5e17395d5e71f68ea1c331e96f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 014f53e139e2d5e17395d5e71f68ea1c331e96f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c2ea7348fe2457b5187dce990b10bda9bb1902b + 014f53e139e2d5e17395d5e71f68ea1c331e96f8 https://github.com/dotnet/test-templates @@ -132,13 +132,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 - + https://github.com/dotnet/fsharp - 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 + dd749058c91585e9b5dae62b0f8df892429ee28f - + https://github.com/dotnet/fsharp - 90a81d78e3a2780e8fc599fff60c7bfcc5ab4526 + dd749058c91585e9b5dae62b0f8df892429ee28f @@ -146,13 +146,13 @@ 56d28849af08dc3143d019694aa92f186b89d2ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 087e15321bb712ef6fe8b0ba6f8bd12facf92629 + fa5b0d8f4a8b424732cc992158aa92842f8a2846 - - https://github.com/dotnet/roslyn - 3af0081a6e811b78d37c62e479914f7f4cfb0d1a + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + 9e93997517cb36aa0ac4444d69e022e288429252 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + a1cd44fdc64aa1f1c4630ddcd95580800d229180 - + https://github.com/dotnet/emsdk - 71359b18c2d83c01a68bf155244a65962a7e8c8e + a1cd44fdc64aa1f1c4630ddcd95580800d229180 diff --git a/eng/Versions.props b/eng/Versions.props index cb7928402b77..b0fd3a47b461 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,37 +78,37 @@ - 8.0.300 - 8.0.300-rtm.24224.16 - 8.0.300-rtm.24224.16 + 8.0.301 + 8.0.301-servicing.24266.11 + 8.0.301-servicing.24266.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24216.12 + 4.10.0-3.24265.5 - 8.0.5-servicing.24216.15 + 8.0.6-servicing.24253.6 - 8.0.5-servicing.24216.15 - 8.0.5-servicing.24216.15 - 8.0.5 - 8.0.5 - 8.0.5 - 8.0.5 + 8.0.6-servicing.24253.6 + 8.0.6-servicing.24253.6 + 8.0.6 + 8.0.6 + 8.0.6 + 8.0.6 2.1.0 - 8.0.5-servicing.24217.5 - 8.0.5-servicing.24217.5 - 8.0.5 - 8.0.5 + 8.0.6-servicing.24251.7 + 8.0.6-servicing.24251.7 + 8.0.6 + 8.0.6 @@ -198,7 +198,7 @@ 14.0.8478 17.0.8478 - 8.0.5 + 8.0.6 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 191891327897cfbe13496b3109b88c7c50015c3e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 16 May 2024 22:21:25 +0000 Subject: [PATCH 479/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240516.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.301 -> To Version 8.0.301 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.5 -> To Version 8.0.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 10 ++++++---- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 36 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5754f75e2446..33450849d909 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -23,8 +24,8 @@ - - + + @@ -43,12 +44,13 @@ + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ecb44d9c63c9..2a324c3956ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime fa5b0d8f4a8b424732cc992158aa92842f8a2846 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c9e3996173cec136bc2e9f3b4ec45f2a323b1d63 + 84f78e6c7d539fab38b30d7c0bf73769219b98f2 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 014f53e139e2d5e17395d5e71f68ea1c331e96f8 + 47a828be93cb7873d97f9e9e6b6b0b5752060c06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 014f53e139e2d5e17395d5e71f68ea1c331e96f8 + 47a828be93cb7873d97f9e9e6b6b0b5752060c06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 014f53e139e2d5e17395d5e71f68ea1c331e96f8 + 47a828be93cb7873d97f9e9e6b6b0b5752060c06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 014f53e139e2d5e17395d5e71f68ea1c331e96f8 + 47a828be93cb7873d97f9e9e6b6b0b5752060c06 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index b0fd3a47b461..b5d7eb0e7b22 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,13 +65,13 @@ - 8.0.5 - 8.0.5 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 - 8.0.5-servicing.24224.4 + 8.0.6 + 8.0.6 + 8.0.6-servicing.24266.3 + 8.0.6-servicing.24266.3 + 8.0.6-servicing.24266.3 + 8.0.6-servicing.24266.3 + 8.0.6-servicing.24266.3 0.2.0 @@ -79,8 +79,8 @@ 8.0.301 - 8.0.301-servicing.24266.11 - 8.0.301-servicing.24266.11 + 8.0.301-servicing.24266.25 + 8.0.301-servicing.24266.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d1c32431bc14cc4da289e44dfeaa00918ba1c6fe Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 16 May 2024 17:40:16 -0700 Subject: [PATCH 480/652] Update branding to 8.0.302 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index cb7928402b77..187c4322c349 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 01 + 02 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 7de5d41854cf6294d76b4b11d7eb474546d92539 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 19:16:26 +0000 Subject: [PATCH 481/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19767) [release/8.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 50 +++++++++++++++++-- eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- .../job/source-index-stage1.yml | 49 ++++++++++++------ .../templates/job/source-index-stage1.yml | 44 +++++++++++----- global.json | 4 +- 6 files changed, 119 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index a37718f02c01..3d5ee3665788 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,28 @@ - + + + + + + + + + + + + + + + + @@ -21,10 +36,20 @@ - + + + + + + + + + + + @@ -44,15 +69,32 @@ - - + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index de3c7ff27016..2b1eb90c741e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade - 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade - 67d23f4ba1813b315e7e33c71d18b63475f5c5f8 + e6f70c7dd528f05cd28cec2a179d58c22e91d9ac https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 187c4322c349..bcdd6040d32e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24225.1 + 8.0.0-beta.24266.3 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index f0513aee5b0d..43ee0c202fc7 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -14,15 +15,15 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - - template: /eng/common/templates-official/variables/pool-providers.yml + - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -33,24 +34,23 @@ jobs: demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 - os: windows + demands: ImageOverride -equals windows.vs2019.amd64 steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -62,7 +62,24 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + + - script: | + echo "Client ID: $(ARM_CLIENT_ID)" + echo "ID Token: $(ARM_ID_TOKEN)" + echo "Tenant ID: $(ARM_TENANT_ID)" + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 + displayName: Upload stage1 artifacts to source index \ No newline at end of file diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index b98202aa02d8..43ee0c202fc7 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -1,6 +1,7 @@ parameters: runAsPublic: false - sourceIndexPackageVersion: 1.0.1-20230228.2 + sourceIndexUploadPackageVersion: 2.0.0-20240502.12 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20240129.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] @@ -14,14 +15,14 @@ jobs: dependsOn: ${{ parameters.dependsOn }} condition: ${{ parameters.condition }} variables: - - name: SourceIndexPackageVersion - value: ${{ parameters.sourceIndexPackageVersion }} + - name: SourceIndexUploadPackageVersion + value: ${{ parameters.sourceIndexUploadPackageVersion }} + - name: SourceIndexProcessBinlogPackageVersion + value: ${{ parameters.sourceIndexProcessBinlogPackageVersion }} - name: SourceIndexPackageSource value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - group: source-dot-net stage1 variables - template: /eng/common/templates/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: @@ -40,16 +41,16 @@ jobs: - ${{ preStep }} - task: UseDotNet@2 - displayName: Use .NET Core SDK 6 + displayName: Use .NET 8 SDK inputs: packageType: sdk - version: 6.0.x + version: 8.0.x installationPath: $(Agent.TempDirectory)/dotnet workingDirectory: $(Agent.TempDirectory) - script: | - $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools - $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install BinLogToSln --version $(sourceIndexProcessBinlogPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools + $(Agent.TempDirectory)/dotnet/dotnet tool install UploadIndexStage1 --version $(sourceIndexUploadPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path $(Agent.TempDirectory)/.source-index/tools displayName: Download Tools # Set working directory to temp directory so 'dotnet' doesn't try to use global.json and use the repo's sdk. workingDirectory: $(Agent.TempDirectory) @@ -61,7 +62,24 @@ jobs: displayName: Process Binlog into indexable sln - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) - displayName: Upload stage1 artifacts to source index - env: - BLOB_CONTAINER_URL: $(source-dot-net-stage1-blob-container-url) + - task: AzureCLI@2 + displayName: Get stage 1 auth token + inputs: + azureSubscription: 'SourceDotNet Stage1 Publish' + addSpnToEnvironment: true + scriptType: 'ps' + scriptLocation: 'inlineScript' + inlineScript: | + echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + + - script: | + echo "Client ID: $(ARM_CLIENT_ID)" + echo "ID Token: $(ARM_ID_TOKEN)" + echo "Tenant ID: $(ARM_TENANT_ID)" + az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) + displayName: "Login to Azure" + + - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 + displayName: Upload stage1 artifacts to source index \ No newline at end of file diff --git a/global.json b/global.json index f84be2571b83..50fd7a407e5e 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.24225.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24225.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24266.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24266.3" } } From 87a59a246b7b3ac5695bbcb42bb1d8a7dc13f0b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 17 May 2024 19:17:09 +0000 Subject: [PATCH 482/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19768) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 35b2fdb74301..fc64e36c63d8 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24263.2", + "version": "1.1.0-beta.24266.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b1eb90c741e..49f73c361363 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade-services - 1e87b738062df027a2d4687b07e04ee7a18c55a3 + 2402a4e788d304bf3a502a817e737b45b36e87f1 - + https://github.com/dotnet/arcade-services - 1e87b738062df027a2d4687b07e04ee7a18c55a3 + 2402a4e788d304bf3a502a817e737b45b36e87f1 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index bcdd6040d32e..a753e781e5c1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24263.2 + 1.1.0-beta.24266.1 From fb61915e2378551464f93565f042babf1e3c8c56 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 17 May 2024 23:16:43 +0000 Subject: [PATCH 483/652] Merged PR 39689: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ff23b01e-599f-4f7c-8bf3-08dc11e0a92e - **Build**: 20240517.44 - **Date Produced**: May 17, 2024 9:37:28 PM UTC - **Commit**: 00abb199c46e43f178358b72c52171b4fc33fdde - **Branch**: refs/heads/internal/release/8.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.301 to 8.0.302][2] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.301-servicing.24266.25 to 8.0.302-servicing.24267.44][2] - **Microsoft.NET.Sdk**: [from 8.0.301-servicing.24266.25 to 8.0.302-servicing.24267.44][2] - **Microsoft.TemplateEngine.Cli**: [from 8.0.301-servicing.24266.25 to 8.0.302-servicing.24267.44][2] - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.6 to 8.0.6][3] - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.6-servicing.24251.7 to 8.0.6-servicing.24266.4][3] - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.6-servicing.24251.7 to 8.0.6-servicing.24266.4][3] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.6 to 8.0.6][3] - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.5-servicing.24217.4 to 8.0.6-servicing.24266.2][4] - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.6 to 8.0.6][3] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 8.0.5-servicing.24217.2 to 8.0.6-servicing.24266.5][5] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC47a828be93cb7873d97f9e9e6b6b0b5752060c06&targetVersion=GC00abb199c46e43f178358b72c52171b4fc33fdde&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GCb83ccbcf1fd06f65ec23cca17b4fdd809b784394&targetVersion=GC745e5ba78bab21f191089ad0702d28b1f5c6550b&_a=files [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC6c37c986b6c8fc0669b38a03a03445a75b8227a6&targetVersion=GC4e8a67279888e260abf0cf5b027cc16ea7069799&_a=files [5]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb5af29a8f41f880f38fd015c6bcb7aeb816fcef6&targetVersion=GCc7a8451f8a664f44336c013032414c4a9ca4dc42&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redi... --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 14 +++++++------- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/NuGet.config b/NuGet.config index 33450849d909..408024534d95 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ - - + + @@ -49,11 +49,11 @@ - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac28dcc05280..f2b1be7c0e8c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b83ccbcf1fd06f65ec23cca17b4fdd809b784394 + 745e5ba78bab21f191089ad0702d28b1f5c6550b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b83ccbcf1fd06f65ec23cca17b4fdd809b784394 + 745e5ba78bab21f191089ad0702d28b1f5c6550b - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b83ccbcf1fd06f65ec23cca17b4fdd809b784394 + 745e5ba78bab21f191089ad0702d28b1f5c6550b https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - b83ccbcf1fd06f65ec23cca17b4fdd809b784394 + 745e5ba78bab21f191089ad0702d28b1f5c6550b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 84f78e6c7d539fab38b30d7c0bf73769219b98f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47a828be93cb7873d97f9e9e6b6b0b5752060c06 + 00abb199c46e43f178358b72c52171b4fc33fdde - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47a828be93cb7873d97f9e9e6b6b0b5752060c06 + 00abb199c46e43f178358b72c52171b4fc33fdde - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47a828be93cb7873d97f9e9e6b6b0b5752060c06 + 00abb199c46e43f178358b72c52171b4fc33fdde - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 47a828be93cb7873d97f9e9e6b6b0b5752060c06 + 00abb199c46e43f178358b72c52171b4fc33fdde https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6c37c986b6c8fc0669b38a03a03445a75b8227a6 + 4e8a67279888e260abf0cf5b027cc16ea7069799 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b5af29a8f41f880f38fd015c6bcb7aeb816fcef6 + c7a8451f8a664f44336c013032414c4a9ca4dc42 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index fdb0f44ef275..3f959f85b885 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.5-servicing.24217.4 + 8.0.6-servicing.24266.2 - 8.0.5-servicing.24217.2 + 8.0.6-servicing.24266.5 @@ -78,9 +78,9 @@ - 8.0.301 - 8.0.301-servicing.24266.25 - 8.0.301-servicing.24266.25 + 8.0.302 + 8.0.302-servicing.24267.44 + 8.0.302-servicing.24267.44 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,8 +105,8 @@ - 8.0.6-servicing.24251.7 - 8.0.6-servicing.24251.7 + 8.0.6-servicing.24266.4 + 8.0.6-servicing.24266.4 8.0.6 8.0.6 From 7960c8beac843763f4eeb9e9b0783b9fdbffe83d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Sat, 18 May 2024 04:53:37 +0000 Subject: [PATCH 484/652] Merged PR 39717: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.6-servicing.24266.4 to 8.0.6-servicing.24267.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.6-servicing.24266.4 to 8.0.6-servicing.24267.14 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.6-servicing.24253.6 to 8.0.7-servicing.24267.24 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.6-servicing.24266.3 to 8.0.6-servicing.24267.15 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.6 to 8.0.6 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.6-servicing.24266.5 to 8.0.7-servicing.24267.12 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.6 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: ... --- NuGet.config | 22 +++++----- eng/Version.Details.xml | 92 ++++++++++++++++++++--------------------- eng/Versions.props | 34 +++++++-------- 3 files changed, 74 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index 408024534d95..269c93216a4d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,13 @@ - + - + - + @@ -21,11 +21,11 @@ - + - - + + @@ -44,16 +44,16 @@ - + - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2b1be7c0e8c..d29ad858e6b8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 745e5ba78bab21f191089ad0702d28b1f5c6550b + 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 745e5ba78bab21f191089ad0702d28b1f5c6550b + 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 745e5ba78bab21f191089ad0702d28b1f5c6550b + 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 745e5ba78bab21f191089ad0702d28b1f5c6550b + 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 84f78e6c7d539fab38b30d7c0bf73769219b98f2 + 5ef70788429ca1ccc10d89e9cafde4752fb16f22 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00abb199c46e43f178358b72c52171b4fc33fdde + 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00abb199c46e43f178358b72c52171b4fc33fdde + 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00abb199c46e43f178358b72c52171b4fc33fdde + 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 00abb199c46e43f178358b72c52171b4fc33fdde + 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c https://github.com/dotnet/test-templates @@ -128,9 +128,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-winforms 4e8a67279888e260abf0cf5b027cc16ea7069799 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - c7a8451f8a664f44336c013032414c4a9ca4dc42 + eea757d15dbc77041d9295e55dc45d18d7f7ed83 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ 56d28849af08dc3143d019694aa92f186b89d2ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - fa5b0d8f4a8b424732cc992158aa92842f8a2846 + cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - a1cd44fdc64aa1f1c4630ddcd95580800d229180 + 16d77ddacb12870344abbc4831387cc3e8f97168 - + https://github.com/dotnet/emsdk - a1cd44fdc64aa1f1c4630ddcd95580800d229180 + 16d77ddacb12870344abbc4831387cc3e8f97168 diff --git a/eng/Versions.props b/eng/Versions.props index 3f959f85b885..9752fbfb6b01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -51,7 +51,7 @@ - 8.0.6-servicing.24266.5 + 8.0.7-servicing.24267.12 @@ -67,11 +67,11 @@ 8.0.6 8.0.6 - 8.0.6-servicing.24266.3 - 8.0.6-servicing.24266.3 - 8.0.6-servicing.24266.3 - 8.0.6-servicing.24266.3 - 8.0.6-servicing.24266.3 + 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.15 0.2.0 @@ -79,8 +79,8 @@ 8.0.302 - 8.0.302-servicing.24267.44 - 8.0.302-servicing.24267.44 + 8.0.302-servicing.24267.73 + 8.0.302-servicing.24267.73 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,22 +91,22 @@ - 8.0.6-servicing.24253.6 + 8.0.7-servicing.24267.24 - 8.0.6-servicing.24253.6 - 8.0.6-servicing.24253.6 - 8.0.6 - 8.0.6 - 8.0.6 - 8.0.6 + 8.0.7-servicing.24267.24 + 8.0.7-servicing.24267.24 + 8.0.7 + 8.0.7 + 8.0.7 + 8.0.7 2.1.0 - 8.0.6-servicing.24266.4 - 8.0.6-servicing.24266.4 + 8.0.6-servicing.24267.14 + 8.0.6-servicing.24267.14 8.0.6 8.0.6 From e805a2522097da59c92022e4a6bb49f4c07cac78 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 18 May 2024 23:19:45 +0000 Subject: [PATCH 485/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240518.2 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.6 -> To Version 8.0.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 269c93216a4d..208178b83d47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -24,8 +24,8 @@ - - + + @@ -44,13 +44,13 @@ - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d29ad858e6b8..3c7d44496fd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 5ef70788429ca1ccc10d89e9cafde4752fb16f22 + aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c + aabf3819c5713968da2f5e7c00c9e72284384670 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c + aabf3819c5713968da2f5e7c00c9e72284384670 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c + aabf3819c5713968da2f5e7c00c9e72284384670 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 455d7fbd5d773a81f5c4ea10878155e5c8b2ce1c + aabf3819c5713968da2f5e7c00c9e72284384670 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 9752fbfb6b01..aaffc329c291 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.6 8.0.6 - 8.0.6-servicing.24267.15 - 8.0.6-servicing.24267.15 - 8.0.6-servicing.24267.15 - 8.0.6-servicing.24267.15 - 8.0.6-servicing.24267.15 + 8.0.6-servicing.24267.20 + 8.0.6-servicing.24267.20 + 8.0.6-servicing.24267.20 + 8.0.6-servicing.24267.20 + 8.0.6-servicing.24267.20 0.2.0 @@ -79,8 +79,8 @@ 8.0.302 - 8.0.302-servicing.24267.73 - 8.0.302-servicing.24267.73 + 8.0.302-servicing.24268.2 + 8.0.302-servicing.24268.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From d6e68b94387d2af8170777d14081ace10045c589 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 21:46:19 +0000 Subject: [PATCH 486/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19800) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- NuGet.config | 53 --------------------------------------- eng/Version.Details.xml | 8 +++--- eng/Versions.props | 2 +- 4 files changed, 6 insertions(+), 59 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index fc64e36c63d8..6efd7abea54d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24266.1", + "version": "1.1.0-beta.24267.1", "commands": [ "darc" ] diff --git a/NuGet.config b/NuGet.config index 3d5ee3665788..4e27eeb09904 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,26 +9,8 @@ - - - - - - - - - - - - - - - - - - @@ -38,19 +20,6 @@ - - - - - - - - - - - - - @@ -72,30 +41,8 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 49f73c361363..9ef4978d7743 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade-services - 2402a4e788d304bf3a502a817e737b45b36e87f1 + edea2714d4eb808921b2128d47234f387c03bf91 - + https://github.com/dotnet/arcade-services - 2402a4e788d304bf3a502a817e737b45b36e87f1 + edea2714d4eb808921b2128d47234f387c03bf91 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a753e781e5c1..f03b98eaa9fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24266.1 + 1.1.0-beta.24267.1 From d8e02cd671ce1569efdd08fb6979c1753562542d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 18:54:40 +0000 Subject: [PATCH 487/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.6 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 22 ++++----- eng/Version.Details.xml | 100 ++++++++++++++++++++-------------------- eng/Versions.props | 40 ++++++++-------- 3 files changed, 81 insertions(+), 81 deletions(-) diff --git a/NuGet.config b/NuGet.config index 208178b83d47..0e65b6cd815a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,13 @@ - + - + - + @@ -21,11 +21,11 @@ - + - - + + @@ -44,16 +44,16 @@ - + - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 631884a61549..af3066d72779 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7fc51460e63a6e9f1f473e2d1d4d96fcef99a3f9 + 8759cccda686ccebdbd59c90c9e0524082671198 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - aa6b3d420ca47bc7362606dd8a43e37c9f52dd1e + 714a9761f995103a6cdf21a7c41041740293bae9 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aabf3819c5713968da2f5e7c00c9e72284384670 + afe72aab7f2ff0e67569d4e3606de3d35e8fa76c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aabf3819c5713968da2f5e7c00c9e72284384670 + afe72aab7f2ff0e67569d4e3606de3d35e8fa76c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aabf3819c5713968da2f5e7c00c9e72284384670 + afe72aab7f2ff0e67569d4e3606de3d35e8fa76c - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - aabf3819c5713968da2f5e7c00c9e72284384670 + afe72aab7f2ff0e67569d4e3606de3d35e8fa76c https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 4e8a67279888e260abf0cf5b027cc16ea7069799 + 75693baf659b4a98a29d70c69a86de8752bf5c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - eea757d15dbc77041d9295e55dc45d18d7f7ed83 + 6c96e5e2b40908998ba65dac3171b90d6b3ca775 https://github.com/dotnet/fsharp @@ -148,11 +148,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cb4ec67fd1784497c953f65bfc390eb8bfdf6c6b + 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 9e93997517cb36aa0ac4444d69e022e288429252 + d963055bb8326039f6083ee1f08648b10db1b887 @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 16d77ddacb12870344abbc4831387cc3e8f97168 + a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed - + https://github.com/dotnet/emsdk - 16d77ddacb12870344abbc4831387cc3e8f97168 + a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed diff --git a/eng/Versions.props b/eng/Versions.props index fe26ed8e8a3b..84d9e523ff6f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.6-servicing.24266.2 + 8.0.7-servicing.24269.16 - 8.0.7-servicing.24267.12 + 8.0.7-servicing.24270.8 @@ -65,13 +65,13 @@ - 8.0.6 - 8.0.6 - 8.0.6-servicing.24267.20 - 8.0.6-servicing.24267.20 - 8.0.6-servicing.24267.20 - 8.0.6-servicing.24267.20 - 8.0.6-servicing.24267.20 + 8.0.7 + 8.0.7 + 8.0.7-servicing.24270.26 + 8.0.7-servicing.24270.26 + 8.0.7-servicing.24270.26 + 8.0.7-servicing.24270.26 + 8.0.7-servicing.24270.26 0.2.0 @@ -79,24 +79,24 @@ 8.0.302 - 8.0.302-servicing.24268.2 - 8.0.302-servicing.24268.2 + 8.0.302-servicing.24271.15 + 8.0.302-servicing.24271.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24265.5 + 4.10.0-3.24269.2 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.14 - 8.0.7-servicing.24267.24 - 8.0.7-servicing.24267.24 + 8.0.7-servicing.24270.14 + 8.0.7-servicing.24270.14 8.0.7 8.0.7 8.0.7 @@ -105,10 +105,10 @@ - 8.0.6-servicing.24267.14 - 8.0.6-servicing.24267.14 - 8.0.6 - 8.0.6 + 8.0.7-servicing.24270.15 + 8.0.7-servicing.24270.15 + 8.0.7 + 8.0.7 @@ -198,7 +198,7 @@ 14.0.8478 17.0.8478 - 8.0.6 + 8.0.7 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From 595f34665bbad14edc32850d12216a3726b07078 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 21 May 2024 19:12:21 +0000 Subject: [PATCH 488/652] Merged PR 39888: [ internal/release/8.0.3xx] always subtract one from template versions. Updated Versions.props - always subtract one from template versions. --- eng/Versions.props | 3 +++ 1 file changed, 3 insertions(+) diff --git a/eng/Versions.props b/eng/Versions.props index 84d9e523ff6f..7ac819d27342 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,6 +141,9 @@ Preview releases already use -1 versionining so don't subtract one for that version. In public builds, we always use the 2 month old version. --> + + true + true true true From 00573c2d013e0361e74d162505285c64f012b9e4 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 19:49:04 +0000 Subject: [PATCH 489/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.7 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 34 +++++++++++++++++----------------- eng/Versions.props | 12 ++++++------ 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/NuGet.config b/NuGet.config index 0e65b6cd815a..180a12c0749c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ - - + + @@ -49,11 +49,11 @@ - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af3066d72779..3e77b5c3dffd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8759cccda686ccebdbd59c90c9e0524082671198 + ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8759cccda686ccebdbd59c90c9e0524082671198 + ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8759cccda686ccebdbd59c90c9e0524082671198 + ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8759cccda686ccebdbd59c90c9e0524082671198 + ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - afe72aab7f2ff0e67569d4e3606de3d35e8fa76c + 6857f8b78971a741a52e6d434661896255bdc103 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - afe72aab7f2ff0e67569d4e3606de3d35e8fa76c + 6857f8b78971a741a52e6d434661896255bdc103 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - afe72aab7f2ff0e67569d4e3606de3d35e8fa76c + 6857f8b78971a741a52e6d434661896255bdc103 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - afe72aab7f2ff0e67569d4e3606de3d35e8fa76c + 6857f8b78971a741a52e6d434661896255bdc103 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 75693baf659b4a98a29d70c69a86de8752bf5c03 + b41338c372f491d19532b30fd3c6b609f963aa92 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6c96e5e2b40908998ba65dac3171b90d6b3ca775 + 7db8d5b8559d931e0b5555b7d3eec6c083dd6e59 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 7ac819d27342..511754cacba0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.7-servicing.24269.16 + 8.0.7-servicing.24270.8 - 8.0.7-servicing.24270.8 + 8.0.7-servicing.24271.5 @@ -79,8 +79,8 @@ 8.0.302 - 8.0.302-servicing.24271.15 - 8.0.302-servicing.24271.15 + 8.0.302-servicing.24271.21 + 8.0.302-servicing.24271.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,8 +105,8 @@ - 8.0.7-servicing.24270.15 - 8.0.7-servicing.24270.15 + 8.0.7-servicing.24271.4 + 8.0.7-servicing.24271.4 8.0.7 8.0.7 From c24a20f32bf989586590b8c3b5f5f82061f59d05 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Tue, 21 May 2024 15:20:40 -0700 Subject: [PATCH 490/652] [release/8.0.3xx-staging] Remove PGO builds --- .vsts-ci.yml | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 9efb421fd9eb..6c1789fb9980 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -325,53 +325,6 @@ extends: buildArchitecture: arm64 runTests: false - # Windows PGO Instrumentation - - template: eng/build.yml@self - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - additionalBuildParameters: '/p:PublishInternalAsset=true' - runTests: false - - template: eng/build.yml@self - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_x86 - buildConfiguration: Release - buildArchitecture: x86 - runTests: false - - template: eng/build.yml@self - parameters: - agentOs: Windows_NT - pgoInstrument: true - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - runTests: false - - # Linux PGO Instrumentation - - template: eng/build.yml@self - parameters: - agentOs: Linux - pgoInstrument: true - jobName: Build_LinuxPortable_Release_x64 - buildConfiguration: Release - buildArchitecture: x64 - linuxPortable: true - runTests: false - - template: eng/build.yml@self - parameters: - agentOs: Linux - pgoInstrument: true - jobName: Build_Release_arm64 - buildConfiguration: Release - buildArchitecture: arm64 - linuxPortable: true - runTests: false - # Source Build - template: /eng/common/templates-official/jobs/source-build.yml@self From c2717c816fd0d4a0247f7a5f7345d8915427aad5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 21 May 2024 23:24:52 +0000 Subject: [PATCH 491/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.30 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24269.2 -> To Version 4.10.0-3.24271.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 180a12c0749c..30954eefe557 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,8 +24,8 @@ - - + + @@ -49,8 +49,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e77b5c3dffd..4a1bcd58e331 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6857f8b78971a741a52e6d434661896255bdc103 + 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6857f8b78971a741a52e6d434661896255bdc103 + 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6857f8b78971a741a52e6d434661896255bdc103 + 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6857f8b78971a741a52e6d434661896255bdc103 + 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 63d80966a9f0d15e057d0d146702405b19c82533 - + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - d963055bb8326039f6083ee1f08648b10db1b887 + 698bc7ffa21da8de7704787bc973471cbc8937bb diff --git a/eng/Versions.props b/eng/Versions.props index 511754cacba0..147da6a1e784 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.302 - 8.0.302-servicing.24271.21 - 8.0.302-servicing.24271.21 + 8.0.302-servicing.24271.30 + 8.0.302-servicing.24271.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24269.2 + 4.10.0-3.24271.3 From a3ad6ce2b24613bd34cfc8565e512111a9cd97af Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 22 May 2024 00:57:40 +0000 Subject: [PATCH 492/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240521.32 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.302 -> To Version 8.0.302 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24269.2 -> To Version 4.10.0-3.24271.3 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 30954eefe557..17ad8dca77ce 100644 --- a/NuGet.config +++ b/NuGet.config @@ -24,8 +24,8 @@ - - + + @@ -49,8 +49,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a1bcd58e331..e3275ef1207f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 + b0151bd70a1495bbf6875dcb45d00b4234ae3486 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 + b0151bd70a1495bbf6875dcb45d00b4234ae3486 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 + b0151bd70a1495bbf6875dcb45d00b4234ae3486 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0791651b38d92e8a8c2f4c8127f7fbee325eaf13 + b0151bd70a1495bbf6875dcb45d00b4234ae3486 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 147da6a1e784..7f60c21ebca8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.302 - 8.0.302-servicing.24271.30 - 8.0.302-servicing.24271.30 + 8.0.302-servicing.24271.32 + 8.0.302-servicing.24271.32 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 6205e55a3f9f8433ff3db1790d352611d82e5099 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 24 May 2024 22:51:54 +0000 Subject: [PATCH 493/652] Merged PR 39965: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ff23b01e-599f-4f7c-8bf3-08dc11e0a92e - **Build**: 20240524.16 - **Date Produced**: May 24, 2024 10:25:08 PM UTC - **Commit**: 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac - **Branch**: refs/heads/internal/release/8.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.302 to 8.0.302][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.302-servicing.24271.32 to 8.0.302-servicing.24274.16][1] - **Microsoft.NET.Sdk**: [from 8.0.302-servicing.24271.32 to 8.0.302-servicing.24274.16][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.302-servicing.24271.32 to 8.0.302-servicing.24274.16][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCb0151bd70a1495bbf6875dcb45d00b4234ae3486&targetVersion=GC0a9e1fea7508a0e2595b27a2d3facad9f44f59ac&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) --- NuGet.config | 37 ++++++++++++++++++++++++++++++++----- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 41 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index 17ad8dca77ce..cc305febd51b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,24 +8,39 @@ + + + + + + + + + + + + - + + + + - - + + @@ -44,15 +59,27 @@ + + + + + + + + - - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3275ef1207f..e2f869c32087 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0151bd70a1495bbf6875dcb45d00b4234ae3486 + 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0151bd70a1495bbf6875dcb45d00b4234ae3486 + 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0151bd70a1495bbf6875dcb45d00b4234ae3486 + 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b0151bd70a1495bbf6875dcb45d00b4234ae3486 + 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 7f60c21ebca8..508ea9c0208b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.302 - 8.0.302-servicing.24271.32 - 8.0.302-servicing.24271.32 + 8.0.302-servicing.24274.16 + 8.0.302-servicing.24274.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eccd6f916e61215e936be8390ef31a3bd23aa2a2 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 29 May 2024 14:18:12 -0700 Subject: [PATCH 494/652] Update to the final 7.0.20 release --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f03b98eaa9fc..4d02158d6e75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -26,7 +26,7 @@ 32 17 $([MSBuild]::Add($(VersionFeature), 30)) - 19 + 20 <_NET70ILLinkPackVersion>7.0.100-1.23401.1 From e0197b73d103e342028be66c018f50c9d4661896 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 30 May 2024 16:15:09 -0700 Subject: [PATCH 495/652] Increment branding to allow for razor hotfix --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index f03b98eaa9fc..97b4cf245b4e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 02 + 03 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) @@ -25,7 +25,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 30)) + $([MSBuild]::Add($(VersionFeature), 29)) 19 From 51e8f38b252722a4eff0a34f1b95e62ec88352ca Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:56:08 +0000 Subject: [PATCH 496/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19840) [release/8.0.3xx] Update dependencies from dotnet/arcade-services --- .config/dotnet-tools.json | 2 +- NuGet.config | 1 - eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 6efd7abea54d..7b47a8e9374e 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24267.1", + "version": "1.1.0-beta.24303.1", "commands": [ "darc" ] diff --git a/NuGet.config b/NuGet.config index 4e27eeb09904..1b9167e7c3a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ef4978d7743..b69339647b53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade e6f70c7dd528f05cd28cec2a179d58c22e91d9ac - + https://github.com/dotnet/arcade-services - edea2714d4eb808921b2128d47234f387c03bf91 + eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf - + https://github.com/dotnet/arcade-services - edea2714d4eb808921b2128d47234f387c03bf91 + eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 51554156e7e7..1dbb10dcd370 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24267.1 + 1.1.0-beta.24303.1 From e14273e31e7f5cc6d555bd2cb2be49e0b20e2cce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:56:26 +0000 Subject: [PATCH 497/652] [release/8.0.3xx] Update dependencies from dotnet/source-build-externals (#19823) [release/8.0.3xx] Update dependencies from dotnet/source-build-externals --- 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 b69339647b53..5100af9bf600 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - a3021ef9ed72d7bdf799092a47d2d024fc13bfcd + 4f2151df120194f0268944f1b723c14820738fc8 From f77227befacef6b2fda81c00d712a4d784fcbf07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 3 Jun 2024 22:56:44 +0000 Subject: [PATCH 498/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19839) [release/8.0.3xx] Update dependencies from dotnet/arcade --- 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 5100af9bf600..ee9d3ec300a9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - e6f70c7dd528f05cd28cec2a179d58c22e91d9ac + f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade - e6f70c7dd528f05cd28cec2a179d58c22e91d9ac + f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade - e6f70c7dd528f05cd28cec2a179d58c22e91d9ac + f2b2071632d5d4c46d0f904f2b0d917b1752551b https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 1dbb10dcd370..a2ff259bde28 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24266.3 + 8.0.0-beta.24270.4 diff --git a/global.json b/global.json index 50fd7a407e5e..6f26d605a5be 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.24266.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24266.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24270.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24270.4" } } From 40c83973417e632fa7b8d0ac6cd92c8626dfc8ef Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 4 Jun 2024 08:04:58 -0700 Subject: [PATCH 499/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19876) Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 7b47a8e9374e..99e585a24601 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24303.1", + "version": "1.1.0-beta.24303.4", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ee9d3ec300a9..846552d9d9a8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf + 1dafa0baedec752ebd1dfcae5b09cc87c8117967 - + https://github.com/dotnet/arcade-services - eaa3c6beb28f56f6e03a14380c9c5b94829fd6cf + 1dafa0baedec752ebd1dfcae5b09cc87c8117967 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index a2ff259bde28..e8c3288f8c92 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24303.1 + 1.1.0-beta.24303.4 From b042fc44151edae2cedea32f1fee1d32f6c5f6ba Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 5 Jun 2024 07:25:22 -0700 Subject: [PATCH 500/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19884) Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 99e585a24601..538dd67ca3a1 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24303.4", + "version": "1.1.0-beta.24304.5", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 846552d9d9a8..e8bc72c245f7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 1dafa0baedec752ebd1dfcae5b09cc87c8117967 + 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 - + https://github.com/dotnet/arcade-services - 1dafa0baedec752ebd1dfcae5b09cc87c8117967 + 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e8c3288f8c92..d1ee581206c3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24303.4 + 1.1.0-beta.24304.5 From 4a113efadc04407deca8e4f769548bd60e69d0a4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 6 Jun 2024 06:43:51 -0700 Subject: [PATCH 501/652] [release/8.0.3xx] Update dependencies from dotnet/arcade-services (#19890) Co-authored-by: dotnet-maestro[bot] --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 538dd67ca3a1..9ed6dce76e98 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,7 +3,7 @@ "isRoot": true, "tools": { "microsoft.dotnet.darc": { - "version": "1.1.0-beta.24304.5", + "version": "1.1.0-beta.24306.1", "commands": [ "darc" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e8bc72c245f7..463db1f53398 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -227,13 +227,13 @@ https://github.com/dotnet/arcade f2b2071632d5d4c46d0f904f2b0d917b1752551b - + https://github.com/dotnet/arcade-services - 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 + b65fa14c7799a84e7fc2384bf821720d8ab1873b - + https://github.com/dotnet/arcade-services - 98b07ca56bb578f2bd9225a5fc97f34b0c25b5f3 + b65fa14c7799a84e7fc2384bf821720d8ab1873b https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index d1ee581206c3..a3a047e1acd9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,7 +43,7 @@ - 1.1.0-beta.24304.5 + 1.1.0-beta.24306.1 From 957c9d148657f831b14e509a408e0389888cb4fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 15:59:48 -0700 Subject: [PATCH 502/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19898) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../job/source-index-stage1.yml | 16 +++++++--------- eng/common/templates/job/source-index-stage1.yml | 11 ++++------- global.json | 4 ++-- 5 files changed, 20 insertions(+), 25 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 463db1f53398..53539ea33cf5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 - + https://github.com/dotnet/arcade - f2b2071632d5d4c46d0f904f2b0d917b1752551b + 9f6799fdc16ae19b3e9478c55b997a6aab839d09 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index a3a047e1acd9..281556c358df 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24270.4 + 8.0.0-beta.24310.5 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 43ee0c202fc7..60dfb6b2d1c0 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -23,7 +23,7 @@ jobs: value: ${{ parameters.sourceIndexPackageSource }} - name: BinlogPath value: ${{ parameters.binlogPath }} - - template: /eng/common/templates/variables/pool-providers.yml + - template: /eng/common/templates-official/variables/pool-providers.yml ${{ if ne(parameters.pool, '') }}: pool: ${{ parameters.pool }} @@ -34,7 +34,8 @@ jobs: demands: ImageOverride -equals windows.vs2019.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + image: windows.vs2022.amd64 + os: windows steps: - ${{ each preStep in parameters.preSteps }}: @@ -70,16 +71,13 @@ jobs: scriptType: 'ps' scriptLocation: 'inlineScript' inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - script: | - echo "Client ID: $(ARM_CLIENT_ID)" - echo "ID Token: $(ARM_ID_TOKEN)" - echo "Tenant ID: $(ARM_TENANT_ID)" az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) displayName: "Login to Azure" - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index \ No newline at end of file + displayName: Upload stage1 artifacts to source index diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 43ee0c202fc7..0b6bb89dc78a 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -70,16 +70,13 @@ jobs: scriptType: 'ps' scriptLocation: 'inlineScript' inlineScript: | - echo "##vso[task.setvariable variable=ARM_CLIENT_ID]$env:servicePrincipalId" - echo "##vso[task.setvariable variable=ARM_ID_TOKEN]$env:idToken" - echo "##vso[task.setvariable variable=ARM_TENANT_ID]$env:tenantId" + echo "##vso[task.setvariable variable=ARM_CLIENT_ID;issecret=true]$env:servicePrincipalId" + echo "##vso[task.setvariable variable=ARM_ID_TOKEN;issecret=true]$env:idToken" + echo "##vso[task.setvariable variable=ARM_TENANT_ID;issecret=true]$env:tenantId" - script: | - echo "Client ID: $(ARM_CLIENT_ID)" - echo "ID Token: $(ARM_ID_TOKEN)" - echo "Tenant ID: $(ARM_TENANT_ID)" az login --service-principal -u $(ARM_CLIENT_ID) --tenant $(ARM_TENANT_ID) --allow-no-subscriptions --federated-token $(ARM_ID_TOKEN) displayName: "Login to Azure" - script: $(Agent.TempDirectory)/.source-index/tools/UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name) -s netsourceindexstage1 -b stage1 - displayName: Upload stage1 artifacts to source index \ No newline at end of file + displayName: Upload stage1 artifacts to source index diff --git a/global.json b/global.json index 6f26d605a5be..36cfb1d2f5be 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.24270.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24270.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24310.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24310.5" } } From 08eff8177d020e76e93338bbb5b07b81a1320862 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 12 Jun 2024 02:59:22 +0000 Subject: [PATCH 503/652] Merged PR 40091: Revert '[ internal/release/8.0.3xx] always subtract one from template versions.' Updated Versions.props - always subtract one from template versions. Reverts !39888 --- eng/Versions.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index dbcfea7ec4ad..a1b710645435 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -141,9 +141,6 @@ Preview releases already use -1 versionining so don't subtract one for that version. In public builds, we always use the 2 month old version. --> - - true - true true true From 87ae19a11ca7ad1fd8dceadb1513ce6edf2a9263 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 11 Jun 2024 20:13:59 -0700 Subject: [PATCH 504/652] Corrected to 17.10.4 to match the Microsoft.Build version in Versions.Details.xml --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ee31e9de2d22..39828233de9e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -124,7 +124,7 @@ - 17.8.5 + 17.10.4 From 652060d364482857a5600be510772793dc9936f2 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Wed, 12 Jun 2024 08:24:33 -0500 Subject: [PATCH 505/652] Add source build exclusion --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index ee09742d35f2..0b2b78fe8a50 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -11,6 +11,10 @@ --> + + + + From c4de72858f4017ef84293b0532017d0e54df8f76 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 12 Jun 2024 23:36:04 +0000 Subject: [PATCH 506/652] Merged PR 40332: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.7-servicing.24271.4 to 8.0.7-servicing.24306.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.7-servicing.24271.4 to 8.0.7-servicing.24306.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.7-servicing.24270.14 to 8.0.7-servicing.24311.13 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.7-servicing.24270.26 to 8.0.7-servicing.24311.6 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.ILLink.Tasks**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.7 to 8.0.7 (parent: Microsoft.NETCore.App.Runtime.win-x64) - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.NET.... --- NuGet.config | 50 ++++++-------------------- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 26 +++++++------- 3 files changed, 64 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc305febd51b..a0801e78871d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,40 +7,24 @@ - - - - - + - - - - - + - - - - - + - - - - - + - - + + @@ -59,28 +43,16 @@ - - - - - + - - - - - + - - + + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 257e82a65b84..3e7955e01972 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ba84675a76a8c12ecf4549f9ec9d98a587ef3e75 + 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 714a9761f995103a6cdf21a7c41041740293bae9 + a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac + cda292ae8710fc730c8122cdd8275f1bf29f82b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac + cda292ae8710fc730c8122cdd8275f1bf29f82b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac + cda292ae8710fc730c8122cdd8275f1bf29f82b6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0a9e1fea7508a0e2595b27a2d3facad9f44f59ac + cda292ae8710fc730c8122cdd8275f1bf29f82b6 https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 63d80966a9f0d15e057d0d146702405b19c82533 + e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed + 41fe641713abfc3ed87a017c93f0a649f5172fb1 - + https://github.com/dotnet/emsdk - a3c7d8205559d673de8b7cdafd6d80d5f4d2cfed + 41fe641713abfc3ed87a017c93f0a649f5172fb1 diff --git a/eng/Versions.props b/eng/Versions.props index a1b710645435..0806cfdb9057 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,20 +67,20 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24270.26 - 8.0.7-servicing.24270.26 - 8.0.7-servicing.24270.26 - 8.0.7-servicing.24270.26 - 8.0.7-servicing.24270.26 + 8.0.7-servicing.24311.6 + 8.0.7-servicing.24311.6 + 8.0.7-servicing.24311.6 + 8.0.7-servicing.24311.6 + 8.0.7-servicing.24311.6 0.2.0 - 8.0.302 - 8.0.302-servicing.24274.16 - 8.0.302-servicing.24274.16 + 8.0.303 + 8.0.303-servicing.24312.14 + 8.0.303-servicing.24312.14 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.7-servicing.24270.14 + 8.0.7-servicing.24311.13 - 8.0.7-servicing.24270.14 - 8.0.7-servicing.24270.14 + 8.0.7-servicing.24311.13 + 8.0.7-servicing.24311.13 8.0.7 8.0.7 8.0.7 @@ -105,8 +105,8 @@ - 8.0.7-servicing.24271.4 - 8.0.7-servicing.24271.4 + 8.0.7-servicing.24306.5 + 8.0.7-servicing.24306.5 8.0.7 8.0.7 From 4e6fa5f10b3e44832e3bc40f17f9e1dd052c9ef8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 16:21:39 +0000 Subject: [PATCH 507/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.7 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 ++++++------ eng/Version.Details.xml | 62 ++++++++++++++++++++--------------------- eng/Versions.props | 18 ++++++------ 3 files changed, 49 insertions(+), 49 deletions(-) diff --git a/NuGet.config b/NuGet.config index a0801e78871d..b5d7e921e056 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,21 +10,21 @@ - + - + - + - - + + @@ -46,13 +46,13 @@ - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3e7955e01972..da799a6cdef3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 8ba687e65b3fb4a94627f7722ede5c2bde6990a1 + 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cda292ae8710fc730c8122cdd8275f1bf29f82b6 + 2eb54d5ac349e57ca89eff7531d9272178abb7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cda292ae8710fc730c8122cdd8275f1bf29f82b6 + 2eb54d5ac349e57ca89eff7531d9272178abb7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cda292ae8710fc730c8122cdd8275f1bf29f82b6 + 2eb54d5ac349e57ca89eff7531d9272178abb7f8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - cda292ae8710fc730c8122cdd8275f1bf29f82b6 + 2eb54d5ac349e57ca89eff7531d9272178abb7f8 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - b41338c372f491d19532b30fd3c6b609f963aa92 + 706e61ff5705f6b87ecdde0d7338006eba3467c5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 7db8d5b8559d931e0b5555b7d3eec6c083dd6e59 + b10cd0c3e35e17582d9f2b8079daf7c115e0bf53 https://github.com/dotnet/fsharp @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d + cc6880ce36d783678284d36e8397fc30fda93c8a https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - 41fe641713abfc3ed87a017c93f0a649f5172fb1 + 727397ca6ba44045f3049fdb12d3908da3de8cee - + https://github.com/dotnet/emsdk - 41fe641713abfc3ed87a017c93f0a649f5172fb1 + 727397ca6ba44045f3049fdb12d3908da3de8cee diff --git a/eng/Versions.props b/eng/Versions.props index c455a98eb099..005fad2d64de 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.7-servicing.24270.8 + 8.0.7-servicing.24311.4 - 8.0.7-servicing.24271.5 + 8.0.7-servicing.24312.2 @@ -79,8 +79,8 @@ 8.0.303 - 8.0.303-servicing.24312.14 - 8.0.303-servicing.24312.14 + 8.0.303-servicing.24313.11 + 8.0.303-servicing.24313.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.7-servicing.24311.13 + 8.0.7-servicing.24312.14 - 8.0.7-servicing.24311.13 - 8.0.7-servicing.24311.13 + 8.0.7-servicing.24312.14 + 8.0.7-servicing.24312.14 8.0.7 8.0.7 8.0.7 @@ -105,8 +105,8 @@ - 8.0.7-servicing.24306.5 - 8.0.7-servicing.24306.5 + 8.0.7-servicing.24312.4 + 8.0.7-servicing.24312.4 8.0.7 8.0.7 From 218917dda3bc2e29a07d08341c440d691be4c564 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 13 Jun 2024 21:50:22 +0000 Subject: [PATCH 508/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.24 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.7 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index b5d7e921e056..694048ce8b84 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -23,8 +23,8 @@ - - + + @@ -43,13 +43,13 @@ - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da799a6cdef3..42328e301b32 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - a2ca3fb80b0555bb411cb048bbcfe6f2a74f24e6 + fd0d853b41be6248ed1eba9daad13df8a0a9898a https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2eb54d5ac349e57ca89eff7531d9272178abb7f8 + 0639f54dfb17fb11bf0f210ae65c554f584f1e5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2eb54d5ac349e57ca89eff7531d9272178abb7f8 + 0639f54dfb17fb11bf0f210ae65c554f584f1e5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2eb54d5ac349e57ca89eff7531d9272178abb7f8 + 0639f54dfb17fb11bf0f210ae65c554f584f1e5d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2eb54d5ac349e57ca89eff7531d9272178abb7f8 + 0639f54dfb17fb11bf0f210ae65c554f584f1e5d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 005fad2d64de..2819f3f9778c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24311.6 - 8.0.7-servicing.24311.6 - 8.0.7-servicing.24311.6 - 8.0.7-servicing.24311.6 - 8.0.7-servicing.24311.6 + 8.0.7-servicing.24312.5 + 8.0.7-servicing.24312.5 + 8.0.7-servicing.24312.5 + 8.0.7-servicing.24312.5 + 8.0.7-servicing.24312.5 0.2.0 @@ -79,8 +79,8 @@ 8.0.303 - 8.0.303-servicing.24313.11 - 8.0.303-servicing.24313.11 + 8.0.303-servicing.24313.24 + 8.0.303-servicing.24313.24 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 017eda697ea41660b232f737605f8db9cd6aeb86 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 02:44:19 +0000 Subject: [PATCH 509/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240613.43 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.7-servicing.24312.14 -> To Version 8.0.7-servicing.24313.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 +++++------ eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 20 ++++++------- 3 files changed, 52 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 694048ce8b84..3b96e0e12c86 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,10 @@ - + - + @@ -20,11 +20,11 @@ - + - - + + @@ -43,13 +43,13 @@ - + - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 42328e301b32..f2fe998a1963 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 5968e003a1be7052fd5f52b529a47bb718ce86e6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fd0d853b41be6248ed1eba9daad13df8a0a9898a + efd75522485736760ddb7dac60d7bf6c7b8d430d https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0639f54dfb17fb11bf0f210ae65c554f584f1e5d + 04063852f86b1ce23e9ff13cd62e583aabcaba7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0639f54dfb17fb11bf0f210ae65c554f584f1e5d + 04063852f86b1ce23e9ff13cd62e583aabcaba7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0639f54dfb17fb11bf0f210ae65c554f584f1e5d + 04063852f86b1ce23e9ff13cd62e583aabcaba7b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0639f54dfb17fb11bf0f210ae65c554f584f1e5d + 04063852f86b1ce23e9ff13cd62e583aabcaba7b https://github.com/dotnet/test-templates @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - cc6880ce36d783678284d36e8397fc30fda93c8a + 2aade6beb02ea367fd97c4070a4198802fe61c03 https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - 727397ca6ba44045f3049fdb12d3908da3de8cee + a64772f521c578bc9925578b1384d3a08a02d31d - + https://github.com/dotnet/emsdk - 727397ca6ba44045f3049fdb12d3908da3de8cee + a64772f521c578bc9925578b1384d3a08a02d31d diff --git a/eng/Versions.props b/eng/Versions.props index 2819f3f9778c..f29f82e55655 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24312.5 - 8.0.7-servicing.24312.5 - 8.0.7-servicing.24312.5 - 8.0.7-servicing.24312.5 - 8.0.7-servicing.24312.5 + 8.0.7-servicing.24313.7 + 8.0.7-servicing.24313.7 + 8.0.7-servicing.24313.7 + 8.0.7-servicing.24313.7 + 8.0.7-servicing.24313.7 0.2.0 @@ -79,8 +79,8 @@ 8.0.303 - 8.0.303-servicing.24313.24 - 8.0.303-servicing.24313.24 + 8.0.303-servicing.24313.43 + 8.0.303-servicing.24313.43 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.7-servicing.24312.14 + 8.0.7-servicing.24313.11 - 8.0.7-servicing.24312.14 - 8.0.7-servicing.24312.14 + 8.0.7-servicing.24313.11 + 8.0.7-servicing.24313.11 8.0.7 8.0.7 8.0.7 From f90e6fc03c3d9a4815ce8cf684a7cbc0ae90f533 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 06:52:30 -0700 Subject: [PATCH 510/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19906) 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 53539ea33cf5..c36b06085797 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 - + https://github.com/dotnet/arcade - 9f6799fdc16ae19b3e9478c55b997a6aab839d09 + c214b6ad17aedca4fa48294d80f6c52ef2463081 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 39828233de9e..fab3cb7660af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24310.5 + 8.0.0-beta.24311.3 diff --git a/global.json b/global.json index 36cfb1d2f5be..7464456e2443 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.24310.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24310.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24311.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24311.3" } } From fceba14b2d7edb0934494f04715934efc522d0d3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 18:43:35 +0000 Subject: [PATCH 511/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.7 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.7 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++------ eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3b96e0e12c86..990b04795e5f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,13 +7,13 @@ - + - + @@ -23,8 +23,8 @@ - - + + @@ -43,16 +43,16 @@ - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 74a5e55c991d..ef3985acfbf4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5968e003a1be7052fd5f52b529a47bb718ce86e6 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5968e003a1be7052fd5f52b529a47bb718ce86e6 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5968e003a1be7052fd5f52b529a47bb718ce86e6 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5968e003a1be7052fd5f52b529a47bb718ce86e6 + 28ae95bc8703be1ebc194391b03b6477cf59bed2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - efd75522485736760ddb7dac60d7bf6c7b8d430d + 56b387739317fec43334e608ed65c7d834712467 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04063852f86b1ce23e9ff13cd62e583aabcaba7b + 277d8cba1e2f186d44ff8ce91dc88237f95245e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04063852f86b1ce23e9ff13cd62e583aabcaba7b + 277d8cba1e2f186d44ff8ce91dc88237f95245e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04063852f86b1ce23e9ff13cd62e583aabcaba7b + 277d8cba1e2f186d44ff8ce91dc88237f95245e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 04063852f86b1ce23e9ff13cd62e583aabcaba7b + 277d8cba1e2f186d44ff8ce91dc88237f95245e9 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 706e61ff5705f6b87ecdde0d7338006eba3467c5 + fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - b10cd0c3e35e17582d9f2b8079daf7c115e0bf53 + 43bb8cc831c2658e1117415019264bfe6f644f94 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 8378a5dc9894..cb6c4227718e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.7-servicing.24311.4 + 8.0.7-servicing.24313.8 - 8.0.7-servicing.24312.2 + 8.0.7-servicing.24313.7 @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24313.7 - 8.0.7-servicing.24313.7 - 8.0.7-servicing.24313.7 - 8.0.7-servicing.24313.7 - 8.0.7-servicing.24313.7 + 8.0.7-servicing.24313.12 + 8.0.7-servicing.24313.12 + 8.0.7-servicing.24313.12 + 8.0.7-servicing.24313.12 + 8.0.7-servicing.24313.12 0.2.0 @@ -79,8 +79,8 @@ 8.0.303 - 8.0.303-servicing.24313.43 - 8.0.303-servicing.24313.43 + 8.0.303-servicing.24314.7 + 8.0.303-servicing.24314.7 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,8 +105,8 @@ - 8.0.7-servicing.24312.4 - 8.0.7-servicing.24312.4 + 8.0.7-servicing.24314.3 + 8.0.7-servicing.24314.3 8.0.7 8.0.7 From 9db0dc5e198b2388040c91063727ef483365e1f0 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Fri, 14 Jun 2024 20:03:23 +0000 Subject: [PATCH 512/652] Merged PR 40465: Exclude System.Threading.Tasks.Dataflow.8.0.0 reporting Applies the same change as https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/pullrequest/40325 --- eng/SourceBuildPrebuiltBaseline.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 0b2b78fe8a50..bf27fdb5ff90 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -17,5 +17,7 @@ + + From f6e91b4cdde3b13c20924d65489f5048380ae8ef Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 21:51:36 +0000 Subject: [PATCH 513/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.7 -> To Version 8.0.7 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 990b04795e5f..69255731b501 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -23,8 +23,8 @@ - - + + @@ -43,13 +43,13 @@ - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ef3985acfbf4..82af95ca2271 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 56b387739317fec43334e608ed65c7d834712467 + 2f1db20456007c9515068a35a65afdf99af70bc6 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 277d8cba1e2f186d44ff8ce91dc88237f95245e9 + c22920594a0491b31c066963ebda06724517072f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 277d8cba1e2f186d44ff8ce91dc88237f95245e9 + c22920594a0491b31c066963ebda06724517072f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 277d8cba1e2f186d44ff8ce91dc88237f95245e9 + c22920594a0491b31c066963ebda06724517072f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 277d8cba1e2f186d44ff8ce91dc88237f95245e9 + c22920594a0491b31c066963ebda06724517072f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index cb6c4227718e..d2f316c30a1f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.7 8.0.7 - 8.0.7-servicing.24313.12 - 8.0.7-servicing.24313.12 - 8.0.7-servicing.24313.12 - 8.0.7-servicing.24313.12 - 8.0.7-servicing.24313.12 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 + 8.0.7-servicing.24314.2 0.2.0 @@ -79,8 +79,8 @@ 8.0.303 - 8.0.303-servicing.24314.7 - 8.0.303-servicing.24314.7 + 8.0.303-servicing.24314.15 + 8.0.303-servicing.24314.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 2cb1516518102054be6f583a0a21b16480ed53e3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 14 Jun 2024 23:26:06 +0000 Subject: [PATCH 514/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240614.22 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 12.8.300-beta.24228.1 -> To Version 12.8.301-beta.24271.6 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 8 ++++---- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 69255731b501..7fa3a8688ce7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,8 +23,8 @@ - - + + @@ -48,8 +48,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82af95ca2271..099dcef0e418 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22920594a0491b31c066963ebda06724517072f + b04c50eef3754f3abdb700442104c2a5db53a77b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22920594a0491b31c066963ebda06724517072f + b04c50eef3754f3abdb700442104c2a5db53a77b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22920594a0491b31c066963ebda06724517072f + b04c50eef3754f3abdb700442104c2a5db53a77b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c22920594a0491b31c066963ebda06724517072f + b04c50eef3754f3abdb700442104c2a5db53a77b https://github.com/dotnet/test-templates @@ -132,27 +132,27 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 43bb8cc831c2658e1117415019264bfe6f644f94 - + https://github.com/dotnet/fsharp - dd749058c91585e9b5dae62b0f8df892429ee28f + 80c165644db640d0f309affe0daa281c7e17b939 - + https://github.com/dotnet/fsharp - dd749058c91585e9b5dae62b0f8df892429ee28f + 80c165644db640d0f309affe0daa281c7e17b939 - + https://github.com/microsoft/vstest - 56d28849af08dc3143d019694aa92f186b89d2ac + 83d73f783bf54c336d1eab04a53d554f8a6c0b19 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 698bc7ffa21da8de7704787bc973471cbc8937bb + + https://github.com/dotnet/roslyn + 771f269b3abcbbd991f05becf8fe5e991d24b0c1 diff --git a/eng/Versions.props b/eng/Versions.props index d2f316c30a1f..054f15018119 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.303 - 8.0.303-servicing.24314.15 - 8.0.303-servicing.24314.15 + 8.0.303-servicing.24314.22 + 8.0.303-servicing.24314.22 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24271.3 + 4.10.0-3.24312.19 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-release-24203-04 + 17.10.0-release-24272-11 8.0.0-alpha.1.22557.12 From fdaac0e5c353be06834d4963c4eca6b071bfddd8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 17 Jun 2024 17:56:22 +0000 Subject: [PATCH 515/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240617.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.303 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24312.19 -> To Version 4.10.0-3.24314.14 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7fa3a8688ce7..fe0022aab809 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,8 +23,8 @@ - - + + @@ -48,8 +48,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 099dcef0e418..bbe4b359d437 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b04c50eef3754f3abdb700442104c2a5db53a77b + 3ecaf32089ff44b59b6cfc518baf20be49886604 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b04c50eef3754f3abdb700442104c2a5db53a77b + 3ecaf32089ff44b59b6cfc518baf20be49886604 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b04c50eef3754f3abdb700442104c2a5db53a77b + 3ecaf32089ff44b59b6cfc518baf20be49886604 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - b04c50eef3754f3abdb700442104c2a5db53a77b + 3ecaf32089ff44b59b6cfc518baf20be49886604 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - - https://github.com/dotnet/roslyn - 771f269b3abcbbd991f05becf8fe5e991d24b0c1 + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + 259e82e9f20dd3dd3ec961f352ddcf9bc29072ea diff --git a/eng/Versions.props b/eng/Versions.props index 054f15018119..8b55f55505cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.303 - 8.0.303-servicing.24314.22 - 8.0.303-servicing.24314.22 + 8.0.303-servicing.24317.6 + 8.0.303-servicing.24317.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24312.19 + 4.10.0-3.24314.14 From f383c69a76e86c85ffc3a2304bb103a6eee38741 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:53:07 -0700 Subject: [PATCH 516/652] Update branding to 8.0.304 (#19943) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index fab3cb7660af..05abcb116b6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 03 + 04 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From a201031f68e094b1f796f0b690a4816bfafb3e30 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 2 Jul 2024 15:25:29 -0700 Subject: [PATCH 517/652] [release/8.0.3xx] Switch to dSAS for internal runtimes (#19946) --- .vsts-ci.yml | 8 ++-- .vsts-pr.yml | 4 +- eng/Version.Details.xml | 12 +++--- eng/Versions.props | 2 +- eng/build-pr.yml | 1 + eng/build.yml | 1 + eng/common/post-build/publish-using-darc.ps1 | 15 +++---- .../job/publish-build-assets.yml | 12 +++--- .../templates-official/job/source-build.yml | 8 ++++ .../templates-official/jobs/source-build.yml | 8 ++++ .../post-build/post-build.yml | 8 ++-- .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ .../templates/job/publish-build-assets.yml | 12 +++--- eng/common/templates/job/source-build.yml | 8 ++++ eng/common/templates/jobs/source-build.yml | 8 ++++ .../templates/post-build/post-build.yml | 8 ++-- .../post-build/setup-maestro-vars.yml | 28 ++++++------ .../steps/enable-internal-runtimes.yml | 28 ++++++++++++ .../templates/steps/get-delegation-sas.yml | 43 +++++++++++++++++++ .../steps/get-federated-access-token.yml | 28 ++++++++++++ global.json | 4 +- 23 files changed, 292 insertions(+), 53 deletions(-) create mode 100644 eng/common/templates-official/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates-official/steps/get-delegation-sas.yml create mode 100644 eng/common/templates-official/steps/get-federated-access-token.yml create mode 100644 eng/common/templates/steps/enable-internal-runtimes.yml create mode 100644 eng/common/templates/steps/get-delegation-sas.yml create mode 100644 eng/common/templates/steps/get-federated-access-token.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6c1789fb9980..449b5db47126 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -21,14 +21,12 @@ variables: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - name: Codeql.Enabled value: true - - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true - name: _InternalRuntimeDownloadArgs value: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) @@ -325,8 +323,10 @@ extends: buildArchitecture: arm64 runTests: false - # Source Build - - template: /eng/common/templates-official/jobs/source-build.yml@self + # Source Build + - template: /eng/common/templates-official/jobs/source-build.yml@self + parameters: + enableInternalSources: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 3df1cf509d1b..0629bdeef653 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -21,7 +21,6 @@ variables: - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - name: Codeql.Enabled value: true - - group: DotNet-DotNetCli-Storage - group: DotNet-Installer-SDLValidation-Params - name: _PublishUsingPipelines value: true @@ -30,7 +29,6 @@ variables: value: '' - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - - group: DotNetBuilds storage account read tokens - name: _InternalRuntimeDownloadArgs value: /p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) @@ -347,6 +345,8 @@ stages: runTests: false - template: /eng/common/templates/jobs/source-build.yml + parameters: + enableInternalSources: true - ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - stage: Publish diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c36b06085797..1db217339e49 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + 8b879da4e449c48d99f3f642fc429379a64e8fe8 - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + 8b879da4e449c48d99f3f642fc429379a64e8fe8 - + https://github.com/dotnet/arcade - c214b6ad17aedca4fa48294d80f6c52ef2463081 + 8b879da4e449c48d99f3f642fc429379a64e8fe8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 05abcb116b6c..76290f52af0f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24311.3 + 8.0.0-beta.24352.1 diff --git a/eng/build-pr.yml b/eng/build-pr.yml index 21393e242d40..6804dd7be399 100644 --- a/eng/build-pr.yml +++ b/eng/build-pr.yml @@ -173,6 +173,7 @@ jobs: steps: - checkout: self clean: true + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: - task: PowerShell@2 diff --git a/eng/build.yml b/eng/build.yml index 3d2a6869c956..54192a470515 100644 --- a/eng/build.yml +++ b/eng/build.yml @@ -179,6 +179,7 @@ jobs: steps: - checkout: self clean: true + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - ${{ if eq(parameters.agentOs, 'Windows_NT') }}: - ${{ if and(not(parameters.isBuiltFromVmr), ne(variables['System.TeamProject'], 'public')) }}: - task: PowerShell@2 diff --git a/eng/common/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index 5a3a32ea8d75..238945cb5ab4 100644 --- a/eng/common/post-build/publish-using-darc.ps1 +++ b/eng/common/post-build/publish-using-darc.ps1 @@ -2,7 +2,6 @@ param( [Parameter(Mandatory=$true)][int] $BuildId, [Parameter(Mandatory=$true)][int] $PublishingInfraVersion, [Parameter(Mandatory=$true)][string] $AzdoToken, - [Parameter(Mandatory=$true)][string] $MaestroToken, [Parameter(Mandatory=$false)][string] $MaestroApiEndPoint = 'https://maestro.dot.net', [Parameter(Mandatory=$true)][string] $WaitPublishingFinish, [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters, @@ -31,13 +30,13 @@ try { } & $darc add-build-to-channel ` - --id $buildId ` - --publishing-infra-version $PublishingInfraVersion ` - --default-channels ` - --source-branch main ` - --azdev-pat $AzdoToken ` - --bar-uri $MaestroApiEndPoint ` - --password $MaestroToken ` + --id $buildId ` + --publishing-infra-version $PublishingInfraVersion ` + --default-channels ` + --source-branch main ` + --azdev-pat "$AzdoToken" ` + --bar-uri "$MaestroApiEndPoint" ` + --ci ` @optionalParams if ($LastExitCode -ne 0) { diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 589ac80a18b7..d01739c12857 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -76,13 +76,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro-prod.westus2.cloudapp.azure.com /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -144,7 +147,6 @@ jobs: arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f193dfbe2366..f983033bb028 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -62,6 +68,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index 08e5db9bb116..5cf6a269c0b6 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates-official/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index da1f40958b45..0dfa387e7b78 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -272,14 +272,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/steps/enable-internal-runtimes.yml b/eng/common/templates-official/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..93a8394a666b --- /dev/null +++ b/eng/common/templates-official/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates-official/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..e3786cef6dfd --- /dev/null +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 8ec0151def21..9fd69fa7c9b7 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -74,13 +74,16 @@ jobs: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Build Assets inputs: - filePath: eng\common\sdk-task.ps1 - arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1 + arguments: > + -task PublishBuildAssets -restore -msbuildEngine dotnet /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' - /p:BuildAssetRegistryToken=$(MaestroAccessToken) /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} /p:OfficialBuildId=$(Build.BuildNumber) @@ -140,7 +143,6 @@ jobs: arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index 8a3deef2b727..c0ff472b697b 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,12 @@ parameters: # container and pool. platform: {} + # If set to true and running on a non-public project, + # Internal blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - job: ${{ parameters.jobNamePrefix }}_${{ parameters.platform.name }} displayName: Source-Build (${{ parameters.platform.name }}) @@ -61,6 +67,8 @@ jobs: clean: all steps: + - ${{ if eq(parameters.enableInternalSources, true) }}: + - template: /eng/common/templates/steps/enable-internal-runtimes.yml - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index a15b07eb51d9..5f46bfa895c1 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/templates/jobs/source-build.yml @@ -21,6 +21,12 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # If set to true and running on a non-public project, + # Internal nuget and blob storage locations will be enabled. + # This is not enabled by default because many repositories do not need internal sources + # and do not need to have the required service connections approved in the pipeline. + enableInternalSources: false + jobs: - ${{ if ne(parameters.allCompletedJobId, '') }}: @@ -38,9 +44,11 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: - template: /eng/common/templates/job/source-build.yml parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index aba44a25a338..2db4933468fd 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -268,14 +268,16 @@ stages: - task: NuGetAuthenticate@1 - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' - -MaestroToken '$(MaestroApiAccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/setup-maestro-vars.yml b/eng/common/templates/post-build/setup-maestro-vars.yml index 0c87f149a4ad..64b9abc68504 100644 --- a/eng/common/templates/post-build/setup-maestro-vars.yml +++ b/eng/common/templates/post-build/setup-maestro-vars.yml @@ -11,13 +11,14 @@ steps: artifactName: ReleaseConfigs checkDownloadedFiles: true - - task: PowerShell@2 + - task: AzureCLI@2 name: setReleaseVars displayName: Set Release Configs Vars inputs: - targetType: inline - pwsh: true - script: | + azureSubscription: "Darc: Maestro Production" + scriptType: pscore + scriptLocation: inlineScript + inlineScript: | try { if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') { $Content = Get-Content $(Build.StagingDirectory)/ReleaseConfigs/ReleaseConfigs.txt @@ -31,15 +32,16 @@ steps: $AzureDevOpsBuildId = $Env:Build_BuildId } else { - $buildApiEndpoint = "${Env:MaestroApiEndPoint}/api/builds/${Env:BARBuildId}?api-version=${Env:MaestroApiVersion}" + . $(Build.SourcesDirectory)\eng\common\tools.ps1 + $darc = Get-Darc + $buildInfo = & $darc get-build ` + --id ${{ parameters.BARBuildId }} ` + --extended ` + --output-format json ` + --ci ` + | convertFrom-Json - $apiHeaders = New-Object 'System.Collections.Generic.Dictionary[[String],[String]]' - $apiHeaders.Add('Accept', 'application/json') - $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } - - $BarId = $Env:BARBuildId + $BarId = ${{ parameters.BARBuildId }} $Channels = $Env:PromoteToMaestroChannels -split "," $Channels = $Channels -join "][" $Channels = "[$Channels]" @@ -65,6 +67,4 @@ steps: exit 1 } env: - MAESTRO_API_TOKEN: $(MaestroApiAccessToken) - BARBuildId: ${{ parameters.BARBuildId }} PromoteToMaestroChannels: ${{ parameters.PromoteToChannelIds }} diff --git a/eng/common/templates/steps/enable-internal-runtimes.yml b/eng/common/templates/steps/enable-internal-runtimes.yml new file mode 100644 index 000000000000..54dc9416c519 --- /dev/null +++ b/eng/common/templates/steps/enable-internal-runtimes.yml @@ -0,0 +1,28 @@ +# Obtains internal runtime download credentials and populates the 'dotnetbuilds-internal-container-read-token-base64' +# variable with the base64-encoded SAS token, by default + +parameters: +- name: federatedServiceConnection + type: string + default: 'dotnetbuilds-internal-read' +- name: outputVariableName + type: string + default: 'dotnetbuilds-internal-container-read-token-base64' +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: true + +steps: +- ${{ if ne(variables['System.TeamProject'], 'public') }}: + - template: /eng/common/templates/steps/get-delegation-sas.yml + parameters: + federatedServiceConnection: ${{ parameters.federatedServiceConnection }} + outputVariableName: ${{ parameters.outputVariableName }} + expiryInHours: ${{ parameters.expiryInHours }} + base64Encode: ${{ parameters.base64Encode }} + storageAccount: dotnetbuilds + container: internal + permissions: rl diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml new file mode 100644 index 000000000000..c0e8f91317f0 --- /dev/null +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -0,0 +1,43 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +- name: expiryInHours + type: number + default: 1 +- name: base64Encode + type: boolean + default: false +- name: storageAccount + type: string +- name: container + type: string +- name: permissions + type: string + default: 'rl' + +steps: +- task: AzureCLI@2 + displayName: 'Generate delegation SAS Token for ${{ parameters.storageAccount }}/${{ parameters.container }}' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + # Calculate the expiration of the SAS token and convert to UTC + $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") + + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + + if ('${{ parameters.base64Encode }}' -eq 'true') { + $sas = [Convert]::ToBase64String([System.Text.Encoding]::UTF8.GetBytes($sas)) + } + + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$sas" diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml new file mode 100644 index 000000000000..c8c49cc0e8f0 --- /dev/null +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -0,0 +1,28 @@ +parameters: +- name: federatedServiceConnection + type: string +- name: outputVariableName + type: string +# Resource to get a token for. Common values include: +# - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps +# - 'https://storage.azure.com/' for storage +# Defaults to Azure DevOps +- name: resource + type: string + default: '499b84ac-1321-427f-aa17-267ca6975798' + +steps: +- task: AzureCLI@2 + displayName: 'Getting federated access token for feeds' + inputs: + azureSubscription: ${{ parameters.federatedServiceConnection }} + scriptType: 'pscore' + scriptLocation: 'inlineScript' + inlineScript: | + $accessToken = az account get-access-token --query accessToken --resource ${{ parameters.resource }} --output tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to get access token for resource '${{ parameters.resource }}'" + exit 1 + } + Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index 7464456e2443..7ce95a54adc7 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.24311.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24311.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24352.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24352.1" } } From e8dfa6bc58d15ba7ea9b8bd271396d132658a3db Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Wed, 3 Jul 2024 08:48:09 -0700 Subject: [PATCH 518/652] [release/8.0.3xx] Do not run TestSdkRpm target (#19951) --- src/redist/targets/GenerateRPMs.targets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/redist/targets/GenerateRPMs.targets b/src/redist/targets/GenerateRPMs.targets index a82f068fcb12..b5d03d5a90c1 100644 --- a/src/redist/targets/GenerateRPMs.targets +++ b/src/redist/targets/GenerateRPMs.targets @@ -12,8 +12,10 @@ DependsOnTargets="GetCurrentRuntimeInformation; GenerateRpmsInner" /> + From 89aca7c07eb32bf3ab6571cd3e14ab0a89496005 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 3 Jul 2024 20:08:39 -0700 Subject: [PATCH 519/652] Undo excess changes --- test/EndToEnd/ValidateInsertedManifests.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/test/EndToEnd/ValidateInsertedManifests.cs b/test/EndToEnd/ValidateInsertedManifests.cs index f5fa4c59b54f..64e3a3b5d9f3 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -31,10 +31,13 @@ public void ManifestReaderCanReadManifests() string manifestFile = manifestDir.GetFile("WorkloadManifest.json").FullName; - File.Exists(manifestFile).Should().BeTrue(); - using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); - Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile); - readManifest.Should().NotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid"); + if (!string.Equals(manifestId, "workloadsets")) + { + new FileInfo(manifestFile).Exists.Should().BeTrue(); + using var fileStream = new FileStream(manifestFile, FileMode.Open, FileAccess.Read); + Action readManifest = () => WorkloadManifestReader.ReadWorkloadManifest(manifestId, fileStream, manifestFile); + readManifest.Should().NotThrow("manifestId:" + manifestId + " manifestFile:" + manifestFile + "is invalid"); + } } } From 02bdc3a7af1e99d99593b22fe003dc04df6dd816 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Jul 2024 12:54:05 +0000 Subject: [PATCH 520/652] Update dependencies from https://github.com/dotnet/arcade build 20240709.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24352.1 -> To Version 8.0.0-beta.24359.3 --- NuGet.config | 44 +++++++++++++++++++ eng/Version.Details.xml | 12 ++--- eng/Versions.props | 2 +- .../job/publish-build-assets.yml | 9 ++-- .../templates/job/publish-build-assets.yml | 9 ++-- global.json | 4 +- 6 files changed, 65 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index fe0022aab809..ca7dfc319d14 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,24 @@ + + + + + + + + + + + + @@ -21,9 +33,21 @@ + + + + + + + + + + + + @@ -43,15 +67,35 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 212f8dd22f7d..ca5d84b4bd40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 - + https://github.com/dotnet/arcade - 8b879da4e449c48d99f3f642fc429379a64e8fe8 + db87887481d4110c09a1004191002482fdd7e4f2 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 8028cd046860..1bca3a9033b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24352.1 + 8.0.0-beta.24359.3 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index d01739c12857..ba3e7df81587 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -140,11 +140,14 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -WaitPublishingFinish true diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 9fd69fa7c9b7..57a41f0a3e13 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -136,11 +136,14 @@ jobs: BARBuildId: ${{ parameters.BARBuildId }} PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} - - task: PowerShell@2 + - task: AzureCLI@2 displayName: Publish Using Darc inputs: - filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + azureSubscription: "Darc: Maestro Production" + scriptType: ps + scriptLocation: scriptPath + scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -WaitPublishingFinish true diff --git a/global.json b/global.json index 7ce95a54adc7..19b70610b2a5 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.24352.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24352.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24359.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24359.3" } } From 883d7708cfcff95f64052a6f524b60a77d66aacd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 18:26:32 +0000 Subject: [PATCH 521/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#19985) [release/8.0.3xx] Update dependencies from dotnet/arcade --- 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 ca5d84b4bd40..ff5bcdc6c667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - db87887481d4110c09a1004191002482fdd7e4f2 + c9efa535175049eb9cba06cae1f8c3d5dbe768a9 - + https://github.com/dotnet/arcade - db87887481d4110c09a1004191002482fdd7e4f2 + c9efa535175049eb9cba06cae1f8c3d5dbe768a9 - + https://github.com/dotnet/arcade - db87887481d4110c09a1004191002482fdd7e4f2 + c9efa535175049eb9cba06cae1f8c3d5dbe768a9 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 1bca3a9033b3..b5c54f07a34e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24359.3 + 8.0.0-beta.24360.5 diff --git a/global.json b/global.json index 19b70610b2a5..0889eebd5a6e 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.24359.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24359.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24360.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24360.5" } } From 979209d37ad560ffbf35ac494959fead9f398609 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 11 Jul 2024 22:53:11 -0700 Subject: [PATCH 522/652] Revert NuGet.config --- NuGet.config | 3 --- 1 file changed, 3 deletions(-) diff --git a/NuGet.config b/NuGet.config index 23ea8421b40e..ca7dfc319d14 100644 --- a/NuGet.config +++ b/NuGet.config @@ -28,7 +28,6 @@ - @@ -99,10 +98,8 @@ - - From 3f0f6c1989776072f9f4b57330240956ceb3b619 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 15 Jul 2024 14:39:34 -0700 Subject: [PATCH 523/652] Add support for targeting Windows version 26100 and update Windows SDK projection versions --- eng/ManualVersions.props | 13 +++++++------ src/redist/targets/GenerateBundledVersions.targets | 1 + test/EndToEnd/GivenWindowsApp.cs | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 57a4b6415199..8ea5be208a97 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,11 +9,12 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.31 - 10.0.18362.31 - 10.0.19041.31 - 10.0.20348.31 - 10.0.22000.31 - 10.0.22621.31 + 10.0.17763.34 + 10.0.18362.34 + 10.0.19041.34 + 10.0.20348.34 + 10.0.22000.34 + 10.0.22621.34 + 10.0.26100.34 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 8dc085a42c34..9305d7dd882f 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -1143,6 +1143,7 @@ Copyright (c) .NET Foundation. All rights reserved. /> + diff --git a/test/EndToEnd/GivenWindowsApp.cs b/test/EndToEnd/GivenWindowsApp.cs index 59f28eee89af..96595fe2704c 100644 --- a/test/EndToEnd/GivenWindowsApp.cs +++ b/test/EndToEnd/GivenWindowsApp.cs @@ -19,6 +19,7 @@ public class GivenWindowsApp : TestBase [InlineData("10.0.20348.0")] [InlineData("10.0.22000.0")] [InlineData("10.0.22621.0")] + [InlineData("10.0.26100.0")] public void ItCanBuildAndRun(string targetPlatformVersion) { var testInstance = TestAssets.Get(TestAssetKinds.TestProjects, "UseCswinrt") From e015fad65dc12f0209abc37d86a2bf50e96d5ad4 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 15 Jul 2024 23:32:51 -0700 Subject: [PATCH 524/652] Revert eng/Version.Details.xml --- 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 59d6d8a31ba0..ff5bcdc6c667 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - b086ae0e4cf1ae64f1237f976fa65221f87cd4a0 + 4f2151df120194f0268944f1b723c14820738fc8 From 34ee84f77524168d6b343d265777a4c05b66a417 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jul 2024 12:39:45 +0000 Subject: [PATCH 525/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240715.2 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24365.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 ff5bcdc6c667..3b230ec4153b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 6ed73280a6d70f7e7ac39c86f2abe8c10983f0bb + 8258018588e4435f92c8355b51c84c7084f36eae From 4eb50e8be3f7ec9ac875155db159e20d2280c46f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Jul 2024 12:41:39 +0000 Subject: [PATCH 526/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240711.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24361.1 --- 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 ff5bcdc6c667..59d6d8a31ba0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 4f2151df120194f0268944f1b723c14820738fc8 + b086ae0e4cf1ae64f1237f976fa65221f87cd4a0 From b8022846882025cc1eb6c7db8bc87934871f6eb9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Jul 2024 21:45:40 +0000 Subject: [PATCH 527/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.303 -> To Version 8.0.304 Dependency coherency updates Microsoft.NET.Test.Sdk,Microsoft.Net.Compilers.Toolset From Version 17.10.0-release-24272-11 -> To Version 17.10.0-release-24317-02 (parent: Microsoft.NET.Sdk --- NuGet.config | 24 ++++-------------------- eng/Version.Details.xml | 26 +++++++++++++------------- eng/Versions.props | 10 +++++----- 3 files changed, 22 insertions(+), 38 deletions(-) diff --git a/NuGet.config b/NuGet.config index ca7dfc319d14..ef1d7211863e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -39,16 +39,8 @@ - - - - - - - - - - + + @@ -80,16 +72,8 @@ - - - - - - - - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff5bcdc6c667..bfce001a1b72 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 2f1db20456007c9515068a35a65afdf99af70bc6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ecaf32089ff44b59b6cfc518baf20be49886604 + 0dc97490bbe2dc247e983947c06222c2c0cc93f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ecaf32089ff44b59b6cfc518baf20be49886604 + 0dc97490bbe2dc247e983947c06222c2c0cc93f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ecaf32089ff44b59b6cfc518baf20be49886604 + 0dc97490bbe2dc247e983947c06222c2c0cc93f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ecaf32089ff44b59b6cfc518baf20be49886604 + 0dc97490bbe2dc247e983947c06222c2c0cc93f2 https://github.com/dotnet/test-templates @@ -141,18 +141,18 @@ 80c165644db640d0f309affe0daa281c7e17b939 - + https://github.com/microsoft/vstest - 83d73f783bf54c336d1eab04a53d554f8a6c0b19 + c4d80397805bec06b354d20aeb1773e243c6add0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 2aade6beb02ea367fd97c4070a4198802fe61c03 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 259e82e9f20dd3dd3ec961f352ddcf9bc29072ea + + https://github.com/dotnet/roslyn + 1f9b00a8865f2b30d14ff2012b00f4ce5ddc1086 diff --git a/eng/Versions.props b/eng/Versions.props index b5c54f07a34e..973a932bbaf0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,16 +78,16 @@ - 8.0.303 - 8.0.303-servicing.24317.6 - 8.0.303-servicing.24317.6 + 8.0.304 + 8.0.304-servicing.24366.12 + 8.0.304-servicing.24366.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24314.14 + 4.10.0-3.24365.5 @@ -187,7 +187,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.10.0-release-24272-11 + 17.10.0-release-24317-02 8.0.0-alpha.1.22557.12 From d1044530933121c72a9c5dc6af29bb199cc4f6d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 00:05:55 +0000 Subject: [PATCH 528/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.304 -> To Version 8.0.304 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.7-servicing.24313.11 -> To Version 8.0.8-servicing.24366.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 26 ++++++-------------- eng/Version.Details.xml | 54 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++-------- 3 files changed, 44 insertions(+), 56 deletions(-) diff --git a/NuGet.config b/NuGet.config index ef1d7211863e..2d5d577062df 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,11 +14,7 @@ - - - - - + @@ -32,15 +28,11 @@ - - - - - + - - + + @@ -66,14 +58,10 @@ - - - - - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bfce001a1b72..05efbba351d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 28ae95bc8703be1ebc194391b03b6477cf59bed2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dc97490bbe2dc247e983947c06222c2c0cc93f2 + 5acda1987af5c89b160f124464a29f39428b9a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dc97490bbe2dc247e983947c06222c2c0cc93f2 + 5acda1987af5c89b160f124464a29f39428b9a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dc97490bbe2dc247e983947c06222c2c0cc93f2 + 5acda1987af5c89b160f124464a29f39428b9a62 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0dc97490bbe2dc247e983947c06222c2c0cc93f2 + 5acda1987af5c89b160f124464a29f39428b9a62 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 2aade6beb02ea367fd97c4070a4198802fe61c03 + 08338fcaa5c9b9a8190abb99222fed12aaba956c https://github.com/dotnet/roslyn @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - a64772f521c578bc9925578b1384d3a08a02d31d + e92f92efe5854b6fe013787830b59166cb9b4ed9 - + https://github.com/dotnet/emsdk - a64772f521c578bc9925578b1384d3a08a02d31d + e92f92efe5854b6fe013787830b59166cb9b4ed9 diff --git a/eng/Versions.props b/eng/Versions.props index 973a932bbaf0..a8bb1f586552 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.304 - 8.0.304-servicing.24366.12 - 8.0.304-servicing.24366.12 + 8.0.304-servicing.24366.26 + 8.0.304-servicing.24366.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.7-servicing.24313.11 + 8.0.8-servicing.24366.12 - 8.0.7-servicing.24313.11 - 8.0.7-servicing.24313.11 - 8.0.7 - 8.0.7 - 8.0.7 - 8.0.7 + 8.0.8-servicing.24366.12 + 8.0.8-servicing.24366.12 + 8.0.8 + 8.0.8 + 8.0.8 + 8.0.8 2.1.0 @@ -202,7 +202,7 @@ 14.0.8478 17.0.8478 - 8.0.7 + 8.0.8 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From d4db6a921921ff4d13d53eb657cbfd982b161ef8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Jul 2024 12:41:46 +0000 Subject: [PATCH 529/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240716.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24366.1 --- 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 3b230ec4153b..6af3b494f2b1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 8258018588e4435f92c8355b51c84c7084f36eae + a489be6626823d2adcf396c9e6e72987a7229173 From 65cfb66b3343e82efbc6dd60a954ec74e5e58937 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 17 Jul 2024 12:45:27 +0000 Subject: [PATCH 530/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240711.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24361.1 From d1e5274456b56eef679f5de0cb65d49fed9edce2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 17 Jul 2024 16:13:19 +0000 Subject: [PATCH 531/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20022) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdl/NuGet.config | 4 ++-- eng/common/sdl/execute-all-sdl-tools.ps1 | 4 +--- eng/common/sdl/init-sdl.ps1 | 8 -------- eng/common/sdl/sdl.ps1 | 4 +++- .../templates-official/steps/execute-sdl.yml | 2 -- .../steps/get-federated-access-token.yml | 14 +++++++++++++- eng/common/templates/steps/execute-sdl.yml | 7 ++++--- .../templates/steps/get-federated-access-token.yml | 14 +++++++++++++- global.json | 6 +++--- 11 files changed, 46 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff5bcdc6c667..5bdeafcb2044 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - c9efa535175049eb9cba06cae1f8c3d5dbe768a9 + fa3d544b066661522f1ec5d5e8cfd461a29b0f8a - + https://github.com/dotnet/arcade - c9efa535175049eb9cba06cae1f8c3d5dbe768a9 + fa3d544b066661522f1ec5d5e8cfd461a29b0f8a - + https://github.com/dotnet/arcade - c9efa535175049eb9cba06cae1f8c3d5dbe768a9 + fa3d544b066661522f1ec5d5e8cfd461a29b0f8a https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b5c54f07a34e..a26a0ff48368 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24360.5 + 8.0.0-beta.24367.1 diff --git a/eng/common/sdl/NuGet.config b/eng/common/sdl/NuGet.config index 3849bdb3cf51..5bfbb02ef043 100644 --- a/eng/common/sdl/NuGet.config +++ b/eng/common/sdl/NuGet.config @@ -5,11 +5,11 @@ - + - + diff --git a/eng/common/sdl/execute-all-sdl-tools.ps1 b/eng/common/sdl/execute-all-sdl-tools.ps1 index 4715d75e974d..81ded5b7f477 100644 --- a/eng/common/sdl/execute-all-sdl-tools.ps1 +++ b/eng/common/sdl/execute-all-sdl-tools.ps1 @@ -6,7 +6,6 @@ Param( [string] $BranchName=$env:BUILD_SOURCEBRANCH, # Optional: name of branch or version of gdn settings; defaults to master [string] $SourceDirectory=$env:BUILD_SOURCESDIRECTORY, # Required: the directory where source files are located [string] $ArtifactsDirectory = (Join-Path $env:BUILD_ARTIFACTSTAGINGDIRECTORY ('artifacts')), # Required: the directory where build artifacts are located - [string] $AzureDevOpsAccessToken, # Required: access token for dnceng; should be provided via KeyVault # Optional: list of SDL tools to run on source code. See 'configure-sdl-tool.ps1' for tools list # format. @@ -75,7 +74,7 @@ try { } Exec-BlockVerbosely { - & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -AzureDevOpsAccessToken $AzureDevOpsAccessToken -GuardianLoggerLevel $GuardianLoggerLevel + & $(Join-Path $PSScriptRoot 'init-sdl.ps1') -GuardianCliLocation $guardianCliLocation -Repository $RepoName -BranchName $BranchName -WorkingDirectory $workingDirectory -GuardianLoggerLevel $GuardianLoggerLevel } $gdnFolder = Join-Path $workingDirectory '.gdn' @@ -104,7 +103,6 @@ try { -TargetDirectory $targetDirectory ` -GdnFolder $gdnFolder ` -ToolsList $tools ` - -AzureDevOpsAccessToken $AzureDevOpsAccessToken ` -GuardianLoggerLevel $GuardianLoggerLevel ` -CrScanAdditionalRunConfigParams $CrScanAdditionalRunConfigParams ` -PoliCheckAdditionalRunConfigParams $PoliCheckAdditionalRunConfigParams ` diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index 3ac1d92b3700..588ff8e22fbe 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -3,7 +3,6 @@ Param( [string] $Repository, [string] $BranchName='master', [string] $WorkingDirectory, - [string] $AzureDevOpsAccessToken, [string] $GuardianLoggerLevel='Standard' ) @@ -21,14 +20,7 @@ $ci = $true # Don't display the console progress UI - it's a huge perf hit $ProgressPreference = 'SilentlyContinue' -# Construct basic auth from AzDO access token; construct URI to the repository's gdn folder stored in that repository; construct location of zip file -$encodedPat = [Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes(":$AzureDevOpsAccessToken")) -$escapedRepository = [Uri]::EscapeDataString("/$Repository/$BranchName/.gdn") -$uri = "https://dev.azure.com/dnceng/internal/_apis/git/repositories/sdl-tool-cfg/Items?path=$escapedRepository&versionDescriptor[versionOptions]=0&`$format=zip&api-version=5.0" -$zipFile = "$WorkingDirectory/gdn.zip" - Add-Type -AssemblyName System.IO.Compression.FileSystem -$gdnFolder = (Join-Path $WorkingDirectory '.gdn') try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository diff --git a/eng/common/sdl/sdl.ps1 b/eng/common/sdl/sdl.ps1 index 648c5068d7d6..7fe603fe995d 100644 --- a/eng/common/sdl/sdl.ps1 +++ b/eng/common/sdl/sdl.ps1 @@ -4,6 +4,8 @@ function Install-Gdn { [Parameter(Mandatory=$true)] [string]$Path, + [string]$Source = "https://pkgs.dev.azure.com/dnceng/_packaging/Guardian1ESPTUpstreamOrgFeed/nuget/v3/index.json", + # If omitted, install the latest version of Guardian, otherwise install that specific version. [string]$Version ) @@ -19,7 +21,7 @@ function Install-Gdn { $ci = $true . $PSScriptRoot\..\tools.ps1 - $argumentList = @("install", "Microsoft.Guardian.Cli", "-Source https://securitytools.pkgs.visualstudio.com/_packaging/Guardian/nuget/v3/index.json", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") + $argumentList = @("install", "Microsoft.Guardian.Cli.win-x64", "-Source $Source", "-OutputDirectory $Path", "-NonInteractive", "-NoCache") if ($Version) { $argumentList += "-Version $Version" diff --git a/eng/common/templates-official/steps/execute-sdl.yml b/eng/common/templates-official/steps/execute-sdl.yml index 07426fde05d8..301d5c591ebd 100644 --- a/eng/common/templates-official/steps/execute-sdl.yml +++ b/eng/common/templates-official/steps/execute-sdl.yml @@ -9,8 +9,6 @@ parameters: steps: - task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' diff --git a/eng/common/templates-official/steps/get-federated-access-token.yml b/eng/common/templates-official/steps/get-federated-access-token.yml index e3786cef6dfd..55e33bd38f71 100644 --- a/eng/common/templates-official/steps/get-federated-access-token.yml +++ b/eng/common/templates-official/steps/get-federated-access-token.yml @@ -3,6 +3,12 @@ parameters: type: string - name: outputVariableName type: string +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' # Resource to get a token for. Common values include: # - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps # - 'https://storage.azure.com/' for storage @@ -10,10 +16,16 @@ parameters: - name: resource type: string default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false steps: - task: AzureCLI@2 displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' @@ -25,4 +37,4 @@ steps: exit 1 } Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/eng/common/templates/steps/execute-sdl.yml b/eng/common/templates/steps/execute-sdl.yml index 07426fde05d8..fe0ebf8c904e 100644 --- a/eng/common/templates/steps/execute-sdl.yml +++ b/eng/common/templates/steps/execute-sdl.yml @@ -9,8 +9,6 @@ parameters: steps: - task: NuGetAuthenticate@1 - inputs: - nuGetServiceConnections: GuardianConnect - task: NuGetToolInstaller@1 displayName: 'Install NuGet.exe' @@ -36,16 +34,19 @@ steps: displayName: Execute SDL (Overridden) continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} + env: + GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - ${{ if eq(parameters.overrideParameters, '') }}: - powershell: ${{ parameters.executeAllSdlToolsScript }} -GuardianCliLocation $(GuardianCliLocation) -NugetPackageDirectory $(Build.SourcesDirectory)\.packages - -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw) ${{ parameters.additionalParameters }} displayName: Execute SDL continueOnError: ${{ parameters.sdlContinueOnError }} condition: ${{ parameters.condition }} + env: + GUARDIAN_DEFAULT_PACKAGE_SOURCE_SECRET: $(System.AccessToken) - ${{ if ne(parameters.publishGuardianDirectoryToPipeline, 'false') }}: # We want to publish the Guardian results and configuration for easy diagnosis. However, the diff --git a/eng/common/templates/steps/get-federated-access-token.yml b/eng/common/templates/steps/get-federated-access-token.yml index c8c49cc0e8f0..55e33bd38f71 100644 --- a/eng/common/templates/steps/get-federated-access-token.yml +++ b/eng/common/templates/steps/get-federated-access-token.yml @@ -3,6 +3,12 @@ parameters: type: string - name: outputVariableName type: string +- name: stepName + type: string + default: 'getFederatedAccessToken' +- name: condition + type: string + default: '' # Resource to get a token for. Common values include: # - '499b84ac-1321-427f-aa17-267ca6975798' for Azure DevOps # - 'https://storage.azure.com/' for storage @@ -10,10 +16,16 @@ parameters: - name: resource type: string default: '499b84ac-1321-427f-aa17-267ca6975798' +- name: isStepOutputVariable + type: boolean + default: false steps: - task: AzureCLI@2 displayName: 'Getting federated access token for feeds' + name: ${{ parameters.stepName }} + ${{ if ne(parameters.condition, '') }}: + condition: ${{ parameters.condition }} inputs: azureSubscription: ${{ parameters.federatedServiceConnection }} scriptType: 'pscore' @@ -25,4 +37,4 @@ steps: exit 1 } Write-Host "Setting '${{ parameters.outputVariableName }}' with the access token value" - Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true]$accessToken" \ No newline at end of file + Write-Host "##vso[task.setvariable variable=${{ parameters.outputVariableName }};issecret=true;isOutput=${{ parameters.isStepOutputVariable }}]$accessToken" \ No newline at end of file diff --git a/global.json b/global.json index 0889eebd5a6e..65129a52f8b6 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.101", + "dotnet": "8.0.107", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24360.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24360.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24367.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24367.1" } } From 2b3671758263e26ff0977dbabce2afc7e4b84dd8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 17:48:05 +0000 Subject: [PATCH 532/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240717.11 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.304 -> To Version 8.0.304 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.7 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++++++-------------- eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 33 insertions(+), 41 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2d5d577062df..ac50471e6158 100644 --- a/NuGet.config +++ b/NuGet.config @@ -17,11 +17,7 @@ - - - - - + @@ -31,8 +27,8 @@ - - + + @@ -60,15 +56,11 @@ - - + + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7eb682707d9..fdb0d743fed9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 28ae95bc8703be1ebc194391b03b6477cf59bed2 + 1526afd4eae1d862d586402ef8e005151a919d52 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5acda1987af5c89b160f124464a29f39428b9a62 + 24cee90194569be08e45250518d2d54c7b0165f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5acda1987af5c89b160f124464a29f39428b9a62 + 24cee90194569be08e45250518d2d54c7b0165f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5acda1987af5c89b160f124464a29f39428b9a62 + 24cee90194569be08e45250518d2d54c7b0165f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5acda1987af5c89b160f124464a29f39428b9a62 + 24cee90194569be08e45250518d2d54c7b0165f5 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - fdc20074cf1e48b8cf11fe6ac78f255b1fbfe611 + bd164556d31c13b09986f597f49a83bf836c165d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 43bb8cc831c2658e1117415019264bfe6f644f94 + 883fc207bb50622d4458ff09ae6a62548783826a https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index b2576ca2df12..0e39035fb75d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.7-servicing.24313.8 + 8.0.8-servicing.24366.6 - 8.0.7-servicing.24313.7 + 8.0.8-servicing.24366.7 @@ -79,8 +79,8 @@ 8.0.304 - 8.0.304-servicing.24366.26 - 8.0.304-servicing.24366.26 + 8.0.304-servicing.24367.11 + 8.0.304-servicing.24367.11 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -105,10 +105,10 @@ - 8.0.7-servicing.24314.3 - 8.0.7-servicing.24314.3 - 8.0.7 - 8.0.7 + 8.0.8-servicing.24366.8 + 8.0.8-servicing.24366.8 + 8.0.8 + 8.0.8 From 324b5459cebd3f15dabc43f7a84bdecc6d02f27d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jul 2024 12:48:27 +0000 Subject: [PATCH 533/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24367.1 --- 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 6af3b494f2b1..27f03b148882 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - a489be6626823d2adcf396c9e6e72987a7229173 + 68d6cef51f1c82d71b435af0f040d72fdd1a782f From 8e31e4d2b7fda8bdf878a0fa3c45dbc6ffc7cdf8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jul 2024 12:52:18 +0000 Subject: [PATCH 534/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240711.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24361.1 From f3841c500a49e648074877bf16ed25194c03a37e Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Thu, 18 Jul 2024 23:53:15 -0700 Subject: [PATCH 535/652] Update publish path --- eng/pipelines/templates/jobs/vmr-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/pipelines/templates/jobs/vmr-build.yml b/eng/pipelines/templates/jobs/vmr-build.yml index c697aaf78d50..1a90ff50aebb 100644 --- a/eng/pipelines/templates/jobs/vmr-build.yml +++ b/eng/pipelines/templates/jobs/vmr-build.yml @@ -283,7 +283,7 @@ jobs: publishRunAttachments: true testRunTitle: SourceBuild_SmokeTests_$(Agent.JobName) - - publish: '${{ variables.sourcesPath }}/artifacts/${{ parameters.architecture }}/Release/' + - publish: $(Build.ArtifactStagingDirectory)/publishing artifact: $(Agent.JobName)_Artifacts displayName: Publish Artifacts condition: succeededOrFailed() From 6609f1bef470da6df06ea6595ebfaaeb44bd2f4b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Jul 2024 13:04:48 +0000 Subject: [PATCH 536/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24367.1 From 7d9e4c1fbec0d474703f32ff17330306606175a5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Jul 2024 13:08:49 +0000 Subject: [PATCH 537/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240711.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24361.1 From 30b3354cad2fd42d613b63dd4211047a40b4ef3e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 20 Jul 2024 02:33:28 +0000 Subject: [PATCH 538/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240719.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.304 -> To Version 8.0.304 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.7 -> To Version 8.0.8 (parent: Microsoft.NET.Sdk --- NuGet.config | 20 ++++++-------------- eng/Version.Details.xml | 42 ++++++++++++++++++++--------------------- eng/Versions.props | 18 +++++++++--------- 3 files changed, 36 insertions(+), 44 deletions(-) diff --git a/NuGet.config b/NuGet.config index ac50471e6158..cfd69ccbe7ae 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,7 @@ - - - - - + @@ -27,8 +23,8 @@ - - + + @@ -47,17 +43,13 @@ - - - - - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdb0d743fed9..36a8ba23b174 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 08338fcaa5c9b9a8190abb99222fed12aaba956c - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 2f1db20456007c9515068a35a65afdf99af70bc6 + 954f61dd38b33caa2b736c73530bd5a294174437 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24cee90194569be08e45250518d2d54c7b0165f5 + 148cecd4fb290c3016c95f3fa12acb0561be369d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24cee90194569be08e45250518d2d54c7b0165f5 + 148cecd4fb290c3016c95f3fa12acb0561be369d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24cee90194569be08e45250518d2d54c7b0165f5 + 148cecd4fb290c3016c95f3fa12acb0561be369d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 24cee90194569be08e45250518d2d54c7b0165f5 + 148cecd4fb290c3016c95f3fa12acb0561be369d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 0e39035fb75d..9d057d34ec19 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,13 +65,13 @@ - 8.0.7 - 8.0.7 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 - 8.0.7-servicing.24314.2 + 8.0.8 + 8.0.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 + 8.0.8-servicing.24369.8 0.2.0 @@ -79,8 +79,8 @@ 8.0.304 - 8.0.304-servicing.24367.11 - 8.0.304-servicing.24367.11 + 8.0.304-servicing.24369.9 + 8.0.304-servicing.24369.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 10f335991fbe596c551947065b13291c32aafc7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Jul 2024 12:52:05 +0000 Subject: [PATCH 539/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24367.1 From dbfeddfc79fb5d8ebe5680c220e9f6b153e10990 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 20 Jul 2024 12:55:49 +0000 Subject: [PATCH 540/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240711.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24361.1 From c2a0ef29a09e3f0755bd780a76e1c9544909415b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Jul 2024 12:44:46 +0000 Subject: [PATCH 541/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24367.1 From 9970b16e40e7ed44c95ad7b11a9e10be06f0cb8b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 21 Jul 2024 12:48:38 +0000 Subject: [PATCH 542/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240711.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24361.1 From b756a66bfd759c6cfab714a4e63bf1003585e1be Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jul 2024 12:45:00 +0000 Subject: [PATCH 543/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240717.1 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24367.1 From 448909c307cb0fce7e23dda2019ad6e2be1a7aed Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Jul 2024 12:48:43 +0000 Subject: [PATCH 544/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240711.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24361.1 From 92ea7283093658ddb71d7717d2c96cc279cb9250 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jul 2024 13:02:28 +0000 Subject: [PATCH 545/652] Update dependencies from https://github.com/dotnet/arcade build 20240722.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24372.3 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/job/publish-build-assets.yml | 2 +- .../templates-official/post-build/post-build.yml | 2 +- eng/common/templates/job/publish-build-assets.yml | 2 +- eng/common/templates/post-build/post-build.yml | 2 +- global.json | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5bdeafcb2044..c737bfee3cbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - fa3d544b066661522f1ec5d5e8cfd461a29b0f8a + 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 - + https://github.com/dotnet/arcade - fa3d544b066661522f1ec5d5e8cfd461a29b0f8a + 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 - + https://github.com/dotnet/arcade - fa3d544b066661522f1ec5d5e8cfd461a29b0f8a + 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index a26a0ff48368..9c8021a27c9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24367.1 + 8.0.0-beta.24372.3 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index ba3e7df81587..0117328800c8 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -149,7 +149,7 @@ jobs: scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 0dfa387e7b78..b81b8770b346 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -281,7 +281,7 @@ stages: scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 57a41f0a3e13..cc2b346ba8ba 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -145,7 +145,7 @@ jobs: scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion 3 - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 2db4933468fd..c3b6a3012fee 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -277,7 +277,7 @@ stages: scriptPath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} - -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' + -AzdoToken '$(System.AccessToken)' -WaitPublishingFinish true -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}' -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}' diff --git a/global.json b/global.json index 65129a52f8b6..3c611f06f0b6 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.24367.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24367.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24372.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24372.3" } } From fa301c0246f7ef5ef513b0a0ec8f375a337c5116 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jul 2024 13:02:52 +0000 Subject: [PATCH 546/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 --- 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 27f03b148882..2a55a5817078 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 68d6cef51f1c82d71b435af0f040d72fdd1a782f + 30ed464acd37779c64e9dc652d4460543ebf9966 From 5e6f4efa58c4e29d1a29e3a547154ca11ee02d2a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Jul 2024 13:09:54 +0000 Subject: [PATCH 547/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24372.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 59d6d8a31ba0..b41069ea8db5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - b086ae0e4cf1ae64f1237f976fa65221f87cd4a0 + e3059b2fc5aad4cf8de79f0d5d78dab2fbd6074c From bdf42e34e12cc5a64fd1f846fcc69e817606d8a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 24 Jul 2024 12:57:49 +0000 Subject: [PATCH 548/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24372.2 From 9a9fab63399d727dcea0f00fe0d444e8d0dd3538 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jul 2024 13:02:19 +0000 Subject: [PATCH 549/652] Update dependencies from https://github.com/dotnet/arcade build 20240722.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24372.3 From 3c83b80b9c72de0892afea5f300a2c84f1a97305 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jul 2024 13:02:46 +0000 Subject: [PATCH 550/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From 77bed1946288b4904a613bd94c0553e4b80349b7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Jul 2024 13:10:27 +0000 Subject: [PATCH 551/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24372.2 From b81bfb202310cf48ee302035e3c86b06a02463ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jul 2024 13:05:27 +0000 Subject: [PATCH 552/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 --- 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 c737bfee3cbd..46f5af2472f6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 + 1e2be7464703499cf98e20536fb4da4218c8fce1 - + https://github.com/dotnet/arcade - 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 + 1e2be7464703499cf98e20536fb4da4218c8fce1 - + https://github.com/dotnet/arcade - 48c3fe3df7c28caa8d5e3122195125b55b4a0c26 + 1e2be7464703499cf98e20536fb4da4218c8fce1 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 9c8021a27c9c..b56b0359d505 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24372.3 + 8.0.0-beta.24376.1 diff --git a/global.json b/global.json index 3c611f06f0b6..3ff484f96e54 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.24372.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24372.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24376.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24376.1" } } From cd2617f81da2af4fc33acf5cd29c18dc71478f07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jul 2024 13:05:51 +0000 Subject: [PATCH 553/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From cac5fb191ea9c31418a5698e292444bccd1147fe Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Jul 2024 13:11:07 +0000 Subject: [PATCH 554/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24372.2 From bc42a2b3ad5ca9d391dcc0418fa83bf17e70e761 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Jul 2024 12:53:34 +0000 Subject: [PATCH 555/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From c43bbea6c048c45d668ca41d369863b8f87e617d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Jul 2024 12:53:59 +0000 Subject: [PATCH 556/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From 1d354998954e0dd448057c78f4f8f547abfc9752 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 27 Jul 2024 12:59:20 +0000 Subject: [PATCH 557/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24372.2 From bbcc978695e836244d80d05a3c8d0252b6da7667 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Jul 2024 12:53:41 +0000 Subject: [PATCH 558/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From a5479a704d6a339015ba26726fce4cecb6340dc1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Jul 2024 12:54:06 +0000 Subject: [PATCH 559/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From 2c2484efbad435bd4e698a2682a8be4997f2a35a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 28 Jul 2024 12:59:41 +0000 Subject: [PATCH 560/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24372.2 From dd88fda939eb58b15f89a7c12c0538daca473c7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Jul 2024 12:52:57 +0000 Subject: [PATCH 561/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From d29a565045be2f0ce246f9b469bd46776f83762d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Jul 2024 12:53:26 +0000 Subject: [PATCH 562/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From 15ecd99fc03505fa90f46302763dc97f52d8dad3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 29 Jul 2024 12:59:38 +0000 Subject: [PATCH 563/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240722.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24372.2 From 2a5db3c9bf1d968495092e9d8ee6783a4cdaed76 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jul 2024 13:02:31 +0000 Subject: [PATCH 564/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From e3fc0e8a99c0fcf983011077d0be533a84a5f2a8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jul 2024 13:02:58 +0000 Subject: [PATCH 565/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From b1ab6ac2cebcb15aac8fc06d470ae3c26ff84e62 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 30 Jul 2024 13:08:21 +0000 Subject: [PATCH 566/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24379.1 --- 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 b41069ea8db5..7885595f1f64 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - e3059b2fc5aad4cf8de79f0d5d78dab2fbd6074c + fb970eccb0a9cae3092464e29cbabda0d4115049 From 9c5192dfea64cbf19768885927a42926cc82e426 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jul 2024 12:48:25 +0000 Subject: [PATCH 567/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From b32325ad4e3c8fba9c5e3c2c50ce192d48f954f0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jul 2024 12:48:50 +0000 Subject: [PATCH 568/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From 36394e89194ed4d54475e8bc8a47c4baf7a37c21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 31 Jul 2024 12:54:04 +0000 Subject: [PATCH 569/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24379.1 From 32d8fd8bd8549f8e6997af5d613d0ef7ad4fcbe7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Aug 2024 12:38:13 +0000 Subject: [PATCH 570/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From 55e20269adf637f2718b0165b425dfe06a2d0d07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Aug 2024 12:38:39 +0000 Subject: [PATCH 571/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From 8c1fdc102a945cba6486617424375a09bfa3017d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 1 Aug 2024 12:43:47 +0000 Subject: [PATCH 572/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24379.1 From f4254b786b7c02395bfee689917c8552a980f70e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Aug 2024 12:53:45 +0000 Subject: [PATCH 573/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From b27c2c5f5843e054a2de9ba8bfb275ee2ddd4a89 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Aug 2024 12:54:12 +0000 Subject: [PATCH 574/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From 16d3c6670cd197a608951c30ae292d405c77cc50 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 2 Aug 2024 12:59:18 +0000 Subject: [PATCH 575/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24379.1 From 65c8a800a9091dc44cbb1b049c4a84bb60577a21 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 3 Aug 2024 12:42:12 +0000 Subject: [PATCH 576/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From 186b268d6bfe220ad220da09f8dbeb94bfbc168f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 3 Aug 2024 12:42:36 +0000 Subject: [PATCH 577/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From 85723833a1b82b95ba028eba542878d63f98799a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 3 Aug 2024 12:47:46 +0000 Subject: [PATCH 578/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24379.1 From e431f17c92ce59906960f5d0523b5ec8f392c177 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 4 Aug 2024 12:51:35 +0000 Subject: [PATCH 579/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From 7eea3996674c5d8a709f6b33fb2641a545a435fc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 4 Aug 2024 12:52:01 +0000 Subject: [PATCH 580/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From dbdd1584e6785654f03dbc3fefeeb2fbabefe1ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 4 Aug 2024 13:00:45 +0000 Subject: [PATCH 581/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24379.1 From 5adf5312de1310220c38e09a59d6e061ca35ca7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Aug 2024 12:42:24 +0000 Subject: [PATCH 582/652] Update dependencies from https://github.com/dotnet/arcade build 20240726.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24367.1 -> To Version 8.0.0-beta.24376.1 From 4645bc08001a3bb3ed23aa484a738690c203220f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Aug 2024 12:42:51 +0000 Subject: [PATCH 583/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240722.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24257.2 -> To Version 8.0.0-alpha.1.24372.3 From 2c21b12db3dd47cf433f07736ec4d2d425443464 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 5 Aug 2024 12:48:36 +0000 Subject: [PATCH 584/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20240729.1 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24269.1 -> To Version 8.0.0-alpha.1.24379.1 From af2e6ff36deb05de654801b80784968fba32a7b4 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 6 Aug 2024 11:43:52 -0700 Subject: [PATCH 585/652] Update branding to 8.0.305 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a26a0ff48368..34f50ee7d70b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 04 + 05 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 5c2ed8423a3e3ce753cb76ce00e6a604460b9a30 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Sun, 11 Aug 2024 21:49:09 -0700 Subject: [PATCH 586/652] Update Windows SDK projection versions --- eng/ManualVersions.props | 21 ++++++++++++------ .../targets/GenerateBundledVersions.targets | 22 +++++++++++++------ 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 8ea5be208a97..fa5627fe6d3b 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,12 +9,19 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.34 - 10.0.18362.34 - 10.0.19041.34 - 10.0.20348.34 - 10.0.22000.34 - 10.0.22621.34 - 10.0.26100.34 + 10.0.17763.41 + 10.0.18362.41 + 10.0.19041.41 + 10.0.20348.41 + 10.0.22000.41 + 10.0.22621.41 + 10.0.26100.41 + 10.0.17763.38 + 10.0.18362.38 + 10.0.19041.38 + 10.0.20348.38 + 10.0.22000.38 + 10.0.22621.38 + 10.0.26100.38 diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index 9305d7dd882f..0df6bf8f7b3c 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -1143,13 +1143,21 @@ Copyright (c) .NET Foundation. All rights reserved. /> - - - - - - - + + + + + + + + + + + + + + + From bf7bcbed5ad360d6816231b780c5174a04bdb7ac Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 14 Aug 2024 12:17:21 +0000 Subject: [PATCH 587/652] Update dependencies from https://github.com/dotnet/arcade build 20240812.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24376.1 -> To Version 8.0.0-beta.24412.1 --- 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 aaf212b33c76..2b59d010a769 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd - + https://github.com/dotnet/arcade - 1e2be7464703499cf98e20536fb4da4218c8fce1 + 770e16f44e6727d0efe1168e62279a399cc92edd https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 60519a0b6575..080d02b56e35 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24376.1 + 8.0.0-beta.24412.1 diff --git a/global.json b/global.json index 3ff484f96e54..15e104ecca84 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.24376.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24376.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24412.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24412.1" } } From 5b501622528c3adad63add6155cbe7cba2096def Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Aug 2024 12:55:57 +0000 Subject: [PATCH 588/652] Update dependencies from https://github.com/dotnet/arcade build 20240813.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24412.1 -> To Version 8.0.0-beta.24413.2 --- NuGet.config | 65 +++++++++++++++++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++---- eng/Versions.props | 2 +- global.json | 6 ++-- 4 files changed, 75 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index cfd69ccbe7ae..60c9c5f54a23 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,31 @@ + + + + + + + + + + + + + + + + + + + @@ -24,6 +43,24 @@ + + + + + + + + + + + + + + + + + + @@ -43,15 +80,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be077c1892fd..dfecdd6d60dd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 770e16f44e6727d0efe1168e62279a399cc92edd + 51321b7e150a2f426cb9e1334687bdfab68ec323 - + https://github.com/dotnet/arcade - 770e16f44e6727d0efe1168e62279a399cc92edd + 51321b7e150a2f426cb9e1334687bdfab68ec323 - + https://github.com/dotnet/arcade - 770e16f44e6727d0efe1168e62279a399cc92edd + 51321b7e150a2f426cb9e1334687bdfab68ec323 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4c38bfe2c591..9afdd7717572 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24412.1 + 8.0.0-beta.24413.2 diff --git a/global.json b/global.json index 15e104ecca84..92a1fa5ea23b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.107", + "dotnet": "8.0.108", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24412.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24412.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24413.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24413.2" } } From bf0f2a546a642c871ae0e951cd039e09525e7291 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 15 Aug 2024 12:56:16 +0000 Subject: [PATCH 589/652] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240814.3 Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 8.0.0-alpha.1.24372.3 -> To Version 8.0.0-alpha.1.24414.3 --- NuGet.config | 65 +++++++++++++++++++++++++++++++++++++++++ eng/Version.Details.xml | 4 +-- 2 files changed, 67 insertions(+), 2 deletions(-) diff --git a/NuGet.config b/NuGet.config index cfd69ccbe7ae..60c9c5f54a23 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,31 @@ + + + + + + + + + + + + + + + + + + + @@ -24,6 +43,24 @@ + + + + + + + + + + + + + + + + + + @@ -43,15 +80,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index be077c1892fd..5be0dc580436 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 30ed464acd37779c64e9dc652d4460543ebf9966 + 8262ce49763c67d87d6233652e5460f310e8b106 From 183722720c95a8ed6378720e255ad1678a854f63 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:14:36 +0000 Subject: [PATCH 590/652] [release/8.0.3xx] Update dependencies from dotnet/source-build-reference-packages (#20088) [release/8.0.3xx] Update dependencies from dotnet/source-build-reference-packages --- 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 03fcafaa7629..e681a974c757 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - 8262ce49763c67d87d6233652e5460f310e8b106 + fe3794a68bd668d36d4d5014a9e6c9d22c0e6d86 From 788bab2693ecd96442cde47d98111f20e0c53258 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 21 Aug 2024 18:44:12 +0000 Subject: [PATCH 591/652] Merged PR 41938: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.8-servicing.24366.8 to 8.0.9-servicing.24416.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.8-servicing.24366.8 to 8.0.9-servicing.24416.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.8-servicing.24366.12 to 8.0.9-servicing.24415.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.8-servicing.24366.12 to 8.0.9-servicing.24415.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.8-servicing.24366.12 to 8.0.9-servicing.24415.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.8-servicing.24369.8 to 8.0.9-servicing.24416.3 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.8-servicing.24366.6 to 8.0.9-servicing.24416.1 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.8-servicing.24366.7 to 8.0.9-servicing.24416.4 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.8 to 8.0.9 (parent: Microsoft.NET.Sdk) - **Mi... --- NuGet.config | 87 ++++-------------------------- eng/Version.Details.xml | 116 ++++++++++++++++++++-------------------- eng/Versions.props | 52 +++++++++--------- 3 files changed, 95 insertions(+), 160 deletions(-) diff --git a/NuGet.config b/NuGet.config index 60c9c5f54a23..2ba735891865 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,61 +7,24 @@ - - + - - - - - - - - - - + - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - + + @@ -80,44 +43,16 @@ - - + - + - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e681a974c757..760db25f1f91 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + 5ef9b9449afda303871855df529a3ea2ac7a9bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + 5ef9b9449afda303871855df529a3ea2ac7a9bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + 5ef9b9449afda303871855df529a3ea2ac7a9bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 1526afd4eae1d862d586402ef8e005151a919d52 + 5ef9b9449afda303871855df529a3ea2ac7a9bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 954f61dd38b33caa2b736c73530bd5a294174437 + 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 148cecd4fb290c3016c95f3fa12acb0561be369d + ca1ade58f3dc59240c85fcf0303ecaee4f26b6d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 148cecd4fb290c3016c95f3fa12acb0561be369d + ca1ade58f3dc59240c85fcf0303ecaee4f26b6d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 148cecd4fb290c3016c95f3fa12acb0561be369d + ca1ade58f3dc59240c85fcf0303ecaee4f26b6d7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 148cecd4fb290c3016c95f3fa12acb0561be369d + ca1ade58f3dc59240c85fcf0303ecaee4f26b6d7 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bd164556d31c13b09986f597f49a83bf836c165d + f1f8971ac89d8ea8b4a4f0971dd307e0c318fae7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 883fc207bb50622d4458ff09ae6a62548783826a + f0d6934ff6cfe796b114fbc4cce13fb2ce79668f https://github.com/dotnet/fsharp @@ -146,35 +146,35 @@ c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 08338fcaa5c9b9a8190abb99222fed12aaba956c + 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://github.com/dotnet/roslyn - 1f9b00a8865f2b30d14ff2012b00f4ce5ddc1086 + 1c559959e2b25fea517c6f89d0c363698421865d https://github.com/dotnet/msbuild 10fbfbf2eeb0597fdc1f600d87d38c7f57317bdc - + https://github.com/nuget/nuget.client - fb50d1a45ed10b39b5f335bc3a4bdcaea9b951cf + b42cb884109d8d33c956311f1a8c89a90be0c195 https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - e92f92efe5854b6fe013787830b59166cb9b4ed9 + 885abbe904afd5987f463378522b82a2cc011cac - + https://github.com/dotnet/emsdk - e92f92efe5854b6fe013787830b59166cb9b4ed9 + 885abbe904afd5987f463378522b82a2cc011cac diff --git a/eng/Versions.props b/eng/Versions.props index 9afdd7717572..3a070bfe030a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.8-servicing.24366.6 + 8.0.9-servicing.24416.1 - 8.0.8-servicing.24366.7 + 8.0.9-servicing.24416.4 @@ -65,52 +65,52 @@ - 8.0.8 - 8.0.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 - 8.0.8-servicing.24369.8 + 8.0.9 + 8.0.9 + 8.0.9-servicing.24416.3 + 8.0.9-servicing.24416.3 + 8.0.9-servicing.24416.3 + 8.0.9-servicing.24416.3 + 8.0.9-servicing.24416.3 0.2.0 - 8.0.304 - 8.0.304-servicing.24369.9 - 8.0.304-servicing.24369.9 + 8.0.305 + 8.0.305-servicing.24420.33 + 8.0.305-servicing.24420.33 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24365.5 + 4.10.0-3.24378.5 - 8.0.8-servicing.24366.12 + 8.0.9-servicing.24415.9 - 8.0.8-servicing.24366.12 - 8.0.8-servicing.24366.12 - 8.0.8 - 8.0.8 - 8.0.8 - 8.0.8 + 8.0.9-servicing.24415.9 + 8.0.9-servicing.24415.9 + 8.0.9 + 8.0.9 + 8.0.9 + 8.0.9 2.1.0 8.0.1 6.0.1 - 8.0.8-servicing.24366.8 - 8.0.8-servicing.24366.8 - 8.0.8 - 8.0.8 + 8.0.9-servicing.24416.2 + 8.0.9-servicing.24416.2 + 8.0.9 + 8.0.9 @@ -122,7 +122,7 @@ - 6.10.0-preview.2.97 + 6.10.2-rc.8 @@ -204,7 +204,7 @@ 14.0.8478 17.0.8478 - 8.0.8 + 8.0.9 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From ac638c48a7e7f9546087643e63c7ff0ff8caa7c6 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 29 Aug 2024 11:13:28 -0700 Subject: [PATCH 592/652] Update branding to 8.0.306 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 9afdd7717572..5b5f3d44679e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 05 + 06 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From a2ed68f7ce45831796b14250cb97047f3ad5bb5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 29 Aug 2024 23:17:41 +0000 Subject: [PATCH 593/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20092) [release/8.0.3xx] Update dependencies from dotnet/arcade --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/steps/telemetry-start.yml | 2 +- global.json | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e681a974c757..0e0e1af8f4c2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 51321b7e150a2f426cb9e1334687bdfab68ec323 + 80264e60280e2815e7d65871081ccac04a32445c - + https://github.com/dotnet/arcade - 51321b7e150a2f426cb9e1334687bdfab68ec323 + 80264e60280e2815e7d65871081ccac04a32445c - + https://github.com/dotnet/arcade - 51321b7e150a2f426cb9e1334687bdfab68ec323 + 80264e60280e2815e7d65871081ccac04a32445c https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 5b5f3d44679e..eee79dcbfc2c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24413.2 + 8.0.0-beta.24426.2 diff --git a/eng/common/templates/steps/telemetry-start.yml b/eng/common/templates/steps/telemetry-start.yml index 32c01ef0b553..6abbcb33a671 100644 --- a/eng/common/templates/steps/telemetry-start.yml +++ b/eng/common/templates/steps/telemetry-start.yml @@ -8,7 +8,7 @@ parameters: steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), not(eq(variables['System.TeamProject'], 'public'))) }}: - - task: AzureKeyVault@1 + - task: AzureKeyVault@2 inputs: azureSubscription: 'HelixProd_KeyVault' KeyVaultName: HelixProdKV diff --git a/global.json b/global.json index 92a1fa5ea23b..404026ec644b 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.24413.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24413.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24426.2" } } From a3dab16fe5c55e358fdd36d95028580c2bde9d03 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 30 Aug 2024 01:02:42 +0000 Subject: [PATCH 594/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240829.13 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.305 -> To Version 8.0.306 --- NuGet.config | 20 ++++++++++++++++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2ba735891865..d7e8752852e0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,9 +11,17 @@ + + + + + + + + @@ -23,8 +31,8 @@ - - + + @@ -48,10 +56,14 @@ - - + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a422ecb83f0e..b19ac2979cbb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca1ade58f3dc59240c85fcf0303ecaee4f26b6d7 + c11baf711760cbddd9c082ef3939f396fa37ba88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca1ade58f3dc59240c85fcf0303ecaee4f26b6d7 + c11baf711760cbddd9c082ef3939f396fa37ba88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca1ade58f3dc59240c85fcf0303ecaee4f26b6d7 + c11baf711760cbddd9c082ef3939f396fa37ba88 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ca1ade58f3dc59240c85fcf0303ecaee4f26b6d7 + c11baf711760cbddd9c082ef3939f396fa37ba88 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 96879c1b7149..bc48259741dd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -78,9 +78,9 @@ - 8.0.305 - 8.0.305-servicing.24420.33 - 8.0.305-servicing.24420.33 + 8.0.306 + 8.0.306-servicing.24429.13 + 8.0.306-servicing.24429.13 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b9569ad2baea5633ed5ee8e652d2f9171eebabc8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 30 Aug 2024 06:41:56 +0000 Subject: [PATCH 595/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240829.29 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24378.5 -> To Version 4.10.0-3.24427.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 6 +++--- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index d7e8752852e0..7ffe4ee3bcfa 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,8 @@ - - + + @@ -56,8 +56,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b19ac2979cbb..761b75612ba8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11baf711760cbddd9c082ef3939f396fa37ba88 + 94419416629e827f6286593e97d9909344ac0a6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11baf711760cbddd9c082ef3939f396fa37ba88 + 94419416629e827f6286593e97d9909344ac0a6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11baf711760cbddd9c082ef3939f396fa37ba88 + 94419416629e827f6286593e97d9909344ac0a6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c11baf711760cbddd9c082ef3939f396fa37ba88 + 94419416629e827f6286593e97d9909344ac0a6f https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://github.com/dotnet/roslyn - 1c559959e2b25fea517c6f89d0c363698421865d + 6602e40818222de350436248d796d43abde37ddb diff --git a/eng/Versions.props b/eng/Versions.props index bc48259741dd..922c07374a4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.306 - 8.0.306-servicing.24429.13 - 8.0.306-servicing.24429.13 + 8.0.306-servicing.24429.29 + 8.0.306-servicing.24429.29 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24378.5 + 4.10.0-3.24427.10 From 40b71336c3c11e54f1d19a0c5756d4c23d48a346 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 30 Aug 2024 07:58:53 +0000 Subject: [PATCH 596/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240829.38 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7ffe4ee3bcfa..68fd21cac356 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,8 @@ - - + + @@ -56,8 +56,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 761b75612ba8..dd9db54aed10 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94419416629e827f6286593e97d9909344ac0a6f + 0ec148fb459481f09ff3a880cc8374066f73fa50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94419416629e827f6286593e97d9909344ac0a6f + 0ec148fb459481f09ff3a880cc8374066f73fa50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94419416629e827f6286593e97d9909344ac0a6f + 0ec148fb459481f09ff3a880cc8374066f73fa50 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94419416629e827f6286593e97d9909344ac0a6f + 0ec148fb459481f09ff3a880cc8374066f73fa50 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 922c07374a4c..934ea280206c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24429.29 - 8.0.306-servicing.24429.29 + 8.0.306-servicing.24429.38 + 8.0.306-servicing.24429.38 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 377c6c2e594c9020bcc606db962ff88c384f455e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 30 Aug 2024 10:11:24 +0000 Subject: [PATCH 597/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240830.9 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 68fd21cac356..28ee4a955694 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,8 @@ - - + + @@ -56,8 +56,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dd9db54aed10..ea64792493c8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ec148fb459481f09ff3a880cc8374066f73fa50 + f86d72d9a94429e2057e9cbd1850583d970a8989 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ec148fb459481f09ff3a880cc8374066f73fa50 + f86d72d9a94429e2057e9cbd1850583d970a8989 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ec148fb459481f09ff3a880cc8374066f73fa50 + f86d72d9a94429e2057e9cbd1850583d970a8989 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ec148fb459481f09ff3a880cc8374066f73fa50 + f86d72d9a94429e2057e9cbd1850583d970a8989 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 934ea280206c..341a28ff3b10 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24429.38 - 8.0.306-servicing.24429.38 + 8.0.306-servicing.24430.9 + 8.0.306-servicing.24430.9 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 21ce41e08fc9b7a00210af7747b05c011babb78e Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 2 Sep 2024 07:24:51 +0000 Subject: [PATCH 598/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240901.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 28ee4a955694..3c4f20d0a354 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,8 @@ - - + + @@ -56,8 +56,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea64792493c8..824f0a9b816f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f86d72d9a94429e2057e9cbd1850583d970a8989 + 573bc1ae8f543dbde857125f1b885ae68c41f106 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f86d72d9a94429e2057e9cbd1850583d970a8989 + 573bc1ae8f543dbde857125f1b885ae68c41f106 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f86d72d9a94429e2057e9cbd1850583d970a8989 + 573bc1ae8f543dbde857125f1b885ae68c41f106 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f86d72d9a94429e2057e9cbd1850583d970a8989 + 573bc1ae8f543dbde857125f1b885ae68c41f106 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 341a28ff3b10..8d8db29d7103 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24430.9 - 8.0.306-servicing.24430.9 + 8.0.306-servicing.24451.10 + 8.0.306-servicing.24451.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From a5032cb961878be8946006627c5cdfa56a4d3626 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 5 Sep 2024 03:45:44 +0000 Subject: [PATCH 599/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240904.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 Dependency coherency updates Microsoft.Net.Compilers.Toolset From Version 4.10.0-3.24427.10 -> To Version 4.10.0-3.24453.2 (parent: Microsoft.NET.Sdk --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3c4f20d0a354..2763202880f8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,8 @@ - - + + @@ -56,8 +56,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 824f0a9b816f..c7b293316525 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 573bc1ae8f543dbde857125f1b885ae68c41f106 + 6676c0a57bfce9bb1d2755a8cdfe4ccde4967d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 573bc1ae8f543dbde857125f1b885ae68c41f106 + 6676c0a57bfce9bb1d2755a8cdfe4ccde4967d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 573bc1ae8f543dbde857125f1b885ae68c41f106 + 6676c0a57bfce9bb1d2755a8cdfe4ccde4967d4b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 573bc1ae8f543dbde857125f1b885ae68c41f106 + 6676c0a57bfce9bb1d2755a8cdfe4ccde4967d4b https://github.com/dotnet/test-templates @@ -150,7 +150,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 3c8202d88deea14a87c7665190286d2a67e464c0 - + https://github.com/dotnet/roslyn 6602e40818222de350436248d796d43abde37ddb diff --git a/eng/Versions.props b/eng/Versions.props index 8d8db29d7103..5c78c49ecd16 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.306 - 8.0.306-servicing.24451.10 - 8.0.306-servicing.24451.10 + 8.0.306-servicing.24454.12 + 8.0.306-servicing.24454.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24427.10 + 4.10.0-3.24453.2 From 271cba5a50f3b3b903493bea3e102430ac28e656 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 9 Sep 2024 07:12:40 +0000 Subject: [PATCH 600/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240908.12 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2763202880f8..a225201cb975 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,8 @@ - - + + @@ -56,8 +56,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c7b293316525..302ef71c945b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6676c0a57bfce9bb1d2755a8cdfe4ccde4967d4b + 4a836301fc6a9adadbdf053b8217b9bb693300f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6676c0a57bfce9bb1d2755a8cdfe4ccde4967d4b + 4a836301fc6a9adadbdf053b8217b9bb693300f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6676c0a57bfce9bb1d2755a8cdfe4ccde4967d4b + 4a836301fc6a9adadbdf053b8217b9bb693300f1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6676c0a57bfce9bb1d2755a8cdfe4ccde4967d4b + 4a836301fc6a9adadbdf053b8217b9bb693300f1 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 5c78c49ecd16..6992ff7f103f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24454.12 - 8.0.306-servicing.24454.12 + 8.0.306-servicing.24458.12 + 8.0.306-servicing.24458.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 37d2b89a2c3beaaed7b48f6108b9428afe59b32d Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 9 Sep 2024 13:14:35 -0700 Subject: [PATCH 601/652] Update Windows SDK projection --- eng/ManualVersions.props | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index fa5627fe6d3b..88e4fdae99fe 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,19 +9,19 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.41 - 10.0.18362.41 - 10.0.19041.41 - 10.0.20348.41 - 10.0.22000.41 - 10.0.22621.41 - 10.0.26100.41 - 10.0.17763.38 - 10.0.18362.38 - 10.0.19041.38 - 10.0.20348.38 - 10.0.22000.38 - 10.0.22621.38 - 10.0.26100.38 + 10.0.17763.44 + 10.0.18362.44 + 10.0.19041.44 + 10.0.20348.44 + 10.0.22000.44 + 10.0.22621.44 + 10.0.26100.44 + 10.0.17763.43 + 10.0.18362.43 + 10.0.19041.43 + 10.0.20348.43 + 10.0.22000.43 + 10.0.22621.43 + 10.0.26100.43 From 13633c68be2c29fb9e773b18a31e8a92aafef5e8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 10 Sep 2024 13:00:24 +0000 Subject: [PATCH 602/652] Update dependencies from https://github.com/dotnet/arcade build 20240909.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24426.2 -> To Version 8.0.0-beta.24459.4 --- 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 0e0e1af8f4c2..c3e5ceb6612e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index eee79dcbfc2c..b42048fdbcba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24426.2 + 8.0.0-beta.24459.4 diff --git a/global.json b/global.json index 404026ec644b..00bd1be86ad8 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.24426.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24426.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24459.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24459.4" } } From e53528c010a0f0c5275fee4b2275717a4b8da9ee Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Sep 2024 03:17:20 +0000 Subject: [PATCH 603/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240910.19 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index a225201cb975..323303b97adf 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,8 @@ - - + + @@ -56,8 +56,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 302ef71c945b..4dc0dd0f0124 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a836301fc6a9adadbdf053b8217b9bb693300f1 + 0ce99a66b8bd0c9e4de3730f7070c075b178044f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a836301fc6a9adadbdf053b8217b9bb693300f1 + 0ce99a66b8bd0c9e4de3730f7070c075b178044f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a836301fc6a9adadbdf053b8217b9bb693300f1 + 0ce99a66b8bd0c9e4de3730f7070c075b178044f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 4a836301fc6a9adadbdf053b8217b9bb693300f1 + 0ce99a66b8bd0c9e4de3730f7070c075b178044f https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 6992ff7f103f..09c53fc7e1b9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24458.12 - 8.0.306-servicing.24458.12 + 8.0.306-servicing.24460.19 + 8.0.306-servicing.24460.19 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9dbd9bec715f408afa3ab1837cef539045aba1b5 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Sep 2024 06:32:06 +0000 Subject: [PATCH 604/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240910.26 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 323303b97adf..ad856adce5cc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -31,8 +31,8 @@ - - + + @@ -56,8 +56,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4dc0dd0f0124..766a3e7d5f2d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ce99a66b8bd0c9e4de3730f7070c075b178044f + 3ee5f2ec3d7df1ffd724f06d04c815a4ab416844 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ce99a66b8bd0c9e4de3730f7070c075b178044f + 3ee5f2ec3d7df1ffd724f06d04c815a4ab416844 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ce99a66b8bd0c9e4de3730f7070c075b178044f + 3ee5f2ec3d7df1ffd724f06d04c815a4ab416844 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0ce99a66b8bd0c9e4de3730f7070c075b178044f + 3ee5f2ec3d7df1ffd724f06d04c815a4ab416844 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 09c53fc7e1b9..ddd88a6d70ba 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24460.19 - 8.0.306-servicing.24460.19 + 8.0.306-servicing.24460.26 + 8.0.306-servicing.24460.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 14f8c249ffada4fbc932b18c9a9d70133bb2ab49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 11 Sep 2024 12:14:43 +0000 Subject: [PATCH 605/652] Update dependencies from https://github.com/dotnet/arcade build 20240910.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24459.4 -> To Version 8.0.0-beta.24460.4 --- 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 c3e5ceb6612e..52061567247e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 + bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd - + https://github.com/dotnet/arcade - e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 + bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd - + https://github.com/dotnet/arcade - e4f0d9916d3fee1f67a63345cdb8438ca3faeff8 + bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index b42048fdbcba..4ec2e2bc6502 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24459.4 + 8.0.0-beta.24460.4 diff --git a/global.json b/global.json index 00bd1be86ad8..e7ae9a7f7aaf 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.24459.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24459.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24460.4", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24460.4" } } From f81e2c10cea5dbc5de029da6bfb3488e4e117457 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Sep 2024 22:02:13 +0000 Subject: [PATCH 606/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240911.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.9-servicing.24415.9 -> To Version 8.0.10-servicing.24459.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 22 +++++------- eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++--------- 3 files changed, 65 insertions(+), 69 deletions(-) diff --git a/NuGet.config b/NuGet.config index ad856adce5cc..ee61f7323f47 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,14 +7,10 @@ - + - - - - - + @@ -28,11 +24,11 @@ - + - - + + @@ -51,13 +47,13 @@ - + - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 766a3e7d5f2d..c0a36c927884 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 5ef9b9449afda303871855df529a3ea2ac7a9bbd - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 7dc1560dfb4ff946388512ef439fcb44f294b32a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 7dc1560dfb4ff946388512ef439fcb44f294b32a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 7dc1560dfb4ff946388512ef439fcb44f294b32a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 7dc1560dfb4ff946388512ef439fcb44f294b32a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 7dc1560dfb4ff946388512ef439fcb44f294b32a - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 7dc1560dfb4ff946388512ef439fcb44f294b32a @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 7dc1560dfb4ff946388512ef439fcb44f294b32a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + 9762034b747bac9c96f27d18ee8287e7057a981b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + 9762034b747bac9c96f27d18ee8287e7057a981b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + 9762034b747bac9c96f27d18ee8287e7057a981b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + 9762034b747bac9c96f27d18ee8287e7057a981b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + 9762034b747bac9c96f27d18ee8287e7057a981b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + 9762034b747bac9c96f27d18ee8287e7057a981b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 23b93b402cc7df84a0a21b24d0f542a1dd3d96f2 + 9762034b747bac9c96f27d18ee8287e7057a981b https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ee5f2ec3d7df1ffd724f06d04c815a4ab416844 + eab38be47dee47af098920b9ec2178ed3dcad777 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ee5f2ec3d7df1ffd724f06d04c815a4ab416844 + eab38be47dee47af098920b9ec2178ed3dcad777 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ee5f2ec3d7df1ffd724f06d04c815a4ab416844 + eab38be47dee47af098920b9ec2178ed3dcad777 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3ee5f2ec3d7df1ffd724f06d04c815a4ab416844 + eab38be47dee47af098920b9ec2178ed3dcad777 https://github.com/dotnet/test-templates @@ -146,9 +146,9 @@ c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3c8202d88deea14a87c7665190286d2a67e464c0 + 7dc1560dfb4ff946388512ef439fcb44f294b32a https://github.com/dotnet/roslyn @@ -170,11 +170,11 @@ https://github.com/dotnet/emsdk - 885abbe904afd5987f463378522b82a2cc011cac + d6672570f0fde2a4a3c7e65d60cec9f8406b039c - + https://github.com/dotnet/emsdk - 885abbe904afd5987f463378522b82a2cc011cac + d6672570f0fde2a4a3c7e65d60cec9f8406b039c diff --git a/eng/Versions.props b/eng/Versions.props index ddd88a6d70ba..c730c0fa70b3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -65,13 +65,13 @@ - 8.0.9 - 8.0.9 - 8.0.9-servicing.24416.3 - 8.0.9-servicing.24416.3 - 8.0.9-servicing.24416.3 - 8.0.9-servicing.24416.3 - 8.0.9-servicing.24416.3 + 8.0.10 + 8.0.10 + 8.0.10-servicing.24453.12 + 8.0.10-servicing.24453.12 + 8.0.10-servicing.24453.12 + 8.0.10-servicing.24453.12 + 8.0.10-servicing.24453.12 0.2.0 @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24460.26 - 8.0.306-servicing.24460.26 + 8.0.306-servicing.24461.10 + 8.0.306-servicing.24461.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,16 +91,16 @@ - 8.0.9-servicing.24415.9 + 8.0.10-servicing.24459.10 - 8.0.9-servicing.24415.9 - 8.0.9-servicing.24415.9 - 8.0.9 - 8.0.9 - 8.0.9 - 8.0.9 + 8.0.10-servicing.24459.10 + 8.0.10-servicing.24459.10 + 8.0.10 + 8.0.10 + 8.0.10 + 8.0.10 2.1.0 8.0.1 6.0.1 From b89b3d265c2630e7a4d95dea9480e4100294f373 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 11 Sep 2024 23:38:07 +0000 Subject: [PATCH 607/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240911.17 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index ee61f7323f47..11853f1188e2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,8 +27,8 @@ - - + + @@ -52,8 +52,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c0a36c927884..323c1364e26b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eab38be47dee47af098920b9ec2178ed3dcad777 + 3c45da98f82ef3022978d83be30fe1d11963a82d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eab38be47dee47af098920b9ec2178ed3dcad777 + 3c45da98f82ef3022978d83be30fe1d11963a82d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eab38be47dee47af098920b9ec2178ed3dcad777 + 3c45da98f82ef3022978d83be30fe1d11963a82d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - eab38be47dee47af098920b9ec2178ed3dcad777 + 3c45da98f82ef3022978d83be30fe1d11963a82d https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c730c0fa70b3..ff319576e3ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24461.10 - 8.0.306-servicing.24461.10 + 8.0.306-servicing.24461.17 + 8.0.306-servicing.24461.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b8f825cfbbe4b59cf3bc3484ac72068325c7047c Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 12 Sep 2024 03:17:18 +0000 Subject: [PATCH 608/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240911.31 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 11853f1188e2..93a44b731154 100644 --- a/NuGet.config +++ b/NuGet.config @@ -27,8 +27,8 @@ - - + + @@ -52,8 +52,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 323c1364e26b..e8979035c8c9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c45da98f82ef3022978d83be30fe1d11963a82d + ef3fd3020a71b60eda2284a8bb19f0bbb36eb42b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c45da98f82ef3022978d83be30fe1d11963a82d + ef3fd3020a71b60eda2284a8bb19f0bbb36eb42b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c45da98f82ef3022978d83be30fe1d11963a82d + ef3fd3020a71b60eda2284a8bb19f0bbb36eb42b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 3c45da98f82ef3022978d83be30fe1d11963a82d + ef3fd3020a71b60eda2284a8bb19f0bbb36eb42b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index ff319576e3ac..e6048f244709 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24461.17 - 8.0.306-servicing.24461.17 + 8.0.306-servicing.24461.31 + 8.0.306-servicing.24461.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 689e2144d55b6a0849d785e2b44c61a13dce0f96 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 12 Sep 2024 12:43:05 +0000 Subject: [PATCH 609/652] Update dependencies from https://github.com/dotnet/arcade build 20240911.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24460.4 -> To Version 8.0.0-beta.24461.1 --- 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 52061567247e..53892d6e6d1c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + dcb2d68022c6b515f547223ffc1837361f116534 - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + dcb2d68022c6b515f547223ffc1837361f116534 - + https://github.com/dotnet/arcade - bee4cec9d8f2d43b4dd7c69dfbf65392301a2dbd + dcb2d68022c6b515f547223ffc1837361f116534 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 4ec2e2bc6502..e34bdc52e29a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24460.4 + 8.0.0-beta.24461.1 diff --git a/global.json b/global.json index e7ae9a7f7aaf..b243131209c9 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.24460.4", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24460.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24461.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24461.1" } } From 48c720051d1933620f85950c98145bd6e20e3d68 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 13 Sep 2024 22:28:00 +0000 Subject: [PATCH 610/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240913.25 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Runtime.win-x64 From Version 8.0.9 -> To Version 8.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 28 +++++--------- eng/Version.Details.xml | 84 ++++++++++++++++++++--------------------- eng/Versions.props | 32 ++++++++-------- 3 files changed, 68 insertions(+), 76 deletions(-) diff --git a/NuGet.config b/NuGet.config index 93a44b731154..d1edd64f1d2a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,24 @@ - + - - - - - + - + - - + + @@ -47,20 +43,16 @@ - + - + - - + + - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 32e4194ae13d..45dd7f135546 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ef9b9449afda303871855df529a3ea2ac7a9bbd + f91fa389d641f923c7be948ad9e8a670b845311d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ef9b9449afda303871855df529a3ea2ac7a9bbd + f91fa389d641f923c7be948ad9e8a670b845311d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ef9b9449afda303871855df529a3ea2ac7a9bbd + f91fa389d641f923c7be948ad9e8a670b845311d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 5ef9b9449afda303871855df529a3ea2ac7a9bbd + f91fa389d641f923c7be948ad9e8a670b845311d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9762034b747bac9c96f27d18ee8287e7057a981b + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9762034b747bac9c96f27d18ee8287e7057a981b + dd48611ed11af2f989057ba2f69d94ddf2a1992d https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9762034b747bac9c96f27d18ee8287e7057a981b + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9762034b747bac9c96f27d18ee8287e7057a981b + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9762034b747bac9c96f27d18ee8287e7057a981b + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9762034b747bac9c96f27d18ee8287e7057a981b + dd48611ed11af2f989057ba2f69d94ddf2a1992d - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 9762034b747bac9c96f27d18ee8287e7057a981b + dd48611ed11af2f989057ba2f69d94ddf2a1992d https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ef3fd3020a71b60eda2284a8bb19f0bbb36eb42b + 5c6e6ddd04e31dae50d72a0436af931fe4665926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ef3fd3020a71b60eda2284a8bb19f0bbb36eb42b + 5c6e6ddd04e31dae50d72a0436af931fe4665926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ef3fd3020a71b60eda2284a8bb19f0bbb36eb42b + 5c6e6ddd04e31dae50d72a0436af931fe4665926 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ef3fd3020a71b60eda2284a8bb19f0bbb36eb42b + 5c6e6ddd04e31dae50d72a0436af931fe4665926 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - f1f8971ac89d8ea8b4a4f0971dd307e0c318fae7 + bfc7e266f9967da8a398f67dac77b84a1210a42d - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f0d6934ff6cfe796b114fbc4cce13fb2ce79668f + f97763771ad77bb288371e1c102d411a0fbc45c2 https://github.com/dotnet/fsharp @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 7dc1560dfb4ff946388512ef439fcb44f294b32a + a8108c906081c3c0198f250fb210c1dd275b2f01 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2452aacd6208..c884cc14ed9c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.9-servicing.24416.1 + 8.0.10-servicing.24462.7 - 8.0.9-servicing.24416.4 + 8.0.10-servicing.24462.8 @@ -67,11 +67,11 @@ 8.0.10 8.0.10 - 8.0.10-servicing.24453.12 - 8.0.10-servicing.24453.12 - 8.0.10-servicing.24453.12 - 8.0.10-servicing.24453.12 - 8.0.10-servicing.24453.12 + 8.0.10-servicing.24462.15 + 8.0.10-servicing.24462.15 + 8.0.10-servicing.24462.15 + 8.0.10-servicing.24462.15 + 8.0.10-servicing.24462.15 0.2.0 @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24461.31 - 8.0.306-servicing.24461.31 + 8.0.306-servicing.24463.25 + 8.0.306-servicing.24463.25 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.10-servicing.24459.10 + 8.0.10-servicing.24461.12 - 8.0.10-servicing.24459.10 - 8.0.10-servicing.24459.10 + 8.0.10-servicing.24461.12 + 8.0.10-servicing.24461.12 8.0.10 8.0.10 8.0.10 @@ -107,10 +107,10 @@ - 8.0.9-servicing.24416.2 - 8.0.9-servicing.24416.2 - 8.0.9 - 8.0.9 + 8.0.10-servicing.24462.13 + 8.0.10-servicing.24462.13 + 8.0.10 + 8.0.10 From 6ff7b492b39fd6243828bd2f3cb72fed898e9466 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Sat, 14 Sep 2024 00:24:06 +0000 Subject: [PATCH 611/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240913.34 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index d1edd64f1d2a..b034028bc3c6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,8 +23,8 @@ - - + + @@ -48,8 +48,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 45dd7f135546..2568a35a0f53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c6e6ddd04e31dae50d72a0436af931fe4665926 + 11ba46e64c2c343b2295572d756ed595bedf637a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c6e6ddd04e31dae50d72a0436af931fe4665926 + 11ba46e64c2c343b2295572d756ed595bedf637a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c6e6ddd04e31dae50d72a0436af931fe4665926 + 11ba46e64c2c343b2295572d756ed595bedf637a - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5c6e6ddd04e31dae50d72a0436af931fe4665926 + 11ba46e64c2c343b2295572d756ed595bedf637a https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index c884cc14ed9c..1a02605f091b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24463.25 - 8.0.306-servicing.24463.25 + 8.0.306-servicing.24463.34 + 8.0.306-servicing.24463.34 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From b07bb1ee0209ae8f5be2f93b89d8f6239a21dc41 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 16 Sep 2024 17:23:50 +0000 Subject: [PATCH 612/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240916.6 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.306 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets From Version 8.0.10 -> To Version 8.0.10 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++++++------ eng/Version.Details.xml | 38 +++++++++++++++++++------------------- eng/Versions.props | 14 +++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index b034028bc3c6..02812b2e00ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -23,8 +23,8 @@ - - + + @@ -43,13 +43,13 @@ - + - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2568a35a0f53..01ac2b048196 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - dd48611ed11af2f989057ba2f69d94ddf2a1992d + c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11ba46e64c2c343b2295572d756ed595bedf637a + 0e7a1bfa79152f145f51693777dd71f25dc7fdb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11ba46e64c2c343b2295572d756ed595bedf637a + 0e7a1bfa79152f145f51693777dd71f25dc7fdb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11ba46e64c2c343b2295572d756ed595bedf637a + 0e7a1bfa79152f145f51693777dd71f25dc7fdb2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 11ba46e64c2c343b2295572d756ed595bedf637a + 0e7a1bfa79152f145f51693777dd71f25dc7fdb2 https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 1a02605f091b..d77a03ecf60a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,11 +67,11 @@ 8.0.10 8.0.10 - 8.0.10-servicing.24462.15 - 8.0.10-servicing.24462.15 - 8.0.10-servicing.24462.15 - 8.0.10-servicing.24462.15 - 8.0.10-servicing.24462.15 + 8.0.10-servicing.24463.9 + 8.0.10-servicing.24463.9 + 8.0.10-servicing.24463.9 + 8.0.10-servicing.24463.9 + 8.0.10-servicing.24463.9 0.2.0 @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24463.34 - 8.0.306-servicing.24463.34 + 8.0.306-servicing.24466.6 + 8.0.306-servicing.24466.6 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 3cfc8b8db3e40ac6ee2a01012ef1c35927367b57 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 17 Sep 2024 21:28:58 +0000 Subject: [PATCH 613/652] Merged PR 42946: [internal/release/8.0.3xx] Updated NuGet.config - add feed for event log Updated NuGet.config - add feed for event log Cherry-picked from commit `2a30382a`. ---- #### AI description (iteration 1) #### PR Classification Configuration update to add a new NuGet feed. #### PR Summary This pull request updates the `NuGet.config` file to add a new package source for event log purposes. - `NuGet.config`: Added a new feed `darc-int-dotnet-runtime-7dc1560` to the list of package sources. --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 02812b2e00ad..57dd2a14ac72 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,6 +21,7 @@ + @@ -47,6 +48,7 @@ + From ec975327cccd819d83405f4a52d07329595f690e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 17 Sep 2024 23:31:22 +0000 Subject: [PATCH 614/652] Merged PR 42966: Use the August version of the web templates - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Use the August version of the web templates ---- #### AI description (iteration 1) #### PR Classification Update to use the latest version of web templates. #### PR Summary This pull request updates the project to use the August version of the web templates. - Changes in `/eng/Versions.props` to adjust the `AspNetCoreTemplateFeature60` version calculation. --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index d77a03ecf60a..3d525040a0ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,7 +150,7 @@ true true true - $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(VersionFeature60), 2)) $(VersionFeature60) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 40c7c551b8e3be415060d844e02f41e3dcf46bbb Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 17 Sep 2024 23:33:13 +0000 Subject: [PATCH 615/652] Merged PR 42955: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ff23b01e-599f-4f7c-8bf3-08dc11e0a92e - **Build**: 20240917.26 - **Date Produced**: September 17, 2024 10:10:18 PM UTC - **Commit**: 2001a1a43b20a0282752f99a332be34ef5b02d2b - **Branch**: refs/heads/internal/release/8.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.306 to 8.0.306][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.306-servicing.24466.6 to 8.0.306-servicing.24467.26][1] - **Microsoft.NET.Sdk**: [from 8.0.306-servicing.24466.6 to 8.0.306-servicing.24467.26][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.306-servicing.24466.6 to 8.0.306-servicing.24467.26][1] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC0e7a1bfa79152f145f51693777dd71f25dc7fdb2&targetVersion=GC2001a1a43b20a0282752f99a332be34ef5b02d2b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) --- NuGet.config | 10 ++++------ eng/Version.Details.xml | 14 +++++++------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/NuGet.config b/NuGet.config index 57dd2a14ac72..2203e6c6f8b4 100644 --- a/NuGet.config +++ b/NuGet.config @@ -21,11 +21,10 @@ - - - + + @@ -48,10 +47,9 @@ - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 01ac2b048196..1408d5f4cc1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e7a1bfa79152f145f51693777dd71f25dc7fdb2 + 2001a1a43b20a0282752f99a332be34ef5b02d2b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e7a1bfa79152f145f51693777dd71f25dc7fdb2 + 2001a1a43b20a0282752f99a332be34ef5b02d2b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e7a1bfa79152f145f51693777dd71f25dc7fdb2 + 2001a1a43b20a0282752f99a332be34ef5b02d2b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 0e7a1bfa79152f145f51693777dd71f25dc7fdb2 + 2001a1a43b20a0282752f99a332be34ef5b02d2b https://github.com/dotnet/test-templates diff --git a/eng/Versions.props b/eng/Versions.props index 3d525040a0ea..d9a0a670b98d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24466.6 - 8.0.306-servicing.24466.6 + 8.0.306-servicing.24467.26 + 8.0.306-servicing.24467.26 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From eb92aa7f5d35e9633d53c15c50c18f0858c71d7a Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Wed, 18 Sep 2024 23:07:13 +0000 Subject: [PATCH 616/652] Merged PR 43015: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: from 8.0.10-servicing.24462.13 to 8.0.10-servicing.24468.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: from 8.0.10-servicing.24462.13 to 8.0.10-servicing.24468.5 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.Platforms**: from 8.0.10-servicing.24461.12 to 8.0.10-servicing.24466.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-jwts**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 8.0.10-servicing.24463.9 to 8.0.10-servicing.24468.4 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 8.0.10-servicing.24462.7 to 8.0.10-servicing.24468.3 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 8.0.10 to 8.0.10 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 8.0.10-servicing.24462.8 to 8.0.10-servicing.24468.10 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.NET.ILLink.Tasks**: from 8.0.10... --- NuGet.config | 20 +++++------ eng/Version.Details.xml | 80 ++++++++++++++++++++--------------------- eng/Versions.props | 28 +++++++-------- 3 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2203e6c6f8b4..cf254290745b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,24 +7,24 @@ - + - + - + - - + + @@ -43,16 +43,16 @@ - + - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1408d5f4cc1a..1c2669366ff8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,44 +7,44 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f91fa389d641f923c7be948ad9e8a670b845311d + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f91fa389d641f923c7be948ad9e8a670b845311d + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f91fa389d641f923c7be948ad9e8a670b845311d + f655eecd22b6810f2989d8ec783f5798a709ab06 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f91fa389d641f923c7be948ad9e8a670b845311d + f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c65d3350a9a305eec3162c2d18dc4b1d0cd267c7 + c2a442982e736e17ae6bcadbfd8ccba278ee1be6 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2001a1a43b20a0282752f99a332be34ef5b02d2b + d082977034f69c4c4f5aa4fedc63430677b3a373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2001a1a43b20a0282752f99a332be34ef5b02d2b + d082977034f69c4c4f5aa4fedc63430677b3a373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2001a1a43b20a0282752f99a332be34ef5b02d2b + d082977034f69c4c4f5aa4fedc63430677b3a373 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2001a1a43b20a0282752f99a332be34ef5b02d2b + d082977034f69c4c4f5aa4fedc63430677b3a373 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - bfc7e266f9967da8a398f67dac77b84a1210a42d + e4efded416f8216935683d9a12e2eb45df78a728 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - f97763771ad77bb288371e1c102d411a0fbc45c2 + e84ed744bb7989299c544f715056d05e220c7e00 https://github.com/dotnet/fsharp @@ -148,7 +148,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - a8108c906081c3c0198f250fb210c1dd275b2f01 + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index d9a0a670b98d..01ce8394d34e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.10-servicing.24462.7 + 8.0.10-servicing.24468.3 - 8.0.10-servicing.24462.8 + 8.0.10-servicing.24468.10 @@ -67,11 +67,11 @@ 8.0.10 8.0.10 - 8.0.10-servicing.24463.9 - 8.0.10-servicing.24463.9 - 8.0.10-servicing.24463.9 - 8.0.10-servicing.24463.9 - 8.0.10-servicing.24463.9 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 + 8.0.10-servicing.24468.4 0.2.0 @@ -79,8 +79,8 @@ 8.0.306 - 8.0.306-servicing.24467.26 - 8.0.306-servicing.24467.26 + 8.0.306-servicing.24468.31 + 8.0.306-servicing.24468.31 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -91,12 +91,12 @@ - 8.0.10-servicing.24461.12 + 8.0.10-servicing.24466.10 - 8.0.10-servicing.24461.12 - 8.0.10-servicing.24461.12 + 8.0.10-servicing.24466.10 + 8.0.10-servicing.24466.10 8.0.10 8.0.10 8.0.10 @@ -107,8 +107,8 @@ - 8.0.10-servicing.24462.13 - 8.0.10-servicing.24462.13 + 8.0.10-servicing.24468.5 + 8.0.10-servicing.24468.5 8.0.10 8.0.10 From 50620f056d2622e6b4112e20fc48562b57800b2e Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Thu, 19 Sep 2024 21:12:40 +0000 Subject: [PATCH 617/652] Merged PR 43041: [internal/release/8.0.3xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.Net.Compilers.Toolset**: from 4.10.0-3.24453.2 to 4.10.0-3.24468.7 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: ff23b01e-599f-4f7c-8bf3-08dc11e0a92e - **Build**: 20240919.20 - **Date Produced**: September 19, 2024 8:06:36 PM UTC - **Commit**: 5cad18dfda0ff1c3051dcf9d35945c853b0063a0 - **Branch**: refs/heads/internal/release/8.0.3xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: [from 8.0.306 to 8.0.306][1] - **Microsoft.DotNet.MSBuildSdkResolver**: [from 8.0.306-servicing.24468.31 to 8.0.306-servicing.24469.20][1] - **Microsoft.NET.Sdk**: [from 8.0.306-servicing.24468.31 to 8.0.306-servicing.24469.20][1] - **Microsoft.TemplateEngine.Cli**: [from 8.0.306-servicing.24468.31 to 8.0.306-servicing.24469.20][1] - **Microsoft.Net.Compilers.Toolset**: [from 4.10.0-3.24453.2 to 4.10.0-3.24468.7][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCd082977034f69c4c4f5aa4fedc63430677b3a373&targetVersion=GC5cad18dfda0ff1c3051dcf9d35945c853b0063a0&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn/branches?baseVersion=GC6602e40818222de350436248d796d43abde37ddb&targetVersion=GC154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:ff23b01e-599f-4f7c-8bf3-08dc11e0a92e) --- NuGet.config | 8 ++++---- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index cf254290745b..47ff69c472b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,8 +23,8 @@ - - + + @@ -48,8 +48,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c2669366ff8..10585f8d1c88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -87,20 +87,20 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d082977034f69c4c4f5aa4fedc63430677b3a373 + 5cad18dfda0ff1c3051dcf9d35945c853b0063a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d082977034f69c4c4f5aa4fedc63430677b3a373 + 5cad18dfda0ff1c3051dcf9d35945c853b0063a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d082977034f69c4c4f5aa4fedc63430677b3a373 + 5cad18dfda0ff1c3051dcf9d35945c853b0063a0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - d082977034f69c4c4f5aa4fedc63430677b3a373 + 5cad18dfda0ff1c3051dcf9d35945c853b0063a0 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - - https://github.com/dotnet/roslyn - 6602e40818222de350436248d796d43abde37ddb + + https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn + 154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c diff --git a/eng/Versions.props b/eng/Versions.props index 01ce8394d34e..830f0cd0eb20 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -79,15 +79,15 @@ 8.0.306 - 8.0.306-servicing.24468.31 - 8.0.306-servicing.24468.31 + 8.0.306-servicing.24469.20 + 8.0.306-servicing.24469.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24453.2 + 4.10.0-3.24468.7 From a871b1e6f3281710f40d624285b678b02137814a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 19 Sep 2024 22:03:17 +0000 Subject: [PATCH 618/652] Merged PR 43044: [internal/release/8.0.3xx] Updated SourceBuildPrebuiltBaseline.xml - add 8.0.0 prebuilts Updated SourceBuildPrebuiltBaseline.xml - add - System.Configuration.ConfigurationManager.8.0.0 - System.Diagnostics.EventLog.8.0.0 - System.Reflection.Metadata.8.0.0 - System.Reflection.MetadataLoadContext.8.0.0 ---- #### AI description (iteration 1) #### PR Classification Update to configuration for source build. #### PR Summary This pull request updates the `SourceBuildPrebuiltBaseline.xml` to include new prebuilts for version 8.0.0. - `eng/SourceBuildPrebuiltBaseline.xml`: Added usage patterns for `System.Configuration.ConfigurationManager`, `System.Diagnostics.EventLog`, `System.Reflection.Metadata`, and `System.Reflection.MetadataLoadContext` for version 8.0.0. --- eng/SourceBuildPrebuiltBaseline.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index bf27fdb5ff90..8017b4c3ecfd 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -18,6 +18,10 @@ + + + + From 7f060a80051d90ce73732648144d4185a9b43a4c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 24 Sep 2024 19:11:44 +0000 Subject: [PATCH 619/652] Merged PR 43121: Directly flow emsdk - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Directly flow emsdk ---- #### AI description (iteration 1) #### PR Classification Dependency update #### PR Summary This pull request updates the Emscripten SDK and adds new package sources. - `NuGet.config`: Added new package sources for `dotnet-aspnetcore`, `dotnet-sdk`, and `dotnet-windowsdesktop`. - `eng/Version.Details.xml`: Updated the Emscripten SDK dependency to version 8.0.10. - `eng/Versions.props`: Updated the Emscripten workload manifest version to 8.0.10. --- NuGet.config | 18 +++++++++++++++++- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/NuGet.config b/NuGet.config index 47ff69c472b2..40cbed19faf5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,12 +8,16 @@ + + - + + + @@ -24,6 +28,10 @@ + + + + @@ -43,15 +51,23 @@ + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 10585f8d1c88..dcbc29af3844 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - d6672570f0fde2a4a3c7e65d60cec9f8406b039c + 91b783edc518e9ea0c0e883016b02261893389db - + https://github.com/dotnet/emsdk - d6672570f0fde2a4a3c7e65d60cec9f8406b039c + 91b783edc518e9ea0c0e883016b02261893389db diff --git a/eng/Versions.props b/eng/Versions.props index 830f0cd0eb20..972028b6fdbb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -204,7 +204,7 @@ 14.0.8478 17.0.8478 - 8.0.9 + 8.0.10 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From ba51b932e6bc1aaede907ebee57e3d9cab4b2d1a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 1 Oct 2024 15:55:41 -0700 Subject: [PATCH 620/652] Update branding to 8.0.307 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index e34bdc52e29a..3fc68ffea1e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 06 + 07 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From ac5461c0b3ccd31ba267639ea75fdf69074930a8 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 1 Oct 2024 16:31:31 -0700 Subject: [PATCH 621/652] Use the august release of the web templates --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3fc68ffea1e1..face6c16c574 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -150,7 +150,7 @@ true true true - $([MSBuild]::Subtract($(VersionFeature60), 1)) + $([MSBuild]::Subtract($(VersionFeature60), 2)) $(VersionFeature60) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) From 88653b401d2cbf2137edaf545d25fca4739fa72d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 22:47:39 +0000 Subject: [PATCH 622/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20135) [release/8.0.3xx] Update dependencies from dotnet/arcade --- 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 53892d6e6d1c..f24eaf13a7e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - dcb2d68022c6b515f547223ffc1837361f116534 + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 - + https://github.com/dotnet/arcade - dcb2d68022c6b515f547223ffc1837361f116534 + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 - + https://github.com/dotnet/arcade - dcb2d68022c6b515f547223ffc1837361f116534 + 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index face6c16c574..6887edeba725 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24461.1 + 8.0.0-beta.24475.3 diff --git a/global.json b/global.json index b243131209c9..137bc2984078 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.24461.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24461.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24475.3", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24475.3" } } From 35767d8564d14d7552ef571d3749e719c5464589 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 11:23:07 -0700 Subject: [PATCH 623/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20158) 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 f24eaf13a7e5..cd99ee30a371 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://github.com/dotnet/arcade - 69abe6b2063083c0b35fc3a5b16cb2bdbaf5e8b0 + 103916ccdbe7f4ab2e194068a1a3cd330542601f https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 6887edeba725..601b7adce569 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24475.3 + 8.0.0-beta.24504.2 diff --git a/global.json b/global.json index 137bc2984078..8320b3ded24a 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.24475.3", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24475.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24504.2" } } From 6d1bb6a7da22b5a96dbcbcd33258a4923badbb06 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 14:51:52 -0700 Subject: [PATCH 624/652] [release/8.0.3xx] Add registry search for upgrade policy keys (#20154) Co-authored-by: Jacques Eloff --- eng/Versions.props | 4 ---- src/redist/targets/GenerateMSIs.targets | 15 +++++++++------ .../targets/packaging/windows/clisdk/bundle.wxs | 5 +++++ .../packaging/windows/clisdk/generatebundle.ps1 | 7 ++++++- 4 files changed, 20 insertions(+), 11 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 601b7adce569..eda623281bd6 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -165,10 +165,6 @@ $(MicrosoftNETCoreAppRuntimePackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) - - - 3.14.1.8722 - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) diff --git a/src/redist/targets/GenerateMSIs.targets b/src/redist/targets/GenerateMSIs.targets index 41d2c7820370..08c029e2d40c 100644 --- a/src/redist/targets/GenerateMSIs.targets +++ b/src/redist/targets/GenerateMSIs.targets @@ -3,10 +3,10 @@ - https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(WixVersion).zip - $(ArtifactsDir)Tools/WixTools/$(WixVersion) - $(WixRoot)/WixTools.$(WixVersion).zip - $(WixRoot)/WixDownload.$(WixVersion).sentinel + https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/wix/Microsoft.Signed.Wix-$(MicrosoftSignedWixVersion).zip + $(ArtifactsDir)Tools/WixTools/$(MicrosoftSignedWixVersion) + $(WixRoot)/WixTools.$(MicrosoftSignedWixVersion).zip + $(WixRoot)/WixDownload.$(MicrosoftSignedWixVersion).sentinel @@ -126,7 +126,7 @@ @@ -344,9 +344,11 @@ @(LatestTemplateInstallerComponent->'%(MSIInstallerFile)') + $(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle\upgradePolicies.wxs + + AdditionalBasePaths="$(MSBuildThisFileDirectory)packaging/windows/clisdk;$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle"> diff --git a/src/redist/targets/packaging/windows/clisdk/bundle.wxs b/src/redist/targets/packaging/windows/clisdk/bundle.wxs index f49737a1c0be..b49b7836071f 100644 --- a/src/redist/targets/packaging/windows/clisdk/bundle.wxs +++ b/src/redist/targets/packaging/windows/clisdk/bundle.wxs @@ -35,6 +35,11 @@ + + + + + Date: Mon, 7 Oct 2024 23:51:52 -0700 Subject: [PATCH 625/652] [release/8.0.3xx] Remove 6.0 template --- eng/Versions.props | 15 --------------- src/redist/targets/BundledTemplates.targets | 18 ------------------ 2 files changed, 33 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index eda623281bd6..d693df70283e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -56,7 +56,6 @@ - 1.1.0-rc.24059.1 1.1.0-rc.24059.1 @@ -154,13 +153,6 @@ $(VersionFeature60) $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) - - - 6.0.302 - 6.0.14 - 6.0.7-servicing.22322.3 - 6.0.7-servicing.22322.2 - $(MicrosoftNETCoreAppRuntimePackageVersion) $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -173,13 +165,6 @@ $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) $(MicrosoftAspNetCoreAppRuntimePackageVersion) - - $(MicrosoftWinFormsProjectTemplates60PackageVersion) - $(MicrosoftWPFProjectTemplates60PackageVersion) - $(NUnit3DotNetNewTemplatePackageVersion) - $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - $(MicrosoftDotNetCommonItemTemplates60PackageVersion) - 6.0.$(AspNetCoreTemplateFeature60) diff --git a/src/redist/targets/BundledTemplates.targets b/src/redist/targets/BundledTemplates.targets index d6e428bb3eb2..028eac3bc25b 100644 --- a/src/redist/targets/BundledTemplates.targets +++ b/src/redist/targets/BundledTemplates.targets @@ -32,30 +32,12 @@ - - - - - - - - - - - - - - - - - - From 9a4e188eb272cc2dab21a0b2264be545fcb0fd4a Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Tue, 8 Oct 2024 01:46:27 -0700 Subject: [PATCH 626/652] Remove more template packages --- eng/Versions.props | 3 --- 1 file changed, 3 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index d693df70283e..653d0e84984f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -149,9 +149,6 @@ true true true - $([MSBuild]::Subtract($(VersionFeature60), 2)) - $(VersionFeature60) - $([MSBuild]::Subtract($(AspNetCoreTemplateFeature60), 1)) $(MicrosoftNETCoreAppRuntimePackageVersion) From 0935ff850a9e08e3d08035a94b2917fa87020897 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 10 Oct 2024 12:26:06 +0000 Subject: [PATCH 627/652] Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1 --- NuGet.config | 62 +++++++++++++++++++++++++++++++++++++++-- eng/Version.Details.xml | 12 ++++---- eng/Versions.props | 2 +- eng/common/tools.ps1 | 2 +- global.json | 6 ++-- 5 files changed, 71 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 40cbed19faf5..d2b6101c2691 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,15 +8,35 @@ + + + + + + + + + + + + + + + + + + + + @@ -24,14 +44,26 @@ - + + + + + + + + + + + + + @@ -52,22 +84,48 @@ + + + + + + - + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1c03f232e03..a3a56fe3e0b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index cb71b73adbb2..d5791dded3d7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24504.2 + 8.0.0-beta.24508.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index eb188cfda415..a2dedaa5297a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -892,7 +892,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 8320b3ded24a..4f310b2c43ab 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.108", + "dotnet": "8.0.110", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24504.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24508.1" } } From 5843c89290aed13a5d0e506bb1dabba7f51e36c6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 11 Oct 2024 12:52:45 +0000 Subject: [PATCH 628/652] Update dependencies from https://github.com/dotnet/source-build-externals build 20241010.2 Microsoft.SourceBuild.Intermediate.source-build-externals From Version 8.0.0-alpha.1.24379.1 -> To Version 8.0.0-alpha.1.24510.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 a3a56fe3e0b9..f7c0819041db 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - fb970eccb0a9cae3092464e29cbabda0d4115049 + d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595 From 713739f40a8386a75d2d2d9663505598269967fa Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 14 Oct 2024 17:41:31 -0700 Subject: [PATCH 629/652] Update Windows SDK projection --- eng/ManualVersions.props | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index 88e4fdae99fe..a0011d25e4c5 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,19 +9,19 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.44 - 10.0.18362.44 - 10.0.19041.44 - 10.0.20348.44 - 10.0.22000.44 - 10.0.22621.44 - 10.0.26100.44 - 10.0.17763.43 - 10.0.18362.43 - 10.0.19041.43 - 10.0.20348.43 - 10.0.22000.43 - 10.0.22621.43 - 10.0.26100.43 + 10.0.17763.53 + 10.0.18362.53 + 10.0.19041.53 + 10.0.20348.53 + 10.0.22000.53 + 10.0.22621.53 + 10.0.26100.53 + 10.0.17763.52 + 10.0.18362.52 + 10.0.19041.52 + 10.0.20348.52 + 10.0.22000.52 + 10.0.22621.52 + 10.0.26100.52 From 5b12bb243859e9e90e52d36840962e3c225880bb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 16 Oct 2024 16:19:47 -0700 Subject: [PATCH 630/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20206) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/steps/get-delegation-sas.yml | 11 ++++++++++- eng/common/templates/steps/get-delegation-sas.yml | 11 ++++++++++- global.json | 4 ++-- 5 files changed, 29 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f7c0819041db..80fab0409d2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index d5791dded3d7..ba8ad493f66e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24508.1 + 8.0.0-beta.24516.1 diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index c0e8f91317f0..c690cc0a070c 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -28,7 +28,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml index c0e8f91317f0..c690cc0a070c 100644 --- a/eng/common/templates/steps/get-delegation-sas.yml +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -28,7 +28,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/global.json b/global.json index 4f310b2c43ab..6e378e0b6d84 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.24508.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24508.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24516.1" } } From bb536f6dd74781aeb3b132d776123743ed1b3e05 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 17 Oct 2024 17:20:54 +0000 Subject: [PATCH 631/652] [release/8.0.3xx] Update dependencies from dotnet/source-build-externals (#20210) [release/8.0.3xx] Update dependencies from dotnet/source-build-externals --- 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 80fab0409d2b..951711749094 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595 + 3b85d089311e89b47758ba6a84eeb79374476dc8 From 93e4a6097a57785126bc751f389d923189712a44 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 17 Oct 2024 19:04:41 +0000 Subject: [PATCH 632/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241017.21 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.306 -> To Version 8.0.307 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.Platforms,Microsoft.Net.Compilers.Toolset From Version 8.0.10-servicing.24466.10 -> To Version 8.0.10-servicing.24474.4 (parent: Microsoft.NET.Sdk --- NuGet.config | 40 ++++------------------------------------ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 25 insertions(+), 57 deletions(-) diff --git a/NuGet.config b/NuGet.config index d2b6101c2691..993808d942c8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -47,24 +47,8 @@ - - - - - - - - - - - - - - - - - - + + @@ -96,24 +80,8 @@ - - - - - - - - - - - - - - - - - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 951711749094..56d5d0a5e064 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,7 +21,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop f655eecd22b6810f2989d8ec783f5798a709ab06 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -30,7 +30,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -52,7 +52,7 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore c2a442982e736e17ae6bcadbfd8ccba278ee1be6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5cad18dfda0ff1c3051dcf9d35945c853b0063a0 + ee59a10f11a4d88afbe9857e67934a5a65d234a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5cad18dfda0ff1c3051dcf9d35945c853b0063a0 + ee59a10f11a4d88afbe9857e67934a5a65d234a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5cad18dfda0ff1c3051dcf9d35945c853b0063a0 + ee59a10f11a4d88afbe9857e67934a5a65d234a8 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 5cad18dfda0ff1c3051dcf9d35945c853b0063a0 + ee59a10f11a4d88afbe9857e67934a5a65d234a8 https://github.com/dotnet/test-templates @@ -150,9 +150,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - - https://dev.azure.com/dnceng/internal/_git/dotnet-roslyn - 154f8a3b6c93384fa1ab0b6a6e30c8230d7fdf7c + + https://github.com/dotnet/roslyn + e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 diff --git a/eng/Versions.props b/eng/Versions.props index ba8ad493f66e..2614679fe69b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,25 +77,25 @@ - 8.0.306 - 8.0.306-servicing.24469.20 - 8.0.306-servicing.24469.20 + 8.0.307 + 8.0.307-servicing.24517.21 + 8.0.307-servicing.24517.21 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24468.7 + 4.10.0-3.24515.13 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.4 - 8.0.10-servicing.24466.10 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.4 + 8.0.10-servicing.24474.4 8.0.10 8.0.10 8.0.10 From 01a2250334179b05b6548d1174550c3a997b65f2 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 19:20:46 +0000 Subject: [PATCH 633/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241021.8 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.307 -> To Version 8.0.307 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates,Microsoft.NET.ILLink.Tasks From Version 8.0.10 -> To Version 8.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 56 +++++------------------ eng/Version.Details.xml | 98 ++++++++++++++++++++--------------------- eng/Versions.props | 44 +++++++++--------- 3 files changed, 81 insertions(+), 117 deletions(-) diff --git a/NuGet.config b/NuGet.config index 993808d942c8..fd680fa61289 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,7 @@ - - - - - - - - - + @@ -27,28 +19,18 @@ - - - - - - - - - - - + - + - - + + @@ -67,34 +49,16 @@ - - - - - - - - - + - + - - + + - - - - - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 56d5d0a5e064..089f06e2712d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,46 +5,46 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - f655eecd22b6810f2989d8ec783f5798a709ab06 + 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 @@ -52,55 +52,55 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c2a442982e736e17ae6bcadbfd8ccba278ee1be6 + 8e8ededd851fffe2166dd41bf850caabf833d13a https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee59a10f11a4d88afbe9857e67934a5a65d234a8 + 6ee43efdfd2e3a9bb49f8d22018b832e1e479a9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee59a10f11a4d88afbe9857e67934a5a65d234a8 + 6ee43efdfd2e3a9bb49f8d22018b832e1e479a9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee59a10f11a4d88afbe9857e67934a5a65d234a8 + 6ee43efdfd2e3a9bb49f8d22018b832e1e479a9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - ee59a10f11a4d88afbe9857e67934a5a65d234a8 + 6ee43efdfd2e3a9bb49f8d22018b832e1e479a9b https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - e4efded416f8216935683d9a12e2eb45df78a728 + a5159750d891acb077fdf5e028eb602bf450944a - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - e84ed744bb7989299c544f715056d05e220c7e00 + 2398667ad95d477c56d7530b619a0bb4d18e3c64 https://github.com/dotnet/fsharp @@ -146,9 +146,9 @@ c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://github.com/dotnet/roslyn diff --git a/eng/Versions.props b/eng/Versions.props index 2614679fe69b..0e1521e02924 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.10-servicing.24468.3 + 8.0.11-servicing.24518.1 - 8.0.10-servicing.24468.10 + 8.0.11-servicing.24518.4 @@ -64,13 +64,13 @@ - 8.0.10 - 8.0.10 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 - 8.0.10-servicing.24468.4 + 8.0.11 + 8.0.11 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.4 0.2.0 @@ -78,8 +78,8 @@ 8.0.307 - 8.0.307-servicing.24517.21 - 8.0.307-servicing.24517.21 + 8.0.307-servicing.24521.8 + 8.0.307-servicing.24521.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -90,26 +90,26 @@ - 8.0.10-servicing.24474.4 + 8.0.11-servicing.24517.7 - 8.0.10-servicing.24474.4 - 8.0.10-servicing.24474.4 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 + 8.0.11-servicing.24517.7 + 8.0.11-servicing.24517.7 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 2.1.0 8.0.1 6.0.1 - 8.0.10-servicing.24468.5 - 8.0.10-servicing.24468.5 - 8.0.10 - 8.0.10 + 8.0.11-servicing.24518.5 + 8.0.11-servicing.24518.5 + 8.0.11 + 8.0.11 From c93651e5afd45a7a3cb930ef9b67f40d5de11f7b Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 22 Oct 2024 05:25:27 +0000 Subject: [PATCH 634/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241021.40 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.307 -> To Version 8.0.307 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.11 -> To Version 8.0.11 (parent: Microsoft.NET.Sdk --- NuGet.config | 16 ++++++------ eng/Version.Details.xml | 58 ++++++++++++++++++++--------------------- eng/Versions.props | 22 ++++++++-------- 3 files changed, 48 insertions(+), 48 deletions(-) diff --git a/NuGet.config b/NuGet.config index fd680fa61289..4b4615fb2571 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -29,8 +29,8 @@ - - + + @@ -49,16 +49,16 @@ - + - - + + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 089f06e2712d..1ffc88fbdf47 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -7,19 +7,19 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 7c8a6299e73d7a3cfee7f77284ee6cabcab2278d + d3e7d292233dc8a3d2df128698239b078d13cdb0 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -58,49 +58,49 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 8e8ededd851fffe2166dd41bf850caabf833d13a + 47576478939fdd59b4400ad135f47938af486ab3 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ee43efdfd2e3a9bb49f8d22018b832e1e479a9b + 07eb260e98358c3a5597449dd32ee81112acb5e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ee43efdfd2e3a9bb49f8d22018b832e1e479a9b + 07eb260e98358c3a5597449dd32ee81112acb5e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ee43efdfd2e3a9bb49f8d22018b832e1e479a9b + 07eb260e98358c3a5597449dd32ee81112acb5e4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 6ee43efdfd2e3a9bb49f8d22018b832e1e479a9b + 07eb260e98358c3a5597449dd32ee81112acb5e4 https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - a5159750d891acb077fdf5e028eb602bf450944a + 3069afa2664d12f5290b7002c5a9eb110e4ea844 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 2398667ad95d477c56d7530b619a0bb4d18e3c64 + 42a83a56d421ac71312453e53dbacc3d2ae6d432 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 0e1521e02924..5fb9651b4801 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.11-servicing.24518.1 + 8.0.11-servicing.24521.3 - 8.0.11-servicing.24518.4 + 8.0.11-servicing.24521.7 @@ -66,11 +66,11 @@ 8.0.11 8.0.11 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 - 8.0.11-servicing.24521.4 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 + 8.0.11-servicing.24521.16 0.2.0 @@ -78,8 +78,8 @@ 8.0.307 - 8.0.307-servicing.24521.8 - 8.0.307-servicing.24521.8 + 8.0.307-servicing.24521.40 + 8.0.307-servicing.24521.40 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -106,8 +106,8 @@ - 8.0.11-servicing.24518.5 - 8.0.11-servicing.24518.5 + 8.0.11-servicing.24521.5 + 8.0.11-servicing.24521.5 8.0.11 8.0.11 From 353be46607a6b166218c60c5127c7437bc0e5362 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 23 Oct 2024 16:25:14 +0000 Subject: [PATCH 635/652] Merged PR 44215: Add back the coherency dependency and resync runtime flow - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Add back the coherency dependency and resync runtime flow ---- #### AI description (iteration 1) #### PR Classification Dependency update and runtime flow synchronization. #### PR Summary This pull request updates dependencies and resynchronizes the runtime flow to ensure coherency. - `/eng/Version.Details.xml`: Updated `Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100` and `Microsoft.SourceBuild.Intermediate.emsdk` dependencies to version 8.0.11. - `/NuGet.config`: Updated package source keys for `dotnet-emsdk` to reflect the new SHA. - `/eng/Versions.props`: Updated `MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion` to 8.0.11. --- NuGet.config | 8 +------- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 2 +- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4b4615fb2571..823137f294a6 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,13 +10,7 @@ - - - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ffc88fbdf47..4df976abe994 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - 91b783edc518e9ea0c0e883016b02261893389db + f6237140b33bf18c72dccfeda14be8d103c3b93e - + https://github.com/dotnet/emsdk - 91b783edc518e9ea0c0e883016b02261893389db + f6237140b33bf18c72dccfeda14be8d103c3b93e diff --git a/eng/Versions.props b/eng/Versions.props index 5fb9651b4801..3af7925dd17a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -182,7 +182,7 @@ 14.0.8478 17.0.8478 - 8.0.10 + 8.0.11 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From f6181df5194ba6975870a31741cb7aef045e09de Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Nov 2024 10:46:06 -0800 Subject: [PATCH 636/652] Update branding to 8.0.308 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index ba8ad493f66e..35fb002104aa 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 07 + 08 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 40f27ed7020369716e23b85e23c5ff0d666d2aa7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 19:55:44 +0000 Subject: [PATCH 637/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20218) [release/8.0.3xx] Update dependencies from dotnet/arcade --- NuGet.config | 78 ----------------------------------------- eng/Version.Details.xml | 12 +++---- eng/Versions.props | 2 +- global.json | 4 +-- 4 files changed, 9 insertions(+), 87 deletions(-) diff --git a/NuGet.config b/NuGet.config index d2b6101c2691..7533934d5914 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,15 +7,6 @@ - - - - - - - - - @@ -27,44 +18,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -83,50 +44,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 951711749094..dcb5598f6547 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 24e02f80c5458d1f75240ae57fc2a98fb8a9022a - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 24e02f80c5458d1f75240ae57fc2a98fb8a9022a - + https://github.com/dotnet/arcade - f7fb1fec01b91be69e4dcc5290a0bff3f28e214f + 24e02f80c5458d1f75240ae57fc2a98fb8a9022a https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 35fb002104aa..2423e0645f7a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24516.1 + 8.0.0-beta.24525.2 diff --git a/global.json b/global.json index 6e378e0b6d84..ecded4d969d3 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.24516.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24516.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24525.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24525.2" } } From caff80190981059cb8fa0e10d33370a277dc1e04 Mon Sep 17 00:00:00 2001 From: Manodasan Wignarajah Date: Mon, 11 Nov 2024 19:17:58 -0800 Subject: [PATCH 638/652] Update Windows SDK projection --- eng/ManualVersions.props | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/ManualVersions.props b/eng/ManualVersions.props index a0011d25e4c5..ab56b1f79f3e 100644 --- a/eng/ManualVersions.props +++ b/eng/ManualVersions.props @@ -9,19 +9,19 @@ Basically: In this file, choose the highest version when resolving merge conflicts. --> - 10.0.17763.53 - 10.0.18362.53 - 10.0.19041.53 - 10.0.20348.53 - 10.0.22000.53 - 10.0.22621.53 - 10.0.26100.53 - 10.0.17763.52 - 10.0.18362.52 - 10.0.19041.52 - 10.0.20348.52 - 10.0.22000.52 - 10.0.22621.52 - 10.0.26100.52 + 10.0.17763.56 + 10.0.18362.56 + 10.0.19041.56 + 10.0.20348.56 + 10.0.22000.56 + 10.0.22621.56 + 10.0.26100.56 + 10.0.17763.55 + 10.0.18362.55 + 10.0.19041.55 + 10.0.20348.55 + 10.0.22000.55 + 10.0.22621.55 + 10.0.26100.55 From 3b5545d731edb62d69a2b2778247a47e4d4f4e66 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 14 Nov 2024 09:21:17 -0800 Subject: [PATCH 639/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20244) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 7 ------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7533934d5914..1b9167e7c3a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,13 +9,6 @@ - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dcb5598f6547..974a4101e0ea 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 24e02f80c5458d1f75240ae57fc2a98fb8a9022a + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 - + https://github.com/dotnet/arcade - 24e02f80c5458d1f75240ae57fc2a98fb8a9022a + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 - + https://github.com/dotnet/arcade - 24e02f80c5458d1f75240ae57fc2a98fb8a9022a + 42652ca52cd5f9f637fef2b3ab6148805e3c5168 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 2423e0645f7a..0725acddb87d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24525.2 + 8.0.0-beta.24562.12 diff --git a/global.json b/global.json index ecded4d969d3..7e3efa9cd763 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.24525.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24525.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24562.12", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24562.12" } } From 209174e6b7ce47dd33e66bd5bf64ea58410c090f Mon Sep 17 00:00:00 2001 From: Nikola Milosavljevic Date: Thu, 14 Nov 2024 17:56:55 +0000 Subject: [PATCH 640/652] Add prebuilt exclusions for emsdk packages --- eng/SourceBuildPrebuiltBaseline.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml index 8017b4c3ecfd..f2075af7425f 100644 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ b/eng/SourceBuildPrebuiltBaseline.xml @@ -15,6 +15,11 @@ + + + + + From 63daaf3841dd8691fe32f7c2bae733b1a234cb92 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 23 Nov 2024 07:26:44 -0800 Subject: [PATCH 641/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20252) Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 7 ------- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 4 files changed, 9 insertions(+), 16 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4d5529694c30..4052b919ae05 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,10 +11,8 @@ - - @@ -25,8 +23,6 @@ - - @@ -48,11 +44,8 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4cfb8d2aa268..72d7d550dd9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - + https://github.com/dotnet/arcade - 42652ca52cd5f9f637fef2b3ab6148805e3c5168 + 3c7e11bf80279cde53a6251c4d0fa10e613fc739 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 0ec16d941f66..103a85e9a5ef 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24562.12 + 8.0.0-beta.24570.5 diff --git a/global.json b/global.json index 7e3efa9cd763..961c5c8bfa23 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.24562.12", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24562.12" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24570.5", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24570.5" } } From b2f20930d95a5323c56be2cdd7ef0c44ba53369c Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Mon, 2 Dec 2024 11:47:29 -0800 Subject: [PATCH 642/652] Update to final version of .net 6 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 103a85e9a5ef..f254c5f2bf42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -25,7 +25,7 @@ 30 32 17 - $([MSBuild]::Add($(VersionFeature), 29)) + 36 20 From 921e5834ec0ef5ed1b1ea9f645d663887bba9362 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 4 Dec 2024 18:25:06 +0000 Subject: [PATCH 643/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241203.15 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.307 -> To Version 8.0.308 Dependency coherency updates VS.Redist.Common.NetCore.SharedFramework.x64.8.0,Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.8.0,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,Microsoft.NETCore.Platforms,Microsoft.NET.ILLink.Tasks,Microsoft.Net.Compilers.Toolset,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.11-servicing.24517.7 -> To Version 8.0.12-servicing.24603.5 (parent: Microsoft.NET.Sdk --- NuGet.config | 7 +++++ eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- eng/Versions.props | 24 ++++++++--------- 3 files changed, 49 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4052b919ae05..32e52a703331 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -19,10 +20,13 @@ + + + @@ -43,7 +47,10 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72d7d550dd9f..81121e5030a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -21,30 +21,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop d3e7d292233dc8a3d2df128698239b078d13cdb0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b @@ -52,9 +52,9 @@ https://github.com/dotnet/core-setup 7d57652f33493fa022125b7f63aad0d70c52d810 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore @@ -85,22 +85,22 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 47576478939fdd59b4400ad135f47938af486ab3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 07eb260e98358c3a5597449dd32ee81112acb5e4 + c180688f2f7bb740d96700bc10be6300af68d6ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 07eb260e98358c3a5597449dd32ee81112acb5e4 + c180688f2f7bb740d96700bc10be6300af68d6ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 07eb260e98358c3a5597449dd32ee81112acb5e4 + c180688f2f7bb740d96700bc10be6300af68d6ce - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 07eb260e98358c3a5597449dd32ee81112acb5e4 + c180688f2f7bb740d96700bc10be6300af68d6ce https://github.com/dotnet/test-templates @@ -146,13 +146,13 @@ c4d80397805bec06b354d20aeb1773e243c6add0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 + 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://github.com/dotnet/roslyn - e29d0b744b8facc8e2ef8b687e9bd2e51d0db531 + 64e323ff5a3f88b1eae1c6d728441e73a38a9daa @@ -168,13 +168,13 @@ https://github.com/Microsoft/ApplicationInsights-dotnet 53b80940842204f78708a538628288ff5d741a1d - + https://github.com/dotnet/emsdk - f6237140b33bf18c72dccfeda14be8d103c3b93e + c458a7647c04e323c238f381eb176af24254b3ff - + https://github.com/dotnet/emsdk - f6237140b33bf18c72dccfeda14be8d103c3b93e + c458a7647c04e323c238f381eb176af24254b3ff diff --git a/eng/Versions.props b/eng/Versions.props index f254c5f2bf42..d7055cb18351 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -77,29 +77,29 @@ - 8.0.307 - 8.0.307-servicing.24521.40 - 8.0.307-servicing.24521.40 + 8.0.308 + 8.0.308-servicing.24603.15 + 8.0.308-servicing.24603.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) - 4.10.0-3.24515.13 + 4.10.0-3.24574.6 - 8.0.11-servicing.24517.7 + 8.0.12-servicing.24603.5 - 8.0.11-servicing.24517.7 - 8.0.11-servicing.24517.7 - 8.0.11 - 8.0.11 - 8.0.11 - 8.0.11 + 8.0.12-servicing.24603.5 + 8.0.12-servicing.24603.5 + 8.0.12 + 8.0.12 + 8.0.12 + 8.0.12 2.1.0 8.0.1 6.0.1 @@ -182,7 +182,7 @@ 14.0.8478 17.0.8478 - 8.0.11 + 8.0.12 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100PackageVersion) 8.0.100$([System.Text.RegularExpressions.Regex]::Match($(EmscriptenWorkloadManifestVersion), `-rtm|-[A-z]*\.*\d*`)) From e682c581a3a2723b3184e0d30ffb449fc0dd1092 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 4 Dec 2024 18:45:58 +0000 Subject: [PATCH 644/652] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20241204.16 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 8.0.308 -> To Version 8.0.308 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0,Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0,dotnet-dev-certs,dotnet-user-jwts,dotnet-user-secrets,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 8.0.11 -> To Version 8.0.12 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 +++++--- eng/Version.Details.xml | 66 ++++++++++++++++++++--------------------- eng/Versions.props | 30 +++++++++---------- 3 files changed, 56 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 32e52a703331..8fa2ad44cdcb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,10 +10,12 @@ + + @@ -25,8 +27,8 @@ - - + + @@ -45,14 +47,16 @@ + - - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 81121e5030a3..38769f00c703 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -5,21 +5,21 @@ Source-build uses transitive dependency resolution to determine correct build SHA of all product contributing repos. The order of dependencies is important and should not be modified without approval from dotnet/source-build-internal. --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - d3e7d292233dc8a3d2df128698239b078d13cdb0 + 0dad47b40c489631d0d3e7c6cc10f0035590a17c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -56,51 +56,51 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 89ef51c5d8f5239345127a1e282e11036e590c8b - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - 47576478939fdd59b4400ad135f47938af486ab3 + 31d685b2d9a86ca1243014d175a3da813f78e428 https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c180688f2f7bb740d96700bc10be6300af68d6ce + 55a73a0e7f0c08bb832c2dceeb49287223efef1f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c180688f2f7bb740d96700bc10be6300af68d6ce + 55a73a0e7f0c08bb832c2dceeb49287223efef1f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c180688f2f7bb740d96700bc10be6300af68d6ce + 55a73a0e7f0c08bb832c2dceeb49287223efef1f - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c180688f2f7bb740d96700bc10be6300af68d6ce + 55a73a0e7f0c08bb832c2dceeb49287223efef1f https://github.com/dotnet/test-templates @@ -124,13 +124,13 @@ 7d2f2719628e6744f3172a2d48e0d1f600b360c0 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 3069afa2664d12f5290b7002c5a9eb110e4ea844 + 44b9411eeca123dd8b2c9d47afe46f9e537f1714 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 42a83a56d421ac71312453e53dbacc3d2ae6d432 + 6a2a510ae56ff16665d95b96a0920e2fd45e1d2b https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d7055cb18351..ff1a47a51f01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -47,11 +47,11 @@ - 8.0.11-servicing.24521.3 + 8.0.12-servicing.24603.6 - 8.0.11-servicing.24521.7 + 8.0.12-servicing.24603.5 @@ -64,13 +64,13 @@ - 8.0.11 - 8.0.11 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 - 8.0.11-servicing.24521.16 + 8.0.12 + 8.0.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 + 8.0.12-servicing.24603.12 0.2.0 @@ -78,8 +78,8 @@ 8.0.308 - 8.0.308-servicing.24603.15 - 8.0.308-servicing.24603.15 + 8.0.308-servicing.24604.16 + 8.0.308-servicing.24604.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -106,10 +106,10 @@ - 8.0.11-servicing.24521.5 - 8.0.11-servicing.24521.5 - 8.0.11 - 8.0.11 + 8.0.12-servicing.24604.2 + 8.0.12-servicing.24604.2 + 8.0.12 + 8.0.12 From a52bb358868a5d95f480cef5810691beaebfdce1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 1 Jan 2025 05:01:50 +0000 Subject: [PATCH 645/652] Update dependencies from https://github.com/dotnet/arcade build 20241223.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.24570.5 -> To Version 8.0.0-beta.24623.2 --- eng/Version.Details.xml | 12 +++---- eng/Versions.props | 2 +- eng/common/cross/toolchain.cmake | 61 ++++++++++++++++---------------- eng/common/tools.ps1 | 2 +- eng/common/tools.sh | 2 +- global.json | 4 +-- 6 files changed, 41 insertions(+), 42 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 72d7d550dd9f..7c55fb2c8684 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 3c7e11bf80279cde53a6251c4d0fa10e613fc739 + 278b1dda181ab18a9fbed73da998e50d128eae21 - + https://github.com/dotnet/arcade - 3c7e11bf80279cde53a6251c4d0fa10e613fc739 + 278b1dda181ab18a9fbed73da998e50d128eae21 - + https://github.com/dotnet/arcade - 3c7e11bf80279cde53a6251c4d0fa10e613fc739 + 278b1dda181ab18a9fbed73da998e50d128eae21 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index f254c5f2bf42..b6e76a26f207 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24570.5 + 8.0.0-beta.24623.2 diff --git a/eng/common/cross/toolchain.cmake b/eng/common/cross/toolchain.cmake index 0998e875e5f7..dafabdcaef00 100644 --- a/eng/common/cross/toolchain.cmake +++ b/eng/common/cross/toolchain.cmake @@ -40,7 +40,7 @@ if(TARGET_ARCH_NAME STREQUAL "arm") set(TOOLCHAIN "arm-linux-gnueabihf") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf/9.2.0") + set(TIZEN_TOOLCHAIN "armv7hl-tizen-linux-gnueabihf") endif() elseif(TARGET_ARCH_NAME STREQUAL "arm64") set(CMAKE_SYSTEM_PROCESSOR aarch64) @@ -49,7 +49,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64") elseif(LINUX) set(TOOLCHAIN "aarch64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "aarch64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "aarch64-unknown-freebsd12") @@ -58,7 +58,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "armel") set(CMAKE_SYSTEM_PROCESSOR armv7l) set(TOOLCHAIN "arm-linux-gnueabi") if(TIZEN) - set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi/9.2.0") + set(TIZEN_TOOLCHAIN "armv7l-tizen-linux-gnueabi") endif() elseif(TARGET_ARCH_NAME STREQUAL "armv6") set(CMAKE_SYSTEM_PROCESSOR armv6l) @@ -95,7 +95,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x64") elseif(LINUX) set(TOOLCHAIN "x86_64-linux-gnu") if(TIZEN) - set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "x86_64-tizen-linux-gnu") endif() elseif(FREEBSD) set(triple "x86_64-unknown-freebsd12") @@ -112,7 +112,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") set(TOOLCHAIN "i686-linux-gnu") endif() if(TIZEN) - set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu/9.2.0") + set(TIZEN_TOOLCHAIN "i586-tizen-linux-gnu") endif() else() message(FATAL_ERROR "Arch is ${TARGET_ARCH_NAME}. Only arm, arm64, armel, armv6, ppc64le, riscv64, s390x, x64 and x86 are supported!") @@ -124,26 +124,25 @@ endif() # Specify include paths if(TIZEN) - if(TARGET_ARCH_NAME STREQUAL "arm") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7hl-tizen-linux-gnueabihf) - endif() - if(TARGET_ARCH_NAME STREQUAL "armel") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/armv7l-tizen-linux-gnueabi) - endif() - if(TARGET_ARCH_NAME STREQUAL "arm64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/aarch64-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x86") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}/include/c++/i586-tizen-linux-gnu) - endif() - if(TARGET_ARCH_NAME STREQUAL "x64") - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/) - include_directories(SYSTEM ${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}/include/c++/x86_64-tizen-linux-gnu) + function(find_toolchain_dir prefix) + # Dynamically find the version subdirectory + file(GLOB DIRECTORIES "${prefix}/*") + list(GET DIRECTORIES 0 FIRST_MATCH) + get_filename_component(TOOLCHAIN_VERSION ${FIRST_MATCH} NAME) + + set(TIZEN_TOOLCHAIN_PATH "${prefix}/${TOOLCHAIN_VERSION}" PARENT_SCOPE) + endfunction() + + if(TARGET_ARCH_NAME MATCHES "^(arm|armel|x86)$") + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + else() + find_toolchain_dir("${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") endif() + + message(STATUS "TIZEN_TOOLCHAIN_PATH set to: ${TIZEN_TOOLCHAIN_PATH}") + + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++) + include_directories(SYSTEM ${TIZEN_TOOLCHAIN_PATH}/include/c++/${TIZEN_TOOLCHAIN}) endif() if(ANDROID) @@ -265,21 +264,21 @@ endif() if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$") if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/lib64") add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64") - add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}") endif() elseif(TARGET_ARCH_NAME STREQUAL "x86") if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl) @@ -288,10 +287,10 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86") endif() add_toolchain_linker_flag(-m32) if(TIZEN) - add_toolchain_linker_flag("-B${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-B${TIZEN_TOOLCHAIN_PATH}") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib") add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib") - add_toolchain_linker_flag("-L${CROSS_ROOTFS}/usr/lib/gcc/${TIZEN_TOOLCHAIN}") + add_toolchain_linker_flag("-L${TIZEN_TOOLCHAIN_PATH}") endif() elseif(ILLUMOS) add_toolchain_linker_flag("-L${CROSS_ROOTFS}/lib/amd64") diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index a2dedaa5297a..60352ede194e 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -321,7 +321,7 @@ function InstallDotNet([string] $dotnetRoot, $variations += @($installParameters) $dotnetBuilds = $installParameters.Clone() - $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public" + $dotnetbuilds.AzureFeed = "https://ci.dot.net/public" $variations += @($dotnetBuilds) if ($runtimeSourceFeed) { diff --git a/eng/common/tools.sh b/eng/common/tools.sh index 3392e3a99921..b9b329ce37ff 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -234,7 +234,7 @@ function InstallDotNet { local public_location=("${installParameters[@]}") variations+=(public_location) - local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public") + local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://ci.dot.net/public") variations+=(dotnetbuilds) if [[ -n "${6:-}" ]]; then diff --git a/global.json b/global.json index 961c5c8bfa23..7f9e5be050b9 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.24570.5", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24570.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24623.2", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24623.2" } } From eb68992ab6a32ccf299730d3c22ec0ae78ece56c Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 7 Jan 2025 10:45:10 -0800 Subject: [PATCH 646/652] Update branding to 8.0.309 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index f254c5f2bf42..c6a1513345c9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 3 - 08 + 09 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) $(VersionMajor).$(VersionMinor) $(MajorMinorVersion).$(VersionSDKMinor) From 894b166b3bca5815d4f507aaa00a6e78ec2b7e55 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 11 Jan 2025 05:03:08 +0000 Subject: [PATCH 647/652] 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 7c55fb2c8684..9e652d023675 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -239,9 +239,9 @@ https://github.com/dotnet/runtime af841c8b33cecc92d74222298f1e45bf7bf3d90a - + https://github.com/dotnet/source-build-reference-packages - fe3794a68bd668d36d4d5014a9e6c9d22c0e6d86 + f9542c50beaefc38dd9d7ec9ea38d54fd154f21a From e7fc49edbfbe69c468d2772ff545a2a96c50c33d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 07:21:55 +0000 Subject: [PATCH 648/652] [release/8.0.3xx] Update dependencies from dotnet/source-build-externals (#20281) [release/8.0.3xx] Update dependencies from dotnet/source-build-externals - Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer into darc-release/8.0.3xx-07b93add-ca1d-43fb-8a03-3ef1580702bc --- 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 3eb7f61b0ac4..6a94a96087cc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -193,9 +193,9 @@ 5957c5c5f85f17c145e7fab4ece37ad6aafcded9 - + https://github.com/dotnet/source-build-externals - 3b85d089311e89b47758ba6a84eeb79374476dc8 + c7cb4da26e74ef645e3e98fcb4534a7d66247a82 From 0a057c95f38ed094f42de74ae68920c8293b9d97 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Jan 2025 09:14:14 +0000 Subject: [PATCH 649/652] [release/8.0.3xx] Update dependencies from dotnet/arcade (#20280) [release/8.0.3xx] Update dependencies from dotnet/arcade - Merge branch 'release/8.0.3xx' of https://github.com/dotnet/installer into darc-release/8.0.3xx-7aefe31d-985e-4642-82c2-00f92c77143d --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- .../templates-official/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, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a94a96087cc..65f7ae100294 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + 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-services diff --git a/eng/Versions.props b/eng/Versions.props index 520feacbee04..01e40912391d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.24623.2 + 8.0.0-beta.25060.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 7f9e5be050b9..2b2357ed17a4 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.24623.2", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.24623.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25060.1" } } From 95930ebc426d578cb800f9eb5800fbbb0a2329fc Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 15 Jan 2025 18:38:56 -0800 Subject: [PATCH 650/652] Fix Duplicate and Incorrect Package Source Entries --- NuGet.config | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index d2a732710398..5e7a3f55ba00 100644 --- a/NuGet.config +++ b/NuGet.config @@ -12,11 +12,6 @@ - - - - - @@ -25,8 +20,6 @@ - - @@ -52,6 +45,7 @@ + @@ -59,7 +53,6 @@ - From 39bd81213a993579bf0180e1e0e72e97cd430a0c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 16 Jan 2025 05:01:45 +0000 Subject: [PATCH 651/652] Update dependencies from https://github.com/dotnet/arcade build 20250114.11 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25064.11 --- NuGet.config | 29 +++++++++++++++++++++++++++++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 6 +++--- 4 files changed, 39 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8fa2ad44cdcb..4c4616c6a576 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,14 +8,23 @@ + + + + + + + + + @@ -23,11 +32,18 @@ + + + + + + + @@ -47,15 +63,28 @@ + + + + + + + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 412b664d4f4b..2f37dd862317 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 - + https://github.com/dotnet/arcade - c255aae7f2b128fa20a4441f0e192c3c53561621 + 872c7fa04100b26c93f66f8ca5d0519d056c5861 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index 93711d1f8229..c91ea77c2fe8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.25060.1 + 8.0.0-beta.25064.11 diff --git a/global.json b/global.json index 2b2357ed17a4..203525c3c615 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.110", + "dotnet": "8.0.112", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -11,7 +11,7 @@ "cmake": "3.21.0" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25060.1", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25060.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25064.11", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25064.11" } } From 889098e8499fc68d5f3f14a006427cb56cd636e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 17 Jan 2025 05:01:55 +0000 Subject: [PATCH 652/652] Update dependencies from https://github.com/dotnet/arcade build 20250116.6 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 8.0.0-beta.25064.11 -> To Version 8.0.0-beta.25066.6 --- NuGet.config | 3 +++ eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/sdk-task.ps1 | 2 +- eng/common/tools.ps1 | 4 ++-- global.json | 4 ++-- 6 files changed, 15 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 104875e9392b..9a66abf45cc8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -20,6 +20,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2f37dd862317..8f774aeb5316 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -214,18 +214,18 @@ - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 - + https://github.com/dotnet/arcade - 872c7fa04100b26c93f66f8ca5d0519d056c5861 + 4db725213dccb0d1102427bce1c39ba3117da7f7 https://github.com/dotnet/arcade-services diff --git a/eng/Versions.props b/eng/Versions.props index c91ea77c2fe8..2635bf7c8e98 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 8.0.0-beta.25064.11 + 8.0.0-beta.25066.6 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 73828dd30d31..4f0546dce120 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.8.1-2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 60352ede194e..a00577ed17aa 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -384,8 +384,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.8.1-2 - $defaultXCopyMSBuildVersion = '17.8.1-2' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/RoslynTools.MSBuild/versions/17.12.0 + $defaultXCopyMSBuildVersion = '17.12.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 203525c3c615..408ccf8072a2 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.25064.11", - "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25064.11" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6", + "Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25066.6" } }