From 3976bb45b6a7e2a373a75aef9d58318fefc2b81d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Wed, 28 Jan 2026 15:47:07 +0100
Subject: [PATCH 1/6] chore: update Polyfill from 1.32.0 to 9.7.7

---
 src/Sentry.Analyzers/Sentry.Analyzers.csproj | 2 +-
 src/Sentry/Sentry.csproj                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sentry.Analyzers/Sentry.Analyzers.csproj b/src/Sentry.Analyzers/Sentry.Analyzers.csproj
index 223a1434f8..f8d3d0754e 100644
--- a/src/Sentry.Analyzers/Sentry.Analyzers.csproj
+++ b/src/Sentry.Analyzers/Sentry.Analyzers.csproj
@@ -24,7 +24,7 @@
       https://github.com/SimonCropp/Polyfill
     -->
     <ItemGroup>
-      <PackageReference Include="Polyfill" Version="1.32.0" PrivateAssets="all" />
+      <PackageReference Include="Polyfill" Version="9.7.7" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index a2b75db0ae..28fe866055 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -65,7 +65,7 @@
     https://github.com/SimonCropp/Polyfill
   -->
   <ItemGroup>
-    <PackageReference Include="Polyfill" Version="1.32.0" PrivateAssets="all" />
+    <PackageReference Include="Polyfill" Version="9.7.7" PrivateAssets="all" />
   </ItemGroup>
 
   <!--

From 67f4d9eda4c2c4810c75a788ed2dda5e93552002 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Wed, 28 Jan 2026 15:56:13 +0100
Subject: [PATCH 2/6] fix: remove redundant extension-method: IDictionary<TKey,
 TValue>. AsReadOnly

---
 src/Sentry/Internal/Extensions/CollectionsExtensions.cs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/Sentry/Internal/Extensions/CollectionsExtensions.cs b/src/Sentry/Internal/Extensions/CollectionsExtensions.cs
index 8d7b6f7bdf..79a0fb4d44 100644
--- a/src/Sentry/Internal/Extensions/CollectionsExtensions.cs
+++ b/src/Sentry/Internal/Extensions/CollectionsExtensions.cs
@@ -69,18 +69,14 @@ public static IEnumerable<KeyValuePair<TKey, TValue>> WhereNotNullValue<TKey, TV
             }
         }
     }
+
     public static IEnumerable<KeyValuePair<TKey, TValue>> Append<TKey, TValue>(
         this IEnumerable<KeyValuePair<TKey, TValue>> source, TKey key, TValue value) =>
         source.Append(new KeyValuePair<TKey, TValue>(key, value));
+
     public static IReadOnlyList<T> AsReadOnly<T>(this IList<T> list) =>
         list as IReadOnlyList<T> ?? new ReadOnlyCollection<T>(list);
 
-#if !NET7_0_OR_GREATER
-    public static IReadOnlyDictionary<TKey, TValue> AsReadOnly<TKey, TValue>(this IDictionary<TKey, TValue> dictionary)
-        where TKey : notnull =>
-        new ReadOnlyDictionary<TKey, TValue>(dictionary);
-#endif
-
     public static IEnumerable<T> ExceptNulls<T>(this IEnumerable<T?> source) =>
         source.Where(x => x != null).Select(x => x!);
 

From 23131ecadfd768ab0ff5043d8c9d26ad264c3c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Wed, 28 Jan 2026 16:42:30 +0100
Subject: [PATCH 3/6] fix: readd missing polyfill:
 HttpContent.ReadAsStreamAsync(CancellationToken)

---
 src/Sentry/Sentry.csproj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index 28fe866055..11ffcbf7a5 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -67,6 +67,10 @@
   <ItemGroup>
     <PackageReference Include="Polyfill" Version="9.7.7" PrivateAssets="all" />
   </ItemGroup>
+  <PropertyGroup>
+    <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.0'">$(DefineConstants);FeatureHttp</DefineConstants>
+    <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.1'">$(DefineConstants);FeatureHttp</DefineConstants>
+  </PropertyGroup>
 
   <!--
     On .NET Framework, we need a package reference to System.Runtime.InteropServices.RuntimeInformation.

From 12a6a657243bf1f7e8c0dbd372c1de0e8520142b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Wed, 28 Jan 2026 17:21:25 +0100
Subject: [PATCH 4/6] build: fix warning: PolyfillMemoryVersion

---
 src/Sentry.Analyzers/Sentry.Analyzers.csproj | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/Sentry.Analyzers/Sentry.Analyzers.csproj b/src/Sentry.Analyzers/Sentry.Analyzers.csproj
