From e11b6dbbfd526e0e1ed925bbb6cebb911b2c80dd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 14 Dec 2024 06:32:23 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/aspnetcore (#45430) Co-authored-by: dotnet-maestro[bot] Co-authored-by: Jeremy Koritzinsky --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 26 +++---- .../aspnetcore/0001-Use-live-crossgen2.patch | 27 ------- 3 files changed, 51 insertions(+), 78 deletions(-) delete mode 100644 src/SourceBuild/patches/aspnetcore/0001-Use-live-crossgen2.patch diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f882ce289b22..2b53d3abb2d9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 543cb4568f28b0d2f2cfecdf2d56365b9252e848 - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf c6bff274b42ea186c4a53aab6e6447cf92aeb1e1 - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace @@ -343,21 +343,21 @@ 60d689b3add229efff4c6ab7611dbc615961fa2c - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace https://github.com/dotnet/test-templates @@ -539,9 +539,9 @@ https://github.com/dotnet/runtime f30cfc0616bd9a50bdeb96049afff04cd5e2a8d9 - + https://github.com/dotnet/aspnetcore - 61be94cbcb4726afaa107f91c349fc4328263b44 + eaf6162a67070674192b5799df3fa3a02a762ace https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index e1fcdcc380ca..aa09876e2d9d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -235,19 +235,19 @@ - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 - 10.0.0-alpha.2.24611.1 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 + 10.0.0-alpha.2.24613.6 diff --git a/src/SourceBuild/patches/aspnetcore/0001-Use-live-crossgen2.patch b/src/SourceBuild/patches/aspnetcore/0001-Use-live-crossgen2.patch deleted file mode 100644 index 204d1c1af2ae..000000000000 --- a/src/SourceBuild/patches/aspnetcore/0001-Use-live-crossgen2.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 85dd61748f2f589d99142bd4914e8225048e0c96 Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Wed, 11 Dec 2024 14:12:35 -0800 -Subject: [PATCH] Use a live crossgen2 always - -Backport: https://github.com/dotnet/aspnetcore/pull/59447 ---- - eng/tools/GenerateFiles/Directory.Build.targets.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in -index 52f289a4acdd..88f09a8c8914 100644 ---- a/eng/tools/GenerateFiles/Directory.Build.targets.in -+++ b/eng/tools/GenerateFiles/Directory.Build.targets.in -@@ -105,10 +105,10 @@ - Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftAspNetCoreAppRuntimeVersion} - - -- -+ - ${MicrosoftNETCoreAppRuntimeVersion} -- $(TargetRuntimeIdentifier) -+ $(TargetRuntimeIdentifier) - - -