From 0ac2d170a8a3c324a3917a6c168e6201a178caad Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 22 Apr 2024 20:43:25 +0000 Subject: [PATCH 1/4] 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 a883df0be948105c30b07338b747301318cdc2bc Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 29 Apr 2024 23:10:46 +0000 Subject: [PATCH 2/4] 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 9e764900e85c15abfeff6d8dbb7bd6ff58f90663 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Mon, 6 May 2024 14:19:05 -0500 Subject: [PATCH 3/4] 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 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 4/4] .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",