Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade (dotnet#888)
Browse files Browse the repository at this point in the history
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.19611.6
- Microsoft.DotNet.GenAPI - 5.0.0-beta.19611.6
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.19611.6
  • Loading branch information
dotnet-maestro[bot] authored and joperezr committed Dec 12, 2019
1 parent 513f4c9 commit faafae7
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 12 deletions.
12 changes: 6 additions & 6 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19611.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.19611.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb840a9bb99335f80024ea04816e7799461879cc</Sha>
<Sha>71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19611.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.19611.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb840a9bb99335f80024ea04816e7799461879cc</Sha>
<Sha>71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19611.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.19611.6">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>cb840a9bb99335f80024ea04816e7799461879cc</Sha>
<Sha>71a91bbb3c49bad2f1e7f2c7f28b32c5c0efc9e5</Sha>
</Dependency>
</ToolsetDependencies>
<!-- ProductDependencies -->
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.19611.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.19611.6</MicrosoftDotNetGenAPIPackageVersion>
<!-- dotnet/corefx dependencies -->
<SystemDrawingCommonPackageVersion>4.6.0</SystemDrawingCommonPackageVersion>
<SystemIOPortsPackageVersion>4.6.0</SystemIOPortsPackageVersion>
Expand Down
25 changes: 22 additions & 3 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function Exec-Process([string]$command, [string]$commandArgs) {
}
}

function InitializeDotNetCli([bool]$install) {
function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
if (Test-Path variable:global:_DotNetInstallDir) {
return $global:_DotNetInstallDir
}
Expand Down Expand Up @@ -146,6 +146,22 @@ function InitializeDotNetCli([bool]$install) {
}

$env:DOTNET_INSTALL_DIR = $dotnetRoot

if ($createSdkLocationFile) {
# Create a temporary file under the toolset dir and rename it to sdk.txt to avoid races.
do {
$sdkCacheFileTemp = Join-Path $ToolsetDir $([System.IO.Path]::GetRandomFileName())
}
until (!(Test-Path $sdkCacheFileTemp))
Set-Content -Path $sdkCacheFileTemp -Value $dotnetRoot

try {
Rename-Item -Force -Path $sdkCacheFileTemp 'sdk.txt'
} catch {
# Somebody beat us
Remove-Item -Path $sdkCacheFileTemp
}
}
}

# Add dotnet to PATH. This prevents any bare invocation of dotnet in custom
Expand Down Expand Up @@ -277,8 +293,11 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
$vsMajorVersion = $vsMinVersion.Major
$xcopyMSBuildVersion = "$vsMajorVersion.$($vsMinVersion.Minor).0-alpha"
}

$vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install

$vsInstallDir = $null
if ($xcopyMSBuildVersion.Trim() -ine "none") {
$vsInstallDir = InitializeXCopyMSBuild $xcopyMSBuildVersion $install
}
if ($vsInstallDir -eq $null) {
throw 'Unable to find Visual Studio that has required version and components installed'
}
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"version": "3.0.101"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19611.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19611.1"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.19611.6",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.19611.6"
}
}

0 comments on commit faafae7

Please sign in to comment.