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 01/11] 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 e6d550acf1a06d47e4c49c4a97a0d5d6d85361dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 17 Oct 2023 19:23:57 +0000 Subject: [PATCH 02/11] 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 03/11] 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 04/11] 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 05/11] 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 06/11] 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 07/11] [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 08/11] [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 09/11] 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 10/11] 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 11/11] 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)