Skip to content

Commit 873df55

Browse files
dotnet-maestro[bot]jkoritzinsky
dotnet-maestro[bot]
and
jkoritzinsky
authored
[main] Update dependencies from dotnet/aspnetcore (#45347)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jeremy Koritzinsky <[email protected]> Co-authored-by: Jeremy Koritzinsky <[email protected]>
1 parent 3684341 commit 873df55

File tree

4 files changed

+80
-51
lines changed

4 files changed

+80
-51
lines changed

‎eng/Version.Details.xml‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -135,13 +135,13 @@
135135
<Uri>https://github.com/dotnet/roslyn</Uri>
136136
<Sha>543cb4568f28b0d2f2cfecdf2d56365b9252e848</Sha>
137137
</Dependency>
138-
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24605.2">
138+
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.24611.1">
139139
<Uri>https://github.com/dotnet/aspnetcore</Uri>
140-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
140+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
141141
</Dependency>
142-
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.24605.2">
142+
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.24611.1">
143143
<Uri>https://github.com/dotnet/aspnetcore</Uri>
144-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
144+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
145145
</Dependency>
146146
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.13.0-rc.90">
147147
<Uri>https://github.com/nuget/nuget.client</Uri>
@@ -275,54 +275,54 @@
275275
<Uri>https://github.com/dotnet/wpf</Uri>
276276
<Sha>c6bff274b42ea186c4a53aab6e6447cf92aeb1e1</Sha>
277277
</Dependency>
278-
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24605.2">
278+
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24611.1">
279279
<Uri>https://github.com/dotnet/aspnetcore</Uri>
280-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
280+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
281281
</Dependency>
282-
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-alpha.2.24605.2">
282+
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-alpha.2.24611.1">
283283
<Uri>https://github.com/dotnet/aspnetcore</Uri>
284-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
284+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
285285
</Dependency>
286-
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-alpha.2.24605.2">
286+
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-alpha.2.24611.1">
287287
<Uri>https://github.com/dotnet/aspnetcore</Uri>
288-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
288+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
289289
</Dependency>
290-
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.2.24605.2">
290+
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.2.24611.1">
291291
<Uri>https://github.com/dotnet/aspnetcore</Uri>
292-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
292+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
293293
</Dependency>
294-
<Dependency Name="dotnet-dev-certs" Version="10.0.0-alpha.2.24605.2">
294+
<Dependency Name="dotnet-dev-certs" Version="10.0.0-alpha.2.24611.1">
295295
<Uri>https://github.com/dotnet/aspnetcore</Uri>
296-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
296+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
297297
</Dependency>
298-
<Dependency Name="dotnet-user-jwts" Version="10.0.0-alpha.2.24605.2">
298+
<Dependency Name="dotnet-user-jwts" Version="10.0.0-alpha.2.24611.1">
299299
<Uri>https://github.com/dotnet/aspnetcore</Uri>
300-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
300+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
301301
</Dependency>
302-
<Dependency Name="dotnet-user-secrets" Version="10.0.0-alpha.2.24605.2">
302+
<Dependency Name="dotnet-user-secrets" Version="10.0.0-alpha.2.24611.1">
303303
<Uri>https://github.com/dotnet/aspnetcore</Uri>
304-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
304+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
305305
</Dependency>
306-
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="10.0.0-alpha.2.24605.2">
306+
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="10.0.0-alpha.2.24611.1">
307307
<Uri>https://github.com/dotnet/aspnetcore</Uri>
308-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
308+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
309309
</Dependency>
310-
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="10.0.0-alpha.2.24605.2">
310+
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="10.0.0-alpha.2.24611.1">
311311
<Uri>https://github.com/dotnet/aspnetcore</Uri>
312-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
312+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
313313
</Dependency>
314-
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="10.0.0-alpha.2.24605.2">
314+
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="10.0.0-alpha.2.24611.1">
315315
<Uri>https://github.com/dotnet/aspnetcore</Uri>
316-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
316+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
317317
</Dependency>
318-
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="10.0.0-alpha.2.24605.2">
318+
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="10.0.0-alpha.2.24611.1">
319319
<Uri>https://github.com/dotnet/aspnetcore</Uri>
320-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
320+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
321321
</Dependency>
322322
<!-- Intermediate is necessary for source build. -->
323-
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.24605.2">
323+
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.24611.1">
324324
<Uri>https://github.com/dotnet/aspnetcore</Uri>
325-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
325+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
326326
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
327327
</Dependency>
328328
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24605.1">
@@ -343,21 +343,21 @@
343343
<Sha>acf6972501eb279605fc8345a7e412c15e06b94a</Sha>
344344
<SourceBuild RepoName="razor" ManagedOnly="true" />
345345
</Dependency>
346-
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.24605.2">
346+
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.24611.1">
347347
<Uri>https://github.com/dotnet/aspnetcore</Uri>
348-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
348+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
349349
</Dependency>
350-
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.24605.2">
350+
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.24611.1">
351351
<Uri>https://github.com/dotnet/aspnetcore</Uri>
352-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
352+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
353353
</Dependency>
354-
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.24605.2">
354+
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.24611.1">
355355
<Uri>https://github.com/dotnet/aspnetcore</Uri>
356-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
356+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
357357
</Dependency>
358-
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.24605.2">
358+
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.24611.1">
359359
<Uri>https://github.com/dotnet/aspnetcore</Uri>
360-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
360+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
361361
</Dependency>
362362
<Dependency Name="Microsoft.DotNet.Test.ProjectTemplates.2.1" Version="1.0.2-beta4.22406.1">
363363
<Uri>https://github.com/dotnet/test-templates</Uri>
@@ -539,9 +539,9 @@
539539
<Uri>https://github.com/dotnet/runtime</Uri>
540540
<Sha>920a17ac91440abb5b34109104e72da77ec58b59</Sha>
541541
</Dependency>
542-
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.24605.2">
542+
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.24611.1">
543543
<Uri>https://github.com/dotnet/aspnetcore</Uri>
544-
<Sha>ec77307b34ff97c6270638077ab062dc78544a81</Sha>
544+
<Sha>61be94cbcb4726afaa107f91c349fc4328263b44</Sha>
545545
</Dependency>
546546
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-alpha.1.24610.2">
547547
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -235,19 +235,19 @@
235235
</PropertyGroup>
236236
<PropertyGroup>
237237
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
238-
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreAppRefPackageVersion>
239-
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
240-
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
241-
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
242-
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
243-
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreAnalyzersPackageVersion>
244-
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreTestHostPackageVersion>
245-
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246-
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24605.2</MicrosoftAspNetCoreAppRefInternalPackageVersion>
247-
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24605.2</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
248-
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24605.2</dotnetdevcertsPackageVersion>
249-
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24605.2</dotnetuserjwtsPackageVersion>
250-
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24605.2</dotnetusersecretsPackageVersion>
238+
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRefPackageVersion>
239+
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
240+
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
241+
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
242+
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
243+
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
244+
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreTestHostPackageVersion>
245+
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
246+
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24611.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
247+
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24611.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
248+
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24611.1</dotnetdevcertsPackageVersion>
249+
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24611.1</dotnetuserjwtsPackageVersion>
250+
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24611.1</dotnetusersecretsPackageVersion>
251251
</PropertyGroup>
252252
<PropertyGroup>
253253
<!-- Dependencies from https://github.com/dotnet/razor -->

‎src/SourceBuild/content/repo-projects/aspnetcore.proj‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030

3131
<PropertyGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
3232
<BuildArgs>$(BuildArgs) $(FlagParameterPrefix)no-build-repo-tasks</BuildArgs>
33+
<!-- 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 -->
34+
<BuildArgs>$(BuildArgs) /p:CrossgenOutput=false</BuildArgs>
3335
</PropertyGroup>
3436

3537
<ItemGroup>

‎src/SourceBuild/patches/aspnetcore/0001-Use-live-crossgen2.patch‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
From 85dd61748f2f589d99142bd4914e8225048e0c96 Mon Sep 17 00:00:00 2001
2+
From: Jeremy Koritzinsky <[email protected]>
3+
Date: Wed, 11 Dec 2024 14:12:35 -0800
4+
Subject: [PATCH] Use a live crossgen2 always
5+
6+
Backport: https://github.com/dotnet/aspnetcore/pull/59447
7+
---
8+
eng/tools/GenerateFiles/Directory.Build.targets.in | 4 ++--
9+
1 file changed, 2 insertions(+), 2 deletions(-)
10+
11+
diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in
12+
index 52f289a4acdd..88f09a8c8914 100644
13+
--- a/eng/tools/GenerateFiles/Directory.Build.targets.in
14+
+++ b/eng/tools/GenerateFiles/Directory.Build.targets.in
15+
@@ -105,10 +105,10 @@
16+
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftAspNetCoreAppRuntimeVersion}</AspNetCorePackVersion>
17+
</KnownAspNetCorePack>
18+
19+
- <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2" Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">
20+
+ <KnownCrossgen2Pack Update="Microsoft.NETCore.App.Crossgen2">
21+
<Crossgen2PackVersion
22+
Condition=" '%(TargetFramework)' == '${DefaultNetCoreTargetFramework}' ">${MicrosoftNETCoreAppRuntimeVersion}</Crossgen2PackVersion>
23+
- <Crossgen2RuntimeIdentifiers>$(TargetRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
24+
+ <Crossgen2RuntimeIdentifiers Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">$(TargetRuntimeIdentifier)</Crossgen2RuntimeIdentifiers>
25+
</KnownCrossgen2Pack>
26+
27+
<KnownILLinkPack Update="Microsoft.NET.ILLink.Tasks" Condition=" '$(DotNetBuildSourceOnly)' == 'true' ">

0 commit comments

Comments
 (0)