Merge pull request #787 from nickspoons/install-net6-windows

Respect use_net6 setting on Windows installation

Author: nickspoons

autoload/OmniSharp.vim

@@ -429,11 +429,12 @@ function! OmniSharp#Install(...) abort
     let l:logfile = OmniSharp#log#GetLogDir() . '\install.log'
     let l:script = shellescape(
     \ s:plugin_root_dir . '\installer\omnisharp-manager.ps1')
+    let l:net6 = g:OmniSharp_server_use_net6 ? '-6' : ''
     let l:version_file_location = l:location . '\OmniSharpInstall-version.txt'
 
     let l:command = printf(
-    \ 'powershell -ExecutionPolicy Bypass -File %s %s -l %s %s',
-    \ l:script, l:http, l:location, l:version)
+    \ 'powershell -ExecutionPolicy Bypass -File %s %s %s -l %s %s',
+    \ l:script, l:http, l:net6, l:location, l:version)
   else
     let l:logfile = OmniSharp#log#GetLogDir() . '/install.log'
     let l:script = shellescape(

installer/omnisharp-manager.ps1

@@ -5,19 +5,21 @@
 # Options:
 # -v | version to use (otherwise use latest)
 # -l | where to install the server
+# -6 | install the net6.0 server version
 # -u | help / usage info
 # -H | install the HTTP version of the server
 
 [CmdletBinding()]
 param(
     [Parameter()][Alias('v')][string]$version,
     [Parameter()][Alias('l')][string]$location = "$($Env:USERPROFILE)\.omnisharp\",
+    [Parameter()][Alias('6')][Switch]$use_net6,
     [Parameter()][Alias('u')][Switch]$usage,
     [Parameter()][Alias('H')][Switch]$http_check
 )
 
 if ($usage) {
-    Write-Host "usage:" $MyInvocation.MyCommand.Name "[-Hu] [-v version] [-l location]"
+    Write-Host "usage:" $MyInvocation.MyCommand.Name "[-Hu] [-v version] [-6] [-l location]"
     exit
 }
 
@@ -32,6 +34,12 @@ if ([string]::IsNullOrEmpty($version)) {
     $version = get_latest_version
 }
 
+if ($use_net6) {
+    $net6 = "-net6.0"
+} else {
+    $net6 = ""
+}
+
 if ($http_check) {
     $http = ".http"
 } else {
@@ -44,7 +52,7 @@ if ([Environment]::Is64BitOperatingSystem) {
     $machine = "x86"
 }
 
-$url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/$($version)/omnisharp$($http)-win-$($machine).zip"
+$url = "https://github.com/OmniSharp/omnisharp-roslyn/releases/download/$($version)/omnisharp$($http)-win-$($machine)$($net6).zip"
 $out = "$($location)\omnisharp$($http)-win-$($machine).zip"
 
 if (Test-Path -Path $location) {