diff --git a/pkgs/by-name/ro/roslyn-ls/deps.json b/pkgs/by-name/ro/roslyn-ls/deps.json index dc33763e9741ac..606814476f120c 100644 --- a/pkgs/by-name/ro/roslyn-ls/deps.json +++ b/pkgs/by-name/ro/roslyn-ls/deps.json @@ -59,36 +59,36 @@ "hash": "sha256-OHQd2npzibOaNSR2sq3NrKKtAALOmnIARmFoBaXiJ0k=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build/17.12.0-preview-24426-07/microsoft.build.17.12.0-preview-24426-07.nupkg" }, - { - "pname": "Microsoft.Build", - "version": "17.3.4", - "hash": "sha256-LHtjk4vxeVSLzAKAcG8BN+S20d2sUR2DAOsSXLNIy5U=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.3.4/microsoft.build.17.3.4.nupkg" - }, { "pname": "Microsoft.Build", "version": "17.7.2", "hash": "sha256-k35nFdPxC8t0zAltVSmAJtsepp/ubNIjPOsJ6k8jSqM=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build/17.7.2/microsoft.build.17.7.2.nupkg" }, + { + "pname": "Microsoft.Build", + "version": "17.9.8", + "hash": "sha256-DmtVi4w2XMlaNH8UlAU2FCShdPM48SUdymmdmcDUWjg=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build/17.9.8/microsoft.build.17.9.8.nupkg" + }, { "pname": "Microsoft.Build.Framework", "version": "17.12.0-preview-24426-07", "hash": "sha256-p5JNAp442gjiu14gfM4eF477iT9Ttac8ALHXISbsecs=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.framework/17.12.0-preview-24426-07/microsoft.build.framework.17.12.0-preview-24426-07.nupkg" }, - { - "pname": "Microsoft.Build.Framework", - "version": "17.3.4", - "hash": "sha256-p2JG7pMBGfDVP6sOzBOqOkImZmwotlGvfS+8BjjVYf8=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.framework/17.3.4/microsoft.build.framework.17.3.4.nupkg" - }, { "pname": "Microsoft.Build.Framework", "version": "17.7.2", "hash": "sha256-fNWmVQYFTJDveAGmxEdNqJRAczV6+Ep8RA8clKBJFqw=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.framework/17.7.2/microsoft.build.framework.17.7.2.nupkg" }, + { + "pname": "Microsoft.Build.Framework", + "version": "17.9.8", + "hash": "sha256-H/Cn4mw2JFO4T7annP/vyLnLs2+4Cwrra9duAyvDgog=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.framework/17.9.8/microsoft.build.framework.17.9.8.nupkg" + }, { "pname": "Microsoft.Build.Locator", "version": "1.6.10", @@ -101,36 +101,36 @@ "hash": "sha256-2igOkxetlTeRv2Xq5wVcQXU7hxdP43yMJq3aK6vndoI=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.tasks.core/17.12.0-preview-24426-07/microsoft.build.tasks.core.17.12.0-preview-24426-07.nupkg" }, - { - "pname": "Microsoft.Build.Tasks.Core", - "version": "17.3.4", - "hash": "sha256-0RA95pD6zHBf1lgYyrrAuEuNeGwuCgGxNdhEJ0cJUCs=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.tasks.core/17.3.4/microsoft.build.tasks.core.17.3.4.nupkg" - }, { "pname": "Microsoft.Build.Tasks.Core", "version": "17.7.2", "hash": "sha256-OrV/qWgZHzGlNUmaSfX5wDBcmg1aQeF3/OUHpSH+uZU=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.tasks.core/17.7.2/microsoft.build.tasks.core.17.7.2.nupkg" }, + { + "pname": "Microsoft.Build.Tasks.Core", + "version": "17.9.8", + "hash": "sha256-1WtkFjP9U7hnWCIYJEpYukC4tVfNSZ722rurQt4/YtE=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.tasks.core/17.9.8/microsoft.build.tasks.core.17.9.8.nupkg" + }, { "pname": "Microsoft.Build.Utilities.Core", "version": "17.12.0-preview-24426-07", "hash": "sha256-np372GONmrZJ8ppPxjZrvtofA5gTnUf2n/Pn9f02ilo=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.build.utilities.core/17.12.0-preview-24426-07/microsoft.build.utilities.core.17.12.0-preview-24426-07.nupkg" }, - { - "pname": "Microsoft.Build.Utilities.Core", - "version": "17.3.4", - "hash": "sha256-SfZxr5xDANnDnC1HCUgho2H9MnF6n51cM47Rrf07fWw=", - "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.utilities.core/17.3.4/microsoft.build.utilities.core.17.3.4.nupkg" - }, { "pname": "Microsoft.Build.Utilities.Core", "version": "17.7.2", "hash": "sha256-oatF0KfuP1nb4+OLNKg2/R/ZLO4EiACaO5leaxMEY4A=", "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.build.utilities.core/17.7.2/microsoft.build.utilities.core.17.7.2.nupkg" }, + { + "pname": "Microsoft.Build.Utilities.Core", + "version": "17.9.8", + "hash": "sha256-oXkXjFVNt3gq5aoVaTxU7houExipjVD/IhPTemcFus0=", + "url": "https://pkgs.dev.azure.com/azure-public/3ccf6661-f8ce-4e8a-bb2e-eff943ddd3c7/_packaging/491596af-6d2d-439e-80bb-1ebb3b54f9a8/nuget/v3/flat2/microsoft.build.utilities.core/17.9.8/microsoft.build.utilities.core.17.9.8.nupkg" + }, { "pname": "Microsoft.CodeAnalysis.Analyzers", "version": "3.11.0", @@ -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", diff --git a/pkgs/by-name/ro/roslyn-ls/package.nix b/pkgs/by-name/ro/roslyn-ls/package.nix index 571b7da8b6d519..414365cfd79571 100644 --- 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 = [ ./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 diff --git a/pkgs/by-name/ro/roslyn-ls/sdk_8_0.patch b/pkgs/by-name/ro/roslyn-ls/sdk_8_0.patch new file mode 100644 index 00000000000000..9693562f989868 --- /dev/null +++ b/pkgs/by-name/ro/roslyn-ls/sdk_8_0.patch @@ -0,0 +1,51 @@ +diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props +index 58f90114f4d..8eb23c25067 100644 +--- a/eng/targets/TargetFrameworks.props ++++ b/eng/targets/TargetFrameworks.props +@@ -17,7 +17,7 @@ + net8.0 + net8.0 + net8.0 +- net6.0 ++ net8.0 + net9.0 + + +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..2f58a6a910e 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 +@@ -23,10 +23,16 @@ + true + + +- <_MsbuildVersion>17.3.4 ++ <_MsbuildVersion>17.11.9 ++ ++ ++ <_MsbuildFramework>$(TargetFramework) ++ ++ ++ <_MsbuildFramework>net6.0 + + + +@@ -36,10 +42,10 @@ + + + +- +- +- +- ++ ++ ++ ++ + + +