diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94871caeefb2..37c5fa8cae2b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -135,13 +135,13 @@ https://github.com/dotnet/roslyn 911cf5f462960bdd01df1ea3c0d0c217b3c3838b - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 https://github.com/nuget/nuget.client @@ -275,54 +275,54 @@ https://github.com/dotnet/wpf 0f380f765da88c10a361920bec87c4103cf47037 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 @@ -343,21 +343,21 @@ 46efcec83821d7f0322c01bc9549de83e855dcac - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 @@ -509,9 +509,9 @@ https://github.com/dotnet/runtime 010e61a4f46d6d9b544cde169dc034417de7223a - + https://github.com/dotnet/aspnetcore - b2d50f7d2f36638fd2db5caf9cc8b759597058b7 + 6ce45ab5b1ae650552e0cb6d41ed25261fa799c4 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 468b45f140e1..7a222f5fc0f5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -219,19 +219,19 @@ - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 - 10.0.0-alpha.2.25061.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 + 10.0.0-alpha.2.25064.1 diff --git a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch index 5ca01e482b4e..d634b7b15161 100644 --- a/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch +++ b/src/SourceBuild/patches/aspnetcore/0001-update-jdk-version.patch @@ -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 { diff --git a/src/SourceBuild/patches/aspnetcore/0002-Enable-building-Hosting-Bundle-in-VMR.patch b/src/SourceBuild/patches/aspnetcore/0002-Enable-building-Hosting-Bundle-in-VMR.patch deleted file mode 100644 index 9dd054340a73..000000000000 --- a/src/SourceBuild/patches/aspnetcore/0002-Enable-building-Hosting-Bundle-in-VMR.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 6afaf38a1744e313bb6c10f7691bc55ced4dc3f1 Mon Sep 17 00:00:00 2001 -From: wtgodbe -Date: Mon, 13 Jan 2025 15:00:54 -0800 -Subject: [PATCH] Enable building Hosting Bundle in VMR - -Backport: https://github.com/dotnet/aspnetcore/pull/59857 - ---- - Directory.Build.props | 1 + - eng/Build.props | 14 +++++++++----- - eng/Publishing.props | 5 +++-- - .../WindowsHostingBundle.wixproj | 17 +++++++++++++---- - 4 files changed, 26 insertions(+), 11 deletions(-) - -diff --git a/Directory.Build.props b/Directory.Build.props -index 0321c8b193..b195586ed5 100644 ---- a/Directory.Build.props -+++ b/Directory.Build.props -@@ -239,6 +239,7 @@ - https://dotnetbuilds.blob.core.windows.net/public/ - https://dotnetbuilds.blob.core.windows.net/internal/ - -+ true - $(ArtifactsShippingPackagesDir) - - -diff --git a/eng/Build.props b/eng/Build.props -index 697c3d9ba0..87e19ef337 100644 ---- a/eng/Build.props -+++ b/eng/Build.props -@@ -59,7 +59,7 @@ - - - -- -+ - - -@@ -70,6 +70,14 @@ - - - -+ -+ -+ -+ Platform=x86 -+ $(DotNetBuildPass) -+ -+ -+ - - - -@@ -255,10 +263,6 @@ - - - -- -- -- -- - - - -diff --git a/eng/Publishing.props b/eng/Publishing.props -index 201e167159..a6a89bd0e9 100644 ---- a/eng/Publishing.props -+++ b/eng/Publishing.props -@@ -96,12 +96,13 @@ - - - -- - -- -+ - - -diff --git a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj -index 3389f389a7..5ef4167757 100644 ---- a/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj -+++ b/src/Installers/Windows/WindowsHostingBundle/WindowsHostingBundle.wixproj -@@ -99,18 +99,27 @@ - $(BundleNameFull) - - -+ -+ -+ $([MSBuild]::NormalizeDirectory('$(CrossArchitectureInstallerBasePath)', 'aspnetcore', 'Runtime', '$(SharedFxMsiVersion)')) -+ -+ -+ -+ $(CrossArchitectureInstallerBasePath) -+ -+ - -- -+ - x64 - SharedFxRedistInstallerx64 - $(SharedFxPackageVersion) - -- -+ - x86 - SharedFxRedistInstallerx86 - $(SharedFxPackageVersion) - -- -+ - arm64 - SharedFxRedistInstallerarm64 - $(SharedFxPackageVersion) -@@ -127,7 +136,7 @@ - $(DefineConstants);BundleRegManufacturer=$(BundleRegManufacturer) - $(DefineConstants);BundleRegFamily=$(BundleRegFamily) - $(DefineConstants);BundleRegName=$(BundleRegName) -- $(DefineConstants);CrossArchitectureInstallerBasePath=$(CrossArchitectureInstallerBasePath) -+ $(DefineConstants);CrossArchitectureInstallerBasePath=$(CrossArchitectureInstallerBasePathNormalized) - - - -