Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[main] Update dependencies from dotnet/aspnetcore #45347

Merged
merged 14 commits into from
Dec 12, 2024
Merged

[main] Update dependencies from dotnet/aspnetcore #45347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
878c1bd
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 6, 2024
5e8f425
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 6, 2024
73cbacb
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 6, 2024
0a9c1ba
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 7, 2024
83df04e
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 7, 2024
964791c
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 9, 2024
5599940
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 9, 2024
ec7a8d9
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 10, 2024
1a65547
Disable crossgen on source-build for now
jkoritzinsky Dec 10, 2024
eeb80dc
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 11, 2024
9747444
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 11, 2024
234a12f
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 11, 2024
a658a75
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Dec 11, 2024
dda2d59
Add patch to use live crossgen2 in aspnetcore
jkoritzinsky Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 38 additions & 38 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,13 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.13.0-preview.1.84">
<Uri>https://github.com/nuget/nuget.client</Uri>
Expand Down Expand Up @@ -275,54 +275,54 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>26c755f308900a4c708498e58fa67f03c8eeeeed</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="dotnet-dev-certs" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="dotnet-user-jwts" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="dotnet-user-secrets" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24604.3">
Expand All @@ -343,21 +343,21 @@
<Sha>611248c0fae9720554c7a14a7408e20acf7b0eb7</Sha>
<SourceBuild RepoName="razor" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
<Uri>https://github.com/dotnet/test-templates</Uri>
Expand Down Expand Up @@ -539,9 +539,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>b66200e5448be50673b0387ca4632d3bfa25887b</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.24605.2">
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.24611.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-alpha.1.24570.9">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
26 changes: 13 additions & 13 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,19 +235,19 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24605.2</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24605.2</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24605.2</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24605.2</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24611.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24611.1</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24611.1</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24611.1</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
Expand Down
2 changes: 2 additions & 0 deletions src/SourceBuild/content/repo-projects/aspnetcore.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@

<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)no-build-repo-tasks</BuildArgs>
<!-- A source-build build can have a separate RID from the SDK that we're building against. This will cause the SDK to not be able to find a crossgen tool pack and fail to R2R: https://github.com/dotnet/source-build/issues/3793 -->
<BuildArgs>$(BuildArgs) /p:CrossgenOutput=false</BuildArgs>
</PropertyGroup>

<ItemGroup>
Expand Down
27 changes: 27 additions & 0 deletions src/SourceBuild/patches/aspnetcore/0001-Use-live-crossgen2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
From 85dd61748f2f589d99142bd4914e8225048e0c96 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <[email protected]>
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}</AspNetCorePackVersion>
</KnownAspNetCorePack>

- <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
+ <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
<Crossgen2PackVersion
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</Crossgen2PackVersion>
- <Crossgen2RuntimeIdentifiers>$(TargetRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
+ <Crossgen2RuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
</KnownCrossgen2Pack>

<KnownILLinkPack Update="Microsoft.NET.ILLink.Tasks" Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
Loading