From bfb3d1a4b56cc0725b659c8a2d7b55ec49131f58 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 27 Jan 2022 13:15:58 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20220126.9 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22075.6 -> To Version 2.5.1-beta.22076.9 --- eng/Version.Details.xml | 76 +++++++++---------- eng/Versions.props | 30 ++++---- eng/common/templates/job/job.yml | 4 + .../templates/job/publish-build-assets.yml | 4 - eng/common/templates/jobs/jobs.yml | 4 + .../templates/post-build/common-variables.yml | 4 - global.json | 8 +- 7 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3da43d2ed21e24..6f1a20036f65bd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 0137095821e2e5a9e030d97248503387b8d72a18 - + https://github.com/dotnet/arcade - 86a931a4ebfa4d65630f0ff6cedf787d2e48a3b9 + 93656ab81d1b7f4507edc971465ef2e640694e64 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index aae2d08e090181..ace7a2c29c2831 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 2.5.1-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 - 7.0.0-beta.22075.6 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 2.5.1-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 + 7.0.0-beta.22076.9 6.0.0-preview.1.102 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 7678b94ce740c0..c5c2a9915121b3 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,6 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false + disableComponentGovernance: false mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -137,6 +138,9 @@ jobs: richNavLogOutputDirectory: $(Build.SourcesDirectory)/artifacts/bin continueOnError: true + - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), ne(parameters.disableComponentGovernance, 'true')) }}: + - task: ComponentGovernanceComponentDetection@0 + - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - task: MicroBuildCleanup@1 diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index fe9dfdf720cf8a..d91bf9147116f0 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -38,10 +38,6 @@ jobs: value: ${{ parameters.configuration }} - group: Publish-Build-Assets - group: AzureDevOps-Artifact-Feeds-Pats - # Skip component governance and codesign validation for SDL. These jobs - # create no content. - - name: skipComponentGovernanceDetection - value: true - name: runCodesignValidationInjection value: false diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 554e71cfc436dd..70d44735ace4a9 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -8,6 +8,10 @@ parameters: # Optional: Enable publishing using release pipelines enablePublishUsingPipelines: false + # Optional: Disable component governance detection. In general, component governance + # should be on for all jobs. Use only in the event of issues. + disableComponentGovernance: false + # Optional: Enable running the source-build jobs to build repo from source enableSourceBuild: false diff --git a/eng/common/templates/post-build/common-variables.yml b/eng/common/templates/post-build/common-variables.yml index c830e6f277606e..1ac7f49a43ca87 100644 --- a/eng/common/templates/post-build/common-variables.yml +++ b/eng/common/templates/post-build/common-variables.yml @@ -22,9 +22,5 @@ variables: - name: SymbolToolVersion value: 1.0.1 - # Skip component governance and codesign validation for SDL. These jobs - # create no content. - - name: skipComponentGovernanceDetection - value: true - name: runCodesignValidationInjection value: false diff --git a/global.json b/global.json index 43ff763c74d864..c215f3140b6212 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22075.6", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22075.6", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22075.6", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22075.6", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22076.9", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22076.9", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22076.9", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22076.9", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22073.5" From e3a81369f3d38b9aadfa5c9f54457ab87e6ef9fa Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Jan 2022 13:14:36 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20220127.8 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22075.6 -> To Version 2.5.1-beta.22077.8 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f1a20036f65bd..5823757d2fe62e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 0137095821e2e5a9e030d97248503387b8d72a18 - + https://github.com/dotnet/arcade - 93656ab81d1b7f4507edc971465ef2e640694e64 + 510b555b426c5383890bbc3c94aca38b8c290758 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index ace7a2c29c2831..245f5d16911c6b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 2.5.1-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 - 7.0.0-beta.22076.9 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 2.5.1-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 + 7.0.0-beta.22077.8 6.0.0-preview.1.102 diff --git a/global.json b/global.json index c215f3140b6212..2b7017e7981114 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22076.9", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22076.9", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22076.9", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22076.9", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22077.8", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22077.8", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22077.8", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22077.8", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22073.5" From 0bc38cf8df260bee498af1e9773852d8fab7e50d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 29 Jan 2022 13:13:30 +0000 Subject: [PATCH 3/4] Update dependencies from https://github.com/dotnet/arcade build 20220128.2 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22075.6 -> To Version 2.5.1-beta.22078.2 --- eng/Version.Details.xml | 76 ++++++++++++++++---------------- eng/Versions.props | 30 ++++++------- eng/common/internal/NuGet.config | 2 +- global.json | 8 ++-- 4 files changed, 58 insertions(+), 58 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5823757d2fe62e..ff2f722d4cdeff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 0137095821e2e5a9e030d97248503387b8d72a18 - + https://github.com/dotnet/arcade - 510b555b426c5383890bbc3c94aca38b8c290758 + 9b22f498e6c8c225251f5a39c35cd9af54dff69e https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 245f5d16911c6b..f5455a81e106c8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 2.5.1-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 - 7.0.0-beta.22077.8 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 2.5.1-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 + 7.0.0-beta.22078.2 6.0.0-preview.1.102 diff --git a/eng/common/internal/NuGet.config b/eng/common/internal/NuGet.config index 769650362f4aa4..19d3d311b166f5 100644 --- a/eng/common/internal/NuGet.config +++ b/eng/common/internal/NuGet.config @@ -2,6 +2,6 @@ - + diff --git a/global.json b/global.json index 2b7017e7981114..90c13309b5a10f 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22077.8", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22077.8", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22077.8", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22077.8", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22078.2", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22078.2", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22078.2", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22078.2", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22073.5" From e9045a74c68df9aa2c68c080b207ca2abd138daf Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 31 Jan 2022 13:14:07 +0000 Subject: [PATCH 4/4] Update dependencies from https://github.com/dotnet/arcade build 20220130.1 Microsoft.DotNet.XUnitConsoleRunner , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.XUnitExtensions , Microsoft.DotNet.GenAPI , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.GenFacades , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.Helix.Sdk From Version 2.5.1-beta.22075.6 -> To Version 2.5.1-beta.22080.1 --- eng/Version.Details.xml | 76 ++++++++++++++++++++--------------------- eng/Versions.props | 30 ++++++++-------- global.json | 8 ++--- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff2f722d4cdeff..1199fe875fe4b9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -50,77 +50,77 @@ - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 https://github.com/microsoft/vstest @@ -250,9 +250,9 @@ https://github.com/dotnet/xharness 0137095821e2e5a9e030d97248503387b8d72a18 - + https://github.com/dotnet/arcade - 9b22f498e6c8c225251f5a39c35cd9af54dff69e + 4d6406fa2e84c8516a338694be3a4097e6e1f104 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index f5455a81e106c8..f99a6d1e22be2a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -54,21 +54,21 @@ 2.0.0-alpha.1.21525.11 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 2.5.1-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 - 7.0.0-beta.22078.2 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 2.5.1-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 + 7.0.0-beta.22080.1 6.0.0-preview.1.102 diff --git a/global.json b/global.json index 90c13309b5a10f..878b3bcbeaa8e5 100644 --- a/global.json +++ b/global.json @@ -12,10 +12,10 @@ "python3": "3.7.1" }, "msbuild-sdks": { - "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22078.2", - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22078.2", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22078.2", - "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22078.2", + "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "7.0.0-beta.22080.1", + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22080.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.22080.1", + "Microsoft.DotNet.SharedFramework.Sdk": "7.0.0-beta.22080.1", "Microsoft.Build.NoTargets": "3.1.0", "Microsoft.Build.Traversal": "3.0.23", "Microsoft.NET.Sdk.IL": "7.0.0-alpha.1.22073.5"