From b857e74c6cd413957ba7fbcb4e241bbff1f7988d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2025 07:08:48 +0000 Subject: [PATCH 1/7] Update dependencies from https://github.com/dotnet/diagnostics build 20250127.1 (#7861) [main] Update dependencies from dotnet/diagnostics --- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f2de9581cbd..d090e9aa8ef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -4,13 +4,13 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore 8e941eb42f819adb116b881195158b3887a70a1c - + https://github.com/dotnet/diagnostics - de1a9b87a00e26b76b96ba88f63aabb3c1e9b777 + d17085c285c6550b8a1a11ded6b38355be39edee - + https://github.com/dotnet/diagnostics - de1a9b87a00e26b76b96ba88f63aabb3c1e9b777 + d17085c285c6550b8a1a11ded6b38355be39edee https://github.com/dotnet/command-line-api @@ -46,9 +46,9 @@ https://github.com/dotnet/arcade 4db725213dccb0d1102427bce1c39ba3117da7f7 - + https://github.com/dotnet/diagnostics - de1a9b87a00e26b76b96ba88f63aabb3c1e9b777 + d17085c285c6550b8a1a11ded6b38355be39edee https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 981dbfce6bd..d19861c46f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,8 +57,8 @@ 2.0.0-beta4.25072.1 - 9.0.0-preview.25075.2 - 9.0.0-preview.25075.2 + 9.0.0-preview.25077.1 + 9.0.0-preview.25077.1 8.0.103-servicing.24114.15 @@ -67,7 +67,7 @@ 8.0.1 8.0.1-servicing.23580.1 - 1.0.607502 + 1.0.607701 $(MicrosoftNETCoreApp31Version) From ee4f229786495d2d68e4d808c7674e5cbff958e1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:58:51 -0800 Subject: [PATCH 2/7] [main] Bump the identity-dependencies group across 1 directory with 3 updates (#7853) * [main] Bump the identity-dependencies group across 1 directory with 3 updates Bumps the identity-dependencies group with 3 updates in the /eng/dependabot/independent directory: [Azure.Core](https://github.com/Azure/azure-sdk-for-net), [Azure.Identity](https://github.com/Azure/azure-sdk-for-net) and [Microsoft.Identity.Web](https://github.com/AzureAD/microsoft-identity-web). Updates `Azure.Core` from 1.44.1 to 1.38.0 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Core_1.44.1...Azure.Core_1.38.0) Updates `Azure.Identity` from 1.13.2 to 1.11.4 - [Release notes](https://github.com/Azure/azure-sdk-for-net/releases) - [Commits](https://github.com/Azure/azure-sdk-for-net/compare/Azure.Identity_1.13.2...Azure.Identity_1.11.4) Updates `Microsoft.Identity.Web` from 3.5.0 to 3.6.2 - [Release notes](https://github.com/AzureAD/microsoft-identity-web/releases) - [Changelog](https://github.com/AzureAD/microsoft-identity-web/blob/master/changelog.md) - [Commits](https://github.com/AzureAD/microsoft-identity-web/compare/3.5.0...3.6.2) --- updated-dependencies: - dependency-name: Azure.Core dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Azure.Identity dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies - dependency-name: Microsoft.Identity.Web dependency-type: direct:production update-type: version-update:semver-minor dependency-group: identity-dependencies ... Signed-off-by: dependabot[bot] * Suppress TFM support for functional tests for .NET 6 and 7 --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Justin Anderson --- eng/dependabot/independent/Versions.props | 2 +- ...Diagnostics.Monitoring.Tool.FunctionalTests.csproj | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props index 0bb43f882f0..ca2cf44eb94 100644 --- a/eng/dependabot/independent/Versions.props +++ b/eng/dependabot/independent/Versions.props @@ -6,7 +6,7 @@ 1.13.2 12.23.0 12.21.0 - 3.5.0 + 3.6.2 1.6.23 4.3.2 5.0.0 diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj index 62326ed9299..b216b840c9b 100644 --- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj +++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj @@ -4,6 +4,17 @@ $(TestTargetFrameworks) $(DefineConstants);UNITTEST + + + true + + + true + From 6cb794068fcf51568757303b77b1a1e038869783 Mon Sep 17 00:00:00 2001 From: Justin Anderson Date: Thu, 30 Jan 2025 10:16:38 -0800 Subject: [PATCH 3/7] Start dependabot updates on 9.x and 8.x and stop on feature branch (#7870) --- .github/dependabot.template.yml | 3 +- .github/dependabot.yml | 104 ++++++++++++++++++++++++++++---- 2 files changed, 94 insertions(+), 13 deletions(-) diff --git a/.github/dependabot.template.yml b/.github/dependabot.template.yml index 62dc61f6815..6049f3bc7e0 100644 --- a/.github/dependabot.template.yml +++ b/.github/dependabot.template.yml @@ -18,7 +18,8 @@ #@ def getBranches(): #@ return [ #@ struct.encode({"name": "main", "majorVersion": "8"}), -#@ struct.encode({"name": "feature/9.x", "majorVersion": "9"}), +#@ struct.encode({"name": "release/9.x", "majorVersion": "9"}), +#@ struct.encode({"name": "release/8.x", "majorVersion": "8"}), #@ struct.encode({"name": "release/8.0", "majorVersion": "8"}), #@ ] #@ end diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b0a36446db7..2d7aea49d9e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -89,14 +89,14 @@ updates: directory: /eng/dependabot/independent schedule: interval: daily - target-branch: feature/9.x + target-branch: release/9.x ignore: - dependency-name: Microsoft.Extensions.* update-types: - version-update:semver-major - dependency-name: Moq commit-message: - prefix: '[feature/9.x] ' + prefix: '[release/9.x] ' groups: azure-sdk-dependencies: patterns: @@ -111,20 +111,20 @@ updates: directory: /eng/dependabot/nuget.org schedule: interval: daily - target-branch: feature/9.x + target-branch: release/9.x commit-message: - prefix: '[feature/9.x] ' + prefix: '[release/9.x] ' - package-ecosystem: nuget directory: /eng/dependabot/net9.0 schedule: interval: daily - target-branch: feature/9.x + target-branch: release/9.x ignore: - dependency-name: '*' update-types: - version-update:semver-major commit-message: - prefix: '[feature/9.x] ' + prefix: '[release/9.x] ' groups: runtime-dependencies: patterns: @@ -135,13 +135,13 @@ updates: directory: /eng/dependabot/net8.0 schedule: interval: daily - target-branch: feature/9.x + target-branch: release/9.x ignore: - dependency-name: '*' update-types: - version-update:semver-major commit-message: - prefix: '[feature/9.x] ' + prefix: '[release/9.x] ' groups: runtime-dependencies: patterns: @@ -152,13 +152,13 @@ updates: directory: /eng/dependabot/net7.0 schedule: interval: daily - target-branch: feature/9.x + target-branch: release/9.x ignore: - dependency-name: '*' update-types: - version-update:semver-major commit-message: - prefix: '[feature/9.x] ' + prefix: '[release/9.x] ' groups: runtime-dependencies: patterns: @@ -169,13 +169,93 @@ updates: directory: /eng/dependabot/net6.0 schedule: interval: daily - target-branch: feature/9.x + target-branch: release/9.x ignore: - dependency-name: '*' update-types: - version-update:semver-major commit-message: - prefix: '[feature/9.x] ' + prefix: '[release/9.x] ' + groups: + runtime-dependencies: + patterns: + - Microsoft.Extensions.* + - Microsoft.NETCore.DotNetHost + - System.Text.Json +- package-ecosystem: nuget + directory: /eng/dependabot/independent + schedule: + interval: daily + target-branch: release/8.x + ignore: + - dependency-name: Microsoft.Extensions.* + update-types: + - version-update:semver-major + - dependency-name: Moq + commit-message: + prefix: '[release/8.x] ' + groups: + azure-sdk-dependencies: + patterns: + - Azure.Core + - Azure.Identity + - Azure.Storage.* + identity-dependencies: + patterns: + - Microsoft.Identity.* + - Microsoft.IdentityModel.* +- package-ecosystem: nuget + directory: /eng/dependabot/nuget.org + schedule: + interval: daily + target-branch: release/8.x + commit-message: + prefix: '[release/8.x] ' +- package-ecosystem: nuget + directory: /eng/dependabot/net8.0 + schedule: + interval: daily + target-branch: release/8.x + ignore: + - dependency-name: '*' + update-types: + - version-update:semver-major + commit-message: + prefix: '[release/8.x] ' + groups: + runtime-dependencies: + patterns: + - Microsoft.Extensions.* + - Microsoft.NETCore.DotNetHost + - System.Text.Json +- package-ecosystem: nuget + directory: /eng/dependabot/net7.0 + schedule: + interval: daily + target-branch: release/8.x + ignore: + - dependency-name: '*' + update-types: + - version-update:semver-major + commit-message: + prefix: '[release/8.x] ' + groups: + runtime-dependencies: + patterns: + - Microsoft.Extensions.* + - Microsoft.NETCore.DotNetHost + - System.Text.Json +- package-ecosystem: nuget + directory: /eng/dependabot/net6.0 + schedule: + interval: daily + target-branch: release/8.x + ignore: + - dependency-name: '*' + update-types: + - version-update:semver-major + commit-message: + prefix: '[release/8.x] ' groups: runtime-dependencies: patterns: From 6eeafd2f3f62b61d554a2ac8e13a595763c3e4ee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 12:38:46 -0800 Subject: [PATCH 4/7] Bump dawidd6/action-download-artifact from 7 to 8 (#7871) Bumps [dawidd6/action-download-artifact](https://github.com/dawidd6/action-download-artifact) from 7 to 8. - [Release notes](https://github.com/dawidd6/action-download-artifact/releases) - [Commits](https://github.com/dawidd6/action-download-artifact/compare/80620a5d27ce0ae443b965134db88467fc607b43...20319c5641d495c8a52e688b7dc5fada6c3a9fbc) --- updated-dependencies: - dependency-name: dawidd6/action-download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/submit-to-do-issue.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/submit-to-do-issue.yml b/.github/workflows/submit-to-do-issue.yml index 73a76b7c572..a9603488da8 100644 --- a/.github/workflows/submit-to-do-issue.yml +++ b/.github/workflows/submit-to-do-issue.yml @@ -35,7 +35,7 @@ jobs: # The default artifact download action doesn't support cross-workflow # artifacts, so use a 3rd party one. - name: 'Download linting results' - uses: dawidd6/action-download-artifact@80620a5d27ce0ae443b965134db88467fc607b43 + uses: dawidd6/action-download-artifact@20319c5641d495c8a52e688b7dc5fada6c3a9fbc with: workflow: ${{env.workflow_name}} run_id: ${{github.event.workflow_run.id }} From 234c7c3d3014fc4676f2c8dac8cec7f6c23cb102 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:07:10 -0800 Subject: [PATCH 5/7] Bump actions/upload-artifact from 4.5.0 to 4.6.0 (#7873) Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.5.0 to 4.6.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/6f51ac03b9356f520e9adb1b1b7802705f340c2b...65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/scan-for-to-do-comments.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scan-for-to-do-comments.yml b/.github/workflows/scan-for-to-do-comments.yml index 4267f6e6b30..ca78ece261a 100644 --- a/.github/workflows/scan-for-to-do-comments.yml +++ b/.github/workflows/scan-for-to-do-comments.yml @@ -27,7 +27,7 @@ jobs: COMMENT_AUTHOR: ${{ github.event.comment.user.login }} - name: Upload artifacts - uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b + uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 with: name: issue-todo path: issue/ From d224dfaee5bbc7a602f9a520862a3a1afa6562d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:37:20 -0800 Subject: [PATCH 6/7] Bump dependabot/fetch-metadata from 2.2.0 to 2.3.0 (#7874) Bumps [dependabot/fetch-metadata](https://github.com/dependabot/fetch-metadata) from 2.2.0 to 2.3.0. - [Release notes](https://github.com/dependabot/fetch-metadata/releases) - [Commits](https://github.com/dependabot/fetch-metadata/compare/dbb049abf0d677abbd7f7eee0375145b417fdd34...d7267f607e9d3fb96fc2fbe83e0af444713e90b7) --- updated-dependencies: - dependency-name: dependabot/fetch-metadata dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/verify-dependabot-clearly-defined.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/verify-dependabot-clearly-defined.yml b/.github/workflows/verify-dependabot-clearly-defined.yml index a04f031cc37..7b386b375dd 100644 --- a/.github/workflows/verify-dependabot-clearly-defined.yml +++ b/.github/workflows/verify-dependabot-clearly-defined.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Fetch Dependabot metadata id: metadata - uses: dependabot/fetch-metadata@dbb049abf0d677abbd7f7eee0375145b417fdd34 + uses: dependabot/fetch-metadata@d7267f607e9d3fb96fc2fbe83e0af444713e90b7 - name: Check ClearlyDefined if: ${{steps.metadata.outputs.package-ecosystem == 'nuget'}} From e65683753d3dcaf3a332504eb753fa41dd08a564 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Jan 2025 13:44:02 -0800 Subject: [PATCH 7/7] Update dependencies from https://github.com/dotnet/arcade build 20250129.1 (#7866) Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25066.6 -> To Version 8.0.0-beta.25079.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- global.json | 4 ++-- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index d090e9aa8ef..b5b8f4c9716 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,29 +22,29 @@ https://github.com/dotnet/roslyn-analyzers b4d9a1334d5189172977ba8fddd00bda70161e4a - + https://github.com/dotnet/arcade - 4db725213dccb0d1102427bce1c39ba3117da7f7 + cae548d41ddb92922d78f3d9737635d104f650a5 - + https://github.com/dotnet/arcade - 4db725213dccb0d1102427bce1c39ba3117da7f7 + cae548d41ddb92922d78f3d9737635d104f650a5 - + https://github.com/dotnet/arcade - 4db725213dccb0d1102427bce1c39ba3117da7f7 + cae548d41ddb92922d78f3d9737635d104f650a5 - + https://github.com/dotnet/arcade - 4db725213dccb0d1102427bce1c39ba3117da7f7 + cae548d41ddb92922d78f3d9737635d104f650a5 https://github.com/dotnet/installer 68e8abb1d3e1a240a6e4c29dcd220aae91681676 - + https://github.com/dotnet/arcade - 4db725213dccb0d1102427bce1c39ba3117da7f7 + cae548d41ddb92922d78f3d9737635d104f650a5 https://github.com/dotnet/diagnostics diff --git a/eng/Versions.props b/eng/Versions.props index d19861c46f8..ea37147fd0d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -48,9 +48,9 @@ --> - 8.0.0-beta.25066.6 - 8.0.0-beta.25066.6 - 8.0.0-beta.25066.6 + 8.0.0-beta.25079.1 + 8.0.0-beta.25079.1 + 8.0.0-beta.25079.1 8.0.1 8.0.1-servicing.23580.8 diff --git a/global.json b/global.json index 0551f5619fc..5111174a2a5 100644 --- a/global.json +++ b/global.json @@ -26,7 +26,7 @@ }, "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25066.6", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25066.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25079.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25079.1" } }