Skip to content

[main] Update dependencies from dotnet/aspnetcore #45917

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

Merged
merged 13 commits into from
Jan 14, 2025
Merged

[main] Update dependencies from dotnet/aspnetcore #45917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
87339ef
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Jan 13, 2025
bb1453d
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Jan 13, 2025
9776479
Update 0001-update-jdk-version.patch
ViktorHofer Jan 13, 2025
fd2fadc
Reduce lines of context in aspnetcore git patch
ViktorHofer Jan 13, 2025
e50ccd2
Merge branch 'main' into darc-main-14c3ab0e-1ad1-4b34-8fcb-c973140a539f
ViktorHofer Jan 13, 2025
53d43ec
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Jan 13, 2025
76d3797
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Jan 14, 2025
5bba150
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Jan 14, 2025
8eaeba0
Update dependencies from https://github.com/dotnet/aspnetcore build 2…
dotnet-maestro[bot] Jan 14, 2025
a1b38c6
Delete src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch
ViktorHofer Jan 14, 2025
190f1f0
Revert "Delete src/SourceBuild/patches/aspnetcore/0001-update-jdk-ver…
ViktorHofer Jan 14, 2025
da9ca4d
Merge remote-tracking branch 'origin/main' into darc-main-14c3ab0e-1a…
ViktorHofer Jan 14, 2025
f129f17
Remove 0002-Enable-building-Hosting-Bundle-in-VMR patch
ViktorHofer Jan 14, 2025
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>911cf5f462960bdd01df1ea3c0d0c217b3c3838b</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.TestHost" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.Build.NuGetSdkResolver" Version="6.13.0-rc.113">
<Uri>https://github.com/nuget/nuget.client</Uri>
Expand Down Expand Up @@ -275,54 +275,54 @@
<Uri>https://github.com/dotnet/wpf</Uri>
<Sha>0f380f765da88c10a361920bec87c4103cf47037</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.App.Ref" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.App.Ref.Internal" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="VS.Redist.Common.AspNetCore.SharedFramework.x64.10.0" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="dotnet-dev-certs" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="dotnet-dev-certs" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="dotnet-user-jwts" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="dotnet-user-jwts" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="dotnet-user-secrets" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="dotnet-user-secrets" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.Analyzers" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.Components.SdkAnalyzers" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.Mvc.Analyzers" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.Mvc.Api.Analyzers" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.aspnetcore" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
<SourceBuild RepoName="aspnetcore" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.CodeAnalysis.Razor.Tooling.Internal" Version="9.0.0-preview.25058.6">
Expand All @@ -343,21 +343,21 @@
<Sha>46efcec83821d7f0322c01bc9549de83e855dcac</Sha>
<SourceBuild RepoName="razor" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.Authorization" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.AspNetCore.Components.Web" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.JSInterop" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via windowsdesktop -->
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="10.0.0-alpha.1.25061.2" CoherentParentDependency="Microsoft.WindowsDesktop.App.Runtime.win-x64">
Expand Down Expand Up @@ -509,9 +509,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>010e61a4f46d6d9b544cde169dc034417de7223a</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.25061.1">
<Dependency Name="Microsoft.Extensions.ObjectPool" Version="10.0.0-alpha.2.25064.1">
<Uri>https://github.com/dotnet/aspnetcore</Uri>
<Sha>b2d50f7d2f36638fd2db5caf9cc8b759597058b7</Sha>
<Sha>6ce45ab5b1ae650552e0cb6d41ed25261fa799c4</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.SystemEvents" Version="10.0.0-alpha.1.25062.3">
<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 @@ -220,19 +220,19 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/aspnet/AspNetCore -->
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.25061.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.25061.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.25061.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.25061.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.25061.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.25061.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.25061.1</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.25061.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.25061.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.25061.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.25061.1</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.25061.1</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.25061.1</dotnetusersecretsPackageVersion>
<MicrosoftAspNetCoreAppRefPackageVersion>10.0.0-alpha.2.25064.1</MicrosoftAspNetCoreAppRefPackageVersion>
<MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>10.0.0-alpha.2.25064.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
<MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>10.0.0-alpha.2.25064.1</MicrosoftAspNetCoreComponentsSdkAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcAnalyzersPackageVersion>10.0.0-alpha.2.25064.1</MicrosoftAspNetCoreMvcAnalyzersPackageVersion>
<MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>10.0.0-alpha.2.25064.1</MicrosoftAspNetCoreMvcApiAnalyzersPackageVersion>
<MicrosoftAspNetCoreAnalyzersPackageVersion>10.0.0-alpha.2.25064.1</MicrosoftAspNetCoreAnalyzersPackageVersion>
<MicrosoftAspNetCoreTestHostPackageVersion>10.0.0-alpha.2.25064.1</MicrosoftAspNetCoreTestHostPackageVersion>
<MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>10.0.0-alpha.2.25064.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
<MicrosoftAspNetCoreAppRefInternalPackageVersion>10.0.0-alpha.2.25064.1</MicrosoftAspNetCoreAppRefInternalPackageVersion>
<VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>10.0.0-alpha.2.25064.1</VSRedistCommonAspNetCoreSharedFrameworkx64100PackageVersion>
<dotnetdevcertsPackageVersion>10.0.0-alpha.2.25064.1</dotnetdevcertsPackageVersion>
<dotnetuserjwtsPackageVersion>10.0.0-alpha.2.25064.1</dotnetuserjwtsPackageVersion>
<dotnetusersecretsPackageVersion>10.0.0-alpha.2.25064.1</dotnetusersecretsPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependencies from https://github.com/dotnet/razor -->
Expand Down
12 changes: 2 additions & 10 deletions src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,17 @@ diff --git a/global.json b/global.json
index c1270224e3..bd7a41270d 100644
--- a/global.json
+++ b/global.json
@@ -24,7 +24,7 @@
"xcopy-msbuild": "17.8.5"
},
@@ -26,3 +26,3 @@
"native-tools": {
- "jdk": "11.0.24"
+ "jdk": "latest"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25056.1",
diff --git a/src/SignalR/clients/java/signalr/build.gradle b/src/SignalR/clients/java/signalr/build.gradle
index 895f8c4338..3e192445c9 100644
--- a/src/SignalR/clients/java/signalr/build.gradle
+++ b/src/SignalR/clients/java/signalr/build.gradle
@@ -22,7 +22,7 @@ allprojects {
version project.findProperty('packageVersion') ?: "99.99.99-dev"

@@ -24,3 +24,3 @@ allprojects {
java {
- sourceCompatibility = 1.8
+ sourceCompatibility = 1.9
}

repositories {
Loading
Loading