From 9514c83bfbbad0dc78ed55c68f1ccf31c6fe3965 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Apr 2024 18:38:34 +0000 Subject: [PATCH 01/13] Merged PR 38998: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.Build**: from 17.3.2 to 17.3.4 (parent: Microsoft.NET.Sdk) - **NuGet.Build.Tasks**: from 6.3.4-rc.2 to 6.3.4-rc.2 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk) - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: from 6.0.29 to 6.0.30 (parent: VS.Redist.Common.NetCore.SharedFramework.x64.6.0) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240416.41 - **Date Produced**: April 16, 2024 11:22:37 PM UTC - **Commit**: 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.421-servicing.24172.16 to 6.0.422-servicing.24216.41][1] - **Microsoft.NET.Sdk**: [from 6.0.421-servicing.24172.16 to 6.0.422-servicing.24216.41][1] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.30][2] - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.29 to 6.0.30][2] - **Microsoft.NETCore.App.Host.win-x64**: [from 6.0.29 to 6.0.30][2] - **Microsoft.NETCore.DotNetHostResolver**: [from 6.0.29 to 6.0.30][2] - **Microsoft.Build**: [from 17.3.2 to 17.3.4][3] - **NuGet.Build.Tasks**: [from 6.3.4-rc.2 to 6.3.4-rc.2][4] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25][2] - **Microsoft.NET.Workload.Emscripten.Manifest-6.0.400**: [from 6.0.29 to 6.0.30][5] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GCe35ea4... --- NuGet.config | 25 ++++------------------- eng/Version.Details.xml | 44 ++++++++++++++++++++--------------------- eng/Versions.props | 20 +++++++++---------- 3 files changed, 36 insertions(+), 53 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6e7ea226c..aa43f8fee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,28 +7,19 @@ - - - - - - + + + - - - - - - @@ -49,21 +40,13 @@ - - - + - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4894786e8..af3fabd1e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop 75c9b26383d5e6908e8b07d68d134f115c696324 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e35ea426ec2ee54f57501b661ec7d656caf480d6 + 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - e35ea426ec2ee54f57501b661ec7d656caf480d6 + 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d @@ -146,14 +146,14 @@ 41a5af9d2c459a06c0795bf21a1c046200f375bf - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - 561848881bab01749e6d8b03be2869a18ca944f7 + + https://github.com/dotnet/msbuild + a400405ba8c43976eda92a70d4adf72f9d292a22 https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 5e444458a8c4a2dac9806fc1d387b7f157669540 + 5ec7c4dd0086f968a8bc5a20d5cc77b1454469f3 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 5a6205aabc468d65922f79266532e0eea9ca97ec + 3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 541d3928c..d75decec0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.421-servicing.24172.16 - 6.0.421-servicing.24172.16 + 6.0.422-servicing.24216.41 + 6.0.422-servicing.24216.41 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,12 +67,12 @@ - 6.0.29-servicing.24171.5 - 6.0.29-servicing.24171.5 - 6.0.29 - 6.0.29 - 6.0.29 - 6.0.29 + 6.0.30-servicing.24215.25 + 6.0.30-servicing.24215.25 + 6.0.30 + 6.0.30 + 6.0.30 + 6.0.30 2.1.0 @@ -97,7 +97,7 @@ - 17.3.2 + 17.3.4 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -155,7 +155,7 @@ 12.3.303 15.4.303 6.0.5 - 6.0.29 + 6.0.30 $(MicrosoftNETWorkloadEmscriptenManifest60400Version) From 365f04e342df359402a200f7e8b75ed6cb2000e8 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 17 Apr 2024 23:13:47 +0000 Subject: [PATCH 02/13] Merged PR 39043: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.421 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.421-rtm.24171.7 to 6.0.422-rtm.24216.16 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.421 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24171.7 to 6.0.30-servicing.24216.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240417.16 - **Date Produced**: April 17, 2024 6:35:52 PM UTC - **Commit**: 83a874d0cffdd270df2889668bbbec6066dd46f6 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolve... --- NuGet.config | 6 ++++ eng/Version.Details.xml | 68 ++++++++++++++++++++--------------------- eng/Versions.props | 32 +++++++++---------- 3 files changed, 56 insertions(+), 50 deletions(-) diff --git a/NuGet.config b/NuGet.config index aa43f8fee..e9a45ce91 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,6 +7,7 @@ + @@ -18,8 +19,10 @@ + + @@ -40,13 +43,16 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index af3fabd1e..0b9e52207 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ 9388790ba9ed8fef11584b2c74fe6789782a1592 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 + 13683233bef71ad1d048e6481966879d52e1ccd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 + 13683233bef71ad1d048e6481966879d52e1ccd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 9ebb8d1d13e5672c54d1682cdc82eb5f474b9586 + 13683233bef71ad1d048e6481966879d52e1ccd5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d + 83a874d0cffdd270df2889668bbbec6066dd46f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2f8fe578abbb1ff0586e1d11c17ead5fbbb4747d + 83a874d0cffdd270df2889668bbbec6066dd46f6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6525c5174ef1b8ee5b29c397e8a4b76e76487927 + 431a1dcb7d4eafa215951499ad374ffde8622e61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc + dee47a1e2958aa9b97d3c5edf9433312cc5a4634 https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index d75decec0..271988b1d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.29-servicing.24171.6 + 6.0.30-servicing.24216.19 - 6.0.29-servicing.24171.7 + 6.0.30-servicing.24216.7 - 6.0.421 + 6.0.422 @@ -43,20 +43,20 @@ - 6.0.29 - 6.0.29 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 + 6.0.30 + 6.0.30 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 0.2.0 - 6.0.422-servicing.24216.41 - 6.0.422-servicing.24216.41 + 6.0.422-servicing.24217.16 + 6.0.422-servicing.24217.16 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,10 +77,10 @@ - 6.0.29-servicing.24171.9 - 6.0.29-servicing.24171.9 - 6.0.29 - 6.0.29 + 6.0.30-servicing.24217.3 + 6.0.30-servicing.24217.3 + 6.0.30 + 6.0.30 @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.421 + 6.0.422 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From ed3aeeda63d5e810513a8b96ad9e7e74d00f7fc4 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 19 Apr 2024 20:48:33 +0000 Subject: [PATCH 03/13] Merged PR 39096: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24216.16 to 6.0.422-rtm.24218.5 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240418.15 - **Date Produced**: April 18, 2024 9:10:24 PM UTC - **Commit**: 2633fcf4a1c687675464ba179c5c79ad5e75a237 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24217.16 to 6.0.422-servicing.24218.15][1] - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24217.16 to 6.0.422-servicing.24218.15][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24216.16 to 6.0.422-rtm.24218.5][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC83a874d0cffdd270df2889668bbbec6066dd46f6&targetVersion=GC2633fcf4a1c687675464ba179c5c79ad5e75a237&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GC13683233bef71ad1d048e6481966879d52e1ccd5&targetVersion=GCef00e74f0a21b8a8192c1c409c154070ef39b95e&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9a45ce91..961e5aa8f 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2b79f9e6d..6da6b9dbe 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13683233bef71ad1d048e6481966879d52e1ccd5 + ef00e74f0a21b8a8192c1c409c154070ef39b95e - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13683233bef71ad1d048e6481966879d52e1ccd5 + ef00e74f0a21b8a8192c1c409c154070ef39b95e https://dev.azure.com/dnceng/internal/_git/dotnet-templating - 13683233bef71ad1d048e6481966879d52e1ccd5 + ef00e74f0a21b8a8192c1c409c154070ef39b95e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83a874d0cffdd270df2889668bbbec6066dd46f6 + 2633fcf4a1c687675464ba179c5c79ad5e75a237 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 83a874d0cffdd270df2889668bbbec6066dd46f6 + 2633fcf4a1c687675464ba179c5c79ad5e75a237 diff --git a/eng/Versions.props b/eng/Versions.props index 271988b1d..feade38d2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.422-servicing.24217.16 - 6.0.422-servicing.24217.16 + 6.0.422-servicing.24218.15 + 6.0.422-servicing.24218.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1e32a8348f59037604e4a4c9af16d727a9637a73 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 Apr 2024 19:41:34 +0000 Subject: [PATCH 04/13] Merged PR 39109: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24218.5 to 6.0.422-rtm.24219.4 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240419.30 - **Date Produced**: April 20, 2024 1:55:25 AM UTC - **Commit**: 8cf6c33a08b323b46d298b83937a623059638611 - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24218.15 to 6.0.422-servicing.24219.30][1] - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24218.15 to 6.0.422-servicing.24219.30][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24218.5 to 6.0.422-rtm.24219.4][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC2633fcf4a1c687675464ba179c5c79ad5e75a237&targetVersion=GC8cf6c33a08b323b46d298b83937a623059638611&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCef00e74f0a21b8a8192c1c409c154070ef39b95e&targetVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 961e5aa8f..fa90e444d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -19,7 +19,7 @@ - + @@ -49,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6da6b9dbe..11240bdbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ef00e74f0a21b8a8192c1c409c154070ef39b95e + effe0d00ab994d57a5e1334667dec144f9f2a9e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ef00e74f0a21b8a8192c1c409c154070ef39b95e + effe0d00ab994d57a5e1334667dec144f9f2a9e9 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ef00e74f0a21b8a8192c1c409c154070ef39b95e + effe0d00ab994d57a5e1334667dec144f9f2a9e9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2633fcf4a1c687675464ba179c5c79ad5e75a237 + 8cf6c33a08b323b46d298b83937a623059638611 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 2633fcf4a1c687675464ba179c5c79ad5e75a237 + 8cf6c33a08b323b46d298b83937a623059638611 diff --git a/eng/Versions.props b/eng/Versions.props index feade38d2..56a45b9ea 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.422-servicing.24218.15 - 6.0.422-servicing.24218.15 + 6.0.422-servicing.24219.30 + 6.0.422-servicing.24219.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 0ac2d170a8a3c324a3917a6c168e6201a178caad Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 Apr 2024 20:43:25 +0000 Subject: [PATCH 05/13] Merged PR 39127: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.WindowsDesktop.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.9 to 6.0.30-servicing.24217.3 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.NetCore.TargetingPack.x64.6.0**: from 6.0.29-servicing.24171.5 to 6.0.30-servicing.24215.25 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.App.Host.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.NETCore.DotNetHostResolver**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.29-servicing.24171.8 to 6.0.30-servicing.24216.19 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.129 to 6.0.130 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.129-servicing.24171.8 to 6.0.130-servicing.24216.15 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.129 to 6.0.130 (parent: Microsoft.NET.Sdk) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24171.6 to 6.0.30-servicing.24216.19 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: from 6.0.29 to 6.0.30 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Wpf.ProjectTemplates**: from 6.0.29-servicing.24171.7 to 6.0.30-servicing.24216.7 (parent: Microsoft.WindowsDesktop.App.Runtime.win-x64) ... --- NuGet.config | 10 ++++ eng/Version.Details.xml | 104 ++++++++++++++++++++-------------------- eng/Versions.props | 48 +++++++++---------- 3 files changed, 86 insertions(+), 76 deletions(-) diff --git a/NuGet.config b/NuGet.config index dd632b04b..5f1ddeefc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,16 +7,22 @@ + + + + + + @@ -37,13 +43,17 @@ + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5a0008b0b..a56c7a3e5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,46 +1,46 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - 75c9b26383d5e6908e8b07d68d134f115c696324 + d0dfc3119d2aa9f601fcbdc56717b2f49781898e - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 189fbbd88d97dd6d65515ba2da05b62eab4e5039 + 97d8f4cade971b93794a3805e7d72ee388f14c9b @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - c83354d42e63d2bb07e6b24b7c67ef91e434f359 + 1d696053fcd6735aaac1902afdb0b92edbf43e71 https://github.com/dotnet/test-templates @@ -90,36 +90,36 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - f68b1f215211a807960d4d4094e3380307fbfc0f + ded0b713ad5db1c4cd83c8287624355038b864b4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a811d50196cfc9525891c16b256ee4962b20e1 + 214a5b1a89eab20d08419f9a446807ed91e48f25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - c5a811d50196cfc9525891c16b256ee4962b20e1 + 214a5b1a89eab20d08419f9a446807ed91e48f25 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 6525c5174ef1b8ee5b29c397e8a4b76e76487927 + 431a1dcb7d4eafa215951499ad374ffde8622e61 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 6aec9b95d59f97bae95b5a5814e3e53de7a0ccfc + dee47a1e2958aa9b97d3c5edf9433312cc5a4634 https://github.com/dotnet/fsharp @@ -146,14 +146,14 @@ 487283bcd8d66693091f2800dcf1c8ae37cccdee - - https://dev.azure.com/devdiv/DevDiv/_git/DotNet-msbuild-Trusted - b177f8fa703370c80b2e56469208c2bb099efba0 + + https://github.com/dotnet/msbuild + d679d209277a156cdc0963c993585ffa5744dc5f https://dev.azure.com/devdiv/DevDiv/_git/NuGet-NuGet.Client-Trusted - 7fe6b814c901490292f02d8ea12749505fbb959a + 451e9bc27184dc49d04e975122c9e7189d525872 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 5a6205aabc468d65922f79266532e0eea9ca97ec + 3b28b2c8eb8a64c82c01e3deb104cfedf3b6a8ca https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 6f3d9ebd3..39947be79 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,15 +23,15 @@ - 6.0.29-servicing.24171.6 + 6.0.30-servicing.24216.19 - 6.0.29-servicing.24171.7 + 6.0.30-servicing.24216.7 - 6.0.129 + 6.0.130 @@ -43,20 +43,20 @@ - 6.0.29 - 6.0.29 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 - 6.0.29-servicing.24171.8 + 6.0.30 + 6.0.30 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 + 6.0.30-servicing.24216.19 0.2.0 - 6.0.129-servicing.24172.15 - 6.0.129-servicing.24172.15 + 6.0.130-servicing.24222.5 + 6.0.130-servicing.24222.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,20 +67,20 @@ - 6.0.29-servicing.24171.5 - 6.0.29-servicing.24171.5 - 6.0.29 - 6.0.29 - 6.0.29 - 6.0.29 + 6.0.30-servicing.24215.25 + 6.0.30-servicing.24215.25 + 6.0.30 + 6.0.30 + 6.0.30 + 6.0.30 2.1.0 - 6.0.29-servicing.24171.9 - 6.0.29-servicing.24171.9 - 6.0.29 - 6.0.29 + 6.0.30-servicing.24217.3 + 6.0.30-servicing.24217.3 + 6.0.30 + 6.0.30 @@ -97,7 +97,7 @@ - 17.0.1 + 17.0.3 $(MicrosoftNETCoreAppRuntimePackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.129 + 6.0.130 $(MicrosoftAspNetCoreAppRuntimePackageVersion) @@ -155,7 +155,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.29 + 6.0.30 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From 9efa2d1b469acc17b9391449bc3c7dd51ecb51dc Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Tue, 23 Apr 2024 21:23:09 +0000 Subject: [PATCH 06/13] Merged PR 39163: Deleted Source Build patch for format repo 0002-Add-explicit-System.Text.Json... Deleted Source Build patch for format repo 0002-Add-explicit-System.Text.Json-dependency.patch --- ...explicit-System.Text.Json-dependency.patch | 73 ------------------- 1 file changed, 73 deletions(-) delete mode 100644 src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch deleted file mode 100644 index 3176d939b..000000000 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Nikola Milosavljevic -Date: Mon, 26 Jun 2023 23:46:46 +0000 -Subject: [PATCH] Add explicit System.Text.Json dependency - -Adding an excplicit System.Text.Json dependency to prevent transitive dependency to be picked up -from PSB, via Microsoft.Build package. - -Backport: https://github.com/dotnet/format/pull/1887 ---- - Directory.Packages.props | 1 + - eng/Version.Details.xml | 4 ++++ - eng/Versions.props | 2 ++ - src/dotnet-format.csproj | 6 ++++++ - 4 files changed, 13 insertions(+) - -diff --git a/Directory.Packages.props b/Directory.Packages.props -index 6b628c22..c9f86593 100644 ---- a/Directory.Packages.props -+++ b/Directory.Packages.props -@@ -36,5 +36,6 @@ - - - -+ - - -\ No newline at end of file -diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml -index cdfa5f5e..86f02b44 100644 ---- a/eng/Version.Details.xml -+++ b/eng/Version.Details.xml -@@ -13,6 +13,10 @@ - https://github.com/dotnet/command-line-api - c776cd4e906b669b9cce1017fee7d0ba9845d163 - -+ -+ https://github.com/dotnet/runtime -+ 3241df7f2b0f3e2dada8d07229723c79fdbe4991 -+ - - - -diff --git a/eng/Versions.props b/eng/Versions.props -index 27582078..bccaf176 100644 ---- a/eng/Versions.props -+++ b/eng/Versions.props -@@ -20,6 +20,8 @@ - - 2.0.0-beta4.22504.1 - 0.4.0-alpha.22504.1 -+ -+ 6.0.8 - - -+ - - - From a883df0be948105c30b07338b747301318cdc2bc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 29 Apr 2024 23:10:46 +0000 Subject: [PATCH 07/13] Merged PR 39288: [internal/release/6.0.1xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.130 to 6.0.130 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.130-servicing.24216.15 to 6.0.130-servicing.24229.9 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.130 to 6.0.130 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a68e208b-7b40-4a19-af8d-08d961c59698) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a68e208b-7b40-4a19-af8d-08d961c59698 - **Build**: 20240429.17 - **Date Produced**: April 29, 2024 10:42:03 PM UTC - **Commit**: 0aff0db725f3979688ed1d6692f3507dc0e2daa2 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.130-servicing.24222.5 to 6.0.130-servicing.24229.17][1] - **Microsoft.NET.Sdk**: [from 6.0.130-servicing.24222.5 to 6.0.130-servicing.24229.17][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.130 to 6.0.130][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.130-servicing.24216.15 to 6.0.130-servicing.24229.9][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.130 to 6.0.130][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC214a5b1a89eab20d08419f9a446807ed91e48f25&targetVersion=GC0aff0db725f3979688ed1d6692f3507dc0e2daa2&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCded0b713ad5db1c4cd83c8287624355038b864b4&targetVersion=GCf9d1cd96d58bf8e5fb569eaef4956089817c2842&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index 5f1ddeefc..50296aa3b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + + + @@ -43,16 +51,22 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bd6cc79aa..3330b9752 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - ded0b713ad5db1c4cd83c8287624355038b864b4 + f9d1cd96d58bf8e5fb569eaef4956089817c2842 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 214a5b1a89eab20d08419f9a446807ed91e48f25 + 0aff0db725f3979688ed1d6692f3507dc0e2daa2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 214a5b1a89eab20d08419f9a446807ed91e48f25 + 0aff0db725f3979688ed1d6692f3507dc0e2daa2 diff --git a/eng/Versions.props b/eng/Versions.props index 39947be79..d08cff8e4 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.130-servicing.24222.5 - 6.0.130-servicing.24222.5 + 6.0.130-servicing.24229.17 + 6.0.130-servicing.24229.17 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From ae2bd4ec541f39c094376bdbc14138a38ec4caa1 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 29 Apr 2024 23:13:26 +0000 Subject: [PATCH 08/13] Merged PR 39289: [internal/release/6.0.4xx] Update dependencies from dnceng/internal/dotnet-sdk This pull request updates the following dependencies [marker]: <> (Begin:Coherency Updates) ## Coherency Updates The following updates ensure that dependencies with a *CoherentParentDependency* attribute were produced in a build used as input to the parent dependency's build. See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview) [DependencyUpdate]: <> (Begin) - **Coherency Updates**: - **Microsoft.DotNet.Common.ItemTemplates**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk) - **Microsoft.TemplateEngine.Cli**: from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7 (parent: Microsoft.NET.Sdk) - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: from 6.0.422 to 6.0.422 (parent: Microsoft.NET.Sdk) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a27c2ce2-aedf-42b7-d31e-08da6571bd31) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - **Subscription**: a27c2ce2-aedf-42b7-d31e-08da6571bd31 - **Build**: 20240429.15 - **Date Produced**: April 29, 2024 10:47:36 PM UTC - **Commit**: b47e9d314726020921851f007797b479a5f6905e - **Branch**: refs/heads/internal/release/6.0.4xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1] - **Microsoft.NET.Sdk**: [from 6.0.422-servicing.24219.30 to 6.0.422-servicing.24229.15][1] - **Microsoft.DotNet.Common.ItemTemplates**: [from 6.0.422 to 6.0.422][2] - **Microsoft.TemplateEngine.Cli**: [from 6.0.422-rtm.24219.4 to 6.0.422-rtm.24229.7][2] - **Microsoft.DotNet.Common.ProjectTemplates.6.0**: [from 6.0.422 to 6.0.422][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC8cf6c33a08b323b46d298b83937a623059638611&targetVersion=GCb47e9d314726020921851f007797b479a5f6905e&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-templating/branches?baseVersion=GCeffe0d00ab994d57a5e1334667dec144f9f2a9e9&targetVersion=GC086db5520af132ac32dcf8cce8ad4d561b868363&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a27c2ce2-aedf-42b7-d31e-08da6571bd31) --- NuGet.config | 18 ++++++++++++++++-- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- 3 files changed, 26 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index fa90e444d..ad69301d0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,21 +8,29 @@ + + + + + + - + + + @@ -43,15 +51,21 @@ + + + + - + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f723590f5..35620a293 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,25 +92,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating - effe0d00ab994d57a5e1334667dec144f9f2a9e9 + 086db5520af132ac32dcf8cce8ad4d561b868363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - effe0d00ab994d57a5e1334667dec144f9f2a9e9 + 086db5520af132ac32dcf8cce8ad4d561b868363 https://dev.azure.com/dnceng/internal/_git/dotnet-templating - effe0d00ab994d57a5e1334667dec144f9f2a9e9 + 086db5520af132ac32dcf8cce8ad4d561b868363 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8cf6c33a08b323b46d298b83937a623059638611 + b47e9d314726020921851f007797b479a5f6905e - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 8cf6c33a08b323b46d298b83937a623059638611 + b47e9d314726020921851f007797b479a5f6905e diff --git a/eng/Versions.props b/eng/Versions.props index 56a45b9ea..5451c2818 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.422-servicing.24219.30 - 6.0.422-servicing.24219.30 + 6.0.422-servicing.24229.15 + 6.0.422-servicing.24229.15 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 9e764900e85c15abfeff6d8dbb7bd6ff58f90663 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 6 May 2024 14:19:05 -0500 Subject: [PATCH 09/13] Migrate security-partners-dotnet pipeline to 1ES (#19621) --- .../pipelines/security-partners-dotnet.yml | 43 +++++++++++++------ 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 562530c96..9130b7552 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -15,19 +15,36 @@ variables: - name: NuGetSecurityAnalysisWarningLevel value: none -jobs: -- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates parameters: - architecture: x64 - excludeSdkContentTests: true - matrix: - Ubuntu1804-Offline: - _BootstrapPrep: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_x64 pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-windows-2022 + os: windows + stages: + - stage: stage + jobs: + - template: /src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml@self + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + image: 1es-ubuntu-2004 + os: linux From a94d7b39b3da1f2e13cb01e36899e8c1a8076751 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Mon, 6 May 2024 13:44:40 -0700 Subject: [PATCH 10/13] [automated] Merge branch 'release/6.0.1xx' => 'release/6.0.4xx' (#19688) Co-authored-by: Matt Thalman --- .../pipelines/security-partners-dotnet.yml | 43 +++++++++++++------ 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml index 562530c96..9130b7552 100644 --- a/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml +++ b/src/SourceBuild/tarball/content/eng/pipelines/security-partners-dotnet.yml @@ -15,19 +15,36 @@ variables: - name: NuGetSecurityAnalysisWarningLevel value: none -jobs: -- template: ../../src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml +resources: + repositories: + - repository: 1ESPipelineTemplates + type: git + name: 1ESPipelineTemplates/1ESPipelineTemplates + ref: refs/tags/release + +extends: + template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates parameters: - architecture: x64 - excludeSdkContentTests: true - matrix: - Ubuntu1804-Offline: - _BootstrapPrep: false - _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 - _EnablePoison: false - _ExcludeOmniSharpTests: false - _RunOnline: false - name: Build_Tarball_x64 pool: name: NetCore1ESPool-Svc-Internal - demands: ImageOverride -equals Build.Ubuntu.1804.Amd64 + image: 1es-windows-2022 + os: windows + stages: + - stage: stage + jobs: + - template: /src/installer/src/SourceBuild/Arcade/eng/common/templates/job/source-build-build-tarball.yml@self + parameters: + architecture: x64 + excludeSdkContentTests: true + matrix: + Ubuntu1804-Offline: + _BootstrapPrep: false + _Container: mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04 + _EnablePoison: false + _ExcludeOmniSharpTests: false + _RunOnline: false + name: Build_Tarball_x64 + pool: + name: NetCore1ESPool-Svc-Internal + image: 1es-ubuntu-2004 + os: linux From d3db392d692c53e2d831f7cd54e18ecfb0bcf34d Mon Sep 17 00:00:00 2001 From: NET Source-Build Bot <102560831+dotnet-sb-bot@users.noreply.github.com> Date: Tue, 14 May 2024 23:50:31 +0200 Subject: [PATCH 11/13] .NET Source-Build 6.0.130 May 2024 Updates (#19751) --- eng/Versions.props | 2 +- src/SourceBuild/tarball/content/global.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 397a43c50..17a176eee 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -144,7 +144,7 @@ or minor release, prebuilts may be needed. When the release is mature, prebuilts are not necessary, and this property is removed from the file. --> - 6.0.129 + 6.0.130 diff --git a/src/SourceBuild/tarball/content/global.json b/src/SourceBuild/tarball/content/global.json index 573709d81..66c3608f6 100644 --- a/src/SourceBuild/tarball/content/global.json +++ b/src/SourceBuild/tarball/content/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "6.0.129" + "dotnet": "6.0.130" }, "msbuild-sdks": { "Microsoft.Build.CentralPackageVersions": "2.0.1", From 43ff23c646cc9fb7016b3b68791e65f037776f91 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 May 2024 17:15:50 -0700 Subject: [PATCH 12/13] Update to later version of nuget --- src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj index bd43b568b..a65f4b183 100644 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj @@ -11,7 +11,7 @@ - + From a407745f768546bbca3f8b0eac8bb7ba8778a759 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Tue, 14 May 2024 17:15:50 -0700 Subject: [PATCH 13/13] Update to later version of nuget --- src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj index bd43b568b..a65f4b183 100644 --- a/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj +++ b/src/SourceBuild/Arcade/src/SourceBuild.Tasks.csproj @@ -11,7 +11,7 @@ - +