From c6a133e412cb6ba7a6bab5d9705f8f9a58ada1bd Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 24 Sep 2024 23:59:06 +0000 Subject: [PATCH 01/22] Merged PR 43129: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 83131e87-e80d-4d5b-f426-08dbd53b3319 - **Build**: 20240924.6 - **Date Produced**: September 24, 2024 10:32:43 PM UTC - **Commit**: dcf4a22cf8671c1abe880ebec4cfd906c99588bf - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.Caching.Memory**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Configuration.Json**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Configuration.UserSecrets**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Configuration.Xml**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.DependencyInjection**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.DependencyInjection.Abstractions**: [from 8.0.2 to 8.0.2][1] - **Microsoft.Extensions.DependencyModel**: [from 8.0.2 to 8.0.2][1] - **Microsoft.Extensions.Diagnostics**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Diagnostics.Abstractions**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1] - **Microsoft.Extensions.Hosting**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Hosting.Abstractions**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Http**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Logging**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Logging.Abstractions**: [from 8.0.2 to 8.0.2][1] - **Microsoft.Extensions.Logging.Configuration**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Logging.Console**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Logging.Debug**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Logging.EventLog**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Logging.EventSource**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Extensions.Logging.TraceSource**: [from 8.0.1 to 8.0.1][1] - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.App.Ref**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.10 to 8.0.10][1] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1] - **Microsoft.NETCore.Platforms**: [from 8.0.10-servicing.24466.10 to 8.0.10-servicing.24474.6][1] - **System.Configuration.ConfigurationManager**: [from 8.0.1 to 8.0.1][1] - **System.Diagnostics.EventLog**: [from 8.0.1 to 8.0.1][1] - **System.Diagnostics.PerformanceCounter**: [fr... --- NuGet.config | 8 +++- eng/Version.Details.xml | 90 ++++++++++++++++++++--------------------- eng/Versions.props | 10 ++--- 3 files changed, 56 insertions(+), 52 deletions(-) diff --git a/NuGet.config b/NuGet.config index 1ccd39949f02..4c20cb76db60 100644 --- a/NuGet.config +++ b/NuGet.config @@ -7,9 +7,11 @@ + + - + @@ -36,6 +38,8 @@ + + @@ -45,7 +49,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 830dd83228e5..64b5645db52d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -75,15 +75,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -91,19 +91,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,53 +121,53 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://github.com/dotnet/source-build-externals @@ -201,7 +201,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -209,7 +209,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -221,7 +221,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -229,7 +229,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -237,11 +237,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -249,7 +249,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -257,7 +257,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -273,19 +273,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -302,7 +302,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -310,7 +310,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 81cabf2857a01351e5ab578947c7403a5b128ad1 + dcf4a22cf8671c1abe880ebec4cfd906c99588bf https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 02c0d42b1a5d..a99f31694937 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.10 8.0.10 8.0.10 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.6 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.6 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.6 8.0.1 8.0.1 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.6 - 8.0.10-servicing.24466.10 + 8.0.10-servicing.24474.6 8.0.0 8.0.1 From 83df6c9080a90cff9af2afc2313611ef9d4d33b0 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:29:07 -0700 Subject: [PATCH 02/22] Update branding to 8.0.11 (#58198) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index a1bdac24c087..6cc1ea7b2ce9 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -8,7 +8,7 @@ 8 0 - 10 + 11 false From daef895eb0ef57f78f8173d8d7caedb32563fd48 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:32:51 -0700 Subject: [PATCH 03/22] [release/8.0] (deps): Bump src/submodules/googletest (#58180) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `ff233bd` to `6dae7eb`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/ff233bdd4cac0a0bf6e5cd45bda3406814cb2796...6dae7eb4a5c3a169f3e298392bff4680224aa94a) --- updated-dependencies: - dependency-name: src/submodules/googletest dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/submodules/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/googletest b/src/submodules/googletest index ff233bdd4cac..6dae7eb4a5c3 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit ff233bdd4cac0a0bf6e5cd45bda3406814cb2796 +Subproject commit 6dae7eb4a5c3a169f3e298392bff4680224aa94a From aab1413fe97ea3a7ec4ccdfb7e5c61cd1add01eb Mon Sep 17 00:00:00 2001 From: Safia Abdalla Date: Wed, 2 Oct 2024 11:33:12 -0700 Subject: [PATCH 04/22] [release/8.0] Add explicit conversion for value-type returning handlers with filters (#57966) * Add explicit conversion for value-type returning handlers with filters * Fix using for testing packages --- .../src/RequestDelegateFactory.cs | 5 + ...estDelegateFactoryTests.EndpointFilters.cs | 98 +++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 src/Http/Http.Extensions/test/RequestDelegateFactoryTests.EndpointFilters.cs diff --git a/src/Http/Http.Extensions/src/RequestDelegateFactory.cs b/src/Http/Http.Extensions/src/RequestDelegateFactory.cs index 82a882f7025a..8d928403297c 100644 --- a/src/Http/Http.Extensions/src/RequestDelegateFactory.cs +++ b/src/Http/Http.Extensions/src/RequestDelegateFactory.cs @@ -533,6 +533,11 @@ private static Expression MapHandlerReturnTypeToValueTask(Expression methodCall, } else { + if (returnType.IsValueType) + { + return Expression.Call(WrapObjectAsValueTaskMethod, Expression.Convert(methodCall, typeof(object))); + } + return Expression.Call(WrapObjectAsValueTaskMethod, methodCall); } } diff --git a/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.EndpointFilters.cs b/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.EndpointFilters.cs new file mode 100644 index 000000000000..b2a223b345e3 --- /dev/null +++ b/src/Http/Http.Extensions/test/RequestDelegateFactoryTests.EndpointFilters.cs @@ -0,0 +1,98 @@ +// Licensed to the .NET Foundation under one or more agreements. +// The .NET Foundation licenses this file to you under the MIT license. + +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Testing; + +namespace Microsoft.AspNetCore.Routing.Internal; + +public partial class RequestDelegateFactoryTests : LoggedTest +{ + public static object[][] ValueTypeReturningDelegates => + [ + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 'b')], + [(Func)((HttpContext httpContext) => true)], + [(Func)((HttpContext httpContext) => 4.2f)], + [(Func)((HttpContext httpContext) => 4.2)], + [(Func)((HttpContext httpContext) => 4.2m)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)] + ]; + + [Theory] + [MemberData(nameof(ValueTypeReturningDelegates))] + public void Create_WithEndpointFilterOnBuiltInValueTypeReturningDelegate_Works(Delegate @delegate) + { + var invokeCount = 0; + + RequestDelegateFactoryOptions options = new() + { + EndpointBuilder = CreateEndpointBuilderFromFilterFactories( + [ + (routeHandlerContext, next) => + { + invokeCount++; + return next; + }, + (routeHandlerContext, next) => + { + invokeCount++; + return next; + }, + ]), + }; + + var result = RequestDelegateFactory.Create(@delegate, options); + Assert.Equal(2, invokeCount); + } + + public static object[][] NullableValueTypeReturningDelegates => + [ + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 'b')], + [(Func)((HttpContext httpContext) => true)], + [(Func)((HttpContext httpContext) => 4.2f)], + [(Func)((HttpContext httpContext) => 4.2)], + [(Func)((HttpContext httpContext) => 4.2m)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)], + [(Func)((HttpContext httpContext) => 42)] + ]; + + [Theory] + [MemberData(nameof(NullableValueTypeReturningDelegates))] + public void Create_WithEndpointFilterOnNullableBuiltInValueTypeReturningDelegate_Works(Delegate @delegate) + { + var invokeCount = 0; + + RequestDelegateFactoryOptions options = new() + { + EndpointBuilder = CreateEndpointBuilderFromFilterFactories( + [ + (routeHandlerContext, next) => + { + invokeCount++; + return next; + }, + (routeHandlerContext, next) => + { + invokeCount++; + return next; + }, + ]), + }; + + var result = RequestDelegateFactory.Create(@delegate, options); + Assert.Equal(2, invokeCount); + } +} From ed311c3ed49a7dc172a5dacb4a0f2f4648fc72c8 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 2 Oct 2024 11:33:22 -0700 Subject: [PATCH 05/22] Stop using Mac 11 (#58063) --- eng/targets/Helix.Common.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 426386e98ebf..452702d612b0 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -49,7 +49,7 @@ - + From 6a4ea395c7db641e9b825c24979ab3d026dab0c8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:33:31 -0700 Subject: [PATCH 06/22] Enable TSA/Policheck (#58124) Co-authored-by: William Godbe --- .azure/pipelines/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml index 0395418fe330..886ccb870b45 100644 --- a/.azure/pipelines/ci.yml +++ b/.azure/pipelines/ci.yml @@ -138,6 +138,10 @@ extends: os: windows spotBugs: enabled: false + policheck: + enabled: true + tsa: + enabled: true containers: alpine319WithNode: image: mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.19-WithNode From cec987b5a685cd43478df7abf5a78893a8f2c765 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 11:33:44 -0700 Subject: [PATCH 07/22] [release/8.0] (deps): Bump src/submodules/MessagePack-CSharp (#58179) Bumps [src/submodules/MessagePack-CSharp](https://github.com/aspnet/MessagePack-CSharp) from `ecc4e18` to `9511905`. - [Commits](https://github.com/aspnet/MessagePack-CSharp/compare/ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d...95119056ee8f4da1714b055a4f16893afaa73af7) --- updated-dependencies: - dependency-name: src/submodules/MessagePack-CSharp dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/submodules/MessagePack-CSharp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/MessagePack-CSharp b/src/submodules/MessagePack-CSharp index ecc4e18ad7a0..95119056ee8f 160000 --- a/src/submodules/MessagePack-CSharp +++ b/src/submodules/MessagePack-CSharp @@ -1 +1 @@ -Subproject commit ecc4e18ad7a0c7db51cd7e3d2997a291ed01444d +Subproject commit 95119056ee8f4da1714b055a4f16893afaa73af7 From dfe2137ce88bbcf7116a55d8ed41f5d1219be8f2 Mon Sep 17 00:00:00 2001 From: Brennan Date: Wed, 2 Oct 2024 14:29:12 -0700 Subject: [PATCH 08/22] [Backport] Http.Sys: Clean up Request parsing errors (#57819) * Http.Sys: Clean up Request parsing errors * nit * comment * fix --- src/Servers/HttpSys/src/LoggerEventIds.cs | 1 + .../HttpSys/src/RequestProcessing/Request.cs | 237 +++++++++--------- .../RequestContext.FeatureCollection.cs | 21 +- .../RequestProcessing/RequestContext.Log.cs | 3 + .../src/RequestProcessing/RequestContext.cs | 17 +- .../RequestProcessing/RequestContextOfT.cs | 6 +- .../FunctionalTests/Listener/RequestTests.cs | 7 +- .../test/FunctionalTests/RequestTests.cs | 44 +++- .../FunctionalTests/ResponseCachingTests.cs | 19 +- .../FunctionalTests/ResponseSendFileTests.cs | 1 + 10 files changed, 219 insertions(+), 137 deletions(-) diff --git a/src/Servers/HttpSys/src/LoggerEventIds.cs b/src/Servers/HttpSys/src/LoggerEventIds.cs index 87f8ea56ee9f..5bc0b6b65ed6 100644 --- a/src/Servers/HttpSys/src/LoggerEventIds.cs +++ b/src/Servers/HttpSys/src/LoggerEventIds.cs @@ -58,4 +58,5 @@ internal static class LoggerEventIds public const int AcceptSetExpectationMismatch = 51; public const int AcceptCancelExpectationMismatch = 52; public const int AcceptObserveExpectationMismatch = 53; + public const int RequestParsingError = 54; } diff --git a/src/Servers/HttpSys/src/RequestProcessing/Request.cs b/src/Servers/HttpSys/src/RequestProcessing/Request.cs index 0b9418cbcac6..6029f8269f53 100644 --- a/src/Servers/HttpSys/src/RequestProcessing/Request.cs +++ b/src/Servers/HttpSys/src/RequestProcessing/Request.cs @@ -37,145 +37,152 @@ internal Request(RequestContext requestContext) { // TODO: Verbose log RequestContext = requestContext; - _contentBoundaryType = BoundaryType.None; - RequestId = requestContext.RequestId; - // For HTTP/2 Http.Sys assigns each request a unique connection id for use with API calls, but the RawConnectionId represents the real connection. - UConnectionId = requestContext.ConnectionId; - RawConnectionId = requestContext.RawConnectionId; - SslStatus = requestContext.SslStatus; + try + { + _contentBoundaryType = BoundaryType.None; - KnownMethod = requestContext.VerbId; - Method = requestContext.GetVerb()!; + RequestId = requestContext.RequestId; + // For HTTP/2 Http.Sys assigns each request a unique connection id for use with API calls, but the RawConnectionId represents the real connection. + UConnectionId = requestContext.ConnectionId; + RawConnectionId = requestContext.RawConnectionId; + SslStatus = requestContext.SslStatus; - RawUrl = requestContext.GetRawUrl()!; + KnownMethod = requestContext.VerbId; + Method = requestContext.GetVerb()!; - var cookedUrl = requestContext.GetCookedUrl(); - QueryString = cookedUrl.GetQueryString() ?? string.Empty; + RawUrl = requestContext.GetRawUrl()!; - var rawUrlInBytes = requestContext.GetRawUrlInBytes(); - var originalPath = RequestUriBuilder.DecodeAndUnescapePath(rawUrlInBytes); + var cookedUrl = requestContext.GetCookedUrl(); + QueryString = cookedUrl.GetQueryString() ?? string.Empty; - PathBase = string.Empty; - Path = originalPath; - var prefix = requestContext.Server.Options.UrlPrefixes.GetPrefix((int)requestContext.UrlContext); + var rawUrlInBytes = requestContext.GetRawUrlInBytes(); + var originalPath = RequestUriBuilder.DecodeAndUnescapePath(rawUrlInBytes); - // 'OPTIONS * HTTP/1.1' - if (KnownMethod == HttpApiTypes.HTTP_VERB.HttpVerbOPTIONS && string.Equals(RawUrl, "*", StringComparison.Ordinal)) - { PathBase = string.Empty; - Path = string.Empty; - } - // Prefix may be null if the requested has been transfered to our queue - else if (prefix is not null) - { - var pathBase = prefix.PathWithoutTrailingSlash; + Path = originalPath; + var prefix = requestContext.Server.Options.UrlPrefixes.GetPrefix((int)requestContext.UrlContext); - // url: /base/path, prefix: /base/, base: /base, path: /path - // url: /, prefix: /, base: , path: / - if (originalPath.Equals(pathBase, StringComparison.Ordinal)) - { - // Exact match, no need to preserve the casing - PathBase = pathBase; - Path = string.Empty; - } - else if (originalPath.Equals(pathBase, StringComparison.OrdinalIgnoreCase)) + // 'OPTIONS * HTTP/1.1' + if (KnownMethod == HttpApiTypes.HTTP_VERB.HttpVerbOPTIONS && string.Equals(RawUrl, "*", StringComparison.Ordinal)) { - // Preserve the user input casing - PathBase = originalPath; + PathBase = string.Empty; Path = string.Empty; } - else if (originalPath.StartsWith(prefix.Path, StringComparison.Ordinal)) - { - // Exact match, no need to preserve the casing - PathBase = pathBase; - Path = originalPath[pathBase.Length..]; - } - else if (originalPath.StartsWith(prefix.Path, StringComparison.OrdinalIgnoreCase)) + // Prefix may be null if the requested has been transferred to our queue + else if (prefix is not null) { - // Preserve the user input casing - PathBase = originalPath[..pathBase.Length]; - Path = originalPath[pathBase.Length..]; - } - else - { - // Http.Sys path base matching is based on the cooked url which applies some non-standard normalizations that we don't use - // like collapsing duplicate slashes "//", converting '\' to '/', and un-escaping "%2F" to '/'. Find the right split and - // ignore the normalizations. - var originalOffset = 0; - var baseOffset = 0; - while (originalOffset < originalPath.Length && baseOffset < pathBase.Length) + var pathBase = prefix.PathWithoutTrailingSlash; + + // url: /base/path, prefix: /base/, base: /base, path: /path + // url: /, prefix: /, base: , path: / + if (originalPath.Equals(pathBase, StringComparison.Ordinal)) { - var baseValue = pathBase[baseOffset]; - var offsetValue = originalPath[originalOffset]; - if (baseValue == offsetValue - || char.ToUpperInvariant(baseValue) == char.ToUpperInvariant(offsetValue)) - { - // case-insensitive match, continue - originalOffset++; - baseOffset++; - } - else if (baseValue == '/' && offsetValue == '\\') - { - // Http.Sys considers these equivalent - originalOffset++; - baseOffset++; - } - else if (baseValue == '/' && originalPath.AsSpan(originalOffset).StartsWith("%2F", StringComparison.OrdinalIgnoreCase)) - { - // Http.Sys un-escapes this - originalOffset += 3; - baseOffset++; - } - else if (baseOffset > 0 && pathBase[baseOffset - 1] == '/' - && (offsetValue == '/' || offsetValue == '\\')) - { - // Duplicate slash, skip - originalOffset++; - } - else if (baseOffset > 0 && pathBase[baseOffset - 1] == '/' - && originalPath.AsSpan(originalOffset).StartsWith("%2F", StringComparison.OrdinalIgnoreCase)) - { - // Duplicate slash equivalent, skip - originalOffset += 3; - } - else + // Exact match, no need to preserve the casing + PathBase = pathBase; + Path = string.Empty; + } + else if (originalPath.Equals(pathBase, StringComparison.OrdinalIgnoreCase)) + { + // Preserve the user input casing + PathBase = originalPath; + Path = string.Empty; + } + else if (originalPath.StartsWith(prefix.Path, StringComparison.Ordinal)) + { + // Exact match, no need to preserve the casing + PathBase = pathBase; + Path = originalPath[pathBase.Length..]; + } + else if (originalPath.StartsWith(prefix.Path, StringComparison.OrdinalIgnoreCase)) + { + // Preserve the user input casing + PathBase = originalPath[..pathBase.Length]; + Path = originalPath[pathBase.Length..]; + } + else + { + // Http.Sys path base matching is based on the cooked url which applies some non-standard normalizations that we don't use + // like collapsing duplicate slashes "//", converting '\' to '/', and un-escaping "%2F" to '/'. Find the right split and + // ignore the normalizations. + var originalOffset = 0; + var baseOffset = 0; + while (originalOffset < originalPath.Length && baseOffset < pathBase.Length) { - // Mismatch, fall back - // The failing test case here is "/base/call//../bat//path1//path2", reduced to "/base/call/bat//path1//path2", - // where http.sys collapses "//" before "../", but we do "../" first. We've lost the context that there were dot segments, - // or duplicate slashes, how do we figure out that "call/" can be eliminated? - originalOffset = 0; - break; + var baseValue = pathBase[baseOffset]; + var offsetValue = originalPath[originalOffset]; + if (baseValue == offsetValue + || char.ToUpperInvariant(baseValue) == char.ToUpperInvariant(offsetValue)) + { + // case-insensitive match, continue + originalOffset++; + baseOffset++; + } + else if (baseValue == '/' && offsetValue == '\\') + { + // Http.Sys considers these equivalent + originalOffset++; + baseOffset++; + } + else if (baseValue == '/' && originalPath.AsSpan(originalOffset).StartsWith("%2F", StringComparison.OrdinalIgnoreCase)) + { + // Http.Sys un-escapes this + originalOffset += 3; + baseOffset++; + } + else if (baseOffset > 0 && pathBase[baseOffset - 1] == '/' + && (offsetValue == '/' || offsetValue == '\\')) + { + // Duplicate slash, skip + originalOffset++; + } + else if (baseOffset > 0 && pathBase[baseOffset - 1] == '/' + && originalPath.AsSpan(originalOffset).StartsWith("%2F", StringComparison.OrdinalIgnoreCase)) + { + // Duplicate slash equivalent, skip + originalOffset += 3; + } + else + { + // Mismatch, fall back + // The failing test case here is "/base/call//../bat//path1//path2", reduced to "/base/call/bat//path1//path2", + // where http.sys collapses "//" before "../", but we do "../" first. We've lost the context that there were dot segments, + // or duplicate slashes, how do we figure out that "call/" can be eliminated? + originalOffset = 0; + break; + } } + PathBase = originalPath[..originalOffset]; + Path = originalPath[originalOffset..]; } - PathBase = originalPath[..originalOffset]; - Path = originalPath[originalOffset..]; } - } - else if (requestContext.Server.Options.UrlPrefixes.TryMatchLongestPrefix(IsHttps, cookedUrl.GetHost()!, originalPath, out var pathBase, out var path)) - { - PathBase = pathBase; - Path = path; - } + else if (requestContext.Server.Options.UrlPrefixes.TryMatchLongestPrefix(IsHttps, cookedUrl.GetHost()!, originalPath, out var pathBase, out var path)) + { + PathBase = pathBase; + Path = path; + } - ProtocolVersion = RequestContext.GetVersion(); + ProtocolVersion = RequestContext.GetVersion(); - Headers = new RequestHeaders(RequestContext); + Headers = new RequestHeaders(RequestContext); - User = RequestContext.GetUser(); + User = RequestContext.GetUser(); - SniHostName = string.Empty; - if (IsHttps) - { - GetTlsHandshakeResults(); - } + SniHostName = string.Empty; + if (IsHttps) + { + GetTlsHandshakeResults(); + } - // GetTlsTokenBindingInfo(); TODO: https://github.com/aspnet/HttpSysServer/issues/231 + // GetTlsTokenBindingInfo(); TODO: https://github.com/aspnet/HttpSysServer/issues/231 - // Finished directly accessing the HTTP_REQUEST structure. - RequestContext.ReleasePins(); - // TODO: Verbose log parameters + } + finally + { + // Finished directly accessing the HTTP_REQUEST structure. + RequestContext.ReleasePins(); + // TODO: Verbose log parameters + } RemoveContentLengthIfTransferEncodingContainsChunked(); } diff --git a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.FeatureCollection.cs b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.FeatureCollection.cs index 2671bc71c8bb..e1931dc0fc6b 100644 --- a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.FeatureCollection.cs +++ b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.FeatureCollection.cs @@ -64,6 +64,7 @@ internal partial class RequestContext : private bool _bodyCompleted; private IHeaderDictionary _responseHeaders = default!; private IHeaderDictionary? _responseTrailers; + private ulong? _requestId; private Fields _initializedFields; @@ -98,11 +99,26 @@ private enum Fields TraceIdentifier = 0x200, } - protected internal void InitializeFeatures() + protected internal bool InitializeFeatures() { _initialized = true; - Request = new Request(this); + // Get the ID before creating the Request object as the Request ctor releases the native memory + // We want the ID in case request processing fails and we need the ID to cancel the native request + _requestId = RequestId; + try + { + Request = new Request(this); + } + catch (Exception ex) + { + Log.RequestParsingError(Logger, ex); + // Synchronously calls Http.Sys and tells it to send an http response + // No one has written to the response yet (haven't even created the response object below) + Server.SendError(_requestId.Value, StatusCodes.Status400BadRequest, authChallenges: null); + return false; + } + Response = new Response(this); _features = new FeatureCollection(new StandardFeatureCollection(this)); @@ -124,6 +140,7 @@ protected internal void InitializeFeatures() _responseStream = new ResponseStream(Response.Body, OnResponseStart); _responseHeaders = Response.Headers; + return true; } private bool IsNotInitialized(Fields field) diff --git a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.Log.cs b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.Log.cs index 2c587b98a401..41b1cf480d5a 100644 --- a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.Log.cs +++ b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.Log.cs @@ -17,5 +17,8 @@ private static partial class Log [LoggerMessage(LoggerEventIds.ChannelBindingRetrieved, LogLevel.Debug, "Channel binding retrieved.", EventName = "ChannelBindingRetrieved")] public static partial void ChannelBindingRetrieved(ILogger logger); + + [LoggerMessage(LoggerEventIds.RequestParsingError, LogLevel.Debug, "Failed to parse request.", EventName = "RequestParsingError")] + public static partial void RequestParsingError(ILogger logger, Exception exception); } } diff --git a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs index 8da0c7a33e37..e9f277b6a990 100644 --- a/src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs +++ b/src/Servers/HttpSys/src/RequestProcessing/RequestContext.cs @@ -187,9 +187,11 @@ public void Abort() _disconnectToken = new CancellationToken(canceled: true); } ForceCancelRequest(); - Request.Dispose(); + // Request and/or Response can be null (even though the property doesn't say it can) + // if the constructor throws (can happen for invalid path format) + Request?.Dispose(); // Only Abort, Response.Dispose() tries a graceful flush - Response.Abort(); + Response?.Abort(); } private static void Abort(object? state) @@ -208,15 +210,22 @@ internal void ForceCancelRequest() { try { + // Shouldn't be able to get here when this is null, but just in case we'll noop + if (_requestId is null) + { + return; + } + var statusCode = HttpApi.HttpCancelHttpRequest(Server.RequestQueue.Handle, - Request.RequestId, IntPtr.Zero); + _requestId.Value, default); // Either the connection has already dropped, or the last write is in progress. // The requestId becomes invalid as soon as the last Content-Length write starts. // The only way to cancel now is with CancelIoEx. if (statusCode == UnsafeNclNativeMethods.ErrorCodes.ERROR_CONNECTION_INVALID) { - Response.CancelLastWrite(); + // Can be null if processing the request threw and the response object was never created. + Response?.CancelLastWrite(); } } catch (ObjectDisposedException) diff --git a/src/Servers/HttpSys/src/RequestProcessing/RequestContextOfT.cs b/src/Servers/HttpSys/src/RequestProcessing/RequestContextOfT.cs index f661bf1fd018..2a1d06a06d26 100644 --- a/src/Servers/HttpSys/src/RequestProcessing/RequestContextOfT.cs +++ b/src/Servers/HttpSys/src/RequestProcessing/RequestContextOfT.cs @@ -27,7 +27,11 @@ public override async Task ExecuteAsync() try { - InitializeFeatures(); + if (!InitializeFeatures()) + { + Abort(); + return; + } if (messagePump.Stopping) { diff --git a/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestTests.cs b/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestTests.cs index 79e1c361380d..0cd4b08086a6 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/Listener/RequestTests.cs @@ -1,15 +1,9 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; -using System.IO; -using System.Net.Http; using System.Net.Sockets; using System.Text; -using System.Threading.Tasks; using Microsoft.AspNetCore.Testing; -using Microsoft.Extensions.Logging; -using Xunit; namespace Microsoft.AspNetCore.Server.HttpSys.Listener; @@ -142,6 +136,7 @@ public async Task Request_OverlongUTF8Path(string requestPath, string expectedPa [InlineData("/", "/", "", "/")] [InlineData("/base", "/base", "/base", "")] [InlineData("/base", "/baSe", "/baSe", "")] + [InlineData("/base", "/baSe/", "/baSe", "/")] [InlineData("/base", "/base/path", "/base", "/path")] [InlineData("/base", "///base/path1/path2", "///base", "/path1/path2")] [InlineData("/base/ball", @"/baSe\ball//path1//path2", @"/baSe\ball", "//path1//path2")] diff --git a/src/Servers/HttpSys/test/FunctionalTests/RequestTests.cs b/src/Servers/HttpSys/test/FunctionalTests/RequestTests.cs index 51eed9b46948..e3f86544e89f 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/RequestTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/RequestTests.cs @@ -1,24 +1,17 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using System.Globalization; -using System.IO; using System.Net; using System.Net.Http; using System.Net.Sockets; using System.Text; -using System.Threading; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Hosting.Server; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http.Features; using Microsoft.AspNetCore.HttpSys.Internal; using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging; -using Microsoft.Extensions.Options; -using Xunit; namespace Microsoft.AspNetCore.Server.HttpSys; @@ -368,6 +361,43 @@ public async Task Request_UrlUnescaping() } } + [Fact] + public async Task Latin1UrlIsRejected() + { + string root; + using (var server = Utilities.CreateHttpServerReturnRoot("/", out root, httpContext => + { + Assert.Fail("Request should not reach here"); + return Task.FromResult(0); + }, LoggerFactory)) + { + var uri = new Uri(root); + StringBuilder builder = new StringBuilder(); + builder.AppendLine(FormattableString.Invariant($"GET /a HTTP/1.1")); + builder.AppendLine("Connection: close"); + builder.Append("HOST: "); + builder.AppendLine(uri.Authority); + builder.AppendLine(); + byte[] request = Encoding.ASCII.GetBytes(builder.ToString()); + // Replace the 'a' in the path with a Latin1 value + request[5] = 0xe1; + + using (var socket = new Socket(SocketType.Stream, ProtocolType.Tcp)) + { + socket.Connect(uri.Host, uri.Port); + socket.Send(request); + var response = new byte[12]; + await Task.Run(() => socket.Receive(response)); + + var statusCode = Encoding.UTF8.GetString(response).Substring(9); + Assert.Equal("400", statusCode); + } + } + + var errorLogs = TestSink.Writes.Where(w => w.LogLevel >= LogLevel.Error).Select(w => w.Exception); + Assert.False(errorLogs.Any(), string.Join(" ", errorLogs)); + } + [ConditionalFact] public async Task Request_WithDoubleSlashes_LeftAlone() { diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs index e0947d2099e6..821d1e86ef18 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseCachingTests.cs @@ -22,8 +22,23 @@ public class ResponseCachingTests : LoggedTest public ResponseCachingTests() { - _absoluteFilePath = Path.Combine(Directory.GetCurrentDirectory(), "Microsoft.AspNetCore.Server.HttpSys.dll"); - _fileLength = new FileInfo(_absoluteFilePath).Length; + _absoluteFilePath = Path.Combine(Directory.GetCurrentDirectory(), Path.GetRandomFileName()); + using var file = File.Create(_absoluteFilePath); + // HttpSys will cache responses up to ~260k, keep this value below that + // 30k is an arbitrary choice + file.Write(new byte[30000]); + _fileLength = 30000; + } + + public override void Dispose() + { + try + { + File.Delete(_absoluteFilePath); + } + catch { } + + base.Dispose(); } [ConditionalFact] diff --git a/src/Servers/HttpSys/test/FunctionalTests/ResponseSendFileTests.cs b/src/Servers/HttpSys/test/FunctionalTests/ResponseSendFileTests.cs index 7e0c03f9c37f..ce82eddfc5bb 100644 --- a/src/Servers/HttpSys/test/FunctionalTests/ResponseSendFileTests.cs +++ b/src/Servers/HttpSys/test/FunctionalTests/ResponseSendFileTests.cs @@ -30,6 +30,7 @@ public ResponseSendFileTests() AbsoluteFilePath = Directory.GetFiles(Directory.GetCurrentDirectory()).First(); RelativeFilePath = Path.GetFileName(AbsoluteFilePath); FileLength = new FileInfo(AbsoluteFilePath).Length; + Assert.True(FileLength > 0, "FileLength is 0"); } [ConditionalFact] From b68823d4a484638f2409caf0475f017afbec5584 Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Mon, 7 Oct 2024 09:50:54 -0700 Subject: [PATCH 09/22] Update the Microsoft.Identity.Web versions used by project templates (#58229) --- eng/Versions.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 6cc1ea7b2ce9..754e1ad6b211 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -300,10 +300,10 @@ 2.57.0 2.57.0 2.5.108 - 2.15.2 - 2.15.2 - 2.15.2 - 2.15.2 + 3.2.0 + 3.2.0 + 3.2.0 + 3.2.0 6.0.1 $(MessagePackVersion) 4.10.0 From 2651bb9970f1804cbc72f025da8c0f8e4de5e3ee Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 22:37:33 +0000 Subject: [PATCH 10/22] Add registry search for upgrade policy keys, update dependencies from Arcade (#58278) Add registry search for upgrade policy keys, update dependencies from Arcade - Add registry search for upgrade policy keys (#57952) * Add registry search for upgrade policy keys * SharedFx bundle too * Add util extension * Another fix --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- .../Windows/SharedFrameworkBundle/Bundle.wxs | 7 ++++++- .../SharedFrameworkBundle.wixproj | 5 +++++ .../Windows/WindowsHostingBundle/Bundle.wxs | 5 +++++ .../WindowsHostingBundle.wixproj | 1 + src/Installers/Windows/Wix.targets | 2 +- 8 files changed, 33 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca81403bb448..c0042cb37012 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -376,26 +376,26 @@ https://github.com/dotnet/winforms abda8e3bfa78319363526b5a5f86863ec979940e - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + 103916ccdbe7f4ab2e194068a1a3cd330542601f - + https://github.com/dotnet/arcade - 80264e60280e2815e7d65871081ccac04a32445c + 103916ccdbe7f4ab2e194068a1a3cd330542601f https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 754e1ad6b211..820ca89f97af 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,9 +162,9 @@ 6.2.4 6.2.4 - 8.0.0-beta.24426.2 - 8.0.0-beta.24426.2 - 8.0.0-beta.24426.2 + 8.0.0-beta.24504.2 + 8.0.0-beta.24504.2 + 8.0.0-beta.24504.2 8.0.0-alpha.1.24379.1 diff --git a/global.json b/global.json index a9a6de59b508..28c2449f2525 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.19", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24426.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24426.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24504.2" } } diff --git a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs index f0508bc3b611..52e85b9a96ce 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs +++ b/src/Installers/Windows/SharedFrameworkBundle/Bundle.wxs @@ -1,5 +1,6 @@ - + + + + + diff --git a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj index e7c93b5ecba8..5f47072f1fee 100644 --- a/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj +++ b/src/Installers/Windows/SharedFrameworkBundle/SharedFrameworkBundle.wixproj @@ -13,6 +13,10 @@ + + $(WixExtDir)\WixUtilExtension.dll + WixUtilExtension + $(WixExtDir)\WixDependencyExtension.dll WixDependencyExtension @@ -25,6 +29,7 @@ + diff --git a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs index 429c66c241a3..6131a49404f4 100644 --- a/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs +++ b/src/Installers/Windows/WindowsHostingBundle/Bundle.wxs @@ -13,6 +13,11 @@ + + + + + diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj index cfb32de2dc5d..2e5c010ed0e7 100644 --- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj +++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj @@ -36,6 +36,7 @@ + diff --git a/src/Installers/Windows/Wix.targets b/src/Installers/Windows/Wix.targets index 0eff14c4f883..6cab47f1059a 100644 --- a/src/Installers/Windows/Wix.targets +++ b/src/Installers/Windows/Wix.targets @@ -110,7 +110,7 @@ NoLogo="true" Cultures="en-us" InstallerFile="%(WixInstallerFilesToProcess.Identity)" - AdditionalBasePaths="$(MSBuildProjectDirectory)" + AdditionalBasePaths="$(MSBuildProjectDirectory);$(PkgMicrosoft_DotNet_Build_Tasks_Installers)\build\wix\bundle" WixExtensions="@(WixExtension)" Loc="@(EmbeddedResource)" Sice="$(SuppressIces)" From 45781b9140ac29edcc96327e91eda39b1fd01ad1 Mon Sep 17 00:00:00 2001 From: wtgodbe Date: Tue, 8 Oct 2024 10:56:25 -0700 Subject: [PATCH 11/22] Update baseline, SDK --- eng/Baseline.Designer.props | 602 ++++++++++++++++++------------------ eng/Baseline.xml | 212 ++++++------- eng/Versions.props | 2 +- global.json | 4 +- 4 files changed, 410 insertions(+), 410 deletions(-) diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index fdced6323d23..d0138a65e8de 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,117 +2,117 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - - + + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 @@ -120,281 +120,281 @@ - 8.0.8 + 8.0.10 - - + + - - + + - - + + - 8.0.8 + 8.0.10 - + - + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - - + + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - - + + - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - - + + - 8.0.8 + 8.0.10 - - - - + + + + - 8.0.8 + 8.0.10 - - + + - - + + - 8.0.8 + 8.0.10 - - + + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - - + + - + - + - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - + - + - + - + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - + - + - + - 8.0.8 + 8.0.10 - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + - + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - - + + - 8.0.8 + 8.0.10 - - + + - - + + - - + + - 8.0.8 + 8.0.10 - + - + - + - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 @@ -403,79 +403,79 @@ - 8.0.8 + 8.0.10 - - + + - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - - + + - - + + - - + + - - + + - 8.0.8 + 8.0.10 - - + + - + - - + + - 8.0.8 + 8.0.10 - - + + - 8.0.8 + 8.0.10 - - + + - 8.0.8 + 8.0.10 @@ -491,192 +491,192 @@ - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - - - + + + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - - + + - - + + - - + + - 8.0.8 + 8.0.10 - - + + - - + + - - - - + + + + - - + + - - + + - - + + - - + + - 8.0.8 + 8.0.10 - + - + - + - + - + - 8.0.8 + 8.0.10 - + - + - + - 8.0.8 + 8.0.10 - + - + - + - 8.0.8 + 8.0.10 - + - + - + - 8.0.8 + 8.0.10 - - - - + + + + - 8.0.8 + 8.0.10 @@ -685,64 +685,64 @@ - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 @@ -764,29 +764,29 @@ - 8.0.8 + 8.0.10 - + - + - + - 8.0.8 + 8.0.10 @@ -802,48 +802,48 @@ - 8.0.8 + 8.0.10 - + - - + + - - - + + + - + - - + + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - - - + + + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 @@ -853,144 +853,144 @@ - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 - - + + - - + + - - + + - 8.0.8 + 8.0.10 - + - + - + - + - + - + - 8.0.8 + 8.0.10 - - - + + + - - - + + + - - - + + + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - - - - + + + + - - - - + + + + - - - - + + + + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - + - + - + - 8.0.8 + 8.0.10 - 8.0.8 + 8.0.10 - + - 8.0.8 + 8.0.10 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 199a62d5c74a..b69677446aba 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,110 +4,110 @@ This file contains a list of all the packages and their versions which were rele Update this list when preparing for a new patch. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eng/Versions.props b/eng/Versions.props index b1bcc44897c8..0e5104d2ebd0 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -11,7 +11,7 @@ 11 - false + true 7.1.2 7.* + + + + + + + + - + @@ -36,6 +44,14 @@ + + + + + + + + @@ -45,7 +61,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index eadef3782912..1ea77054edb1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -189,9 +189,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 81cabf2857a01351e5ab578947c7403a5b128ad1 - + https://github.com/dotnet/source-build-externals - fb970eccb0a9cae3092464e29cbabda0d4115049 + d4feb7e49067fc9bbf7dfb9fa76a326c33fa0595 diff --git a/eng/Versions.props b/eng/Versions.props index 0e5104d2ebd0..ce21c9c8e7ac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -166,7 +166,7 @@ 8.0.0-beta.24504.2 8.0.0-beta.24504.2 - 8.0.0-alpha.1.24379.1 + 8.0.0-alpha.1.24510.2 8.0.0-alpha.1.24415.1 From d6247550dc5b62d7b04e750f2ddec854578dc1d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 11 Oct 2024 09:27:06 -0700 Subject: [PATCH 14/22] Update dependencies from https://github.com/dotnet/arcade build 20241008.1 (#58347) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.24504.2 -> To Version 8.0.0-beta.24508.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1ea77054edb1..36b29a4265cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -376,26 +376,26 @@ https://github.com/dotnet/winforms abda8e3bfa78319363526b5a5f86863ec979940e - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 - + https://github.com/dotnet/arcade - 103916ccdbe7f4ab2e194068a1a3cd330542601f + e5b13e054339e41d422212a0ecaf24fec20cb5a1 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index ce21c9c8e7ac..a152549f4bcb 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,9 +162,9 @@ 6.2.4 6.2.4 - 8.0.0-beta.24504.2 - 8.0.0-beta.24504.2 - 8.0.0-beta.24504.2 + 8.0.0-beta.24508.1 + 8.0.0-beta.24508.1 + 8.0.0-beta.24508.1 8.0.0-alpha.1.24510.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index eb188cfda415..a2dedaa5297a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -892,7 +892,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index 4c706ad995e3..6f596ec7c945 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.19", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24504.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24504.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1" } } From 20b27a0bd73f1173c78667cd79ac68f3bb05be32 Mon Sep 17 00:00:00 2001 From: maestro-prod-Primary Date: Tue, 15 Oct 2024 19:18:48 +0000 Subject: [PATCH 15/22] Merged PR 43131: [internal/release/8.0] Update dependencies from dnceng/internal/dotnet-efcore, dnceng/internal/dotnet-runtime This pull request updates the following dependencies [marker]: <> (Begin:83131e87-e80d-4d5b-f426-08dbd53b3319) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - **Subscription**: 83131e87-e80d-4d5b-f426-08dbd53b3319 - **Build**: 20241014.23 - **Date Produced**: October 15, 2024 7:35:06 AM UTC - **Commit**: c36b66f47588241680d564feaa2d589299adcd9c - **Branch**: refs/heads/internal/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Extensions.HostFactoryResolver.Sources**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4] - **Microsoft.Internal.Runtime.AspNetCore.Transport**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4] - **Microsoft.NET.Runtime.MonoAOTCompiler.Task**: [from 8.0.11 to 8.0.11][4] - **Microsoft.NET.Runtime.WebAssembly.Sdk**: [from 8.0.11 to 8.0.11][4] - **Microsoft.NETCore.App.Ref**: [from 8.0.11 to 8.0.11][4] - **Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm**: [from 8.0.11 to 8.0.11][4] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.11 to 8.0.11][4] - **Microsoft.NETCore.BrowserDebugHost.Transport**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4] - **Microsoft.NETCore.Platforms**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4] - **Microsoft.SourceBuild.Intermediate.runtime.linux-x64**: [from 8.0.11-servicing.24514.8 to 8.0.11-servicing.24514.23][4] [4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC5292f3ab6decc3a8f863b02e6043fdaa1190c72d&targetVersion=GCc36b66f47588241680d564feaa2d589299adcd9c&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:83131e87-e80d-4d5b-f426-08dbd53b3319) [marker]: <> (Begin:e179a2a7-bc5d-4498-2467-08dbd53ba9ce) ## From https://dev.azure.com/dnceng/internal/_git/dot --- NuGet.config | 14 ++--- eng/Version.Details.xml | 132 ++++++++++++++++++++-------------------- eng/Versions.props | 36 +++++------ 3 files changed, 90 insertions(+), 92 deletions(-) diff --git a/NuGet.config b/NuGet.config index 4c20cb76db60..8908b4ae1923 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,12 +6,11 @@ - - - + - + + @@ -38,9 +37,7 @@ - - - + @@ -49,7 +46,8 @@ - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0db23e7ee11f..a819694c39eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,37 +9,37 @@ --> - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4315fa43c9573671f8f5be21497d59f9c99cd829 + b34321294f3d32444d9236c8935e159178b64658 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4315fa43c9573671f8f5be21497d59f9c99cd829 + b34321294f3d32444d9236c8935e159178b64658 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4315fa43c9573671f8f5be21497d59f9c99cd829 + b34321294f3d32444d9236c8935e159178b64658 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4315fa43c9573671f8f5be21497d59f9c99cd829 + b34321294f3d32444d9236c8935e159178b64658 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4315fa43c9573671f8f5be21497d59f9c99cd829 + b34321294f3d32444d9236c8935e159178b64658 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4315fa43c9573671f8f5be21497d59f9c99cd829 + b34321294f3d32444d9236c8935e159178b64658 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4315fa43c9573671f8f5be21497d59f9c99cd829 + b34321294f3d32444d9236c8935e159178b64658 - + https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 4315fa43c9573671f8f5be21497d59f9c99cd829 + b34321294f3d32444d9236c8935e159178b64658 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -75,15 +75,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -91,19 +91,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -121,53 +121,53 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c https://github.com/dotnet/source-build-externals @@ -201,7 +201,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -209,7 +209,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -221,7 +221,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -229,7 +229,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -237,11 +237,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -249,7 +249,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -257,7 +257,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -273,19 +273,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -302,7 +302,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -310,28 +310,28 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + 5292f3ab6decc3a8f863b02e6043fdaa1190c72d - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - dcf4a22cf8671c1abe880ebec4cfd906c99588bf + c36b66f47588241680d564feaa2d589299adcd9c https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index fa2421141385..0a8746499422 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,12 +67,12 @@ 8.0.2 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10-servicing.24474.6 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11-servicing.24514.23 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.10-servicing.24474.6 + 8.0.11-servicing.24514.23 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.10-servicing.24474.6 + 8.0.11-servicing.24514.23 8.0.1 8.0.1 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.10-servicing.24474.6 + 8.0.11-servicing.24514.23 - 8.0.10-servicing.24474.6 + 8.0.11-servicing.24514.23 8.0.0 8.0.1 @@ -143,14 +143,14 @@ 8.1.0-preview.23604.1 8.1.0-preview.23604.1 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 - 8.0.10 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 + 8.0.11 4.8.0-3.23518.7 4.8.0-3.23518.7 From 127af9e0ec17b90837596d138ee78c6cfb251adb Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Wed, 16 Oct 2024 18:33:17 +0000 Subject: [PATCH 16/22] Merged PR 43827: revert OOB package shas revert OOB package shas from '5292f3ab6decc3a8f863b02e6043fdaa1190c72d' to 'dcf4a22cf8671c1abe880ebec4cfd906c99588bf' ---- #### AI description (iteration 1) #### PR Classification Reversion of previous changes to package SHAs. #### PR Summary This pull request reverts the SHAs of several dependencies to their previous values. - `eng/Version.Details.xml`: Reverted SHAs for multiple dependencies including `Microsoft.Extensions.Hosting.Abstractions`, `Microsoft.Extensions.Logging`, `System.Security.Cryptography.Pkcs`, and others. --- eng/Version.Details.xml | 60 ++++++++++++++++++++--------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a819694c39eb..4c02613fe6fa 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -47,7 +47,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -75,15 +75,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -91,19 +91,19 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -127,47 +127,47 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -201,7 +201,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -209,7 +209,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -221,7 +221,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -229,7 +229,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -237,11 +237,11 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -249,7 +249,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -257,7 +257,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -273,7 +273,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -302,7 +302,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -310,7 +310,7 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - 5292f3ab6decc3a8f863b02e6043fdaa1190c72d + 81cabf2857a01351e5ab578947c7403a5b128ad1 - - + + @@ -46,8 +46,8 @@ - - + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4c02613fe6fa..2520cdb45344 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -121,9 +121,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -185,9 +185,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime 5535e31a712343a63f5d7d796cd874e563e5ac14 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://github.com/dotnet/source-build-externals @@ -277,15 +277,15 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime @@ -318,20 +318,20 @@ --> https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://github.com/dotnet/xdt @@ -368,9 +368,9 @@ - + https://dev.azure.com/dnceng/internal/_git/dotnet-runtime - c36b66f47588241680d564feaa2d589299adcd9c + 9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 0a8746499422..bf2fee3a149f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -72,7 +72,7 @@ 8.0.11 8.0.11 8.0.11 - 8.0.11-servicing.24514.23 + 8.0.11-servicing.24517.7 8.0.0 8.0.1 8.0.0 @@ -93,7 +93,7 @@ 8.0.0 8.0.0 8.0.0 - 8.0.11-servicing.24514.23 + 8.0.11-servicing.24517.7 8.0.1 8.0.1 8.0.1 @@ -109,7 +109,7 @@ 8.0.0 8.0.2 8.0.0 - 8.0.11-servicing.24514.23 + 8.0.11-servicing.24517.7 8.0.1 8.0.1 8.0.1 @@ -129,9 +129,9 @@ 8.0.0 8.0.0 8.0.0 - 8.0.11-servicing.24514.23 + 8.0.11-servicing.24517.7 - 8.0.11-servicing.24514.23 + 8.0.11-servicing.24517.7 8.0.0 8.0.1 From 49c3e206cdf565e780abae849304bd7110187bf5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 11:15:36 -0700 Subject: [PATCH 19/22] Update dependencies from https://github.com/dotnet/arcade build 20241016.1 (#58474) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 +++++++++---------- eng/Versions.props | 6 +++--- .../steps/get-delegation-sas.yml | 11 +++++++++- .../templates/steps/get-delegation-sas.yml | 11 +++++++++- global.json | 4 ++-- 5 files changed, 35 insertions(+), 17 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 36b29a4265cd..b895094f2b34 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -376,26 +376,26 @@ https://github.com/dotnet/winforms abda8e3bfa78319363526b5a5f86863ec979940e - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f - + https://github.com/dotnet/arcade - e5b13e054339e41d422212a0ecaf24fec20cb5a1 + f7fb1fec01b91be69e4dcc5290a0bff3f28e214f https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index a152549f4bcb..9a97f520a3e5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -162,9 +162,9 @@ 6.2.4 6.2.4 - 8.0.0-beta.24508.1 - 8.0.0-beta.24508.1 - 8.0.0-beta.24508.1 + 8.0.0-beta.24516.1 + 8.0.0-beta.24516.1 + 8.0.0-beta.24516.1 8.0.0-alpha.1.24510.2 diff --git a/eng/common/templates-official/steps/get-delegation-sas.yml b/eng/common/templates-official/steps/get-delegation-sas.yml index c0e8f91317f0..c690cc0a070c 100644 --- a/eng/common/templates-official/steps/get-delegation-sas.yml +++ b/eng/common/templates-official/steps/get-delegation-sas.yml @@ -28,7 +28,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/eng/common/templates/steps/get-delegation-sas.yml b/eng/common/templates/steps/get-delegation-sas.yml index c0e8f91317f0..c690cc0a070c 100644 --- a/eng/common/templates/steps/get-delegation-sas.yml +++ b/eng/common/templates/steps/get-delegation-sas.yml @@ -28,7 +28,16 @@ steps: # Calculate the expiration of the SAS token and convert to UTC $expiry = (Get-Date).AddHours(${{ parameters.expiryInHours }}).ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ssZ") - $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + # Temporarily work around a helix issue where SAS tokens with / in them will cause incorrect downloads + # of correlation payloads. https://github.com/dotnet/dnceng/issues/3484 + $sas = "" + do { + $sas = az storage container generate-sas --account-name ${{ parameters.storageAccount }} --name ${{ parameters.container }} --permissions ${{ parameters.permissions }} --expiry $expiry --auth-mode login --as-user -o tsv + if ($LASTEXITCODE -ne 0) { + Write-Error "Failed to generate SAS token." + exit 1 + } + } while($sas.IndexOf('/') -ne -1) if ($LASTEXITCODE -ne 0) { Write-Error "Failed to generate SAS token." diff --git a/global.json b/global.json index 6f596ec7c945..cbc2adc9d22b 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ }, "msbuild-sdks": { "Yarn.MSBuild": "1.22.19", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24508.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24508.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24516.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.24516.1" } } From 155b8bfc1300f815429a7221f51cdcc77c731298 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Fri, 18 Oct 2024 23:51:42 +0000 Subject: [PATCH 20/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20241018.7 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.11 -> To Version 8.0.11 --- NuGet.config | 2 -- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index e077ea1bdfa7..9d700893018d 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,6 @@ - @@ -37,7 +36,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fdedbcf4b2c8..d93006f819e0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b34321294f3d32444d9236c8935e159178b64658 + 3b21bdbca2e61c185d51f7317415415d28d2bc3c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b34321294f3d32444d9236c8935e159178b64658 + 3b21bdbca2e61c185d51f7317415415d28d2bc3c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b34321294f3d32444d9236c8935e159178b64658 + 3b21bdbca2e61c185d51f7317415415d28d2bc3c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b34321294f3d32444d9236c8935e159178b64658 + 3b21bdbca2e61c185d51f7317415415d28d2bc3c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b34321294f3d32444d9236c8935e159178b64658 + 3b21bdbca2e61c185d51f7317415415d28d2bc3c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b34321294f3d32444d9236c8935e159178b64658 + 3b21bdbca2e61c185d51f7317415415d28d2bc3c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b34321294f3d32444d9236c8935e159178b64658 + 3b21bdbca2e61c185d51f7317415415d28d2bc3c https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - b34321294f3d32444d9236c8935e159178b64658 + 3b21bdbca2e61c185d51f7317415415d28d2bc3c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime From 53c99d38123a63525e2e2a46157ff90e7971979f Mon Sep 17 00:00:00 2001 From: Sean Reeser Date: Mon, 21 Oct 2024 15:24:42 +0000 Subject: [PATCH 21/22] [internal/release/8.0] Updated NuGet.config - add feed for efcore 3b21bdbc --- NuGet.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NuGet.config b/NuGet.config index 9d700893018d..2989853cc75c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,6 +6,7 @@ + @@ -36,6 +37,7 @@ + From 809a6199125358b3217190d33d71a018d5369872 Mon Sep 17 00:00:00 2001 From: DotNet-Bot Date: Mon, 21 Oct 2024 22:46:23 +0000 Subject: [PATCH 22/22] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-efcore build 20241021.4 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 8.0.11 -> To Version 8.0.11 --- NuGet.config | 4 ++-- eng/Version.Details.xml | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2989853cc75c..bad334e8c9b3 100644 --- a/NuGet.config +++ b/NuGet.config @@ -6,7 +6,7 @@ - + @@ -37,7 +37,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d93006f819e0..08f471a66db1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -11,35 +11,35 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3b21bdbca2e61c185d51f7317415415d28d2bc3c + 5d020e763f00511c102f94fdf5bf525512d7daaf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3b21bdbca2e61c185d51f7317415415d28d2bc3c + 5d020e763f00511c102f94fdf5bf525512d7daaf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3b21bdbca2e61c185d51f7317415415d28d2bc3c + 5d020e763f00511c102f94fdf5bf525512d7daaf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3b21bdbca2e61c185d51f7317415415d28d2bc3c + 5d020e763f00511c102f94fdf5bf525512d7daaf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3b21bdbca2e61c185d51f7317415415d28d2bc3c + 5d020e763f00511c102f94fdf5bf525512d7daaf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3b21bdbca2e61c185d51f7317415415d28d2bc3c + 5d020e763f00511c102f94fdf5bf525512d7daaf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3b21bdbca2e61c185d51f7317415415d28d2bc3c + 5d020e763f00511c102f94fdf5bf525512d7daaf https://dev.azure.com/dnceng/internal/_git/dotnet-efcore - 3b21bdbca2e61c185d51f7317415415d28d2bc3c + 5d020e763f00511c102f94fdf5bf525512d7daaf https://dev.azure.com/dnceng/internal/_git/dotnet-runtime