From 86b4b6ae135bf9a22597469149dba1d0c71973c9 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Tue, 16 Jul 2024 23:17:53 +0000 Subject: [PATCH 01/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.20 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.132-servicing.24315.1 -> To Version 6.0.133-servicing.24366.20 Dependency coherency updates Microsoft.NETCore.App.Ref,VS.Redist.Common.NetCore.TargetingPack.x64.6.0,Microsoft.NETCore.App.Runtime.win-x64,Microsoft.NETCore.App.Host.win-x64,Microsoft.NETCore.DotNetHostResolver,VS.Redist.Common.NetCore.SharedFramework.x64.6.0,Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 From Version 6.0.32 -> To Version 6.0.33 (parent: Microsoft.NET.Sdk --- NuGet.config | 18 +++--------------- eng/Version.Details.xml | 36 ++++++++++++++++++------------------ eng/Versions.props | 18 +++++++++--------- 3 files changed, 30 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index c0378a005e7d..3eaa738a3e0b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -14,21 +14,13 @@ - - - - - + - - - - - + @@ -72,11 +64,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 35719daa970c..3599abb6fc20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -17,30 +17,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop ef2ca68feb305bd9ebc3934b8488526caee3d118 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - e77011b31a3e5c47d931248a64b47f9b2d47853d + 6c636980f730a30c3f5352cff80ce035ae53f016 @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating c86b7556cbdc3e9a5a5226547490713e2e948401 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53a7fb7b59ad63d09ce5182e2baaac1bd978f5d9 + 1c4520d3edaefd72e3067952f17da1712aa88d39 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 53a7fb7b59ad63d09ce5182e2baaac1bd978f5d9 + 1c4520d3edaefd72e3067952f17da1712aa88d39 @@ -166,9 +166,9 @@ 698fdad58fa64a55f16cd9562c90224cc498ed02 - + https://github.com/dotnet/emsdk - 8601068126449af799f8e07ca358dbbd4b3fcab4 + 849e1a63a8319f9578b9e5f02da592d24d4aa2df https://github.com/dotnet/source-build diff --git a/eng/Versions.props b/eng/Versions.props index 0e6fe8dac2d2..50f51cd58790 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -55,8 +55,8 @@ - 6.0.132-servicing.24315.1 - 6.0.132-servicing.24315.1 + 6.0.133-servicing.24366.20 + 6.0.133-servicing.24366.20 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -67,12 +67,12 @@ - 6.0.32-servicing.24314.7 - 6.0.32-servicing.24314.7 - 6.0.32 - 6.0.32 - 6.0.32 - 6.0.32 + 6.0.33-servicing.24366.10 + 6.0.33-servicing.24366.10 + 6.0.33 + 6.0.33 + 6.0.33 + 6.0.33 2.1.0 @@ -155,7 +155,7 @@ 12.0.101-preview.9.31 15.0.101-preview.9.31 $(MicrosoftNETCoreAppRefPackageVersion) - 6.0.32 + 6.0.33 $(MicrosoftNETWorkloadEmscriptenManifest60100Version) From ba2ecc581b8fbaa29c730b0cb07e1e0bb90082b3 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 00:32:37 +0000 Subject: [PATCH 02/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.30 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.133-servicing.24366.20 -> To Version 6.0.133-servicing.24366.30 Dependency coherency updates Microsoft.DotNet.Common.ItemTemplates,Microsoft.TemplateEngine.Cli,Microsoft.DotNet.Common.ProjectTemplates.6.0 From Version 6.0.132 -> To Version 6.0.133 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 3 files changed, 16 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3eaa738a3e0b..1c7bf28d69a8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,11 +23,7 @@ - - - - - + @@ -66,11 +62,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3599abb6fc20..a145a07ccd99 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -90,27 +90,27 @@ c40ef7e056b48e011c43a21354d6790ba6b8b4fc - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c86b7556cbdc3e9a5a5226547490713e2e948401 + 2fdb78d36dc993a532bd80ee2682a2b534497413 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c86b7556cbdc3e9a5a5226547490713e2e948401 + 2fdb78d36dc993a532bd80ee2682a2b534497413 - + https://dev.azure.com/dnceng/internal/_git/dotnet-templating - c86b7556cbdc3e9a5a5226547490713e2e948401 + 2fdb78d36dc993a532bd80ee2682a2b534497413 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c4520d3edaefd72e3067952f17da1712aa88d39 + 94f9ff9aab969379b0578dd09ac669607a6a03fb - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 1c4520d3edaefd72e3067952f17da1712aa88d39 + 94f9ff9aab969379b0578dd09ac669607a6a03fb diff --git a/eng/Versions.props b/eng/Versions.props index 50f51cd58790..98c7a3a5400f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 6.0.132 + 6.0.133 @@ -55,8 +55,8 @@ - 6.0.133-servicing.24366.20 - 6.0.133-servicing.24366.20 + 6.0.133-servicing.24366.30 + 6.0.133-servicing.24366.30 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -115,7 +115,7 @@ $(MicrosoftDotNetWpfProjectTemplatesPackageVersion) $(NUnit3DotNetNewTemplatePackageVersion) $(MicrosoftDotNetCommonItemTemplatesPackageVersion) - 6.0.132 + 6.0.133 $(MicrosoftAspNetCoreAppRuntimePackageVersion) From 1acb5cb84cfde76860981fdca63711079b48b0f0 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Wed, 17 Jul 2024 06:39:38 +0000 Subject: [PATCH 03/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240716.35 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.133-servicing.24366.30 -> To Version 6.0.133-servicing.24366.35 Dependency coherency updates Microsoft.WindowsDesktop.App.Ref,VS.Redist.Common.WindowsDesktop.SharedFramework.x64.6.0,VS.Redist.Common.WindowsDesktop.TargetingPack.x64.6.0,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.Dotnet.WinForms.ProjectTemplates,Microsoft.WindowsDesktop.App.Runtime.win-x64,Microsoft.DotNet.Wpf.ProjectTemplates From Version 6.0.32 -> To Version 6.0.33 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1c7bf28d69a8..f208efe99611 100644 --- a/NuGet.config +++ b/NuGet.config @@ -26,11 +26,7 @@ - - - - - + @@ -65,11 +61,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a145a07ccd99..7f87a3d13c9f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 - + https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop - ef2ca68feb305bd9ebc3934b8488526caee3d118 + db4e5a36567b85765753af097e878d894a3552c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -103,23 +103,23 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2fdb78d36dc993a532bd80ee2682a2b534497413 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94f9ff9aab969379b0578dd09ac669607a6a03fb + f6a68faf3f7ac78efa311c06e2baebcedaa2d7b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 94f9ff9aab969379b0578dd09ac669607a6a03fb + f6a68faf3f7ac78efa311c06e2baebcedaa2d7b3 - + https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - 670045968593e524941ef480423796ceb50c5e2f + 6a984c48f3489b60f25deb72ede6e5051bb130d4 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - 798cc6d4922db482f84fb72a8244f0da898bc5d6 + b660c1e83039451abe9d9190a7aabe87c03fd7ae https://github.com/dotnet/fsharp diff --git a/eng/Versions.props b/eng/Versions.props index 98c7a3a5400f..efdae9a25582 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -23,11 +23,11 @@ - 6.0.32-servicing.24314.5 + 6.0.33-servicing.24366.4 - 6.0.32-servicing.24314.4 + 6.0.33-servicing.24366.5 @@ -55,8 +55,8 @@ - 6.0.133-servicing.24366.30 - 6.0.133-servicing.24366.30 + 6.0.133-servicing.24366.35 + 6.0.133-servicing.24366.35 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -77,10 +77,10 @@ - 6.0.32-servicing.24314.6 - 6.0.32-servicing.24314.6 - 6.0.32 - 6.0.32 + 6.0.33-servicing.24366.6 + 6.0.33-servicing.24366.6 + 6.0.33 + 6.0.33 From 059f21337d102f8c1e12344acea4777fa0b28298 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Thu, 18 Jul 2024 19:45:53 +0000 Subject: [PATCH 04/14] Merged PR 41211: Enable internal runtimes when building tarball - Please add description for changes you are making. - If there is an issue related to this PR, please add the reference. Enable internal runtimes when building tarball ---- #### AI description (iteration 1) #### PR Classification New feature #### PR Summary This pull request enables internal runtimes when building the tarball. - `src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml`: Added a template step to enable internal runtimes. --- .../eng/common/templates/job/source-build-create-tarball.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml index 8b5b456b662c..2e4867a58551 100644 --- a/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml +++ b/src/SourceBuild/Arcade/eng/common/templates/job/source-build-create-tarball.yml @@ -42,6 +42,7 @@ jobs: arguments: $(Build.SourcesDirectory)/NuGet.config $Token env: Token: $(dn-bot-dnceng-artifact-feeds-rw) + - template: /eng/common/templates-official/steps/enable-internal-runtimes.yml - script: | set -x df -h From bd61fa371091f52f90be9ee296c70aafb47a5c06 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Thu, 18 Jul 2024 19:59:32 +0000 Subject: [PATCH 05/14] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-sdk build 20240718.8 Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk From Version 6.0.133-servicing.24366.35 -> To Version 6.0.133-servicing.24368.8 Dependency coherency updates Microsoft.AspNetCore.App.Ref,Microsoft.AspNetCore.App.Ref.Internal,Microsoft.AspNetCore.App.Runtime.win-x64,VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0,dotnet-dev-certs,dotnet-user-secrets From Version 6.0.32 -> To Version 6.0.33 (parent: Microsoft.NET.Sdk --- NuGet.config | 12 ++---------- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 26 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index f208efe99611..ee97243b8334 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,11 +7,7 @@ - - - - - + @@ -47,11 +43,7 @@ - - - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 660e86e3a9f4..3ab4aca9bb2c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -52,30 +52,30 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 189fbbd88d97dd6d65515ba2da05b62eab4e5039 - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - fedc545ce86467b7d3413d906f1ab02fb3db12ff + d917e14cc49f16d7190195501fd43fa4835d274f https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2fdb78d36dc993a532bd80ee2682a2b534497413 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6a68faf3f7ac78efa311c06e2baebcedaa2d7b3 + 34c71e50bca16f1c356033a42e364578c6c6a7dc - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - f6a68faf3f7ac78efa311c06e2baebcedaa2d7b3 + 34c71e50bca16f1c356033a42e364578c6c6a7dc diff --git a/eng/Versions.props b/eng/Versions.props index 8cae2df17a46..385a4b04a2a7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,20 +43,20 @@ - 6.0.32 - 6.0.32 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 - 6.0.32-servicing.24314.5 + 6.0.33 + 6.0.33 + 6.0.33-servicing.24368.7 + 6.0.33-servicing.24368.7 + 6.0.33-servicing.24368.7 + 6.0.33-servicing.24368.7 0.2.0 - 6.0.133-servicing.24366.35 - 6.0.133-servicing.24366.35 + 6.0.133-servicing.24368.8 + 6.0.133-servicing.24368.8 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 48ad8f7176f00900ff49df9fb936bc7c8c79d345 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Mon, 29 Jul 2024 20:08:27 +0000 Subject: [PATCH 06/14] Merged PR 41389: [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.AspNetCore.App.Ref**: from 6.0.33 to 6.0.33 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Ref.Internal**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **Microsoft.AspNetCore.App.Runtime.win-x64**: from 6.0.33 to 6.0.33 (parent: Microsoft.NET.Sdk) - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **dotnet-dev-certs**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (parent: Microsoft.NET.Sdk) - **dotnet-user-secrets**: from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5 (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**: 20240729.12 - **Date Produced**: July 29, 2024 7:41:21 PM UTC - **Commit**: 902d4b651242b37d952aedd9ef8b17b9ed766d09 - **Branch**: refs/heads/internal/release/6.0.1xx [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.MSBuildSdkResolver**: [from 6.0.133-servicing.24368.8 to 6.0.133-servicing.24379.12][1] - **Microsoft.NET.Sdk**: [from 6.0.133-servicing.24368.8 to 6.0.133-servicing.24379.12][1] - **Microsoft.AspNetCore.App.Ref**: [from 6.0.33 to 6.0.33][2] - **Microsoft.AspNetCore.App.Ref.Internal**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 6.0.33 to 6.0.33][2] - **VS.Redist.Common.AspNetCore.SharedFramework.x64.6.0**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **dotnet-dev-certs**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] - **dotnet-user-secrets**: [from 6.0.33-servicing.24368.7 to 6.0.33-servicing.24379.5][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-sdk/branches?baseVersion=GC34c71e50bca16f1c356033a42e364578c6c6a7dc&targetVersion=GC902d4b651242b37d952aedd9ef8b17b9ed766d09&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GCd917e14cc49f16d7190195501fd43fa4835d274f&targetVersion=GCf0f9de5692adf1c0576de062f93c6ab7b176433f&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a68e208b-7b40-4a19-af8d-08d961c59698) --- NuGet.config | 19 +++++++++++++++++-- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 12 ++++++------ 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/NuGet.config b/NuGet.config index ee97243b8334..5f91d1c22516 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,10 +7,13 @@ - + + + + @@ -20,9 +23,15 @@ + + + + + + @@ -43,16 +52,22 @@ - + + + + + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ab4aca9bb2c..df9d76345975 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -54,28 +54,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f - + https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore - d917e14cc49f16d7190195501fd43fa4835d274f + f0f9de5692adf1c0576de062f93c6ab7b176433f https://github.com/dotnet/test-templates @@ -103,14 +103,14 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-templating 2fdb78d36dc993a532bd80ee2682a2b534497413 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 34c71e50bca16f1c356033a42e364578c6c6a7dc + 902d4b651242b37d952aedd9ef8b17b9ed766d09 - + https://dev.azure.com/dnceng/internal/_git/dotnet-sdk - 34c71e50bca16f1c356033a42e364578c6c6a7dc + 902d4b651242b37d952aedd9ef8b17b9ed766d09 diff --git a/eng/Versions.props b/eng/Versions.props index 385a4b04a2a7..498ca530b79d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -45,18 +45,18 @@ 6.0.33 6.0.33 - 6.0.33-servicing.24368.7 - 6.0.33-servicing.24368.7 - 6.0.33-servicing.24368.7 - 6.0.33-servicing.24368.7 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 + 6.0.33-servicing.24379.5 0.2.0 - 6.0.133-servicing.24368.8 - 6.0.133-servicing.24368.8 + 6.0.133-servicing.24379.12 + 6.0.133-servicing.24379.12 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 1d4a1b192ed814cf28512d86196704e49faa846a Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Thu, 29 Aug 2024 11:13:04 -0700 Subject: [PATCH 07/14] Update branding to 6.0.135 --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 4a792cc04683..0c5a7119901c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 6 0 1 - 34 + 35 $(VersionMajor).$(VersionMinor).$(VersionSDKMinor)$(VersionFeature) servicing $(VersionMajor).$(VersionMinor) From 0f6f164ab829e4c4b5a043eb4c0f38226125253e Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 30 Aug 2024 14:16:54 -0700 Subject: [PATCH 08/14] Update .vsts-pr.yml for centos --- .vsts-pr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 2222ff644358..99b666f02a18 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -175,16 +175,16 @@ stages: _BuildArchitecture: 'x64' _AdditionalBuildParameters: '/p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_x64: + Build_CentOS_7_2_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_Arm64: + Build_CentOS_7_2_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' @@ -291,7 +291,7 @@ stages: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -301,7 +301,7 @@ stages: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' From c49adcf408612230d8c51944ee53ce12f30ea782 Mon Sep 17 00:00:00 2001 From: Marc Paine Date: Fri, 30 Aug 2024 14:17:25 -0700 Subject: [PATCH 09/14] Update .vsts-ci.yml for centos --- .vsts-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 66492d6dc091..6ad84103f97a 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -219,16 +219,16 @@ extends: _BuildArchitecture: 'x64' _AdditionalBuildParameters: '/p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_x64: + Build_CentOS_7_2_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_Rhel_7_2_Release_Arm64: + Build_CentOS_7_2_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' @@ -335,7 +335,7 @@ extends: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -345,7 +345,7 @@ extends: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker rhel' + _DockerParameter: '--docker centos' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' From 711cb729d878e4d85335e6f27a31296eb2452ea8 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 30 Aug 2024 14:21:41 -0700 Subject: [PATCH 10/14] Use floating centos tag and remove EOL RHEL Dockerfile --- eng/docker/centos/Dockerfile | 2 +- eng/docker/rhel/Dockerfile | 27 --------------------------- 2 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 eng/docker/rhel/Dockerfile diff --git a/eng/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile index 0627f84d847d..d341147e72b8 100644 --- a/eng/docker/centos/Dockerfile +++ b/eng/docker/centos/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-b46d863-20180719033416 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7 RUN yum -q -y install sudo diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile deleted file mode 100644 index c629cbf0ab66..000000000000 --- a/eng/docker/rhel/Dockerfile +++ /dev/null @@ -1,27 +0,0 @@ -# -# Copyright (c) .NET Foundation and contributors. All rights reserved. -# Licensed under the MIT license. See LICENSE file in the project root for full license information. -# - -# Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 - -# Setup User to match Host User, and give superuser permissions -ARG USER_ID=0 -RUN useradd -m code_executor -u ${USER_ID} -g root -RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers - -# With the User Change, we need to change permissions on these directories -RUN chmod -R a+rwx /usr/local -RUN chmod -R a+rwx /home -RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo - -# Set user to the one we just created -USER ${USER_ID} - -# Set working directory -ARG WORK_DIR -WORKDIR ${WORK_DIR} - -# Set up Azure Artifacts credential provider -RUN wget -qO- https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh | bash From a02a34dbecff32512c2498c1fb634a1c1a20917a Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 3 Sep 2024 11:04:51 -0500 Subject: [PATCH 11/14] Revert "Update .vsts-pr.yml for centos" This reverts commit 0f6f164ab829e4c4b5a043eb4c0f38226125253e. --- .vsts-pr.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vsts-pr.yml b/.vsts-pr.yml index 99b666f02a18..2222ff644358 100644 --- a/.vsts-pr.yml +++ b/.vsts-pr.yml @@ -175,16 +175,16 @@ stages: _BuildArchitecture: 'x64' _AdditionalBuildParameters: '/p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_2_Release_x64: + Build_Rhel_7_2_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_2_Release_Arm64: + Build_Rhel_7_2_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' @@ -291,7 +291,7 @@ stages: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -301,7 +301,7 @@ stages: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' From 3791940deafef69b934e5bf46e325335a18ca55d Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 3 Sep 2024 11:05:01 -0500 Subject: [PATCH 12/14] Revert "Update .vsts-ci.yml for centos" This reverts commit c49adcf408612230d8c51944ee53ce12f30ea782. --- .vsts-ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 6ad84103f97a..66492d6dc091 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -219,16 +219,16 @@ extends: _BuildArchitecture: 'x64' _AdditionalBuildParameters: '/p:BuildSdkDeb=true' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_2_Release_x64: + Build_Rhel_7_2_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' _TestArg: $(_NonWindowsTestArg) - Build_CentOS_7_2_Release_Arm64: + Build_Rhel_7_2_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' @@ -335,7 +335,7 @@ extends: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_x64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '' _BuildArchitecture: 'x64' @@ -345,7 +345,7 @@ extends: _TestArg: $(_NonWindowsTestArg) Build_Linux_Portable_Rpm_Release_Arm64: _BuildConfig: Release - _DockerParameter: '--docker centos' + _DockerParameter: '--docker rhel' _LinuxPortable: '--linux-portable' _RuntimeIdentifier: '--runtime-id linux-arm64' _BuildArchitecture: 'arm64' From b42cbaa0aef98b9d9c4f0267097e0c2c8e924cc1 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 3 Sep 2024 11:05:06 -0500 Subject: [PATCH 13/14] Revert "Use floating centos tag and remove EOL RHEL Dockerfile" This reverts commit 711cb729d878e4d85335e6f27a31296eb2452ea8. --- eng/docker/centos/Dockerfile | 2 +- eng/docker/rhel/Dockerfile | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 eng/docker/rhel/Dockerfile diff --git a/eng/docker/centos/Dockerfile b/eng/docker/centos/Dockerfile index d341147e72b8..0627f84d847d 100644 --- a/eng/docker/centos/Dockerfile +++ b/eng/docker/centos/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:centos-7-b46d863-20180719033416 RUN yum -q -y install sudo diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile new file mode 100644 index 000000000000..c629cbf0ab66 --- /dev/null +++ b/eng/docker/rhel/Dockerfile @@ -0,0 +1,27 @@ +# +# Copyright (c) .NET Foundation and contributors. All rights reserved. +# Licensed under the MIT license. See LICENSE file in the project root for full license information. +# + +# Dockerfile that creates a container suitable to build dotnet-cli +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 + +# Setup User to match Host User, and give superuser permissions +ARG USER_ID=0 +RUN useradd -m code_executor -u ${USER_ID} -g root +RUN echo 'code_executor ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + +# With the User Change, we need to change permissions on these directories +RUN chmod -R a+rwx /usr/local +RUN chmod -R a+rwx /home +RUN chown root:root /usr/bin/sudo && chmod 4755 /usr/bin/sudo + +# Set user to the one we just created +USER ${USER_ID} + +# Set working directory +ARG WORK_DIR +WORKDIR ${WORK_DIR} + +# Set up Azure Artifacts credential provider +RUN wget -qO- https://raw.githubusercontent.com/Microsoft/artifacts-credprovider/master/helpers/installcredprovider.sh | bash From 52794bd1aff9df48797bb23e3620ce44f31568f9 Mon Sep 17 00:00:00 2001 From: Matt Thalman Date: Tue, 3 Sep 2024 11:05:51 -0500 Subject: [PATCH 14/14] try different rhel tag --- eng/docker/rhel/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/docker/rhel/Dockerfile b/eng/docker/rhel/Dockerfile index c629cbf0ab66..202025488aa6 100644 --- a/eng/docker/rhel/Dockerfile +++ b/eng/docker/rhel/Dockerfile @@ -4,7 +4,7 @@ # # Dockerfile that creates a container suitable to build dotnet-cli -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359 +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:rhel-7-rpmpkg-e1b4a89-20175311035359-2 # Setup User to match Host User, and give superuser permissions ARG USER_ID=0