32
32
:group 'lsp-mode
33
33
:package-version '(lsp-mode . " 8.0.0" ))
34
34
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 " )))
38
38
" Path to the `stdpipe' script.
39
39
On Windows, this script is used as a proxy for the language server's named pipe.
40
40
Unused on other platforms." )
@@ -81,8 +81,9 @@ Unused on other platforms.")
81
81
:package-version '(lsp-mode . " 8.0.0" )
82
82
:group 'lsp-roslyn )
83
83
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"
86
87
:type 'string
87
88
:package-version '(lsp-mode . " 8.0.0" )
88
89
:group 'lsp-roslyn )
@@ -265,9 +266,9 @@ Assumes it was installed with the server install function."
265
266
266
267
(defun lsp-roslyn--get-rid ()
267
268
" 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))
269
270
(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)))
271
272
(if-let ((platform-name (cond
272
273
((eq system-type 'gnu/linux ) " linux" )
273
274
((eq system-type 'darwin ) " osx" )
@@ -284,12 +285,8 @@ Assumes it was installed with the server install function."
284
285
" <?xml version=\" 1.0\" encoding=\" utf-8\" ?>
285
286
<configuration>
286
287
<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\" />
289
289
</packageSources>
290
- <disabledPackageSources>
291
- <clear />
292
- </disabledPackageSources>
293
290
</configuration>"
294
291
" The nuget.config to use when downloading Roslyn." )
295
292
@@ -333,7 +330,7 @@ FORCED if specified with prefix argument."
333
330
(lsp-async-start-process
334
331
callback
335
332
error-callback
336
- lsp-roslyn-dotnet-executable " restore" lsp-roslyn-install-path
333
+ lsp-roslyn-dotnet-executable " restore" " --interactive " lsp-roslyn-install-path
337
334
(format " /p:PackageName=%s " pkg-name)
338
335
(format " /p:PackageVersion=%s " lsp-roslyn-package-version))))
339
336
0 commit comments