Skip to content

Commit

Permalink
[master] Update dependencies from dotnet/arcade (#999)
Browse files Browse the repository at this point in the history
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20152.4
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20152.4
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20152.4
  • Loading branch information
dotnet-maestro[bot] committed Mar 3, 2020
1 parent c808348 commit 6a0804b
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 9 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.20151.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20152.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
<Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20151.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20152.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
<Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20151.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20152.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
<Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</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.20151.1</MicrosoftDotNetGenAPIPackageVersion>
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20152.4</MicrosoftDotNetGenAPIPackageVersion>
<!-- dotnet/corefx dependencies -->
<SystemDrawingCommonPackageVersion>4.6.0</SystemDrawingCommonPackageVersion>
<SystemIOPortsPackageVersion>4.6.0</SystemIOPortsPackageVersion>
Expand Down
5 changes: 5 additions & 0 deletions eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ Param(
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
)

# Unset 'Platform' environment variable to avoid unwanted collision in InstallDotNetCore.targets file
# some computer has this env var defined (e.g. Some HP)
if($env:Platform) {
$env:Platform=""
}
function Print-Usage() {
Write-Host "Common settings:"
Write-Host " -configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)"
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.1.101"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20151.1",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20151.1"
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20152.4",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20152.4"
}
}

0 comments on commit 6a0804b

Please sign in to comment.