diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6c0b7dadb4b2..e6499254d8e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -97,47 +97,47 @@ 7abe97c385a57f3d43941c50259e24cd90997156 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 - + https://github.com/dotnet/roslyn - 6908aead3a8b313798c381d5e435e9e6068301a7 + b5e48cce69950f6f8cf8b6c6919cddf4c03a2f48 https://github.com/dotnet/aspnetcore diff --git a/eng/Versions.props b/eng/Versions.props index c036bea9993c..e10c89dca36b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -213,15 +213,15 @@ - 4.14.0-1.25070.2 - 4.14.0-1.25070.2 - 4.14.0-1.25070.2 - 4.14.0-1.25070.2 - 4.14.0-1.25070.2 - 4.14.0-1.25070.2 - 4.14.0-1.25070.2 - 4.14.0-1.25070.2 - 4.14.0-1.25070.2 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 + 4.14.0-2.25081.4 diff --git a/src/SourceBuild/patches/roslyn/0001-Use-BaseOS-instead-of-TargetRid-when-its-available.patch b/src/SourceBuild/patches/roslyn/0001-Use-BaseOS-instead-of-TargetRid-when-its-available.patch deleted file mode 100644 index cf2d19f1ce75..000000000000 --- a/src/SourceBuild/patches/roslyn/0001-Use-BaseOS-instead-of-TargetRid-when-its-available.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fe7b6d17a00a69b6bb8cb25d640af56f74a60032 Mon Sep 17 00:00:00 2001 -From: Jeremy Koritzinsky -Date: Tue, 21 Jan 2025 11:31:58 -0800 -Subject: [PATCH] Use BaseOS instead of TargetRid when its available. - -In Source Build, BaseOS is the portable runtime identifier for TargetRid. - -Backport: https://github.com/dotnet/roslyn/pull/76838 - ---- - .../Microsoft.CodeAnalysis.LanguageServer.csproj | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj -index 9b556fcdb8f..a76305b4a29 100644 ---- a/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj -+++ b/src/LanguageServer/Microsoft.CodeAnalysis.LanguageServer/Microsoft.CodeAnalysis.LanguageServer.csproj -@@ -45,12 +45,13 @@ - $(ArtifactsDir)/LanguageServer/$(Configuration)/$(TargetFramework)/neutral - - -- - $(TargetRid) -- win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64 -+ $(BaseOS) -+ win-x64;win-arm64;linux-x64;linux-arm64;linux-musl-x64;linux-musl-arm64;osx-x64;osx-arm64 - - true -