From d5db6992694e04bed1b3b884133ac66e232b99f2 Mon Sep 17 00:00:00 2001 From: Ryan Toth Date: Mon, 18 Nov 2024 08:17:24 -0800 Subject: [PATCH 1/6] Address vulnerabilities in MessagePack and STJ --- Directory.Packages.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index cd6494a47..a41cacebf 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,7 @@ true true - 2.5.108 + 2.5.187 2.0.162 17.10.48 @@ -29,7 +29,7 @@ - + From abd16b37aa0e1da9b830feb19a2cf8a188832ea1 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Wed, 12 Mar 2025 17:25:25 -0600 Subject: [PATCH 2/6] Insert into 17.13 --- tools/variables/InsertTargetBranch.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/variables/InsertTargetBranch.ps1 b/tools/variables/InsertTargetBranch.ps1 index cdcc91943..c4f3cdf90 100644 --- a/tools/variables/InsertTargetBranch.ps1 +++ b/tools/variables/InsertTargetBranch.ps1 @@ -1,2 +1,2 @@ # This is the default branch of the VS repo that we will use to insert into VS. -'main' +'rel/d17.13' From 6cf55be0c3ab3210fb419b828195cdbccf15eac4 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 17 Mar 2025 13:41:08 -0600 Subject: [PATCH 3/6] Drop threading analyzers from package dependencies --- Directory.Packages.props | 5 +++-- src/StreamJsonRpc/StreamJsonRpc.csproj | 3 ++- test/StreamJsonRpc.Tests/DuplexPipeMarshalingTests.cs | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 56490b583..9840bc0af 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -6,7 +6,7 @@ true 2.5.192 2.0.187 - 17.13.2 + 17.13.61 3.11.0-beta1.24629.2 @@ -18,9 +18,10 @@ + - + diff --git a/src/StreamJsonRpc/StreamJsonRpc.csproj b/src/StreamJsonRpc/StreamJsonRpc.csproj index 2e7738e0c..d13c2cf16 100644 --- a/src/StreamJsonRpc/StreamJsonRpc.csproj +++ b/src/StreamJsonRpc/StreamJsonRpc.csproj @@ -15,7 +15,8 @@ - + + diff --git a/test/StreamJsonRpc.Tests/DuplexPipeMarshalingTests.cs b/test/StreamJsonRpc.Tests/DuplexPipeMarshalingTests.cs index 96f452add..11f9e4a3b 100644 --- a/test/StreamJsonRpc.Tests/DuplexPipeMarshalingTests.cs +++ b/test/StreamJsonRpc.Tests/DuplexPipeMarshalingTests.cs @@ -644,12 +644,14 @@ public async Task StreamClosesDeterministically() writing = true; this.Logger.WriteLine("Writing {0} bytes.", e.Length); }; +#pragma warning disable CS0618 // Type or member is obsolete monitoredStream.DidWrite += (s, e) => { Assert.True(writing); writing = false; this.Logger.WriteLine("Wrote {0} bytes.", e.Count); }; +#pragma warning restore CS0618 // Type or member is obsolete monitoredStream.DidWriteByte += (s, e) => { Assert.True(writing); From d6b9605dae730dd7a49d0b84b22a4dc10d797610 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Tue, 19 Aug 2025 07:37:01 -0600 Subject: [PATCH 4/6] Classify UnreachableAssembly symbols as test symbol This fixes an official build break. --- tools/Get-SymbolFiles.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/Get-SymbolFiles.ps1 b/tools/Get-SymbolFiles.ps1 index d7f8b27c6..a119f9e85 100644 --- a/tools/Get-SymbolFiles.ps1 +++ b/tools/Get-SymbolFiles.ps1 @@ -18,7 +18,7 @@ Write-Progress -Activity $ActivityName -CurrentOperation "Discovery PDB files" $PDBs = Get-ChildItem -rec "$Path/*.pdb" # Filter PDBs to product OR test related. -$testregex = "unittest|tests|\.test\.|Benchmarks" +$testregex = "unittest|tests|\.test\.|Benchmarks|UnreachableAssembly" Write-Progress -Activity $ActivityName -CurrentOperation "De-duplicating symbols" $PDBsByHash = @{} From 84b86852dd9fcb0bdde25b3b68a3db4fc668f9e3 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 10 Nov 2025 09:40:36 -0700 Subject: [PATCH 5/6] Stop running optprof on older servicing branches They're failing, causing repeated investigations into the failures, and we're not planning to fix this unless we have a servicing event. --- azure-pipelines/OptProf.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/azure-pipelines/OptProf.yml b/azure-pipelines/OptProf.yml index 79520f1d5..f08b9fd1b 100644 --- a/azure-pipelines/OptProf.yml +++ b/azure-pipelines/OptProf.yml @@ -5,7 +5,6 @@ schedules: displayName: Weekly OptProf run branches: include: - - 'v*.*' - main always: true # we must keep data fresh since optimizationdata drops are purged after 30 days From 4e6ea3044256f8b21b67d29be6a43d8f41aa71e6 Mon Sep 17 00:00:00 2001 From: Andrew Arnott Date: Mon, 10 Nov 2025 10:07:39 -0700 Subject: [PATCH 6/6] Build on ubuntu-22.04 --- azure-pipelines/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines/build.yml b/azure-pipelines/build.yml index f5d542e88..3bb4e8c90 100644 --- a/azure-pipelines/build.yml +++ b/azure-pipelines/build.yml @@ -85,7 +85,7 @@ parameters: - name: linuxPool type: object default: - vmImage: ubuntu-20.04 + vmImage: ubuntu-22.04 - name: macOSPool type: object default: