From b71e2295b87c91ef154f30fcbd256f0579fbe317 Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt Date: Fri, 9 Mar 2018 20:04:56 -0800 Subject: [PATCH 1/3] allow newer dotnet cli --- PowerShellEditorServices.build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1 index 4dc22fc64..b5ad2f387 100644 --- a/PowerShellEditorServices.build.ps1 +++ b/PowerShellEditorServices.build.ps1 @@ -37,7 +37,7 @@ task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestP } # Make sure the dotnet we found is the right version - if ($dotnetExePath -and (& $dotnetExePath --version) -eq $requiredSdkVersion) { + if ($dotnetExePath -and [version](& $dotnetExePath --version) -ge [version]$requiredSdkVersion) { $script:dotnetExe = $dotnetExePath } else { From fa42f4b97bc43f1588eec21bc76c1c3e0c6ca976 Mon Sep 17 00:00:00 2001 From: Tyler James Leonhardt Date: Sun, 11 Mar 2018 16:15:53 -0700 Subject: [PATCH 2/3] show correct version you are using --- PowerShellEditorServices.build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1 index b5ad2f387..1eec859a0 100644 --- a/PowerShellEditorServices.build.ps1 +++ b/PowerShellEditorServices.build.ps1 @@ -78,7 +78,7 @@ task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestP $env:DOTNET_INSTALL_DIR = $dotnetExeDir } - Write-Host "`n### Using dotnet v$requiredSDKVersion at path $script:dotnetExe`n" -ForegroundColor Green + Write-Host "`n### Using dotnet v$(& $dotnetExePath --version) at path $script:dotnetExe`n" -ForegroundColor Green } task Clean { From caf56ab9ea2161c169088323f478779d7f860282 Mon Sep 17 00:00:00 2001 From: Tyler Leonhardt Date: Mon, 19 Mar 2018 08:22:43 -0700 Subject: [PATCH 3/3] use dotnetExe var --- PowerShellEditorServices.build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PowerShellEditorServices.build.ps1 b/PowerShellEditorServices.build.ps1 index 1eec859a0..684dc42bd 100644 --- a/PowerShellEditorServices.build.ps1 +++ b/PowerShellEditorServices.build.ps1 @@ -78,7 +78,7 @@ task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, TestP $env:DOTNET_INSTALL_DIR = $dotnetExeDir } - Write-Host "`n### Using dotnet v$(& $dotnetExePath --version) at path $script:dotnetExe`n" -ForegroundColor Green + Write-Host "`n### Using dotnet v$(& $script:dotnetExe --version) at path $script:dotnetExe`n" -ForegroundColor Green } task Clean {