diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a8cf9df8..115f78f52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/windowsdesktop - 523a7a61218e4b210cc579d4d29aee28027008ed + 45a76b046c760e8dc3d9cd81a8fa240efabe221e - + https://github.com/dotnet/windowsdesktop - 523a7a61218e4b210cc579d4d29aee28027008ed + 45a76b046c760e8dc3d9cd81a8fa240efabe221e - + https://github.com/dotnet/windowsdesktop - 523a7a61218e4b210cc579d4d29aee28027008ed + 45a76b046c760e8dc3d9cd81a8fa240efabe221e https://github.com/dotnet/runtime @@ -84,13 +84,13 @@ 1812ab7e880c51b4c3da836e02c362e694a139a3 - + https://github.com/dotnet/winforms - 355d112ab87257a36a3348caf5669e61c6273850 + 97250206203b7ffeffe6b0ebde69e3fd54b740fe - + https://github.com/dotnet/wpf - 74c2b7c625180071d45c813c7aff2c5f7209e6b4 + b4099a0f76c02b5bc8eea6556b3f80fa7a7d47f0 @@ -100,9 +100,9 @@ - + https://github.com/dotnet/arcade - 5d8c586ca1bed15f630ba7d2ed16f591be06eafd + 08eea2b992d991297fc23de413bddfb9b3db5082 diff --git a/eng/Versions.props b/eng/Versions.props index 0a373f9ce..b677b6306 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,11 @@ - 5.0.0-preview.2.20155.1 + 5.0.0-preview.3.20155.2 - 5.0.0-preview.2.20155.2 + 5.0.0-preview.3.20155.8 @@ -69,9 +69,9 @@ - 5.0.0-preview.2.20155.3 - 5.0.0-preview.2.20155.3 - 5.0.0-preview.2.20155.3 + 5.0.0-preview.3.20156.3 + 5.0.0-preview.3.20156.3 + 5.0.0-preview.3.20156.3 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 5f5b881a3..c33d33cb6 100644 --- a/global.json +++ b/global.json @@ -8,6 +8,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20154.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20155.4" } }