From 67b07a4710259813121bfb2ceb2f2540ba0eab4f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 17:47:37 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20230421.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23221.2 --- NuGet.config | 27 ------------------- eng/Version.Details.xml | 12 ++++----- eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 12 ++++++--- .../templates/steps/component-governance.yml | 10 +++++++ global.json | 4 +-- 6 files changed, 27 insertions(+), 40 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/NuGet.config b/NuGet.config index 9f41cb141..01a4cdf20 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,30 +9,15 @@ - - - - - - - - - - - - - - - @@ -56,21 +41,9 @@ - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f1069a15c..54d6553f9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,18 +198,18 @@ - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 746a46f3963c9359da5dab5425bc0feaf9e88068 - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 746a46f3963c9359da5dab5425bc0feaf9e88068 - + https://github.com/dotnet/arcade - 7c5e5a782c67460b123c8e41d484ebcca8002c93 + 746a46f3963c9359da5dab5425bc0feaf9e88068 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 26345d72e..9db4f52c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23211.2 + 7.0.0-beta.23221.2 diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index e3ba93980..3cb5145ea 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -24,7 +24,7 @@ parameters: enablePublishBuildAssets: false enablePublishTestResults: false enablePublishUsingPipelines: false - disableComponentGovernance: false + disableComponentGovernance: '' mergeTestResults: false testRunTitle: '' testResultsFormat: '' @@ -142,9 +142,13 @@ 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 - continueOnError: true + - template: /eng/common/templates/steps/component-governance.yml + parameters: + ${{ if eq(parameters.disableComponentGovernance, '') }}: + ${{ if and(ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest'), eq(parameters.runAsPublic, 'false'), or(contains(variables['Build.SourceBranch'], 'internal/release'), eq(variables['Build.SourceBranch'], 'main'))) }}: + disableComponentGovernance: false + ${{ else }}: + disableComponentGovernance: true - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates/steps/component-governance.yml b/eng/common/templates/steps/component-governance.yml new file mode 100644 index 000000000..babc2757d --- /dev/null +++ b/eng/common/templates/steps/component-governance.yml @@ -0,0 +1,10 @@ +parameters: + disableComponentGovernance: false + +steps: +- ${{ if eq(parameters.disableComponentGovernance, 'true') }}: + - script: "echo ##vso[task.setvariable variable=skipComponentGovernanceDetection]true" + displayName: Set skipComponentGovernanceDetection variable +- ${{ if ne(parameters.disableComponentGovernance, 'true') }}: + - task: ComponentGovernanceComponentDetection@0 + continueOnError: true \ No newline at end of file diff --git a/global.json b/global.json index 550a365a9..3e657a132 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23211.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23211.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23221.2", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23221.2" } } From 39b97e3e09a1c54c5a4093a7d8024bc04594a529 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 28 Apr 2023 16:35:48 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20230428.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk From Version 7.0.0-beta.23211.2 -> To Version 7.0.0-beta.23228.7 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 54d6553f9..b2d5ee1ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -198,18 +198,18 @@ - + https://github.com/dotnet/arcade - 746a46f3963c9359da5dab5425bc0feaf9e88068 + df8799988af6503cbcd9544713d30732328c8c57 - + https://github.com/dotnet/arcade - 746a46f3963c9359da5dab5425bc0feaf9e88068 + df8799988af6503cbcd9544713d30732328c8c57 - + https://github.com/dotnet/arcade - 746a46f3963c9359da5dab5425bc0feaf9e88068 + df8799988af6503cbcd9544713d30732328c8c57 https://github.com/dotnet/source-build-reference-packages diff --git a/eng/Versions.props b/eng/Versions.props index 9db4f52c2..07b9560e1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ - 7.0.0-beta.23221.2 + 7.0.0-beta.23228.7 diff --git a/global.json b/global.json index 3e657a132..4d4fe182c 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "3.16.4" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23221.2", - "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23221.2" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.23228.7", + "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.23228.7" } }