未验证 提交 3b755e61 编写于 作者: D dotnet-maestro[bot] 提交者: GitHub

Update dependencies from https://github.com/dotnet/arcade build 20200302.4 (#2693)

- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20152.4
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20152.4
- Microsoft.DotNet.CodeAnalysis - 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
上级 c9d96d18
...@@ -59,13 +59,13 @@ ...@@ -59,13 +59,13 @@
<Uri>https://github.com/dotnet/corefx</Uri> <Uri>https://github.com/dotnet/corefx</Uri>
<Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha> <Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20129.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20152.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86e54fb5076d46a6f959f0329d53c1c72e2280df</Sha> <Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20129.1"> <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20152.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86e54fb5076d46a6f959f0329d53c1c72e2280df</Sha> <Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/corefx</Uri> <Uri>https://github.com/dotnet/corefx</Uri>
...@@ -91,17 +91,17 @@ ...@@ -91,17 +91,17 @@
<Uri>https://github.com/dotnet/coreclr</Uri> <Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha> <Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20129.1"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20152.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86e54fb5076d46a6f959f0329d53c1c72e2280df</Sha> <Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20129.1"> <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20152.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86e54fb5076d46a6f959f0329d53c1c72e2280df</Sha> <Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20129.1"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20152.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>86e54fb5076d46a6f959f0329d53c1c72e2280df</Sha> <Sha>d8c2d041341ea7974fd3f2057e9d6afdd4f37598</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/corefx</Uri> <Uri>https://github.com/dotnet/corefx</Uri>
......
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade --> <!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup> <PropertyGroup>
<MicrosoftDotNetApiCompatVersion>5.0.0-beta.20129.1</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20152.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20129.1</MicrosoftDotNetCodeAnalysisPackageVersion> <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20152.4</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20129.1</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20152.4</MicrosoftDotNetGenAPIVersion>
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab --> <!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup> <PropertyGroup>
......
...@@ -26,6 +26,11 @@ Param( ...@@ -26,6 +26,11 @@ Param(
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties [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() { function Print-Usage() {
Write-Host "Common settings:" Write-Host "Common settings:"
Write-Host " -configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)" Write-Host " -configuration <value> Build configuration: 'Debug' or 'Release' (short: -c)"
......
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20129.1", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20152.4",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20129.1" "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20152.4"
}, },
"native-tools": { "native-tools": {
"strawberry-perl": "5.28.1.1-1", "strawberry-perl": "5.28.1.1-1",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册