Skip to content

Commit 6a0804b

Browse files
[master] Update dependencies from dotnet/arcade (#999)
- 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
1 parent c808348 commit 6a0804b

File tree

4 files changed

+14
-9
lines changed

4 files changed

+14
-9
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20151.1">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20152.4">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
6+
<Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20151.1">
8+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20152.4">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
10+
<Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20151.1">
12+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20152.4">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>8ccad075bbb0db445e03eed0a6073d27bdd4f31a</Sha>
14+
<Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
1515
</Dependency>
1616
</ToolsetDependencies>
1717
<!-- ProductDependencies -->

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<PreReleaseVersionLabel>prerelease</PreReleaseVersionLabel>
5-
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20151.1</MicrosoftDotNetGenAPIPackageVersion>
5+
<MicrosoftDotNetGenAPIPackageVersion>5.0.0-beta.20152.4</MicrosoftDotNetGenAPIPackageVersion>
66
<!-- dotnet/corefx dependencies -->
77
<SystemDrawingCommonPackageVersion>4.6.0</SystemDrawingCommonPackageVersion>
88
<SystemIOPortsPackageVersion>4.6.0</SystemIOPortsPackageVersion>

eng/common/build.ps1

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@ Param(
2626
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
2727
)
2828

29+
# Unset 'Platform' environment variable to avoid unwanted collision in InstallDotNetCore.targets file
30+
# some computer has this env var defined (e.g. Some HP)
31+
if($env:Platform) {
32+
$env:Platform=""
33+
}
2934
function Print-Usage() {
3035
Write-Host "Common settings:"
3136
Write-Host " -configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)"

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"version": "3.1.101"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20151.1",
15-
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20151.1"
14+
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20152.4",
15+
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20152.4"
1616
}
1717
}

0 commit comments

Comments
 (0)