From 406f7ed42300583f03f08260a6b25df5357675b6 Mon Sep 17 00:00:00 2001 From: Forgind Date: Tue, 25 Jul 2023 16:08:41 -0700 Subject: [PATCH 001/162] 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 000000000..ae023280e --- /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/162] 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 afd5d21bd..491a7cf1b 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/162] 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 ae023280e..d8e10e398 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 @@ namespace Microsoft.DotNet.Cli.Build 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/162] 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 f4a425bc6..a0f146506 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/162] 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 1e0c8ab9e..9e31720fe 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 028f1aa32..1e5c9d33e 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 195ac196b..d4f324ce3 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 fa7b9b483..f03128599 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 d8e10e398..8f80e57f3 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/162] 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 a0f146506..bae041b3f 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/162] PR feedback --- src/core-sdk-tasks/JsonPropertyParser.cs | 64 -------------------- src/redist/targets/BuildCoreSdkTasks.targets | 1 - src/redist/targets/BundledManifests.targets | 27 +++------ 3 files changed, 10 insertions(+), 82 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 8f80e57f3..000000000 --- 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 491a7cf1b..6268b743f 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 bae041b3f..a9d6feadf 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/162] 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 a9d6feadf..23987058f 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/162] stabilize version --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 2c2d40c52..c49800909 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/162] 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 a19db2106..e9b7749cf 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/162] 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 c8f8b3823..f32317ad5 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/162] 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 e9b7749cf..d74478a55 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/162] 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 d74478a55..f073ebe25 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/162] 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 f073ebe25..39d5df2fb 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/162] 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 39d5df2fb..6b926f159 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/162] 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 cdede126c..ffd5dd329 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -31,7 +31,12 @@ namespace EndToEnd.Tests 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/162] =?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 ffd5dd329..eafb8ba56 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -35,11 +35,10 @@ namespace EndToEnd.Tests 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/162] 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 6b926f159..9e35b84e3 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/162] 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 eafb8ba56..ccf6b39b1 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -31,8 +31,7 @@ namespace EndToEnd.Tests 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/162] 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 ccf6b39b1..0a8e4d917 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -22,7 +22,7 @@ namespace EndToEnd.Tests 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/162] 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 0a8e4d917..778c07ea7 100644 --- a/test/EndToEnd/ValidateInsertedManifests.cs +++ b/test/EndToEnd/ValidateInsertedManifests.cs @@ -22,12 +22,12 @@ namespace EndToEnd.Tests 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/162] 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 9761a4caf..c05eae78d 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/162] 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 b8a08378a..dbe630432 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 d9f961933..8d748f64e 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 814abbe71..369d54511 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/162] 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 dbe630432..a2a586db7 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -4,7 +4,7 @@ diff --git a/run-build.ps1 b/run-build.ps1 index 4f2e1275f..4286a0a3f 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 c380d75ce..e735b79f3 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 8d748f64e..b07e9abb3 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 369d54511..d19a60e8f 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/162] 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 e29400586..9fcb5685f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,7 +7,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1dbc4f44..c8454b071 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 6064718d0..f82990531 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/162] 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 c8454b071..e53a5fa2a 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 f82990531..931984de9 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/162] 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 e53a5fa2a..679346b36 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 931984de9..a80f6d559 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/162] 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 faad825c8..01925eb5f 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -202,16 +202,16 @@ namespace EndToEnd.Tests 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/162] 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 6b8cd6559..679346b36 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/162] [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 3f2e1c759..dc2873407 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 176f98910..0a10a518e 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 55b6a212d..7a6756c3e 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/162] [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 679346b36..99c375f49 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 a80f6d559..58fb124cb 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/162] 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 99c375f49..15224c424 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 58fb124cb..956a570a0 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/162] 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 15224c424..7cf9f2c74 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 956a570a0..da3f04a14 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/162] 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 7cf9f2c74..ecc57947f 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 da3f04a14..3c0f59f88 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/162] 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 ecc57947f..d698ae9cf 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 3c0f59f88..8533f48a0 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 789235dfe..687a1eecb 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/162] 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/162] 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/162] 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 2635b91db..24b087e8d 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 d80eb8e54..8ab1a9600 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 class SourceBuiltArtifactsTests : SdkTests 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/162] [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 d698ae9cf..27cccc7ae 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 8533f48a0..aca35532c 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 687a1eecb..639cb4f44 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/162] 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 4286a0a3f..7b98f2ee5 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 b07e9abb3..e55047af6 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 d19a60e8f..b34065a10 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/162] [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 eab79f2b7..81f3943d2 100644 --- a/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs +++ b/src/core-sdk-tasks/GenerateMSBuildExtensionsSWR.cs @@ -24,7 +24,8 @@ namespace Microsoft.DotNet.Cli.Build 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 @@ namespace Microsoft.DotNet.Cli.Build 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 @@ namespace Microsoft.DotNet.Cli.Build { 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 @@ namespace Microsoft.DotNet.Cli.Build 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/162] 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 b34065a10..be8668f85 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/162] [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 d3236b84d..77aed9c29 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 9896a37d2..b677dc4c4 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 639cb4f44..88256e459 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/162] 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 b677dc4c4..903911f4d 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/162] 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 a2a586db7..b8a08378a 100644 --- a/eng/AfterSigning.targets +++ b/eng/AfterSigning.targets @@ -4,7 +4,6 @@ diff --git a/run-build.ps1 b/run-build.ps1 index 7b98f2ee5..4f2e1275f 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 e735b79f3..c380d75ce 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 e55047af6..d9f961933 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 be8668f85..814abbe71 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/162] 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 77aed9c29..54139871f 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 903911f4d..458e85e0a 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/162] 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 54139871f..53b0cffeb 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 458e85e0a..a4af4b2b8 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/162] [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 9fcb5685f..94ab32f7a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 53b0cffeb..98034b438 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 - 1b7f3a6560f6fb5f32b2758603c0376037f555ea + 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 + + + https://github.com/dotnet/emsdk + 8219dd3f8f022dcd2fd8df2319ab4222fa11aa39 diff --git a/eng/Versions.props b/eng/Versions.props index a4af4b2b8..a43edc3aa 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 01925eb5f..fa7350c16 100644 --- a/test/EndToEnd/ProjectBuildTests.cs +++ b/test/EndToEnd/ProjectBuildTests.cs @@ -202,7 +202,7 @@ namespace EndToEnd.Tests 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/162] [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 98034b438..badc7e735 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 a43edc3aa..33b4ca481 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/162] 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 badc7e735..0d5c062d3 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 33b4ca481..19de1d070 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/162] 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 0d5c062d3..03e920a9c 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 19de1d070..5b1e51410 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/162] 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 03e920a9c..08d9ffaf0 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 5b1e51410..a9a5bf126 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/162] 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 08d9ffaf0..48b7eaed8 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 a9a5bf126..d6a296a60 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/162] 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 48b7eaed8..cea67a378 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 d6a296a60..985a11dc7 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/162] 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 cea67a378..d324c4529 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 985a11dc7..2a3b08b3b 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/162] 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 d324c4529..de03413af 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 2a3b08b3b..4ceb28332 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/162] 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 de03413af..2a84abf4e 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 4ceb28332..968542276 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 50c6a3e7e21e2acfeac8daa7beae8a04c5209ae5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 7 Dec 2023 14:09:20 +0000 Subject: [PATCH 058/162] 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 2a84abf4e..4571c993e 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 968542276..6e117c22d 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 059/162] 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 2a84abf4e..f53f059b7 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 968542276..6b65af4f2 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 060/162] 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 054db7569..625c362cf 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 f5ca2545c..5c44abcba 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 061/162] 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 625c362cf..929e69008 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 5c44abcba..3b80cef6f 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 062/162] 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 929e69008..54219a9d5 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 3b80cef6f..d8927db00 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 063/162] 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 54219a9d5..1e3b21e8f 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 d8927db00..2c58f8a76 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 064/162] 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 1e3b21e8f..134fe1bd4 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 2c58f8a76..800e95a8a 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 065/162] 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 134fe1bd4..5a7311b86 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 800e95a8a..b3032cb5f 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 066/162] 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 5a7311b86..aa47486cd 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 b3032cb5f..11d4ad1bf 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 067/162] [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 5a7311b86..ecb755232 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 b3032cb5f..d274ff29b 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 068/162] 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 ecb755232..eea1d97d1 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 d274ff29b..94d2dfb73 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 069/162] 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 eea1d97d1..117189307 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 94d2dfb73..f632de489 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 070/162] 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 117189307..048dc57a2 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 f632de489..cf53c8370 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 071/162] 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 5774a15b6..22a94aa46 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 13f8e564f..5c44d3754 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 072/162] 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 22a94aa46..2c705685a 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 5c44d3754..56011947b 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 073/162] 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 2c705685a..d662d5b45 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 56011947b..243ee7a6c 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 074/162] 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 d662d5b45..53b98a1a3 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 243ee7a6c..bec0a08ee 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 075/162] 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 53b98a1a3..60add4c85 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 bec0a08ee..b94a88920 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 076/162] 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 60add4c85..d0bff5a06 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 b94a88920..b38c17dec 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 077/162] 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 d0bff5a06..79e5e1d3c 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 b38c17dec..561f0b515 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 078/162] 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 79e5e1d3c..020e64f37 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 561f0b515..187e47fb2 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 079/162] 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 020e64f37..a5a3d3aac 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 187e47fb2..982af7ded 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 080/162] 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 a5a3d3aac..f95ef5580 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 982af7ded..e8b5bd4da 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 081/162] 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 f95ef5580..c6b5f5467 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 e8b5bd4da..4bb59dadb 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 082/162] 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 c6b5f5467..484561ff3 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 4bb59dadb..5ad820960 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 083/162] 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 484561ff3..7acda4f01 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 5ad820960..571714567 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 084/162] 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 7acda4f01..021dffee2 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 571714567..a6f11005b 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 085/162] 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 021dffee2..1012a0494 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 a6f11005b..f33314510 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 086/162] 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 1012a0494..cb6e3cbc9 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 f33314510..9cbd97018 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 087/162] 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 cb6e3cbc9..5587de7a1 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 9cbd97018..934590726 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 088/162] 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 5587de7a1..08ca0e138 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 934590726..13ecb7900 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 089/162] 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 08ca0e138..32d9724e1 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 13ecb7900..57b7a3f26 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 090/162] 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 32d9724e1..dcb41a298 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 57b7a3f26..c331a60f2 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 091/162] 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 dcb41a298..8b63f03a5 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 c331a60f2..7f44f6298 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 092/162] 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 8b63f03a5..1d3d488b7 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 7f44f6298..f7346812d 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 093/162] 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 1d3d488b7..4d89d0853 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 f7346812d..86b841206 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 094/162] 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 4d89d0853..1c5d601b6 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 86b841206..670035a6a 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 095/162] 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 1c5d601b6..aa644e31d 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 670035a6a..537bd056d 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 096/162] 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 aa644e31d..6f1d0a776 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 537bd056d..0b035e527 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 097/162] 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 6f1d0a776..6bdfd7a8f 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 0b035e527..985abdf87 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 098/162] 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 6bdfd7a8f..b0bd43de1 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 985abdf87..99bf9171f 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 099/162] 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 b0bd43de1..6a1ab0cc1 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 99bf9171f..e535f369b 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 100/162] 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 94ab32f7a..e3428e918 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,6 +9,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6a1ab0cc1..d6fb43002 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 e535f369b..61679004c 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 101/162] [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 d6fb43002..62a90b728 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 61679004c..655a2b314 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 102/162] 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 62a90b728..cfdaf4bbc 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 655a2b314..9584995d7 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 103/162] 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 cfdaf4bbc..c25af0bf9 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 9584995d7..6cac2b87c 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 104/162] 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 e3428e918..9dedafcb5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c25af0bf9..b557684c6 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 6cac2b87c..7992d3b38 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 105/162] [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 9dedafcb5..ba606dcba 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b557684c6..59af8b631 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 7992d3b38..f0dff43a4 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 106/162] 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 59af8b631..220d02f64 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 f0dff43a4..409964fb9 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 107/162] 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 220d02f64..f2b10a8bc 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 409964fb9..23556b3a9 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 108/162] 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 220d02f64..1054fdcb0 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 409964fb9..1d1aa66d3 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 109/162] 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 1054fdcb0..c8ce09bb0 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 1d1aa66d3..2246e5741 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 110/162] 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 798f2c391..8ccc8494e 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 4751434a3..bf014dd8f 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 111/162] 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 798f2c391..79a56b30a 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 4751434a3..48cb07a47 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 e20ee3a98..e24ca2f46 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 bb0d9f8b0..fa5446c09 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 ef720f9d7..3f74abf7c 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 fdd0cbb91..eb188cfda 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 e8d478943..3392e3a99 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 88256e459..52a0f29ec 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 112/162] [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 4321af5be..4ddb10fde 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 0c9f96af3..f122b766a 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 113/162] [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 4ddb10fde..6af5af2a0 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 f122b766a..460f5286c 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 114/162] 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 6af5af2a0..6babfcc43 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 460f5286c..672bc0b4a 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 115/162] 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 6babfcc43..b5722d5b9 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 672bc0b4a..c26eb152e 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 116/162] 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 b5722d5b9..e46406508 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 c26eb152e..3a2155e5c 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 117/162] 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 750bc6edf..0a4e6d725 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 5bcd4880e..54146585e 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 118/162] 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 5bcd4880e..7c413d4f6 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 119/162] 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 ed432ea13..245dd40e7 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 913012906e4a1098cea6e530fbdc6902e8693876 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 18 Jan 2024 15:32:06 +0000 Subject: [PATCH 120/162] 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 0a4e6d725..0dd5184f0 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 720b0ae3f..f707807f9 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 121/162] 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 0dd5184f0..3471a6b45 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 f707807f9..a1246fc5f 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 f07eca1c5758ecf0f1af68f1ddbce19a3c39d5d8 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 17:36:35 +0000 Subject: [PATCH 122/162] 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 ba606dcba..ee1171ec6 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 3471a6b45..6c765391e 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 a1246fc5f..cb3811182 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 123/162] 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 ee1171ec6..b05f57230 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 6c765391e..3c2b0dd78 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 cb3811182..b37213b7e 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 124/162] 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 b37213b7e..28210248b 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 c26160121f0b4ac08ce944ffd0f92a1a061ec2dc Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 19 Jan 2024 20:52:26 +0000 Subject: [PATCH 125/162] 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 b05f57230..bd0c81012 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 3c2b0dd78..503791971 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 28210248b..c9d82544c 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 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 126/162] 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 a1246fc5f..46f35b231 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 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 127/162] [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 46f35b231..620c6fb99 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 ad9af2548..e6cd301f7 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 5acc61c19..41d2c7820 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 82639d7f5aa40a62f788e3b9d2edf34601b92f16 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Wed, 14 Feb 2024 10:12:48 -0800 Subject: [PATCH 128/162] 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 620c6fb99..66bcd35a1 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 129/162] 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 66bcd35a1..0a5de56c6 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 130/162] 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 bd0c81012..780eb8898 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 503791971..dabf52107 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 8858a8d5b..9601fada4 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 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 131/162] [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 3471a6b45..912f5728b 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 66bcd35a1..129f86773 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 1e779fec4..5a3a32ea8 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 fa5446c09..8ec0151de 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 3f74abf7c..aba44a25a 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 9cc5c550d..d236f9fdb 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 52a0f29ec..e46bfeda9 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 f905d18fd594203a7e162e7c561799b47a336c2b Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Thu, 15 Feb 2024 09:26:27 -0800 Subject: [PATCH 132/162] 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 245dd40e7..88c5e4f82 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 16bdce438f3367b2420b16ebf9fe1221cdad749f Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 15 Feb 2024 19:16:13 +0000 Subject: [PATCH 133/162] 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 780eb8898..db353d728 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 dabf52107..dd76287bf 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 9601fada4..8c58657fb 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 134/162] 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 88c5e4f82..1da2a5ee8 100644 --- a/test/SdkTests/TestConfig.xml +++ b/test/SdkTests/TestConfig.xml @@ -16,8 +16,6 @@ - - From 6ba8ce2677fc7e37df40729db762e030cba3bebd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 16 Feb 2024 23:25:26 +0000 Subject: [PATCH 135/162] 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 db353d728..eacbe0a71 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 0b95db019..424d0ffb4 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 b7e3b00e3..9b511b507 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 136/162] 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 eacbe0a71..2efd8a26b 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 424d0ffb4..7041bf7fa 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 9b511b507..86c79b810 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 137/162] 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 2efd8a26b..9bf35989e 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 7041bf7fa..c7edb5ad4 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 86c79b810..20a1879a5 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 b3a0178e3a1b1b6a0a17455b5f7f8f695a689409 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 00:10:49 +0000 Subject: [PATCH 138/162] 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 9bf35989e..e49b2e308 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 c7edb5ad4..d4a3824ed 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 20a1879a5..448c96a59 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 cdf975bb994d473ff7fc3d76a3c57d35ee122a41 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 21 Feb 2024 21:59:27 +0000 Subject: [PATCH 139/162] 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 e49b2e308..773d2a57e 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 d4a3824ed..29a5272e6 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 448c96a59..6de8d862c 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 e448282aca0bd7e728df1add51755284a2303111 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 26 Feb 2024 06:30:54 +0000 Subject: [PATCH 140/162] 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 773d2a57e..79c285b31 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 29a5272e6..1d5144786 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 6de8d862c..b43f47fd1 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 c5e158a05c36ae16e7c602b3e7b4bfb2e3da30c5 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 5 Mar 2024 10:59:31 -0800 Subject: [PATCH 141/162] 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 9f5353f8e..1a1aabbde 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 142/162] 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 1a1aabbde..6ed9cecd2 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 143/162] 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 79c285b31..03fe9e8da 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 1d5144786..b5c15c0ea 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 b43f47fd1..2b4ed52a8 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 144/162] 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 03fe9e8da..cd498b0c2 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 b5c15c0ea..77c7744c1 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 2b4ed52a8..dd6915a14 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 145/162] 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 6ed9cecd2..ab1e93fee 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 11e8d7af5e06499a2541a8a1971a9621c2d8a66d Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Mon, 11 Mar 2024 02:22:23 -0700 Subject: [PATCH 146/162] [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 000000000..d14d1293e --- /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 d2aceffaeec34468a641cc50b24de264394ab353 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 12 Mar 2024 21:13:23 +0000 Subject: [PATCH 147/162] 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 cd498b0c2..a61fa6503 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 77c7744c1..de8f1f5a9 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 dd6915a14..0b65be5f9 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 456eb7f619e02fafb9362cf361c28956f9546d0d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 20:36:08 +0000 Subject: [PATCH 148/162] 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 a61fa6503..31b7ad1b4 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 de8f1f5a9..be47b899c 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 0950bd2fa..bd55c6e66 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 149/162] 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 31b7ad1b4..ed7ce6032 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 be47b899c..de0c30610 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 bd55c6e66..f9ad8ef55 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 f7cc5781a0fdd2b9a8120f507dc6d34f20200fcd Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 19 Mar 2024 22:05:23 +0000 Subject: [PATCH 150/162] 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 ed7ce6032..bacb52ece 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 de0c30610..af8f1542f 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 f9ad8ef55..56e87e455 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 151/162] [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 9bf35989e..b883b67bf 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 c7edb5ad4..bea9b2c4d 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 e5ba2f15e..bc4ec5c75 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 6c65e8192..efa2fd72b 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 000000000..a2709d105 --- /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 000000000..ba9ba4930 --- /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 000000000..53138622f --- /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 000000000..8aba3b44b --- /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 000000000..4b6337391 --- /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 000000000..b68d3c2f3 --- /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 000000000..857a0f8ba --- /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 000000000..08e5db9bb --- /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 000000000..c24193acf --- /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 000000000..5c98fe1c0 --- /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 000000000..0c87f149a --- /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 000000000..da669030d --- /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 000000000..f67a210d6 --- /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 000000000..eba58109b --- /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 000000000..0ecec47b0 --- /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 000000000..9b4a5ffa3 --- /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 000000000..07426fde0 --- /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 000000000..1bf43bf80 --- /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 000000000..04012fed1 --- /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 000000000..83d97a26a --- /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 000000000..3eb7e2d5f --- /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 000000000..829f17c34 --- /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 000000000..beab7d1bf --- /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 000000000..dbdd66d4a --- /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 e24ca2f46..8ec5c4f2d 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 a06373f38..2b21eae42 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 e46bfeda9..b967bd08e 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 152/162] 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 bacb52ece..922af3334 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 af8f1542f..f364701d3 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 56e87e455..2178ad782 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 153/162] 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 922af3334..c417f07b3 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 f364701d3..18363008a 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 2178ad782..191ecc9ce 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 154/162] 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 c417f07b3..12ee76ca7 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 cfe8dcbaa..8df2871c1 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 9022ff6cb..d5c95e994 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 155/162] 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 12ee76ca7..dd07efd45 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 8df2871c1..b99812f24 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 d5c95e994..13e1f83f1 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 156/162] 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 dd07efd45..b1a410622 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 b99812f24..d06665c57 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 13e1f83f1..9e58cfab1 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 7cfea26553ff7a860e58985b683233a211d3df5d Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 21 Mar 2024 01:53:09 +0000 Subject: [PATCH 157/162] 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 b1a410622..573a49220 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 d06665c57..95565205a 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 9e58cfab1..b92b77abd 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 a07c61f6c83b62d2b326aea4722bcb26a135dbb1 Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 2 Apr 2024 11:56:05 -0700 Subject: [PATCH 158/162] 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 bc4ec5c75..56b8d4bd4 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 159/162] [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 bea9b2c4d..98359c2ea 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 56b8d4bd4..488ae9347 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 f5c1ec7ea..2d5660642 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 a2709d105..1f035fee7 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 ba9ba4930..52b4d05d3 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 53138622f..589ac80a1 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 8aba3b44b..f193dfbe2 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 4b6337391..f0513aee5 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 5c98fe1c0..da1f40958 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 beab7d1bf..1f308b24e 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 b967bd08e..31d5f24b1 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 160/162] [8.0.2xx] Migrate to 1ES templates for internal builds (#19129) --- .vsts-ci.yml | 673 ++++++++++++++++++++++++----------------------- .vsts-pr.yml | 56 ++-- eng/build-pr.yml | 261 ++++++++++++++++++ eng/build.yml | 38 +-- 4 files changed, 662 insertions(+), 366 deletions(-) create mode 100644 eng/build-pr.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index d14d1293e..e94f2b856 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') }}: +resources: + repositories: + - repository: 1esPipelines + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + ${{ if notin(variables['Build.Reason'], 'PullRequest') }}: + template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines + ${{ else }}: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1esPipelines + 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) - 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 + 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) - demands: ImageOverride -equals windows.vs2022.amd64 + image: 1es-windows-2022 + os: windows + steps: + - task: 1ES.PublishPipelineArtifact@1 + displayName: Publish Build Config + inputs: + targetPath: $(Build.SourcesDirectory)\eng\buildConfiguration + artifactName: buildConfiguration + + # 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 + + # 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 + + # MacOS + - template: eng/build.yml@self + 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@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 + + # 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 + + # 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 + + # 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 + + # 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 + + # 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-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 d14d1293e..f5c697bab 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 000000000..831d96781 --- /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 ea389797c..4f947ea8f 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 1a17989bf13cf5211e199c1e3543186ab2329cf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Apr 2024 17:56:36 +0000 Subject: [PATCH 161/162] 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 9d97a617a..c3e750405 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 bad36cc84..b0659e89c 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 3e43417d0..4b0f294a2 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 0ecec47b0..cbba05967 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 67a2e2c74..289bb2396 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 0ecec47b0..cbba05967 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 31d5f24b1..f4af7d9ef 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 a97cad6749b9934f8cf5639b92754a8f371333a3 Mon Sep 17 00:00:00 2001 From: Jacques Eloff Date: Fri, 12 Apr 2024 10:15:49 -0700 Subject: [PATCH 162/162] 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 4b0f294a2..239b4349d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -169,7 +169,7 @@ - 3.14.0.8606 + 3.14.1.8722