зеркало из https://github.com/dotnet/xdt.git
Update dependencies from https://github.com/dotnet/arcade build 20210624.3 (#417)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
Родитель
d5068298f3
Коммит
fbf64a74ad
|
@ -1,9 +1,9 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Dependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21323.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21324.3">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>1685a12f35cfb396f9352d63736eb675673b0e20</Sha>
|
||||
<Sha>a68ec1edf328e737b31a09cb49e1929c28e91d0c</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
|
|
|
@ -378,7 +378,16 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
|
|||
}
|
||||
|
||||
$msbuildVersionDir = if ([int]$vsMajorVersion -lt 16) { "$vsMajorVersion.0" } else { "Current" }
|
||||
return $global:_MSBuildExe = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin\msbuild.exe"
|
||||
|
||||
$local:BinFolder = Join-Path $vsInstallDir "MSBuild\$msbuildVersionDir\Bin"
|
||||
$local:Prefer64bit = if ($vsRequirements.Prefer64bit) { $vsRequirements.Prefer64bit } else { $false }
|
||||
if ($local:Prefer64bit -and (Test-Path(Join-Path $local:BinFolder "amd64"))) {
|
||||
$global:_MSBuildExe = Join-Path $local:BinFolder "amd64\msbuild.exe"
|
||||
} else {
|
||||
$global:_MSBuildExe = Join-Path $local:BinFolder "msbuild.exe"
|
||||
}
|
||||
|
||||
return $global:_MSBuildExe
|
||||
}
|
||||
|
||||
function InitializeVisualStudioEnvironmentVariables([string] $vsInstallDir, [string] $vsMajorVersion) {
|
||||
|
|
|
@ -3,6 +3,6 @@
|
|||
"dotnet": "6.0.100-preview.4.21255.9"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21323.1"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21324.3"
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче