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

Update dependencies from https://github.com/dotnet/arcade build 20200305.4 (#2724)

- Microsoft.DotNet.ApiCompat - 5.0.0-beta.20155.4
- Microsoft.DotNet.Arcade.Sdk - 5.0.0-beta.20155.4
- Microsoft.DotNet.CodeAnalysis - 5.0.0-beta.20155.4
- Microsoft.DotNet.GenAPI - 5.0.0-beta.20155.4
- Microsoft.DotNet.Helix.Sdk - 5.0.0-beta.20155.4
Co-authored-by: Ndotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
上级 b4099a0f
...@@ -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.20154.1"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20155.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha> <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20154.1"> <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20155.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha> <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</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.20154.1"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.20155.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha> <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20154.1"> <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20155.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha> <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20154.1"> <Dependency Name="Microsoft.DotNet.GenAPI" Version="5.0.0-beta.20155.4">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha> <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</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.20154.1</MicrosoftDotNetApiCompatVersion> <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20155.4</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20154.1</MicrosoftDotNetCodeAnalysisPackageVersion> <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20155.4</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>5.0.0-beta.20154.1</MicrosoftDotNetGenAPIVersion> <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20155.4</MicrosoftDotNetGenAPIVersion>
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab --> <!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup> <PropertyGroup>
......
...@@ -31,7 +31,9 @@ function Write-PipelineTelemetryError { ...@@ -31,7 +31,9 @@ function Write-PipelineTelemetryError {
$PSBoundParameters.Remove('Category') | Out-Null $PSBoundParameters.Remove('Category') | Out-Null
$Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message" if($Force -Or ((Test-Path variable:ci) -And $ci)) {
$Message = "(NETCORE_ENGINEERING_TELEMETRY=$Category) $Message"
}
$PSBoundParameters.Remove('Message') | Out-Null $PSBoundParameters.Remove('Message') | Out-Null
$PSBoundParameters.Add('Message', $Message) $PSBoundParameters.Add('Message', $Message)
Write-PipelineTaskError @PSBoundParameters Write-PipelineTaskError @PSBoundParameters
......
...@@ -635,7 +635,7 @@ function MSBuild-Core() { ...@@ -635,7 +635,7 @@ function MSBuild-Core() {
$exitCode = Exec-Process $buildTool.Path $cmdArgs $exitCode = Exec-Process $buildTool.Path $cmdArgs
if ($exitCode -ne 0) { if ($exitCode -ne 0) {
Write-PipelineTelemetryError Category 'Build' -Message 'Build failed.' Write-PipelineTelemetryError -Category 'Build' -Message 'Build failed.'
$buildLog = GetMSBuildBinaryLogCommandLineArgument $args $buildLog = GetMSBuildBinaryLogCommandLineArgument $args
if ($buildLog -ne $null) { if ($buildLog -ne $null) {
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
"version": "5.0.100-alpha1-015515" "version": "5.0.100-alpha1-015515"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20154.1", "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20155.4",
"Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20154.1" "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20155.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.
先完成此消息的编辑!
想要评论请 注册