From 8eb0937bad6dd628f70d29a75e76bff112d8a707 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 5 Feb 2025 21:42:18 -0700 Subject: [PATCH 1/9] Renovate should not update to versions from non-release branches --- .github/renovate.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/renovate.json b/.github/renovate.json index c140014f..a41e0267 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -16,6 +16,11 @@ "matchDatasources": ["dotnet-version", "docker"], "matchDepNames": ["dotnet-sdk", "mcr.microsoft.com/dotnet/sdk"], "groupName": "Dockerfile and global.json updates" + }, + { + "matchPackageNames": ["*"], + "allowedVersions": "!/-g[a-f0-9]+$/", + "groupName": "Ignore versions built from non-release branches" } ] } From 9db1062760fc20f2124ec32a012aced5666372bf Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 5 Feb 2025 22:36:37 -0700 Subject: [PATCH 2/9] Drop group name in renovate --- .github/renovate.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index a41e0267..092ed049 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -19,8 +19,7 @@ }, { "matchPackageNames": ["*"], - "allowedVersions": "!/-g[a-f0-9]+$/", - "groupName": "Ignore versions built from non-release branches" + "allowedVersions": "!/-g[a-f0-9]+$/" } ] } From 574886f56785776ec9246585256d3056228cd021 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 7 Feb 2025 07:20:17 -0700 Subject: [PATCH 3/9] Update xunit (#346) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 8811c1ea..8703de3f 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -10,8 +10,8 @@ - - + + From a84479fe40048d4e6239c977ad8cff1e9eeb0297 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Fri, 7 Feb 2025 20:57:31 -0700 Subject: [PATCH 4/9] Switch nuget feed The new feed will not be filled with CI builds. It will only have nuget.org and other public feeds, and CI for private build packages (e.g. microbuild). --- azure-pipelines/install-dependencies.yml | 4 ++-- nuget.config | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/azure-pipelines/install-dependencies.yml b/azure-pipelines/install-dependencies.yml index 9835c3f8..01e250c3 100644 --- a/azure-pipelines/install-dependencies.yml +++ b/azure-pipelines/install-dependencies.yml @@ -11,13 +11,13 @@ steps: - template: WIFtoPATauth.yml parameters: wifServiceConnectionName: azure-public/vside package pull - deadPATServiceConnectionId: 0ae39abc-4d06-4436-a7b5-865833df49db # azure-public/msft_consumption + deadPATServiceConnectionId: 46f0d4d4-9fff-4c58-a1ab-3b8f97e3b78a # azure-public/msft_consumption_public - task: NuGetAuthenticate@1 displayName: 🔏 Authenticate NuGet feeds inputs: ${{ if and(parameters.needsAzurePublicFeeds, eq(variables['system.collectionId'], '011b8bdf-6d56-4f87-be0d-0092136884d9')) }}: - nuGetServiceConnections: azure-public/msft_consumption + nuGetServiceConnections: azure-public/msft_consumption_public - powershell: | $AccessToken = '$(System.AccessToken)' # Avoid specifying the access token directly on the init.ps1 command line to avoid it showing up in errors diff --git a/nuget.config b/nuget.config index 52071eaa..a46b6388 100644 --- a/nuget.config +++ b/nuget.config @@ -6,8 +6,7 @@ - - + From a71c97c2377c9d17faafb1a570350c213169efd0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 09:58:39 -0700 Subject: [PATCH 5/9] Update becheran/mlc action to v0.21.0 (#347) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7eb7860e..da3e9e1f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -76,6 +76,6 @@ jobs: steps: - uses: actions/checkout@v4 - name: 🔗 Markup Link Checker (mlc) - uses: becheran/mlc@v0.19.2 + uses: becheran/mlc@v0.21.0 with: args: --do-not-warn-for-redirect-to https://learn.microsoft.com*,https://dotnet.microsoft.com/*,https://dev.azure.com/*,https://app.codecov.io/* -p docfx From a8d08d4856b60c9a2911b3a2fd0f1f297bd4a7ea Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 10 Feb 2025 09:59:19 -0700 Subject: [PATCH 6/9] Update dependency Microsoft.NET.Test.Sdk to 17.13.0 (#348) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 8703de3f..350c7eb5 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -9,7 +9,7 @@ - + From 62c89782b8d88a4cfef61338775a14522874e001 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 10 Feb 2025 10:01:53 -0700 Subject: [PATCH 7/9] Bump MicroBuildVersion to 2.0.187 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index c2c31959..f9d52e8e 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ true true - 2.0.181 + 2.0.187 From c54b2b362185cc148d4c5690bac3f9f1d8adc9d6 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 10 Feb 2025 10:17:08 -0700 Subject: [PATCH 8/9] Rollback dependencies to publicly available versions --- Directory.Packages.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index f564b7b3..56791685 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -8,7 +8,7 @@ 3.11.0 4.12.0 1.1.2 - 3.1.525101 + 3.0.442202 3.11.0-beta1.24527.2 @@ -26,9 +26,9 @@ - - - + + + From dcac5622a9fdd730181042ec75f4ce3b4d14ba8f Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 10 Feb 2025 11:27:55 -0700 Subject: [PATCH 9/9] Revert "Fix up build breaks after dependency upgrade" This reverts commit efdee0b1349ce980deedd8d7ca130e8258d1486d. --- src/SosThreadingTools/DumpAsyncCommand.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SosThreadingTools/DumpAsyncCommand.cs b/src/SosThreadingTools/DumpAsyncCommand.cs index 9aedaf99..dcc005c5 100644 --- a/src/SosThreadingTools/DumpAsyncCommand.cs +++ b/src/SosThreadingTools/DumpAsyncCommand.cs @@ -370,7 +370,7 @@ private void MarkThreadingBlockTasks(List allStateMachines) { if (visitedObjects.Add(stackObject.Address)) { - ClrObject joinableTaskObject = stackObject.Type is null ? runtime.Heap.GetObject(stackObject.Address) : runtime.Heap.GetObject(stackObject.Address, stackObject.Type); + var joinableTaskObject = new ClrObject(stackObject.Address, stackObject.Type); int state = joinableTaskObject.ReadField("state"); if ((state & 0x10) == 0x10) {