From 6ba99b172fbb0d641e6c09cab07fa0fc4760c8e9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 25 Apr 2023 12:05:56 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20230424.3 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.23224.1 -> To Version 8.0.0-beta.23224.3 --- eng/Version.Details.xml | 72 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++--------- global.json | 6 ++-- 3 files changed, 54 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d08ce0a8fb9f4..abadb42a82a59 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,73 +92,73 @@ - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 https://github.com/dotnet/runtime-assets @@ -288,9 +288,9 @@ https://github.com/dotnet/xharness cc6611a8c5eee02e5095d9d14a8b0c509ac46e86 - + https://github.com/dotnet/arcade - d14c4adbdbb8c7ee060f9e333883fc9890939b66 + 07ee10f0dfbef32742df139f41ddc241a6b7be52 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 528f1f69f95c8..83268532131d8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 2.5.1-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 - 8.0.0-beta.23224.1 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 2.5.1-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 + 8.0.0-beta.23224.3 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 4a7d00695e7dc..6e672a247eb8c 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.3.23178.7" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23224.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.3", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23224.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.4.23221.1" From d72ba867925058bd45f812b29fe928bc6d4e41eb Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 26 Apr 2023 12:06:04 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20230424.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.23224.1 -> To Version 8.0.0-beta.23224.5 --- eng/Version.Details.xml | 72 ++++++++++++++++---------------- eng/Versions.props | 30 ++++++------- eng/common/templates/job/job.yml | 2 + global.json | 6 +-- 4 files changed, 56 insertions(+), 54 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index abadb42a82a59..1031b43280d03 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,73 +92,73 @@ - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 https://github.com/dotnet/runtime-assets @@ -288,9 +288,9 @@ https://github.com/dotnet/xharness cc6611a8c5eee02e5095d9d14a8b0c509ac46e86 - + https://github.com/dotnet/arcade - 07ee10f0dfbef32742df139f41ddc241a6b7be52 + 092ad720c43c79eb081a52e129399b1980f6de41 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 83268532131d8..7b1e89a8bbd75 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -84,21 +84,21 @@ 8.0.100-preview.2.23107.1 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 2.5.1-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 - 8.0.0-beta.23224.3 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 2.5.1-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 + 8.0.0-beta.23224.5 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index a21533fdd31d2..1279a8b12b1ef 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -162,6 +162,8 @@ jobs: disableComponentGovernance: false ${{ else }}: disableComponentGovernance: true + ${{ else }}: + disableComponentGovernance: ${{ parameters.disableComponentGovernance }} componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} - ${{ if eq(parameters.enableMicrobuild, 'true') }}: diff --git a/global.json b/global.json index 6e672a247eb8c..5488551bd1b46 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.100-preview.3.23178.7" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.3", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23224.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23224.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23224.5", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.23224.5", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-preview.4.23221.1"