Merge pull request #116 from jmarolf/update-roslyn-versions
upgrade vswhere
This commit is contained in:
Коммит
990dd7fb81
|
@ -5,16 +5,16 @@
|
|||
|
||||
<!-- Opt-in repo features -->
|
||||
<UsingToolVSSDK>true</UsingToolVSSDK>
|
||||
|
||||
|
||||
<!-- Toolset -->
|
||||
<RoslynToolsRepoToolsetVersion>1.0.0-beta-62705-01</RoslynToolsRepoToolsetVersion>
|
||||
<VSWhereVersion>2.3.2</VSWhereVersion>
|
||||
<VSWhereVersion>2.3.7</VSWhereVersion>
|
||||
|
||||
<!-- MSBuild -->
|
||||
<MicrosoftBuildVersion>15.3.409</MicrosoftBuildVersion>
|
||||
<MicrosoftBuildEngineVersion>15.3.409</MicrosoftBuildEngineVersion>
|
||||
<MicrosoftBuildFrameworkVersion>15.3.409</MicrosoftBuildFrameworkVersion>
|
||||
|
||||
|
||||
<!-- Roslyn Templates for VS 2015 -->
|
||||
<MicrosoftCodeAnalysisAnalyzersVersionVS2015>1.1.0</MicrosoftCodeAnalysisAnalyzersVersionVS2015>
|
||||
<MicrosoftCodeAnalysisCommonVersionVS2015>1.0.1</MicrosoftCodeAnalysisCommonVersionVS2015>
|
||||
|
|
|
@ -19,6 +19,7 @@ Param(
|
|||
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
|
||||
)
|
||||
|
||||
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
|
||||
set-strictmode -version 2.0
|
||||
$ErrorActionPreference = "Stop"
|
||||
|
||||
|
@ -74,22 +75,22 @@ function GetVSWhereVersion {
|
|||
return $xml.Project.PropertyGroup.VSWhereVersion
|
||||
}
|
||||
|
||||
function LocateVisualStudio {
|
||||
function LocateVisualStudio {
|
||||
$vswhereVersion = GetVSWhereVersion
|
||||
$vsWhereDir = Join-Path $ToolsRoot "vswhere\$vswhereVersion"
|
||||
$vsWhereExe = Join-Path $vsWhereDir "vswhere.exe"
|
||||
|
||||
|
||||
if (!(Test-Path $vsWhereExe)) {
|
||||
Create-Directory $vsWhereDir
|
||||
Create-Directory $vsWhereDir
|
||||
Invoke-WebRequest "http://github.com/Microsoft/vswhere/releases/download/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
|
||||
}
|
||||
|
||||
$vsInstallDir = & $vsWhereExe -latest -property installationPath -requires Microsoft.Component.MSBuild -requires Microsoft.VisualStudio.Component.VSSDK -requires Microsoft.Net.Component.4.6.TargetingPack -requires Microsoft.VisualStudio.Component.Roslyn.Compiler -requires Microsoft.VisualStudio.Component.VSSDK
|
||||
|
||||
|
||||
$vsInstallDir = & $vsWhereExe -latest -prerelease -property installationPath -requires Microsoft.Component.MSBuild -requires Microsoft.VisualStudio.Component.VSSDK -requires Microsoft.Net.Component.4.6.TargetingPack -requires Microsoft.VisualStudio.Component.Roslyn.Compiler -requires Microsoft.VisualStudio.Component.VSSDK
|
||||
|
||||
if (!(Test-Path $vsInstallDir)) {
|
||||
throw "Failed to locate Visual Studio (exit code '$lastExitCode')."
|
||||
}
|
||||
|
||||
|
||||
return $vsInstallDir
|
||||
}
|
||||
|
||||
|
@ -155,4 +156,4 @@ finally {
|
|||
if ($ci -and $prepareMachine) {
|
||||
Stop-Processes
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче