From c23f556f142a1a0006597b0719397213f7587887 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 2 Mar 2022 00:51:45 +0000 Subject: [PATCH 01/10] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 6 ++++-- eng/Version.Details.xml | 32 ++++++++++++++++---------------- eng/Versions.props | 16 ++++++++-------- 3 files changed, 28 insertions(+), 26 deletions(-) diff --git a/NuGet.config b/NuGet.config index 29722a8953a9..dea330547f67 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,11 @@ + - + @@ -27,10 +28,11 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1984516791e3..115a20fce0c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0257e5c118d78ce1b4d5e514779240c929c4b8aa + a3f82454c6b949a8c1222f55273b4624a6e35e6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0257e5c118d78ce1b4d5e514779240c929c4b8aa + a3f82454c6b949a8c1222f55273b4624a6e35e6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0257e5c118d78ce1b4d5e514779240c929c4b8aa + a3f82454c6b949a8c1222f55273b4624a6e35e6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0257e5c118d78ce1b4d5e514779240c929c4b8aa + a3f82454c6b949a8c1222f55273b4624a6e35e6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0257e5c118d78ce1b4d5e514779240c929c4b8aa + a3f82454c6b949a8c1222f55273b4624a6e35e6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0257e5c118d78ce1b4d5e514779240c929c4b8aa + a3f82454c6b949a8c1222f55273b4624a6e35e6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0257e5c118d78ce1b4d5e514779240c929c4b8aa + a3f82454c6b949a8c1222f55273b4624a6e35e6f - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 0257e5c118d78ce1b4d5e514779240c929c4b8aa + a3f82454c6b949a8c1222f55273b4624a6e35e6f https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 341bf5835a63..a2ef49e407cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -122,14 +122,14 @@ 6.0.2 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 6.0.0-beta.22107.2 6.0.0-beta.22107.2 From 1768ab50c90c53561c54bd7ef838be11ace73f43 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 2 Mar 2022 04:44:04 +0000 Subject: [PATCH 02/10] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index dea330547f67..03bb73582fca 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 115a20fce0c7..61b2bf5f2863 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a3f82454c6b949a8c1222f55273b4624a6e35e6f + d92bd4c9d507b217792e84152da552dcc14a2e38 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a3f82454c6b949a8c1222f55273b4624a6e35e6f + d92bd4c9d507b217792e84152da552dcc14a2e38 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a3f82454c6b949a8c1222f55273b4624a6e35e6f + d92bd4c9d507b217792e84152da552dcc14a2e38 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a3f82454c6b949a8c1222f55273b4624a6e35e6f + d92bd4c9d507b217792e84152da552dcc14a2e38 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a3f82454c6b949a8c1222f55273b4624a6e35e6f + d92bd4c9d507b217792e84152da552dcc14a2e38 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a3f82454c6b949a8c1222f55273b4624a6e35e6f + d92bd4c9d507b217792e84152da552dcc14a2e38 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a3f82454c6b949a8c1222f55273b4624a6e35e6f + d92bd4c9d507b217792e84152da552dcc14a2e38 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - a3f82454c6b949a8c1222f55273b4624a6e35e6f + d92bd4c9d507b217792e84152da552dcc14a2e38 https://github.com/dotnet/runtime From 27188b2e0e1683134c746b6b0fb1c1e0f51a9304 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 2 Mar 2022 12:59:11 +0000 Subject: [PATCH 03/10] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 03bb73582fca..7d1ba96afcc5 100644 --- a/NuGet.config +++ b/NuGet.config @@ -8,7 +8,7 @@ - + @@ -28,7 +28,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61b2bf5f2863..ddd5074a7900 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d92bd4c9d507b217792e84152da552dcc14a2e38 + 85dcee4fb73204ebf807225653176eae24d05a0e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d92bd4c9d507b217792e84152da552dcc14a2e38 + 85dcee4fb73204ebf807225653176eae24d05a0e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d92bd4c9d507b217792e84152da552dcc14a2e38 + 85dcee4fb73204ebf807225653176eae24d05a0e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d92bd4c9d507b217792e84152da552dcc14a2e38 + 85dcee4fb73204ebf807225653176eae24d05a0e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d92bd4c9d507b217792e84152da552dcc14a2e38 + 85dcee4fb73204ebf807225653176eae24d05a0e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d92bd4c9d507b217792e84152da552dcc14a2e38 + 85dcee4fb73204ebf807225653176eae24d05a0e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d92bd4c9d507b217792e84152da552dcc14a2e38 + 85dcee4fb73204ebf807225653176eae24d05a0e https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - d92bd4c9d507b217792e84152da552dcc14a2e38 + 85dcee4fb73204ebf807225653176eae24d05a0e https://github.com/dotnet/runtime From beea6304afd8dafe876b4c0ae848b544b6d38a8d Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Fri, 4 Mar 2022 01:50:47 +0000 Subject: [PATCH 04/10] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 2 ++ eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 14 +++++++------- 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7d1ba96afcc5..80bdb823a33d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + @@ -33,6 +34,7 @@ + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ddd5074a7900..61a27df18bbd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + d7beb98f5c0e748d145968b5936e51a86c2898d2 https://github.com/dotnet/runtime @@ -245,33 +245,33 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + d7beb98f5c0e748d145968b5936e51a86c2898d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + d7beb98f5c0e748d145968b5936e51a86c2898d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + d7beb98f5c0e748d145968b5936e51a86c2898d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + d7beb98f5c0e748d145968b5936e51a86c2898d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + d7beb98f5c0e748d145968b5936e51a86c2898d2 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + d7beb98f5c0e748d145968b5936e51a86c2898d2 diff --git a/eng/Versions.props b/eng/Versions.props index a2ef49e407cd..d02c8b100995 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -63,12 +63,12 @@ 6.0.0 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3 - 6.0.3-servicing.22123.9 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4 + 6.0.4-servicing.22153.5 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.3-servicing.22123.9 + 6.0.4-servicing.22153.5 6.0.0 6.0.0 6.0.1 From 4279611ccd327eeff5df43580e419ddc9df29887 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Mon, 7 Mar 2022 18:53:29 +0000 Subject: [PATCH 05/10] Merged PR 21649: [internal/release/6.0] Make UseUrls() override default hosting config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description Prior to this change, default config (typically loaded from `DOTNET_`/`ASPNET_` environment variables and command line arguments) could override the application-level configuration. This would prevent `GenericWebHostService` from seeing the latest configuration set by `UseUrls()` of `DOTNET_URLS`, `ASPNET_URLS` or `--urls` was set. Fixes #38185 ## Customer Impact This is a big gotcha to customers using `WebApplicationBuilder` (which is used in all the ASP.NET Core 6 templates) who expect the following to work: ```C# var builder = WebApplication.CreateBuilder(args); builder.WebHost.UseUrls("http://*:8080"); var app = builder.Build(); app.Run(); ``` A comment on the issue suggesting we patch this has gotten 5 thumbs ups not counting mine. ## Regression? - [ ] Yes - [x] No ## Risk - [ ] High - [ ] Medium - [x] Low This is a small well tested change which only affects the loading of default config sources and those added via a `HostFactoryResolver` to host configuration. [Here’s the existing test](https://github.com/dotnet/aspnetcore/blob/0f6f649f1da658bbe37b8898df0c80c5affa9d2d/src/DefaultBuilder/test/Microsoft.AspNetCore.Tests/WebApplicationTests.cs#L883) showing that the expected configuration providers are still dispose. ## Verification - [x] Manual (required) - [x] Automated ## Packaging changes reviewed? - [ ] Yes - [ ] No - [x] N/A --- .../src/WebApplicationBuilder.cs | 21 ++++++++++++--- .../WebApplicationTests.cs | 27 +++++++++++++++++++ 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/src/DefaultBuilder/src/WebApplicationBuilder.cs b/src/DefaultBuilder/src/WebApplicationBuilder.cs index 19e8c0661c84..e258cb298349 100644 --- a/src/DefaultBuilder/src/WebApplicationBuilder.cs +++ b/src/DefaultBuilder/src/WebApplicationBuilder.cs @@ -22,6 +22,7 @@ public sealed class WebApplicationBuilder private readonly BootstrapHostBuilder _bootstrapHostBuilder; private readonly WebApplicationServiceCollection _services = new(); private readonly List> _hostConfigurationValues; + private readonly ConfigurationManager _hostConfigurationManager = new(); private WebApplication? _builtApplication; @@ -76,6 +77,8 @@ internal WebApplicationBuilder(WebApplicationOptions options, Action + { + bootstrapBuilder.ConfigureHostConfiguration(configBuilder => + { + configBuilder.AddInMemoryCollection(new Dictionary + { + [WebHostDefaults.ServerUrlsKey] = "http://localhost:5000", + }); + }); + }); + + builder.WebHost.UseUrls("http://localhost:5001"); + + var urls = new List(); + var server = new MockAddressesServer(urls); + builder.Services.AddSingleton(server); + await using var app = builder.Build(); + + await app.StartAsync(); + + var url = Assert.Single(urls); + Assert.Equal("http://localhost:5001", url); + } + [Fact] public async Task WebApplicationUrls_ThrowsInvalidOperationExceptionIfThereIsNoIServerAddressesFeature() { From 07c4ec3cdc5b296dfa8bbd4edefd655a81856612 Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Wed, 9 Mar 2022 02:45:26 +0000 Subject: [PATCH 06/10] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-runtime --- NuGet.config | 8 ++------ eng/Version.Details.xml | 18 +++++++++--------- eng/Versions.props | 4 ++-- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/NuGet.config b/NuGet.config index 80bdb823a33d..bbe21be566e7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,9 +4,7 @@ - - - + @@ -32,9 +30,7 @@ - - - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 61a27df18bbd..16531cf760aa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7beb98f5c0e748d145968b5936e51a86c2898d2 + 3e42a51d155adac6a1e3e5fe7bbbbf922502594f https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7beb98f5c0e748d145968b5936e51a86c2898d2 + 3e42a51d155adac6a1e3e5fe7bbbbf922502594f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7beb98f5c0e748d145968b5936e51a86c2898d2 + 3e42a51d155adac6a1e3e5fe7bbbbf922502594f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7beb98f5c0e748d145968b5936e51a86c2898d2 + 3e42a51d155adac6a1e3e5fe7bbbbf922502594f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7beb98f5c0e748d145968b5936e51a86c2898d2 + 3e42a51d155adac6a1e3e5fe7bbbbf922502594f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7beb98f5c0e748d145968b5936e51a86c2898d2 + 3e42a51d155adac6a1e3e5fe7bbbbf922502594f - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - d7beb98f5c0e748d145968b5936e51a86c2898d2 + 3e42a51d155adac6a1e3e5fe7bbbbf922502594f diff --git a/eng/Versions.props b/eng/Versions.props index c34e6cebdf6f..75af9bf607f7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.4 6.0.4 6.0.4 - 6.0.4-servicing.22153.5 + 6.0.4-servicing.22158.4 6.0.0 6.0.1 6.0.0 @@ -103,7 +103,7 @@ 6.0.0 6.0.0 6.0.0 - 6.0.4-servicing.22153.5 + 6.0.4-servicing.22158.4 6.0.0 6.0.0 6.0.1 From 0729a7d4291839f2afbbbb8a2e524bb82f1898b7 Mon Sep 17 00:00:00 2001 From: mmitche Date: Mon, 14 Mar 2022 12:07:05 -0700 Subject: [PATCH 07/10] Merge from github release/6.0 --- .azure/pipelines/ci.yml | 32 +++++---- Directory.Build.props | 3 + Directory.Build.targets | 9 ++- eng/Build.props | 2 +- eng/Version.Details.xml | 16 ++--- eng/Versions.props | 4 +- eng/common/templates/job/execute-sdl.yml | 69 +++---------------- eng/common/templates/jobs/codeql-build.yml | 2 +- eng/common/templates/steps/execute-sdl.yml | 68 ++++++++++++++++++ .../templates/variables/sdl-variables.yml | 7 ++ global.json | 4 +- .../Routing/QueryParameterValueSupplier.cs | 4 +- src/Installers/Rpm/Directory.Build.props | 8 ++- src/Installers/Rpm/Directory.Build.targets | 15 ++-- .../Rpm/Runtime/Rpm.Runtime.rpmproj | 10 ++- .../TargetingPack/Rpm.TargetingPack.rpmproj | 10 ++- 16 files changed, 153 insertions(+), 110 deletions(-) create mode 100644 eng/common/templates/steps/execute-sdl.yml create mode 100644 eng/common/templates/variables/sdl-variables.yml diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 2e8a54414837..277fc34c626f 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -407,7 +407,6 @@ stages: --no-build-nodejs --no-build-java -p:OnlyPackPlatformSpecificPackages=true - -p:AssetManifestFileName=aspnetcore-Linux_x64.xml $(_BuildArgs) $(_InternalRuntimeDownloadArgs) displayName: Run build.sh @@ -496,17 +495,26 @@ stages: jobName: Linux_arm64_build jobDisplayName: "Build: Linux ARM64" agentOs: Linux - buildArgs: - --arch arm64 - --all - --pack - --no-build-nodejs - --no-build-java - -p:OnlyPackPlatformSpecificPackages=true - -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml - $(_BuildArgs) - $(_PublishArgs) - $(_InternalRuntimeDownloadArgs) + steps: + - script: ./eng/build.sh + --ci + --arch arm64 + --pack + --all + --no-build-nodejs + --no-build-java + -p:OnlyPackPlatformSpecificPackages=true + $(_BuildArgs) + $(_InternalRuntimeDownloadArgs) + displayName: Run build.sh + - script: git clean -xfd src/**/obj/; + ./dockerbuild.sh rhel --ci --nobl --arch arm64 --build-installers --no-build-deps --no-build-nodejs + -p:OnlyPackPlatformSpecificPackages=true -p:BuildRuntimeArchive=false -p:LinuxInstallerType=rpm + -p:AssetManifestFileName=aspnetcore-Linux_arm64.xml + $(_BuildArgs) + $(_PublishArgs) + $(_InternalRuntimeDownloadArgs) + displayName: Build RPM installers installNodeJs: false installJdk: false artifacts: diff --git a/Directory.Build.props b/Directory.Build.props index 8f0ac5942284..721f099a7734 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -30,6 +30,9 @@ $(MSBuildProjectName.EndsWith('.Test')) OR $(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true true + true true true true + Condition="'$(ExcludeFromSourceBuild)' == '' and + '$(DotNetBuildFromSource)' == 'true' and + '$(IsAspNetCoreApp)' != 'true' and + '$(MSBuildProjectName)' != '$(TargetingPackName)' and + '$(IsAnalyzersProject)' != 'true' and + '$(IsProjectTemplateProject)' != 'true'">true diff --git a/eng/Build.props b/eng/Build.props index fd3736f50d0d..09cb548d4eee 100644 --- a/eng/Build.props +++ b/eng/Build.props @@ -95,7 +95,7 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 - + https://github.com/dotnet/arcade - 7215d8265a7fbcd022eb72ff7a6e2048444c985f + 879df783283dfb44c7653493fdf7fd7b07ba6b01 diff --git a/eng/Versions.props b/eng/Versions.props index 181afaaa14ca..e65eba6c0088 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -131,8 +131,8 @@ 6.0.4 6.0.4 - 6.0.0-beta.22122.7 - 6.0.0-beta.22122.7 + 6.0.0-beta.22161.1 + 6.0.0-beta.22161.1 true true - + + x64 + aarch64 + diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index 0a4283f81c66..4fe38e018bc1 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -18,7 +18,7 @@ - + @@ -37,6 +37,11 @@ + + $(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner1VersionSuffix)$(CblMarinerExtension) + $(InstallersOutputPath)$(CblMarinerBaseName)$(CblMariner2VersionSuffix)$(CblMarinerExtension) + + DATE=$([System.DateTime]::UtcNow.ToString(ddd MMM dd yyyy)) @@ -51,10 +56,6 @@ - - amd64 - - @@ -79,12 +80,12 @@ - + @@ -12,11 +12,9 @@ - $(RuntimeInstallerBaseName)-$(SharedFxVersion)-x64.rpm - $(RuntimeInstallerBaseName)-$(SharedFxVersion)-cm.1-x64.rpm - $(RuntimeInstallerBaseName)-$(SharedFxVersion)-cm.2-x64.rpm + $(RuntimeInstallerBaseName)-$(SharedFxVersion)-$(RpmArch).rpm $(InstallersOutputPath)$(TargetFileName) - $(InstallersOutputPath)$(CblMarinerTargetFileName) - $(InstallersOutputPath)$(CblMariner2TargetFileName) + $(RuntimeInstallerBaseName)-$(SharedFxVersion) + -$(RpmArch).rpm diff --git a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj index 77217207580c..469d08471c16 100644 --- a/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj +++ b/src/Installers/Rpm/TargetingPack/Rpm.TargetingPack.rpmproj @@ -29,13 +29,11 @@ - $(TargetingPackInstallerBaseName)-$(TargetingPackVersion).rpm - $(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-cm.1.rpm - $(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-cm.2.rpm + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion)-$(RpmArch).rpm $(InstallersOutputPath)$(TargetFileName) - $(InstallersOutputPath)$(CblMarinerTargetFileName) - $(InstallersOutputPath)$(CblMariner2TargetFileName) - + $(TargetingPackInstallerBaseName)-$(TargetingPackVersion) + -$(RpmArch).rpm + $(TargetingPackVersionPrefix) From 765af57a7265ecae919669d9624bdf9941ffd40f Mon Sep 17 00:00:00 2001 From: DotNet Bot Date: Mon, 14 Mar 2022 23:19:57 +0000 Subject: [PATCH 08/10] [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-efcore dnceng/internal/dotnet-runtime - Set to private runtime --- NuGet.config | 8 +++---- eng/Version.Details.xml | 48 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++++----- eng/helix/helix.proj | 2 +- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/NuGet.config b/NuGet.config index bbe21be566e7..76ccfd79eeee 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,10 @@ - + - + @@ -27,10 +27,10 @@ - + - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a1f0d6ec5533..152d7e3408ee 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85dcee4fb73204ebf807225653176eae24d05a0e + aca50aef8604cc23910d18edce820e0fa7c61910 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85dcee4fb73204ebf807225653176eae24d05a0e + aca50aef8604cc23910d18edce820e0fa7c61910 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85dcee4fb73204ebf807225653176eae24d05a0e + aca50aef8604cc23910d18edce820e0fa7c61910 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85dcee4fb73204ebf807225653176eae24d05a0e + aca50aef8604cc23910d18edce820e0fa7c61910 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85dcee4fb73204ebf807225653176eae24d05a0e + aca50aef8604cc23910d18edce820e0fa7c61910 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85dcee4fb73204ebf807225653176eae24d05a0e + aca50aef8604cc23910d18edce820e0fa7c61910 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85dcee4fb73204ebf807225653176eae24d05a0e + aca50aef8604cc23910d18edce820e0fa7c61910 https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 85dcee4fb73204ebf807225653176eae24d05a0e + aca50aef8604cc23910d18edce820e0fa7c61910 https://github.com/dotnet/runtime @@ -177,9 +177,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3e42a51d155adac6a1e3e5fe7bbbbf922502594f + be98e88c760526452df94ef452fff4602fb5bded https://github.com/dotnet/runtime @@ -201,9 +201,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - - https://github.com/dotnet/runtime - 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 + + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime + be98e88c760526452df94ef452fff4602fb5bded https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -233,9 +233,9 @@ https://github.com/dotnet/runtime 4822e3c3aa77eb82b2fb33c9321f923cf11ddde6 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 839cdfb0ecca5e0be3dbccd926e7651ef50fdf10 + be98e88c760526452df94ef452fff4602fb5bded https://github.com/dotnet/runtime @@ -247,15 +247,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3e42a51d155adac6a1e3e5fe7bbbbf922502594f + be98e88c760526452df94ef452fff4602fb5bded https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3e42a51d155adac6a1e3e5fe7bbbbf922502594f + be98e88c760526452df94ef452fff4602fb5bded https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3e42a51d155adac6a1e3e5fe7bbbbf922502594f + be98e88c760526452df94ef452fff4602fb5bded https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3e42a51d155adac6a1e3e5fe7bbbbf922502594f + be98e88c760526452df94ef452fff4602fb5bded https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3e42a51d155adac6a1e3e5fe7bbbbf922502594f + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 3e42a51d155adac6a1e3e5fe7bbbbf922502594f + be98e88c760526452df94ef452fff4602fb5bded - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663 + be98e88c760526452df94ef452fff4602fb5bded https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 181afaaa14ca..bf843f739bc7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -68,7 +68,7 @@ 6.0.4 6.0.4 6.0.4 - 6.0.4-servicing.22158.4 + 6.0.4-servicing.22164.4 6.0.0 6.0.1 6.0.0 @@ -103,13 +103,13 @@ 6.0.0 6.0.0 6.0.0 - 6.0.4-servicing.22158.4 + 6.0.4-servicing.22164.4 6.0.0 6.0.0 6.0.1 6.0.2 6.0.0 - 6.0.0 + 6.0.1 6.0.1 6.0.0 6.0.0 @@ -117,10 +117,10 @@ 6.0.0 6.0.0 6.0.0 - 6.0.2 + 6.0.3 6.0.0 - 6.0.2 + 6.0.3 6.0.4 6.0.4 diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index b9b16f9f858f..f1f7e4a3d42e 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -10,7 +10,7 @@ not HelixCorrelationPayload. --> - true + false From 578ba6d8016785b53d7a96248ed6ccf211843b05 Mon Sep 17 00:00:00 2001 From: "Doug Bunting (AAPT)" Date: Fri, 18 Mar 2022 01:36:59 +0000 Subject: [PATCH 09/10] Merged PR 21869: Correct `--architecture` in `fpm` commands # {PR title} Correct `--architecture` in `fpm` commands ## Description Update `fpm` commands to use a supported `--architecture` value. As-is, the x64 .rpm files we produce are incompatible w/ installation on an x64 machine. Problem found during servicing version flow. ## Customer Impact Unable to build dotnet-installer-ci-official w/ current .rpm files from dotnet-aspnetcore repo. ## Regression? - [x] Yes - [ ] No This is a build regression since 6.0.3. It will also impact our 'main' branch. ## Risk - [ ] High - [ ] Medium - [x] Low Have verified the chosen values for the command line using available online documentation. Since we know the current .rpm files are busted, things can only get better :smiley: ## Verification - [x] Manual (required) - [ ] Automated I am locally building this branch and will use `rpmlint` in a `docker` container to verify the goodness of the produced package. ## Packaging changes reviewed? - [ ] Yes - [ ] No - [ ] N/A Not sure how to answer this because the change is to an internal setting of the RPM installer. If others agree it's the right change, it's been reviewed :smiley: ---- ## When servicing release/2.1 - [ ] Make necessary changes in eng/PatchConfig.props --- src/Installers/Rpm/Directory.Build.targets | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/Installers/Rpm/Directory.Build.targets b/src/Installers/Rpm/Directory.Build.targets index 4fe38e018bc1..07d01bb46ed6 100644 --- a/src/Installers/Rpm/Directory.Build.targets +++ b/src/Installers/Rpm/Directory.Build.targets @@ -50,6 +50,14 @@ $(ChangeLogProps);PACKAGE_VERSION=$(PackageVersion) $(ChangeLogProps);PACKAGE_REVISION=$(PackageRevision) + + x86_64 + aarch64 + $(IntermediateOutputPath)changelog @@ -64,7 +72,7 @@ - + From f9ae0f5d30be2de3c0de61b5673bd8873231d70a Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Tue, 22 Mar 2022 16:01:14 +0000 Subject: [PATCH 10/10] Merged PR 21931: Revert "[release/6.0] Build ProjectTemplates in Source-Build (#40650)" (#40805) # {PR title} Summary of the changes (Less than 80 chars) ## Description {Detail} Fixes #{bug number} (in this specific format) ## Customer Impact {Justification} ## Regression? - [ ] Yes - [ ] No [If yes, specify the version the behavior has regressed from] ## Risk - [ ] High - [ ] Medium - [ ] Low [Justify the selection above] ## Verification - [ ] Manual (required) - [ ] Automated ## Packaging changes reviewed? - [ ] Yes - [ ] No - [ ] N/A ---- ## When servicing release/2.1 - [ ] Make necessary changes in eng/PatchConfig.props Revert "[release/6.0] Build ProjectTemplates in Source-Build (#40650)" (#40805) This reverts commit 7c2000d3444c2c0b1f4aaeb32800b0659c2d401d. --- Directory.Build.props | 3 --- Directory.Build.targets | 9 ++------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 721f099a7734..8f0ac5942284 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -30,9 +30,6 @@ $(MSBuildProjectName.EndsWith('.Test')) OR $(MSBuildProjectName.EndsWith('.FunctionalTest')) ) ">true true - true true true true + Condition="'$(ExcludeFromSourceBuild)' == '' and '$(DotNetBuildFromSource)' == 'true' and '$(IsAspNetCoreApp)' != 'true' and '$(MSBuildProjectName)' != '$(TargetingPackName)' and '$(IsAnalyzersProject)' != 'true'">true