From 900a82efbc79964e9a71df25e9d2a71afc48dfcb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 9 Jan 2023 10:06:19 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20221201.6 Microsoft.DotNet.ApiCompat , 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 7.0.0-beta.22572.6 -> To Version 7.0.0-beta.22601.6 --- eng/Version.Details.xml | 76 ++++++++++----------- eng/Versions.props | 32 ++++----- eng/common/templates/steps/source-build.yml | 6 ++ eng/common/tools.sh | 2 +- global.json | 6 +- 5 files changed, 64 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fd8d0bbb177a1..a19d7e3177698 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -58,77 +58,77 @@ - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 https://github.com/dotnet/runtime-assets @@ -254,9 +254,9 @@ https://github.com/dotnet/xharness 5ebf69650b9f7b4ecab485be840b3022420f7812 - + https://github.com/dotnet/arcade - 82d0268ba6ae13318bcf7fcbcccf83472593ca62 + c01ccbc9554b39205750bf5bda7aad29f89bc0c9 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 4a2ef78abc126..a24f013f5d56c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -62,22 +62,22 @@ 7.0.100-rc.1.22402.1 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 2.5.1-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 - 7.0.0-beta.22572.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 2.5.1-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 + 7.0.0-beta.22601.6 6.0.0-preview.1.102 diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 12a8ff94d8e96..4624885e3bfeb 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -63,6 +63,11 @@ steps: targetRidArgs='/p:TargetRid=${{ parameters.platform.targetRID }}' fi + runtimeOsArgs= + if [ '${{ parameters.platform.runtimeOS }}' != '' ]; then + runtimeOsArgs='/p:RuntimeOS=${{ parameters.platform.runtimeOS }}' + fi + publishArgs= if [ '${{ parameters.platform.skipPublishValidation }}' != 'true' ]; then publishArgs='--publish' @@ -75,6 +80,7 @@ steps: $internalRuntimeDownloadArgs \ $internalRestoreArgs \ $targetRidArgs \ + $runtimeOsArgs \ /p:SourceBuildNonPortable=${{ parameters.platform.nonPortable }} \ /p:ArcadeBuildFromSource=true displayName: Build diff --git a/eng/common/tools.sh b/eng/common/tools.sh index c110d0ed410c5..e9a7ed9af6794 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -511,7 +511,7 @@ global_json_file="${repo_root}global.json" # determine if global.json contains a "runtimes" entry global_json_has_runtimes=false if command -v jq &> /dev/null; then - if jq -er '. | select(has("runtimes"))' "$global_json_file" &> /dev/null; then + if jq -e '.tools | has("runtimes")' "$global_json_file" &> /dev/null; then global_json_has_runtimes=true fi elif [[ "$(cat "$global_json_file")" =~ \"runtimes\"[[:space:]\:]*\{ ]]; then diff --git a/global.json b/global.json index 5bcd1b3e07a95..575c6a78a5b97 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "7.0.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22572.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22572.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22572.6", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22601.6", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22601.6", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22601.6", "Microsoft.Build.NoTargets": "3.5.0", "Microsoft.Build.Traversal": "3.1.6", "Microsoft.NET.Sdk.IL": "7.0.0-rc.1.22414.6"