Skip to content

Re-Bootstrap Source Build to .NET 10.0.100-preview.4.25210.1 #48395

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 2 commits into from
Apr 14, 2025
Merged

Re-Bootstrap Source Build to .NET 10.0.100-preview.4.25210.1 #48395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e39018e
Re-Bootstrap Source Build to .NET 10.0.100-preview.4.25210.1
dotnet-sb-bot Apr 11, 2025
2a17f2a
Add aspnetcore patch
ViktorHofer Apr 12, 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
6 changes: 3 additions & 3 deletions src/SourceBuild/content/eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25202.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25209.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fddad170a95109a19a1fee78a83a87cd2e2bb79</Sha>
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.VersionTools" Version="10.0.0-beta.25110.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>3fddad170a95109a19a1fee78a83a87cd2e2bb79</Sha>
<Sha>03b4b258fc72e5663f2ad701df5d70129aa2df8a</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
are not necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltSdkVersion>10.0.100-preview.4.25203.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>10.0.100-preview.4.25203.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltSdkVersion>10.0.100-preview.4.25210.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>10.0.100-preview.4.25210.1</PrivateSourceBuiltArtifactsVersion>
<!-- arcade dependencies -->
<MicrosoftDotNetVersionToolsVersion>10.0.0-beta.25110.3</MicrosoftDotNetVersionToolsVersion>
<!-- command-line-api dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"tools": {
"dotnet": "10.0.100-preview.4.25203.20"
"dotnet": "10.0.100-preview.4.25209.46"
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
"Microsoft.Build.Traversal": "3.4.0",
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25202.1"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25209.3"
}
}
24 changes: 24 additions & 0 deletions src/SourceBuild/patches/aspnetcore/0001-nuprune-warning.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
From 479ec304ff25b58728f6b3ec8cd33a604f953ec1 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <[email protected]>
Date: Sat, 12 Apr 2025 10:08:34 +0200
Subject: [PATCH] Resolve NU1510 as System.Net.ServerSentEvents is inbox now

Backport: https://github.com/dotnet/aspnetcore/pull/61467

---
.../src/Microsoft.AspNetCore.Http.Connections.Client.csproj | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj b/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
index 7c9977be80e2..4086df48687e 100644
--- a/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
+++ b/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
@@ -25,7 +25,7 @@
<Reference Include="Microsoft.AspNetCore.Http.Connections.Common" />
<Reference Include="Microsoft.Extensions.Logging.Abstractions" />
<Reference Include="Microsoft.Extensions.Options" />
- <Reference Include="System.Net.ServerSentEvents" />
+ <Reference Include="System.Net.ServerSentEvents" Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''">
Loading