From ae68a17c32c0a11be112ad2f8438e5a440bb2063 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 21 Apr 2023 17:15:43 +0000 Subject: [PATCH 1/5] [release/7.0.4xx] Update dependencies from dotnet/sdk (#16182) [release/7.0.4xx] Update dependencies from dotnet/sdk - Coherency Updates: - Microsoft.NET.Test.Sdk: from 17.7.0-preview.23214.2 to 17.7.0-preview.23220.1 (parent: Microsoft.NET.Sdk) --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3ad79ee10..30b9a6d9e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - f53e9a9a9d3849978e424bf4732fe9459c9b2d6a + 3aebe9f4e7a26ca9ce752ca3ece95999dcd0cd36 - + https://github.com/dotnet/sdk - f53e9a9a9d3849978e424bf4732fe9459c9b2d6a + 3aebe9f4e7a26ca9ce752ca3ece95999dcd0cd36 - + https://github.com/dotnet/sdk - f53e9a9a9d3849978e424bf4732fe9459c9b2d6a + 3aebe9f4e7a26ca9ce752ca3ece95999dcd0cd36 - + https://github.com/dotnet/sdk - f53e9a9a9d3849978e424bf4732fe9459c9b2d6a + 3aebe9f4e7a26ca9ce752ca3ece95999dcd0cd36 @@ -133,9 +133,9 @@ b9c0f04d0ec3ec292bde52acccbc41c208931f07 - + https://github.com/microsoft/vstest - 1541fc31ead99a358c649e7e9fa203e0dd4d20a5 + 21bc097b123d4d51cab3fcef12529c5c23e632be diff --git a/eng/Versions.props b/eng/Versions.props index 08513c8bf..3348fbaac 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23220.17 - 7.0.400-preview.23220.17 - 7.0.400-preview.23220.17 + 7.0.400-preview.23221.2 + 7.0.400-preview.23221.2 + 7.0.400-preview.23221.2 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) @@ -193,7 +193,7 @@ 2.2.0-beta.19072.10 2.0.0 - 17.7.0-preview.23214.2 + 17.7.0-preview.23220.1 From 50cc344a8045ecf7ab63488104397dcfceae3f22 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 17:47:42 +0000 Subject: [PATCH 2/5] 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 --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- eng/common/templates/job/job.yml | 12 ++++++++---- eng/common/templates/steps/component-governance.yml | 10 ++++++++++ global.json | 4 ++-- 5 files changed, 27 insertions(+), 13 deletions(-) create mode 100644 eng/common/templates/steps/component-governance.yml diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30b9a6d9e..561fbab89 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -192,18 +192,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 3348fbaac..b5dd8fdc1 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 767d909e04dc48535347eaa83e4499d139671f3e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 18:09:08 +0000 Subject: [PATCH 3/5] Update dependencies from https://github.com/dotnet/sdk build 20230421.5 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23221.2 -> To Version 7.0.400-preview.23221.5 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp From Version 12.5.0-beta.23219.3 -> To Version 12.5.0-beta.23221.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 30b9a6d9e..914d5086c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 3aebe9f4e7a26ca9ce752ca3ece95999dcd0cd36 + cf8c22ef8be20451ea0e2c8ef5b0f94b10eea2db - + https://github.com/dotnet/sdk - 3aebe9f4e7a26ca9ce752ca3ece95999dcd0cd36 + cf8c22ef8be20451ea0e2c8ef5b0f94b10eea2db - + https://github.com/dotnet/sdk - 3aebe9f4e7a26ca9ce752ca3ece95999dcd0cd36 + cf8c22ef8be20451ea0e2c8ef5b0f94b10eea2db - + https://github.com/dotnet/sdk - 3aebe9f4e7a26ca9ce752ca3ece95999dcd0cd36 + cf8c22ef8be20451ea0e2c8ef5b0f94b10eea2db @@ -124,13 +124,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-wpf 03e9f99d0f93a3e3768227a9c6a1076fabd0de43 - + https://github.com/dotnet/fsharp - b9c0f04d0ec3ec292bde52acccbc41c208931f07 + 858e2df9631a385cbddef62eeb424f9b3071b031 - + https://github.com/dotnet/fsharp - b9c0f04d0ec3ec292bde52acccbc41c208931f07 + 858e2df9631a385cbddef62eeb424f9b3071b031 diff --git a/eng/Versions.props b/eng/Versions.props index 3348fbaac..8020fdd34 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23221.2 - 7.0.400-preview.23221.2 - 7.0.400-preview.23221.2 + 7.0.400-preview.23221.5 + 7.0.400-preview.23221.5 + 7.0.400-preview.23221.5 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From 8aea6898f42c919673fb6924d11fae250b1cb452 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Apr 2023 22:32:30 +0000 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/sdk build 20230421.10 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23221.2 -> To Version 7.0.400-preview.23221.10 Dependency coherency updates Microsoft.FSharp.Compiler,Microsoft.SourceBuild.Intermediate.fsharp,Microsoft.Build,Microsoft.SourceBuild.Intermediate.msbuild From Version 12.5.0-beta.23219.3 -> To Version 12.5.0-beta.23221.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 914d5086c..9f13f626a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - cf8c22ef8be20451ea0e2c8ef5b0f94b10eea2db + 162443bb75e86746607bf91c2015b26ef5feb9fc - + https://github.com/dotnet/sdk - cf8c22ef8be20451ea0e2c8ef5b0f94b10eea2db + 162443bb75e86746607bf91c2015b26ef5feb9fc - + https://github.com/dotnet/sdk - cf8c22ef8be20451ea0e2c8ef5b0f94b10eea2db + 162443bb75e86746607bf91c2015b26ef5feb9fc - + https://github.com/dotnet/sdk - cf8c22ef8be20451ea0e2c8ef5b0f94b10eea2db + 162443bb75e86746607bf91c2015b26ef5feb9fc @@ -149,13 +149,13 @@ 281de15d8e915793688eeac757aa4b3f08596d08 - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + ac3f5ad89f3f04d080986607d504a838ed622fb9 - + https://github.com/dotnet/msbuild - 2cbc8b6aef648cf21c6a68a0dab7fe09a614e475 + ac3f5ad89f3f04d080986607d504a838ed622fb9 diff --git a/eng/Versions.props b/eng/Versions.props index 8020fdd34..b4e5a131e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23221.5 - 7.0.400-preview.23221.5 - 7.0.400-preview.23221.5 + 7.0.400-preview.23221.10 + 7.0.400-preview.23221.10 + 7.0.400-preview.23221.10 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) From fa8ac4cf5f6dfe7620f478843e5bb368322902f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 23 Apr 2023 03:43:20 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/sdk build 20230422.4 Microsoft.DotNet.Common.ItemTemplates , Microsoft.DotNet.MSBuildSdkResolver , Microsoft.NET.Sdk , Microsoft.TemplateEngine.Cli From Version 7.0.400-preview.23221.10 -> To Version 7.0.400-preview.23222.4 Dependency coherency updates Microsoft.Net.Compilers.Toolset,NuGet.Build.Tasks From Version 4.7.0-1.23220.5 -> To Version 4.7.0-1.23222.1 (parent: Microsoft.NET.Sdk --- eng/Version.Details.xml | 24 ++++++++++++------------ eng/Versions.props | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5d537d4e6..60fef4c9b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -98,22 +98,22 @@ 45a41b353d078e4d1e5918246fddbacb452eb210 - + https://github.com/dotnet/sdk - 162443bb75e86746607bf91c2015b26ef5feb9fc + 9338256c2c3c6c251a06fd7c487b11af81a930de - + https://github.com/dotnet/sdk - 162443bb75e86746607bf91c2015b26ef5feb9fc + 9338256c2c3c6c251a06fd7c487b11af81a930de - + https://github.com/dotnet/sdk - 162443bb75e86746607bf91c2015b26ef5feb9fc + 9338256c2c3c6c251a06fd7c487b11af81a930de - + https://github.com/dotnet/sdk - 162443bb75e86746607bf91c2015b26ef5feb9fc + 9338256c2c3c6c251a06fd7c487b11af81a930de @@ -144,9 +144,9 @@ linker - + https://github.com/dotnet/roslyn - 281de15d8e915793688eeac757aa4b3f08596d08 + ef625f3b960594fcb3f902af88ad7c90df656516 @@ -158,9 +158,9 @@ ac3f5ad89f3f04d080986607d504a838ed622fb9 - + https://github.com/nuget/nuget.client - 7eaba9f3f68b8df63d5dcf10e2a8ef3591164ddf + 63edda646848553467639abe6bbade5ebc5dec61 diff --git a/eng/Versions.props b/eng/Versions.props index 2cde64523..ab43fb404 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -69,9 +69,9 @@ - 7.0.400-preview.23221.10 - 7.0.400-preview.23221.10 - 7.0.400-preview.23221.10 + 7.0.400-preview.23222.4 + 7.0.400-preview.23222.4 + 7.0.400-preview.23222.4 $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion) $(MicrosoftNETSdkPackageVersion)