Unverified Commit d9b2b97a authored by Konrad Malik's avatar Konrad Malik
Browse files

roslyn-ls: 4.13.0-3.24577.4 -> 4.13.0-3.25051.1 

Added a git-patch to drop net6.0 dependency, which is now EOL.
See https://github.com/NixOS/nixpkgs/pull/372476#issuecomment-2583766551
parent 0581f467

pkgs/by-name/ro/roslyn-ls/deps.json

+12 −18
Original line number Diff line number Diff line
@@ -329,12 +329,6 @@ 
    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.0/microsoft.netcore.targets.1.1.0.nupkg"

  },

  {

    "pname": "Microsoft.NETCore.Targets",

    "version": "1.1.3",

    "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc=",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.targets/1.1.3/microsoft.netcore.targets.1.1.3.nupkg"

  },

  {

    "pname": "Microsoft.NETFramework.ReferenceAssemblies",

    "version": "1.0.3",
@@ -409,9 +403,9 @@ 
  },

  {

    "pname": "Microsoft.VisualStudio.Telemetry",

    "version": "17.12.32",

    "hash": "sha256-HkAQyMovZEABmgcaaSo/DOyRbx+pyVOZGxEm7GEKd2E=",

    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.12.32/microsoft.visualstudio.telemetry.17.12.32.nupkg"

    "version": "17.13.28",

    "hash": "sha256-DAmV0dT0Bw+BITSQbL/26055k2tAXtIfhnBmv1DwrA8=",

    "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.visualstudio.telemetry/17.13.28/microsoft.visualstudio.telemetry.17.13.28.nupkg"

  },

  {

    "pname": "Microsoft.VisualStudio.Threading",
@@ -427,9 +421,9 @@ 
  },

  {

    "pname": "Microsoft.VisualStudio.Utilities.Internal",

    "version": "16.3.73",

    "hash": "sha256-zwk4jWuCw2ANhG00TnwT9JE7n/h2EQkYKeq6o966ilo=",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.73/microsoft.visualstudio.utilities.internal.16.3.73.nupkg"

    "version": "16.3.90",

    "hash": "sha256-3OkOduGmMmenv73Yidzz6dvbRISyjo+hGRYhWOFmV4s=",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.visualstudio.utilities.internal/16.3.90/microsoft.visualstudio.utilities.internal.16.3.90.nupkg"

  },

  {

    "pname": "Microsoft.VisualStudio.Validation",
@@ -991,9 +985,9 @@ 
  },

  {

    "pname": "System.Private.Uri",

    "version": "4.3.2",

    "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU=",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.2/system.private.uri.4.3.2.nupkg"

    "version": "4.3.0",

    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.private.uri/4.3.0/system.private.uri.4.3.0.nupkg"

  },

  {

    "pname": "System.Reflection",
@@ -1159,9 +1153,9 @@ 
  },

  {

    "pname": "System.Text.Json",

    "version": "8.0.4",

    "hash": "sha256-g5oT7fbXxQ9Iah1nMCr4UUX/a2l+EVjJyTrw3FTbIaI=",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.4/system.text.json.8.0.4.nupkg"

    "version": "8.0.5",

    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=",

    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/system.text.json/8.0.5/system.text.json.8.0.5.nupkg"

  },

  {

    "pname": "System.Threading",

pkgs/by-name/ro/roslyn-ls/force-sdk_8_0.patch

0 → 100644
+45 −0
Original line number Diff line number Diff line 
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" />

pkgs/by-name/ro/roslyn-ls/package.nix

+7 −6
Original line number Diff line number Diff line
@@ -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