From 98e138e3e92a12d7b28107c188bba9ea4056d3c1 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 10 Feb 2023 13:09:09 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20230209.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23107.1 -> To Version 8.0.0-beta.23109.5 --- eng/Version.Details.xml | 72 ++++++++++++++++---------------- eng/Versions.props | 30 ++++++------- eng/common/init-tools-native.ps1 | 9 ++-- eng/common/templates/job/job.yml | 6 +-- global.json | 6 +-- 5 files changed, 60 insertions(+), 63 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9b4c4cfa00501..710084ac3e24f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,73 +92,73 @@ - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 https://github.com/dotnet/runtime-assets @@ -284,9 +284,9 @@ https://github.com/dotnet/xharness bde66a8c7071bc96175bfb5eb619394fff03902e - + https://github.com/dotnet/arcade - b31c4466a49800c2f019690e81182c7ffd584dda + b888df17a4acb65630c1e9ad5e94f22a33b62ab0 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 21167ca027a33..7ee0c01dd5518 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 2.5.1-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 - 8.0.0-beta.23107.1 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 2.5.1-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 + 8.0.0-beta.23109.5 6.0.0-preview.1.102 diff --git a/eng/common/init-tools-native.ps1 b/eng/common/init-tools-native.ps1 index fbc67effc3631..27ccdb9ecc951 100644 --- a/eng/common/init-tools-native.ps1 +++ b/eng/common/init-tools-native.ps1 @@ -83,7 +83,8 @@ try { Select-Object -Expand 'native-tools' -ErrorAction SilentlyContinue if ($NativeTools) { if ($PathPromotion -eq $True) { - if ($env:SYSTEM_TEAMPROJECT) { # check to see if we're in an Azure pipelines build + $ArcadeToolsDirectory = "$env:SYSTEMDRIVE\arcade-tools" + if (Test-Path $ArcadeToolsDirectory) { # if this directory exists, we should use native tools on machine $NativeTools.PSObject.Properties | ForEach-Object { $ToolName = $_.Name $ToolVersion = $_.Value @@ -93,11 +94,6 @@ try { if ($ToolVersion -eq "latest") { $ToolVersion = "" } - $ArcadeToolsDirectory = "C:\arcade-tools" - if (-not (Test-Path $ArcadeToolsDirectory)) { - Write-Error "Arcade tools directory '$ArcadeToolsDirectory' was not found; artifacts were not properly installed." - exit 1 - } $ToolDirectories = (Get-ChildItem -Path "$ArcadeToolsDirectory" -Filter "$ToolName-$ToolVersion*" | Sort-Object -Descending) if ($ToolDirectories -eq $null) { Write-Error "Unable to find directory for $ToolName $ToolVersion; please make sure the tool is installed on this image." @@ -125,6 +121,7 @@ try { if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) { Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding." + Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "If this is running on a build machine, the arcade-tools directory was not found, which means there's an error with the image." } } exit 0 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index f0af425d9f68a..61914a1fbcd3f 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -134,7 +134,7 @@ jobs: - ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}: - task: NuGetAuthenticate@0 - - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: + - ${{ if and(ne(parameters.artifacts.download, 'false'), ne(parameters.artifacts.download, '')) }}: - task: DownloadPipelineArtifact@2 inputs: buildType: current @@ -171,7 +171,7 @@ jobs: TeamName: $(_TeamName) - ${{ if ne(parameters.artifacts.publish, '') }}: - - ${{ if or(eq(parameters.artifacts.publish.artifacts, 'true'), ne(parameters.artifacts.publish.artifacts, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.artifacts, 'false'), ne(parameters.artifacts.publish.artifacts, '')) }}: - task: CopyFiles@2 displayName: Gather binaries for publish to artifacts inputs: @@ -192,7 +192,7 @@ jobs: ArtifactName: ${{ coalesce(parameters.artifacts.publish.artifacts.name , 'Artifacts_$(Agent.Os)_$(_BuildConfig)') }} continueOnError: true condition: always() - - ${{ if or(eq(parameters.artifacts.publish.logs, 'true'), ne(parameters.artifacts.publish.logs, '')) }}: + - ${{ if and(ne(parameters.artifacts.publish.logs, 'false'), ne(parameters.artifacts.publish.logs, '')) }}: - publish: artifacts/log artifact: ${{ coalesce(parameters.artifacts.publish.logs.name, 'Logs_Build_$(Agent.Os)_$(_BuildConfig)') }} displayName: Publish logs diff --git a/global.json b/global.json index 593b3a87a94c9..d2594195467bd 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-alpha.1.23061.8" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23107.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23107.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23107.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23109.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23109.5", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23109.5", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "8.0.0-preview.2.23105.4"