From 6858a87af432aae629e28970a14c3560bef4f349 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 6 Mar 2020 13:17:06 +0000
Subject: [PATCH] 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: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
---
 eng/Version.Details.xml                   | 20 ++++++++++----------
 eng/Versions.props                        |  6 +++---
 eng/common/pipeline-logging-functions.ps1 |  4 +++-
 eng/common/tools.ps1                      |  2 +-
 global.json                               |  4 ++--
 5 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index af4404d67..d94a02997 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -59,13 +59,13 @@
       <Uri>https://github.com/dotnet/corefx</Uri>
       <Sha>8d21b79b924d29088dbde46d42737a657d466b5e</Sha>
     </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>
-      <Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
+      <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</Sha>
     </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>
-      <Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
+      <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NETCore.Platforms" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.Private.Winforms">
       <Uri>https://github.com/dotnet/corefx</Uri>
@@ -91,17 +91,17 @@
       <Uri>https://github.com/dotnet/coreclr</Uri>
       <Sha>b415b57a15b0c6ba77e63df901823bb46b8aafda</Sha>
     </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>
-      <Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
+      <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</Sha>
     </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>
-      <Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
+      <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</Sha>
     </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>
-      <Sha>5d8c586ca1bed15f630ba7d2ed16f591be06eafd</Sha>
+      <Sha>08eea2b992d991297fc23de413bddfb9b3db5082</Sha>
     </Dependency>
     <Dependency Name="System.Resources.Extensions" Version="5.0.0-alpha1.19512.1" CoherentParentDependency="Microsoft.Private.Winforms">
       <Uri>https://github.com/dotnet/corefx</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index c5f01b846..18ec89a55 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -41,9 +41,9 @@
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/arcade -->
   <PropertyGroup>
-    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20154.1</MicrosoftDotNetApiCompatVersion>
-    <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20154.1</MicrosoftDotNetCodeAnalysisPackageVersion>
-    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20154.1</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20155.4</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetCodeAnalysisPackageVersion>5.0.0-beta.20155.4</MicrosoftDotNetCodeAnalysisPackageVersion>
+    <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20155.4</MicrosoftDotNetGenAPIVersion>
   </PropertyGroup>
   <!-- Packages that come from https://github.com/dotnet/corefxlab -->
   <PropertyGroup>
diff --git a/eng/common/pipeline-logging-functions.ps1 b/eng/common/pipeline-logging-functions.ps1
index a3e1317ad..5042baebf 100644
--- a/eng/common/pipeline-logging-functions.ps1
+++ b/eng/common/pipeline-logging-functions.ps1
@@ -31,7 +31,9 @@ function Write-PipelineTelemetryError {
 
         $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.Add('Message', $Message)
         Write-PipelineTaskError @PSBoundParameters
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index a45302b37..60c1cd897 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -635,7 +635,7 @@ function MSBuild-Core() {
   $exitCode = Exec-Process $buildTool.Path $cmdArgs
 
   if ($exitCode -ne 0) {
-    Write-PipelineTelemetryError Category 'Build' -Message 'Build failed.'
+    Write-PipelineTelemetryError -Category 'Build' -Message 'Build failed.'
 
     $buildLog = GetMSBuildBinaryLogCommandLineArgument $args
     if ($buildLog -ne $null) {
diff --git a/global.json b/global.json
index 8ec2788d6..fa6f39f75 100644
--- a/global.json
+++ b/global.json
@@ -15,8 +15,8 @@
     "version": "5.0.100-alpha1-015515"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20154.1",
-    "Microsoft.DotNet.Helix.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.20155.4"
   },
   "native-tools": {
     "strawberry-perl": "5.28.1.1-1",
-- 
GitLab