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

Jump to bottom

[main] Update dependencies from dotnet/aspnetcore #42842

Closed
wants to merge 38 commits into from
Closed

[main] Update dependencies from dotnet/aspnetcore #42842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
ba15532
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 23, 2024
a1ad657
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 23, 2024
30f2f0b
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 23, 2024
47349d7
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 23, 2024
6015914
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 23, 2024
614e0b5
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 24, 2024
4f45bbe
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 24, 2024
2670841
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 24, 2024
cb2d386
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 25, 2024
2273042
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 26, 2024
693324f
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 26, 2024
266673f
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 26, 2024
3f0ff61
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 26, 2024
56b2f9d
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 26, 2024
81e7164
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 27, 2024
71cdf9f
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 28, 2024
fb102ae
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 28, 2024
203a271
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Sep 30, 2024
f35b593
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 1, 2024
2df5c84
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 1, 2024
d506613
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 1, 2024
30c473d
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 2, 2024
39e797c
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 2, 2024
b3a366f
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 2, 2024
b5324e1
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 2, 2024
5699cba
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 3, 2024
c74281d
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 3, 2024
5f1eead
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 3, 2024
3825ab5
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 3, 2024
223fb85
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 3, 2024
99aa7fa
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 4, 2024
e64c67a
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 4, 2024
7fb6ea4
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Oct 5, 2024
f1e27a3
Merge remote-tracking branch 'origin/main' into darc-main-8bfea056-14…
nagilson Oct 7, 2024
295819a
Merge branch 'main' into darc-main-8bfea056-14e2-4cbc-b6bc-a50f533aa438
nagilson Oct 7, 2024
51c9534
Keep aspnetcore pinned to 9 until the sdk can target 10
nagilson Oct 7, 2024
49c9904
Use 9.0 XPLAT And Test Host for Runtime Test
nagilson Oct 7, 2024
d0dd525
Merge branch 'main' into darc-main-8bfea056-14e2-4cbc-b6bc-a50f533aa438
nagilson Oct 7, 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
69 changes: 35 additions & 34 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@
<Uri>https://github.com/dotnet/roslyn</Uri>
<Sha>6a9d2b077973e31b213517579f674b461053ac1c</Sha>
</Dependency>
</Dependency>
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
See https://github.com/dotnet/sdk/issues/42920. -->
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="9.0.0-rc.1.24452.1" Pinned="true">
Expand Down Expand Up @@ -281,54 +282,54 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>ce09c88c666057407b355ea86e1ad8713ac674a1</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="dotnet-dev-certs" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="dotnet-user-jwts" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="dotnet-user-secrets" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.24502.5">
Expand All @@ -349,21 +350,21 @@
<Sha>f266ffb956e3704b1473d572cd3015fc0ee8b3be</Sha>
<SourceBuild RepoName="razor" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</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 @@ -545,9 +546,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d22c74dc974a757b48380a01dd0450efba31db64</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.24501.14">
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.24504.5">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>03a9832f53a9dd12cc7815596dd78fcee8c29f4a</Sha>
<Sha>c2702edd46640379d968f0a17b6d42d87930b4bd</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-alpha.1.24476.2">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,19 +253,19 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24501.14</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.24504.5</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>9.0.0-rc.1.24452.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24501.14</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24501.14</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24501.14</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24501.14</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.24504.5</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.24504.5</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.24504.5</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.24504.5</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>9.0.0-rc.1.24452.1</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24501.14</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24501.14</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.24501.14</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24501.14</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24501.14</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24501.14</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.24504.5</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.24504.5</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>10.0.0-alpha.2.24422.4</VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion>
Copy link
Member

@wtgodbe wtgodbe Aug 22, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Need to change the name of this prop too (to VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion), and replace its usage in places like

sdk/src/Installer/redist-installer/targets/GenerateLayout.targets

Line 12 in 606560e

<AspNetCoreBlobVersion>$(VSRedistCommonAspNetCoreSharedFrameworkx6490PackageVersion)</AspNetCoreBlobVersion>

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When I update things like this I try to hoist all the variables that changes names up to Versions.props to avoid having to search through everything again in a year

<dotnetdevcertsPackageVersion>10.0.0-alpha.2.24504.5</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.24504.5</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.24504.5</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
Expand Down
Loading