index f8d3d0754e..d6bb07d565 100644
--- a/src/Sentry.Analyzers/Sentry.Analyzers.csproj
+++ b/src/Sentry.Analyzers/Sentry.Analyzers.csproj
@@ -26,6 +26,16 @@
     <ItemGroup>
       <PackageReference Include="Polyfill" Version="9.7.7" PrivateAssets="all" />
     </ItemGroup>
+    <Target Name="BeforePreparePolyfill" BeforeTargets="PreparePolyfill">
+      <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+        <PolyfillNoWarnIncorrectVersion>true</PolyfillNoWarnIncorrectVersion>
+      </PropertyGroup>
+    </Target>
+    <Target Name="AfterPreparePolyfill" AfterTargets="PreparePolyfill" DependsOnTargets="PreparePolyfill">
+      <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+        <DefineConstants>$([System.String]::Copy('$(DefineConstants)').Replace('FeatureMemory','').Replace(';;',';'))</DefineConstants>
+      </PropertyGroup>
+    </Target>
 
     <ItemGroup>
       <Using Remove="System.Text.Json" />

From 12ef3024c157aff3aff462462aa330649e05f7b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Tue, 10 Feb 2026 19:55:08 +0100
Subject: [PATCH 5/6] chore: update Polyfill from 9.7.7 to 9.8.1

---
 src/Sentry.Analyzers/Sentry.Analyzers.csproj | 2 +-
 src/Sentry/Sentry.csproj                     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Sentry.Analyzers/Sentry.Analyzers.csproj b/src/Sentry.Analyzers/Sentry.Analyzers.csproj
index d6bb07d565..e855f9d246 100644
--- a/src/Sentry.Analyzers/Sentry.Analyzers.csproj
+++ b/src/Sentry.Analyzers/Sentry.Analyzers.csproj
@@ -24,7 +24,7 @@
       https://github.com/SimonCropp/Polyfill
     -->
     <ItemGroup>
-      <PackageReference Include="Polyfill" Version="9.7.7" PrivateAssets="all" />
+      <PackageReference Include="Polyfill" Version="9.8.1" PrivateAssets="all" />
     </ItemGroup>
     <Target Name="BeforePreparePolyfill" BeforeTargets="PreparePolyfill">
       <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
diff --git a/src/Sentry/Sentry.csproj b/src/Sentry/Sentry.csproj
index 11ffcbf7a5..f2f88ca2d5 100644
--- a/src/Sentry/Sentry.csproj
+++ b/src/Sentry/Sentry.csproj
@@ -65,7 +65,7 @@
     https://github.com/SimonCropp/Polyfill
   -->
   <ItemGroup>
-    <PackageReference Include="Polyfill" Version="9.7.7" PrivateAssets="all" />
+    <PackageReference Include="Polyfill" Version="9.8.1" PrivateAssets="all" />
   </ItemGroup>
   <PropertyGroup>
     <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.0'">$(DefineConstants);FeatureHttp</DefineConstants>

From d6718ccc14628f7a703006ee8a7d8c479dd8e1b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20P=C3=B6lz?=
 <38893694+Flash0ver@users.noreply.github.com>
Date: Tue, 10 Feb 2026 21:22:02 +0100
Subject: [PATCH 6/6] build: add global "Polyfills" using

---
 src/Directory.Build.props  | 6 ++++++
 test/Directory.Build.props | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index e3e1feb526..a57bbf9638 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -60,4 +60,10 @@
     <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="All" Condition="'$(Configuration)' != 'Debug'" />
   </ItemGroup>
 
+  <!-- "Sentry" uses "Polyfill" and gives access to it's internals via "InternalsVisibleTo", but some Polyfills are in a separate namespace -->
+  <ItemGroup Condition="'$(MSBuildProjectName)' != 'Sentry' And $(MSBuildProjectName.StartsWith('Sentry.'))">
+    <!-- the latest TargetFramework requires no Polyfills; "Sentry.Compiler.Extensions" has its own Polyfills -->
+    <Using Include="Polyfills" Condition="'$(TargetFramework)' != $(LatestTfm) And $(MSBuildProjectName) != 'Sentry.Compiler.Extensions'" />
+  </ItemGroup>
+
 </Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index 7559ec9d73..43c5f797ab 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -79,4 +79,10 @@
     <PackageReference Include="System.Text.RegularExpressions" Version="4.3.1" />
   </ItemGroup>
 
+  <!-- "Sentry" uses "Polyfill" and gives access to it's internals via "InternalsVisibleTo", but some Polyfills are in a separate namespace -->
+  <ItemGroup Condition="'$(MSBuildProjectName)' != 'Sentry' And $(MSBuildProjectName.StartsWith('Sentry.'))">
+    <!-- the latest TargetFramework requires no Polyfills -->
+    <Using Include="Polyfills" Condition="'$(TargetFramework)' != $(LatestTfm)" />
+  </ItemGroup>
+
 </Project>