roslyn-ls: 4.13.0-3.24577.4 -> 4.13.0-3.25051.1 (#373293)

NixOS · Jan 13, 2025 · ba9f794 · ba9f794
2 parents f3ac713 + d9b2b97
commit ba9f794
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 24 deletions.
diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json
diff --git a/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch b/pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch
@@ -0,0 +1,45 @@
+diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props
+index 2dddaff1560..bc8fd1938d5 100644
+--- a/eng/targets/TargetFrameworks.props
++++ b/eng/targets/TargetFrameworks.props
+@@ -17,7 +17,7 @@
+     <NetVS>net8.0</NetVS>
+     <NetVSCode>net8.0</NetVSCode>
+     <NetVSShared>net8.0</NetVSShared>
+-    <NetRoslynBuildHostNetCoreVersion>net6.0</NetRoslynBuildHostNetCoreVersion>
++    <NetRoslynBuildHostNetCoreVersion>net8.0</NetRoslynBuildHostNetCoreVersion>
+     <NetRoslynNext>net9.0</NetRoslynNext>
+   </PropertyGroup>
+
+diff --git a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
+index 8101f56b8be..1733955dc3d 100644
+--- a/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
++++ b/src/Workspaces/Core/MSBuild.BuildHost/Microsoft.CodeAnalysis.Workspaces.MSBuild.BuildHost.csproj
+@@ -28,6 +28,12 @@
+     -->
+     <_MsbuildVersion>17.3.4</_MsbuildVersion>
+   </PropertyGroup>
++  <PropertyGroup>
++    <_MsbuildFramework>$(TargetFramework)</_MsbuildFramework>
++  </PropertyGroup>
++  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'">
++    <_MsbuildFramework>net6.0</_MsbuildFramework>
++  </PropertyGroup>
+   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
+     <PackageReference Include="Microsoft.Build" VersionOverride="$(_MsbuildVersion)" ExcludeAssets="Runtime" PrivateAssets="All" />
+     <PackageReference Include="Microsoft.Build.Framework" VersionOverride="$(_MsbuildVersion)" ExcludeAssets="Runtime" />
+@@ -36,10 +42,10 @@
+   </ItemGroup>
+   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' != 'true'">
+     <!-- Reference MSBuild directly to avoid redistributing its package closure and including the dependencies in deps.json file. -->
+-    <PackageDownloadAndReference Include="Microsoft.Build" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
+-    <PackageDownloadAndReference Include="Microsoft.Build.Framework" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
+-    <PackageDownloadAndReference Include="Microsoft.Build.Tasks.Core" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
+-    <PackageDownloadAndReference Include="Microsoft.Build.Utilities.Core" Version="$(_MsbuildVersion)" Folder="ref/$(TargetFramework)" />
++    <PackageDownloadAndReference Include="Microsoft.Build" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
++    <PackageDownloadAndReference Include="Microsoft.Build.Framework" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
++    <PackageDownloadAndReference Include="Microsoft.Build.Tasks.Core" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
++    <PackageDownloadAndReference Include="Microsoft.Build.Utilities.Core" Version="$(_MsbuildVersion)" Folder="ref/$(_MsbuildFramework)" />
+   </ItemGroup>
+   <ItemGroup>
+     <PackageReference Include="Microsoft.Build.Locator" PrivateAssets="All" />
diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix
@@ -18,9 +18,6 @@ let
         (combinePackages [
           sdk_9_0
           sdk_8_0
-          # NOTE: we should be able to remove net6.0 after upstream removes from here:
-          # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20
-          sdk_6_0
         ])
         packages
         targetPackages
@@ -35,24 +32,28 @@ in
 buildDotnetModule rec {
   inherit pname dotnet-sdk dotnet-runtime;
 
-  vsVersion = "2.59.14";
+  vsVersion = "2.61.27";
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "roslyn";
     rev = "VSCode-CSharp-${vsVersion}";
-    hash = "sha256-tzBIqXBtPGupBBvHTFO93w6f5qCgllWY420xtjf9o3g=";
+    hash = "sha256-mqlCfgymhH/pR/GW3qZd0rmLdNezgVGZS6Q6zaNor8E=";
   };
 
   # versioned independently from vscode-csharp
   # "roslyn" in here:
   # https://github.com/dotnet/vscode-csharp/blob/main/package.json
-  version = "4.13.0-3.24577.4";
+  version = "4.13.0-3.25051.1";
   projectFile = "src/LanguageServer/${project}/${project}.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;
 
   nativeBuildInputs = [ jq ];
 
+  # until upstream updates net6.0 here:
+  # https://github.com/dotnet/roslyn/blob/6cc106c0eaa9b0ae070dba3138a23aeab9b50c13/eng/targets/TargetFrameworks.props#L20
+  patches = [ ./force-sdk_8_0.patch ];
+
   postPatch = ''
     # Upstream uses rollForward = latestPatch, which pins to an *exact* .NET SDK version.
     jq '.sdk.rollForward = "latestMinor"' < global.json > global.json.tmp