From ba8ce9e1a00b57aba6ab7384c16f4594be6754e2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 3 Mar 2021 22:06:36 +0000 Subject: [PATCH] [main] Update dependencies from dotnet/arcade dotnet/xharness (#49056) [main] Update dependencies from dotnet/arcade dotnet/xharness - re-add workaround for publishing disk space issues - Just revert all changes to the publish-using-darc script --- .config/dotnet-tools.json | 2 +- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 28 ++++---- eng/common/cross/armel/tizen-fetch.sh | 2 +- .../templates/steps/perf-send-to-helix.yml | 4 +- eng/common/templates/steps/send-to-helix.yml | 4 +- eng/common/tools.ps1 | 2 +- global.json | 8 +-- 8 files changed, 61 insertions(+), 61 deletions(-) diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index cec2e13b19c..81a28a52d68 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -15,7 +15,7 @@ ] }, "microsoft.dotnet.xharness.cli": { - "version": "1.0.0-prerelease.21152.3", + "version": "1.0.0-prerelease.21153.1", "commands": [ "xharness" ] diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ce50214ec11..b4ef3d872ae 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,69 +6,69 @@ - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 - + https://github.com/dotnet/arcade - 15246f4af00a1cb2e580783d32ec2937b1878a64 + f95dc73e2028d630d67b782c9dcccbe464cf9677 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -198,13 +198,13 @@ https://github.com/mono/linker 0c4902a114192fce1e7570d998e70d24669e9cc3 - + https://github.com/dotnet/xharness - a9691a8237313f47e4ba5d2531f1d8abbd443ebe + a6f357e7784c653aaf64a984f7cdd9b1c7461796 - + https://github.com/dotnet/xharness - a9691a8237313f47e4ba5d2531f1d8abbd443ebe + a6f357e7784c653aaf64a984f7cdd9b1c7461796 diff --git a/eng/Versions.props b/eng/Versions.props index 7632f4fd7c7..aca24e4cbdd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,18 +49,18 @@ 3.9.0-5.final 3.9.0-5.final - 6.0.0-beta.21125.5 - 6.0.0-beta.21125.5 - 6.0.0-beta.21125.5 - 6.0.0-beta.21125.5 - 6.0.0-beta.21125.5 - 6.0.0-beta.21125.5 - 2.5.1-beta.21125.5 - 6.0.0-beta.21125.5 - 6.0.0-beta.21125.5 - 6.0.0-beta.21125.5 - 6.0.0-beta.21125.5 - 6.0.0-beta.21125.5 + 6.0.0-beta.21152.1 + 6.0.0-beta.21152.1 + 6.0.0-beta.21152.1 + 6.0.0-beta.21152.1 + 6.0.0-beta.21152.1 + 6.0.0-beta.21152.1 + 2.5.1-beta.21152.1 + 6.0.0-beta.21152.1 + 6.0.0-beta.21152.1 + 6.0.0-beta.21152.1 + 6.0.0-beta.21152.1 + 6.0.0-beta.21152.1 5.9.0-preview.2 @@ -144,8 +144,8 @@ 1.0.1-prerelease-00006 16.9.0-preview-20201201-01 - 1.0.0-prerelease.21152.3 - 1.0.0-prerelease.21152.3 + 1.0.0-prerelease.21153.1 + 1.0.0-prerelease.21153.1 2.4.1 2.4.2 1.3.0 diff --git a/eng/common/cross/armel/tizen-fetch.sh b/eng/common/cross/armel/tizen-fetch.sh index 2776cbba4e4..64f0187e5aa 100755 --- a/eng/common/cross/armel/tizen-fetch.sh +++ b/eng/common/cross/armel/tizen-fetch.sh @@ -157,7 +157,7 @@ fetch_tizen_pkgs() Inform "Initialize arm base" fetch_tizen_pkgs_init standard base Inform "fetch common packages" -fetch_tizen_pkgs armv7l gcc glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel +fetch_tizen_pkgs armv7l gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils Inform "fetch coreclr packages" fetch_tizen_pkgs armv7l lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu Inform "fetch corefx packages" diff --git a/eng/common/templates/steps/perf-send-to-helix.yml b/eng/common/templates/steps/perf-send-to-helix.yml index a468e92ce44..3427b311a72 100644 --- a/eng/common/templates/steps/perf-send-to-helix.yml +++ b/eng/common/templates/steps/perf-send-to-helix.yml @@ -11,8 +11,8 @@ parameters: WorkItemDirectory: '' # optional -- a payload directory to zip up and send to Helix; requires WorkItemCommand; incompatible with XUnitProjects CorrelationPayloadDirectory: '' # optional -- a directory to zip up and send to Helix as a correlation payload IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json - DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases.json + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases.json EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." Creator: '' # optional -- if the build is external, use this to specify who is sending the job diff --git a/eng/common/templates/steps/send-to-helix.yml b/eng/common/templates/steps/send-to-helix.yml index bb5f1a92938..cd02ae1607f 100644 --- a/eng/common/templates/steps/send-to-helix.yml +++ b/eng/common/templates/steps/send-to-helix.yml @@ -18,8 +18,8 @@ parameters: XUnitRuntimeTargetFramework: '' # optional -- framework to use for the xUnit console runner XUnitRunnerVersion: '' # optional -- version of the xUnit nuget package you wish to use on Helix; required for XUnitProjects IncludeDotNetCli: false # optional -- true will download a version of the .NET CLI onto the Helix machine as a correlation payload; requires DotNetCliPackageType and DotNetCliVersion - DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json - DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/master/release-notes/releases-index.json + DotNetCliPackageType: '' # optional -- either 'sdk', 'runtime' or 'aspnetcore-runtime'; determines whether the sdk or runtime will be sent to Helix; see https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json + DotNetCliVersion: '' # optional -- version of the CLI to send to Helix; based on this: https://raw.githubusercontent.com/dotnet/core/main/release-notes/releases-index.json EnableXUnitReporter: false # optional -- true enables XUnit result reporting to Mission Control WaitForWorkItemCompletion: true # optional -- true will make the task wait until work items have been completed and fail the build if work items fail. False is "fire and forget." IsExternal: false # [DEPRECATED] -- doesn't do anything, jobs are external if HelixAccessToken is empty and Creator is set diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index be5ce4a2ed5..d52467eea11 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -141,7 +141,7 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Use dotnet installation specified in DOTNET_INSTALL_DIR if it contains the required SDK version, # otherwise install the dotnet CLI and SDK to repo local .dotnet directory to avoid potential permission issues. - if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { + if ((-not $globalJsonHasRuntimes) -and (-not [string]::IsNullOrEmpty($env:DOTNET_INSTALL_DIR)) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) { $dotnetRoot = $env:DOTNET_INSTALL_DIR } else { $dotnetRoot = Join-Path $RepoRoot '.dotnet' diff --git a/global.json b/global.json index 9c05657b2dc..72cce5fec4f 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21125.5", - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21125.5", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21125.5", - "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21125.5", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "6.0.0-beta.21152.1", + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21152.1", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21152.1", + "Microsoft.DotNet.SharedFramework.Sdk": "6.0.0-beta.21152.1", "Microsoft.Build.NoTargets": "2.0.17", "Microsoft.Build.Traversal": "2.1.1", "Microsoft.NET.Sdk.IL": "6.0.0-preview.3.21151.2" -- GitLab