From 3ff877f2b5876049f3bf05d946edba5c6622da9f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 23 Jan 2026 02:01:32 +0000 Subject: [PATCH 1/9] Update dependencies from https://github.com/microsoft/testfx build 20260121.4 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26071.4 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26071.4 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 797211a5331a..17f7780eb6a6 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26071.3 - 4.1.0-preview.26071.3 + 2.1.0-preview.26071.4 + 4.1.0-preview.26071.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1c908d227f1f..82c1e4d830a3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/microsoft/testfx - 6adab94760f7b10b6aaca1b4fd04543d9e539242 + 9cc3416249265cd1284f2a00cafc7e1bacedd2ab - + https://github.com/microsoft/testfx - 6adab94760f7b10b6aaca1b4fd04543d9e539242 + 9cc3416249265cd1284f2a00cafc7e1bacedd2ab https://github.com/dotnet/dotnet From d4eb0e2cc21bd30c22982e921de8c9a318772b6b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 24 Jan 2026 02:02:11 +0000 Subject: [PATCH 2/9] Update dependencies from https://github.com/microsoft/testfx build 20260123.5 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26073.5 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26073.5 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 17f7780eb6a6..67b856030290 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26071.4 - 4.1.0-preview.26071.4 + 2.1.0-preview.26073.5 + 4.1.0-preview.26073.5 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82c1e4d830a3..92783f99af94 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/microsoft/testfx - 9cc3416249265cd1284f2a00cafc7e1bacedd2ab + 3c4d290391271602b2f0abdea129ba45e87acb9f - + https://github.com/microsoft/testfx - 9cc3416249265cd1284f2a00cafc7e1bacedd2ab + 3c4d290391271602b2f0abdea129ba45e87acb9f https://github.com/dotnet/dotnet From fb6f3736d68ec3b4207d6fe85dcf1607324394e1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 25 Jan 2026 02:02:00 +0000 Subject: [PATCH 3/9] Update dependencies from https://github.com/microsoft/testfx build 20260124.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26074.1 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26074.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 67b856030290..2a909ecd2c4e 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26073.5 - 4.1.0-preview.26073.5 + 2.1.0-preview.26074.1 + 4.1.0-preview.26074.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92783f99af94..9625c1f0ffca 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 455f1358f39b4d38fa3893c327a45027c4a81843 - + https://github.com/microsoft/testfx - 3c4d290391271602b2f0abdea129ba45e87acb9f + 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 - + https://github.com/microsoft/testfx - 3c4d290391271602b2f0abdea129ba45e87acb9f + 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 https://github.com/dotnet/dotnet From 37dccbec8ce896ec0927153f4ac1cc43086a63fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 26 Jan 2026 02:01:19 +0000 Subject: [PATCH 4/9] Update dependencies from https://github.com/microsoft/testfx build 20260125.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26075.1 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26075.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 62d49a5c227c..f596c305b679 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26074.1 - 4.1.0-preview.26074.1 + 2.1.0-preview.26075.1 + 4.1.0-preview.26075.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 075b09600b1a..b700a64639ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/microsoft/testfx - 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 + 551933c1da7ad827635c25960c6f174ff6ca7acd - + https://github.com/microsoft/testfx - 9d29fa8a9d4ac0dd99c7d6bdca149d8f14c55304 + 551933c1da7ad827635c25960c6f174ff6ca7acd https://github.com/dotnet/dotnet From 920f7c16b832d527fe2f3295498ac8351e9852d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 27 Jan 2026 02:01:10 +0000 Subject: [PATCH 5/9] Update dependencies from https://github.com/microsoft/testfx build 20260126.1 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26076.1 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26076.1 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f596c305b679..40ab7f694211 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26075.1 - 4.1.0-preview.26075.1 + 2.1.0-preview.26076.1 + 4.1.0-preview.26076.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index b700a64639ac..9272ef1a061e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/microsoft/testfx - 551933c1da7ad827635c25960c6f174ff6ca7acd + ad5aef4225e69edc95ff94eb6fc609d904038af0 - + https://github.com/microsoft/testfx - 551933c1da7ad827635c25960c6f174ff6ca7acd + ad5aef4225e69edc95ff94eb6fc609d904038af0 https://github.com/dotnet/dotnet From 67f18be05c0db60c831a2ea80adb77d7224e4dcc Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 28 Jan 2026 02:01:46 +0000 Subject: [PATCH 6/9] Update dependencies from https://github.com/microsoft/testfx build 20260127.6 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26071.3 -> To Version 2.1.0-preview.26077.6 MSTest From Version 4.1.0-preview.26071.3 -> To Version 4.1.0-preview.26077.6 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 40ab7f694211..ac420200acbc 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26076.1 - 4.1.0-preview.26076.1 + 2.1.0-preview.26077.6 + 4.1.0-preview.26077.6 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9272ef1a061e..9781da92254e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 1ad3cb0c8b50c510cc52d6456bb4b5b676b59229 - + https://github.com/microsoft/testfx - ad5aef4225e69edc95ff94eb6fc609d904038af0 + ccdb0ee122177251ae18655264e94312d63c4d45 - + https://github.com/microsoft/testfx - ad5aef4225e69edc95ff94eb6fc609d904038af0 + ccdb0ee122177251ae18655264e94312d63c4d45 https://github.com/dotnet/dotnet From 92f957cb164b14018793729a5304f0ab8fe9b563 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Jan 2026 06:46:51 +0000 Subject: [PATCH 7/9] [release/10.0.1xx] Fix -extra container variant check to support .NET 9+ (#52597) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: baronfel <573979+baronfel@users.noreply.github.com> Co-authored-by: mthalman <15789599+mthalman@users.noreply.github.com> Co-authored-by: DonnaChen888 --- .../Tasks/ComputeDotnetBaseImageAndTag.cs | 4 +- .../TargetsTests.cs | 47 ++++++++++++++++++- 2 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs index 92cd3f5a5c85..69ced08eae1e 100644 --- a/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs +++ b/src/Containers/Microsoft.NET.Build.Containers/Tasks/ComputeDotnetBaseImageAndTag.cs @@ -130,7 +130,7 @@ private bool TargetRuntimeIdentiriersAreValid() { if (muslRidsCount == TargetRuntimeIdentifiers.Length) { - IsMuslRid = true; + IsMuslRid = true; } else { @@ -191,7 +191,7 @@ private bool ComputeRepositoryAndTag([NotNullWhen(true)] out string? repository, && !UsesInvariantGlobalization && versionAllowsUsingAOTAndExtrasImages // the extras only became available on the stable tags of the FirstVersionWithNewTaggingScheme - && (!parsedVersion.IsPrerelease && parsedVersion.Major == FirstVersionWithNewTaggingScheme)) + && (!parsedVersion.IsPrerelease && parsedVersion.Major >= FirstVersionWithNewTaggingScheme)) { Log.LogMessage("Using extra variant because the application needs globalization"); tag += "-extra"; diff --git a/test/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs b/test/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs index d0cb12539451..2c6b80ace493 100644 --- a/test/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs +++ b/test/Microsoft.NET.Build.Containers.IntegrationTests/TargetsTests.cs @@ -26,7 +26,7 @@ public void CanDeferContainerAppCommand( }, projectName: $"{nameof(CanDeferContainerAppCommand)}_{prop}_{value}_{string.Join("_", expectedAppCommandArgs)}"); using var _ = d; var instance = project.CreateProjectInstance(ProjectInstanceSettings.None); - instance.Build([ ComputeContainerConfig ], []); + instance.Build([ComputeContainerConfig], []); var computedAppCommand = instance.GetItems(ContainerAppCommand).Select(i => i.EvaluatedInclude); // The test was not testing anything previously, as the list returned was zero length, @@ -614,6 +614,51 @@ public void AOTAppsLessThan8WithCulturesDoNotGetExtraImages(string rid, string e computedBaseImageTag.Should().BeEquivalentTo(expectedImage); } + [InlineData("8.0.100", "v8.0", "jammy-chiseled", "mcr.microsoft.com/dotnet/runtime:8.0-jammy-chiseled-extra")] + [InlineData("9.0.100", "v9.0", "noble-chiseled", "mcr.microsoft.com/dotnet/runtime:9.0-noble-chiseled-extra")] + [InlineData("10.0.100", "v10.0", "noble-chiseled", "mcr.microsoft.com/dotnet/runtime:10.0-noble-chiseled-extra")] + [Theory] + public void FDDConsoleAppWithCulturesAndOptingIntoChiseledGetsExtrasForNet9AndLater(string sdkVersion, string tfm, string containerFamily, string expectedImage) + { + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = sdkVersion, + ["TargetFrameworkVersion"] = tfm, + [KnownStrings.Properties.ContainerRuntimeIdentifier] = "linux-x64", + [KnownStrings.Properties.ContainerFamily] = containerFamily, + [KnownStrings.Properties.InvariantGlobalization] = false.ToString(), + }, projectName: $"{nameof(FDDConsoleAppWithCulturesAndOptingIntoChiseledGetsExtrasForNet9AndLater)}_{sdkVersion}_{tfm}_{containerFamily}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } + + [InlineData("8.0.100", "v8.0", "jammy-chiseled", "mcr.microsoft.com/dotnet/aspnet:8.0-jammy-chiseled-extra")] + [InlineData("9.0.100", "v9.0", "noble-chiseled", "mcr.microsoft.com/dotnet/aspnet:9.0-noble-chiseled-extra")] + [InlineData("10.0.100", "v10.0", "noble-chiseled", "mcr.microsoft.com/dotnet/aspnet:10.0-noble-chiseled-extra")] + [Theory] + public void FDDAspNetAppWithCulturesAndOptingIntoChiseledGetsExtrasForNet9AndLater(string sdkVersion, string tfm, string containerFamily, string expectedImage) + { + var (project, logger, d) = ProjectInitializer.InitProject(new() + { + ["NetCoreSdkVersion"] = sdkVersion, + ["TargetFrameworkVersion"] = tfm, + [KnownStrings.Properties.ContainerRuntimeIdentifier] = "linux-x64", + [KnownStrings.Properties.ContainerFamily] = containerFamily, + [KnownStrings.Properties.InvariantGlobalization] = false.ToString(), + }, bonusItems: new() + { + [KnownStrings.Items.FrameworkReference] = KnownFrameworkReferences.WebApp + }, projectName: $"{nameof(FDDAspNetAppWithCulturesAndOptingIntoChiseledGetsExtrasForNet9AndLater)}_{sdkVersion}_{tfm}_{containerFamily}"); + using var _ = d; + var instance = project.CreateProjectInstance(global::Microsoft.Build.Execution.ProjectInstanceSettings.None); + instance.Build(new[] { ComputeContainerBaseImage }, null, null, out var outputs).Should().BeTrue(String.Join(Environment.NewLine, logger.Errors)); + var computedBaseImageTag = instance.GetProperty(ContainerBaseImage)?.EvaluatedValue; + computedBaseImageTag.Should().BeEquivalentTo(expectedImage); + } + [Fact] public void AspNetFDDAppsGetAspNetBaseImage() { From 687cc8f7ad0859837bdc216b616512e4af31f85c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 29 Jan 2026 02:01:59 +0000 Subject: [PATCH 8/9] Update dependencies from https://github.com/microsoft/testfx build 20260128.2 On relative base path root Microsoft.Testing.Platform From Version 2.1.0-preview.26077.6 -> To Version 2.1.0-preview.26078.2 MSTest From Version 4.1.0-preview.26077.6 -> To Version 4.1.0-preview.26078.2 --- eng/Version.Details.props | 4 ++-- eng/Version.Details.xml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index b5b02eaee1cd..907a95db55d0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -142,8 +142,8 @@ This file should be imported by eng/Versions.props 2.1.0 - 2.1.0-preview.26077.6 - 4.1.0-preview.26077.6 + 2.1.0-preview.26078.2 + 4.1.0-preview.26078.2 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff0968dbea1a..844c4cc1f366 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -561,13 +561,13 @@ https://github.com/dotnet/dotnet 74dc6e4ed64cc0255a6be520761a857dda273863 - + https://github.com/microsoft/testfx - ccdb0ee122177251ae18655264e94312d63c4d45 + 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 - + https://github.com/microsoft/testfx - ccdb0ee122177251ae18655264e94312d63c4d45 + 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 https://github.com/dotnet/dotnet From b1b002a49b32111c330aa4a55f9c3559366cfa49 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 29 Jan 2026 05:40:25 +0000 Subject: [PATCH 9/9] Reset files to release/10.0.2xx Reset patterns: - global.json - NuGet.config - eng/Version.Details.xml - eng/Version.Details.props - eng/common/* --- NuGet.config | 3 +- eng/Version.Details.props | 372 +++++----- eng/Version.Details.xml | 685 +++++++++--------- .../job/publish-build-assets.yml | 2 +- .../core-templates/job/source-build.yml | 2 +- .../core-templates/post-build/post-build.yml | 4 +- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 13 +- global.json | 4 +- 9 files changed, 544 insertions(+), 543 deletions(-) diff --git a/NuGet.config b/NuGet.config index cc20a9a3c554..f3f728c95515 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -39,6 +38,8 @@ + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 907a95db55d0..f7ff07db3842 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,173 +6,151 @@ This file should be imported by eng/Versions.props - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-preview.26077.113 - 10.0.4 - 10.0.4 - 18.0.11 - 18.0.11-servicing-26077-113 - 7.0.2-rc.7813 - 10.0.104 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.0-preview.26077.113 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 2.0.0-preview.1.26077.113 - 2.2.4 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4-servicing.26077.113 - 10.0.0-beta.26077.113 - 10.0.0-beta.26077.113 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 14.0.104-servicing.26077.113 - 10.0.4 - 5.0.0-2.26077.113 - 5.0.0-2.26077.113 - 10.0.4-servicing.26077.113 - 10.0.4 - 10.0.4 + 10.0.0-preview.26077.126 + 18.3.0-release-26077-126 + 18.3.0-release-26077-126 + 7.3.0-preview.1.7826 + 10.0.200-alpha.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 10.0.0-preview.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 10.0.0-beta.26077.126 + 15.2.200-servicing.26077.126 + 5.3.0-2.26077.126 + 5.3.0-2.26077.126 10.0.0-preview.7.25377.103 - 10.0.0-preview.26077.113 - 10.0.4-servicing.26077.113 - 18.0.1-release-26077-113 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26077.113 - 10.0.104 - 10.0.104-servicing.26077.113 - 10.0.104 - 10.0.104 - 10.0.104-servicing.26077.113 - 18.0.1-release-26077-113 - 18.0.1-release-26077-113 - 3.2.4 - 10.0.4 - 10.0.4-servicing.26077.113 - 10.0.4 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 7.0.2-rc.7813 - 10.0.4 - 2.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 - 10.0.4 + 10.0.0-preview.26077.126 + 18.3.0-release-26077-126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-alpha.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 10.0.200-preview.26077.126 + 18.3.0-release-26077-126 + 18.3.0-release-26077-126 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + 7.3.0-preview.1.7826 + + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.0-preview.1.25612.105 + 2.2.2 + 10.0.2 + 10.0.2 + 10.0.0-rtm.25523.111 + 10.0.0-rtm.25523.111 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2-servicing.25612.105 + 3.2.2 + 10.0.2 + 10.0.2-servicing.25612.105 + 10.0.2 + 10.0.2 + 2.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 + 10.0.2 2.1.0 - 2.1.0-preview.26078.2 - 4.1.0-preview.26078.2 + 2.1.0-preview.26077.6 + 4.1.0-preview.26077.6 - $(dotnetdevcertsPackageVersion) - $(dotnetuserjwtsPackageVersion) - $(dotnetusersecretsPackageVersion) - $(MicrosoftAspNetCoreAnalyzersPackageVersion) - $(MicrosoftAspNetCoreAppRefPackageVersion) - $(MicrosoftAspNetCoreAppRefInternalPackageVersion) - $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) - $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) - $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) - $(MicrosoftAspNetCoreAuthorizationPackageVersion) - $(MicrosoftAspNetCoreComponentsPackageVersion) - $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsFormsPackageVersion) - $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) - $(MicrosoftAspNetCoreComponentsWebPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) - $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) - $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) - $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) - $(MicrosoftAspNetCoreMetadataPackageVersion) - $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) - $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) $(MicrosoftAspNetCoreMvcRazorExtensionsToolingInternalPackageVersion) - $(MicrosoftAspNetCoreTestHostPackageVersion) - $(MicrosoftBclAsyncInterfacesPackageVersion) $(MicrosoftBuildPackageVersion) $(MicrosoftBuildLocalizationPackageVersion) $(MicrosoftBuildNuGetSdkResolverPackageVersion) @@ -183,46 +161,25 @@ This file should be imported by eng/Versions.props $(MicrosoftCodeAnalysisCSharpCodeStylePackageVersion) $(MicrosoftCodeAnalysisCSharpFeaturesPackageVersion) $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisExternalAccessHotReloadPackageVersion) $(MicrosoftCodeAnalysisPublicApiAnalyzersPackageVersion) $(MicrosoftCodeAnalysisRazorToolingInternalPackageVersion) $(MicrosoftCodeAnalysisWorkspacesCommonPackageVersion) $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) - $(MicrosoftDeploymentDotNetReleasesPackageVersion) - $(MicrosoftDiaSymReaderPackageVersion) $(MicrosoftDotNetArcadeSdkPackageVersion) $(MicrosoftDotNetBuildTasksInstallersPackageVersion) $(MicrosoftDotNetBuildTasksTemplatingPackageVersion) $(MicrosoftDotNetBuildTasksWorkloadsPackageVersion) $(MicrosoftDotNetHelixSdkPackageVersion) $(MicrosoftDotNetSignToolPackageVersion) - $(MicrosoftDotNetWebItemTemplates100PackageVersion) - $(MicrosoftDotNetWebProjectTemplates100PackageVersion) - $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) - $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(MicrosoftDotNetXliffTasksPackageVersion) $(MicrosoftDotNetXUnitExtensionsPackageVersion) - $(MicrosoftExtensionsConfigurationIniPackageVersion) - $(MicrosoftExtensionsDependencyModelPackageVersion) - $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) - $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) - $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) - $(MicrosoftExtensionsLoggingPackageVersion) - $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) - $(MicrosoftExtensionsLoggingConsolePackageVersion) - $(MicrosoftExtensionsObjectPoolPackageVersion) $(MicrosoftFSharpCompilerPackageVersion) - $(MicrosoftJSInteropPackageVersion) $(MicrosoftNetCompilersToolsetPackageVersion) $(MicrosoftNetCompilersToolsetFrameworkPackageVersion) - $(MicrosoftNETHostModelPackageVersion) - $(MicrosoftNETILLinkTasksPackageVersion) - $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) $(MicrosoftNETRuntimeEmscriptenSdkInternalPackageVersion) $(MicrosoftNETSdkRazorSourceGeneratorsTransportPackageVersion) - $(MicrosoftNETSdkWindowsDesktopPackageVersion) $(MicrosoftNETTestSdkPackageVersion) - $(MicrosoftNETCoreAppRefPackageVersion) - $(MicrosoftNETCorePlatformsPackageVersion) $(MicrosoftSourceLinkAzureReposGitPackageVersion) $(MicrosoftSourceLinkBitbucketGitPackageVersion) $(MicrosoftSourceLinkCommonPackageVersion) @@ -239,10 +196,6 @@ This file should be imported by eng/Versions.props $(MicrosoftTemplateSearchTemplateDiscoveryPackageVersion) $(MicrosoftTestPlatformBuildPackageVersion) $(MicrosoftTestPlatformCLIPackageVersion) - $(MicrosoftWebXdtPackageVersion) - $(MicrosoftWin32SystemEventsPackageVersion) - $(MicrosoftWindowsDesktopAppInternalPackageVersion) - $(MicrosoftWindowsDesktopAppRefPackageVersion) $(NuGetBuildTasksPackageVersion) $(NuGetBuildTasksConsolePackageVersion) $(NuGetBuildTasksPackPackageVersion) @@ -259,6 +212,57 @@ This file should be imported by eng/Versions.props $(NuGetProjectModelPackageVersion) $(NuGetProtocolPackageVersion) $(NuGetVersioningPackageVersion) + + $(dotnetdevcertsPackageVersion) + $(dotnetuserjwtsPackageVersion) + $(dotnetusersecretsPackageVersion) + $(MicrosoftAspNetCoreAnalyzersPackageVersion) + $(MicrosoftAspNetCoreAppRefPackageVersion) + $(MicrosoftAspNetCoreAppRefInternalPackageVersion) + $(MicrosoftAspNetCoreAuthenticationFacebookPackageVersion) + $(MicrosoftAspNetCoreAuthenticationGooglePackageVersion) + $(MicrosoftAspNetCoreAuthenticationMicrosoftAccountPackageVersion) + $(MicrosoftAspNetCoreAuthorizationPackageVersion) + $(MicrosoftAspNetCoreComponentsPackageVersion) + $(MicrosoftAspNetCoreComponentsAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsFormsPackageVersion) + $(MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion) + $(MicrosoftAspNetCoreComponentsWebPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion) + $(MicrosoftAspNetCoreComponentsWebAssemblyServerPackageVersion) + $(MicrosoftAspNetCoreComponentsWebViewPackageVersion) + $(MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion) + $(MicrosoftAspNetCoreMetadataPackageVersion) + $(MicrosoftAspNetCoreMvcAnalyzersPackageVersion) + $(MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion) + $(MicrosoftAspNetCoreTestHostPackageVersion) + $(MicrosoftBclAsyncInterfacesPackageVersion) + $(MicrosoftDeploymentDotNetReleasesPackageVersion) + $(MicrosoftDiaSymReaderPackageVersion) + $(MicrosoftDotNetWebItemTemplates100PackageVersion) + $(MicrosoftDotNetWebProjectTemplates100PackageVersion) + $(MicrosoftDotnetWinFormsProjectTemplatesPackageVersion) + $(MicrosoftDotnetWpfProjectTemplatesPackageVersion) + $(MicrosoftExtensionsConfigurationIniPackageVersion) + $(MicrosoftExtensionsDependencyModelPackageVersion) + $(MicrosoftExtensionsFileProvidersAbstractionsPackageVersion) + $(MicrosoftExtensionsFileProvidersEmbeddedPackageVersion) + $(MicrosoftExtensionsFileSystemGlobbingPackageVersion) + $(MicrosoftExtensionsLoggingPackageVersion) + $(MicrosoftExtensionsLoggingAbstractionsPackageVersion) + $(MicrosoftExtensionsLoggingConsolePackageVersion) + $(MicrosoftExtensionsObjectPoolPackageVersion) + $(MicrosoftJSInteropPackageVersion) + $(MicrosoftNETHostModelPackageVersion) + $(MicrosoftNETILLinkTasksPackageVersion) + $(MicrosoftNETRuntimeEmscripten3156Cachewinx64PackageVersion) + $(MicrosoftNETSdkWindowsDesktopPackageVersion) + $(MicrosoftNETCoreAppRefPackageVersion) + $(MicrosoftNETCorePlatformsPackageVersion) + $(MicrosoftWebXdtPackageVersion) + $(MicrosoftWin32SystemEventsPackageVersion) + $(MicrosoftWindowsDesktopAppInternalPackageVersion) + $(MicrosoftWindowsDesktopAppRefPackageVersion) $(SystemCodeDomPackageVersion) $(SystemCommandLinePackageVersion) $(SystemComponentModelCompositionPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 844c4cc1f366..4d03b1d0e642 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,62 +1,62 @@ - + - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b @@ -68,170 +68,170 @@ https://github.com/dotnet/dotnet 6a953e76162f3f079405f80e28664fa51b136740 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa + + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + b0f34d51fccc69fd334253924abd8d6853fad7aa - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - + https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + 2047768c55865642b1b930bbc6e1260825ace624 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + ccdb0ee122177251ae18655264e94312d63c4d45 - + https://github.com/microsoft/testfx - 25cc8f2b28eac830a37d1c666f05fa5b95d07b76 + ccdb0ee122177251ae18655264e94312d63c4d45 - - https://github.com/dotnet/dotnet - 74dc6e4ed64cc0255a6be520761a857dda273863 + + https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet + 44525024595742ebe09023abe709df51de65009b diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..3437087c80fc 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c08b3ad8ad03..d805d5faeb94 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -63,7 +63,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ 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: Azure-Linux-3-Amd64 + image: 1es-mariner-2 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index b942a79ef02d..9423d71ca3a2 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2019.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2019.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..e0b19c14a073 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2019.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 049fe6db994e..bef4affa4a41 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -560,26 +560,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } - + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index b3a77f359c1d..4ab2f787b6d0 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.113", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.113", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26077.126", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26077.126", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"