Skip to content

Commit 4abe804

Browse files
authored
lsp-roslyn: update to 4.12.0-3.24470.11 and fix stdpipe-path in Windows (#4558)
1 parent 9222365 commit 4abe804

File tree

1 file changed

+10
-13
lines changed

1 file changed

+10
-13
lines changed

clients/lsp-roslyn.el

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@
3232
:group 'lsp-mode
3333
:package-version '(lsp-mode . "8.0.0"))
3434

35-
(defvar lsp-roslyn--stdpipe-path (expand-file-name
36-
"lsp-roslyn-stdpipe.ps1"
37-
(file-name-directory (file-truename load-file-name)))
35+
(defconst lsp-roslyn--stdpipe-path (expand-file-name
36+
"lsp-roslyn-stdpipe.ps1"
37+
(file-name-directory (locate-library "lsp-roslyn")))
3838
"Path to the `stdpipe' script.
3939
On Windows, this script is used as a proxy for the language server's named pipe.
4040
Unused on other platforms.")
@@ -81,8 +81,9 @@ Unused on other platforms.")
8181
:package-version '(lsp-mode . "8.0.0")
8282
:group 'lsp-roslyn)
8383

84-
(defcustom lsp-roslyn-package-version "4.9.0-3.23604.10"
85-
"Version of the Roslyn package to install."
84+
(defcustom lsp-roslyn-package-version "4.12.0-3.24470.11"
85+
"Version of the Roslyn package to install.
86+
Gotten from https://dev.azure.com/azure-public/vside/_artifacts/feed/vs-impl/NuGet/Microsoft.CodeAnalysis.LanguageServer.win-x64"
8687
:type 'string
8788
:package-version '(lsp-mode . "8.0.0")
8889
:group 'lsp-roslyn)
@@ -265,9 +266,9 @@ Assumes it was installed with the server install function."
265266

266267
(defun lsp-roslyn--get-rid ()
267268
"Retrieves the .NET Runtime Identifier (RID) for the current system."
268-
(let* ((is-x64 (string-match-p "x86_64" system-configuration))
269+
(let* ((is-x64 (string-match-p (rx (or "x86_64" "aarch64")) system-configuration))
269270
(is-x86 (and (string-match-p "x86" system-configuration) (not is-x64)))
270-
(is-arm (string-match-p "arm" system-configuration)))
271+
(is-arm (string-match-p (rx (or "arm" "aarch")) system-configuration)))
271272
(if-let ((platform-name (cond
272273
((eq system-type 'gnu/linux) "linux")
273274
((eq system-type 'darwin) "osx")
@@ -284,12 +285,8 @@ Assumes it was installed with the server install function."
284285
"<?xml version=\"1.0\" encoding=\"utf-8\"?>
285286
<configuration>
286287
<packageSources>
287-
<clear />
288-
<add key=\"msft_consumption\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/msft_consumption/nuget/v3/index.json\" />
288+
<add key=\"vs-impl\" value=\"https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-impl/nuget/v3/index.json\" />
289289
</packageSources>
290-
<disabledPackageSources>
291-
<clear />
292-
</disabledPackageSources>
293290
</configuration>"
294291
"The nuget.config to use when downloading Roslyn.")
295292

@@ -333,7 +330,7 @@ FORCED if specified with prefix argument."
333330
(lsp-async-start-process
334331
callback
335332
error-callback
336-
lsp-roslyn-dotnet-executable "restore" lsp-roslyn-install-path
333+
lsp-roslyn-dotnet-executable "restore" "--interactive" lsp-roslyn-install-path
337334
(format "/p:PackageName=%s" pkg-name)
338335
(format "/p:PackageVersion=%s" lsp-roslyn-package-version))))
339336

0 commit comments

Comments
 (0)