Tyrrrz · Tyrrrz · Feb 16, 2026 · Feb 16, 2026 · Feb 16, 2026 · Feb 16, 2026
diff --git a/PolyShim/List-Signatures.ps1 b/PolyShim/List-Signatures.ps1
@@ -378,8 +378,8 @@ foreach ($file in $codeFiles) {
         $typeKind = $match.Groups[1].Value
         $typeName = $match.Groups[2].Value
 
-        # Skip PolyfillExtensions classes
-        if ($typeName -match '^PolyfillExtensions\d*$') {
+        # Skip MemberPolyfills_* classes
+        if ($typeName -match '^MemberPolyfills_') {
             continue
         }
 

diff --git a/PolyShim/Net100/Random.cs b/PolyShim/Net100/Random.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Text;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net100_Random
 {
     extension(Random random)
     {

diff --git a/PolyShim/Net100/TimeSpan.cs b/PolyShim/Net100/TimeSpan.cs
@@ -6,8 +6,10 @@
 // ReSharper disable PartialTypeWithSinglePart
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net100_TimeSpan
 {
     extension(TimeSpan)
     {

diff --git a/PolyShim/Net50/Convert.cs b/PolyShim/Net50/Convert.cs
@@ -6,8 +6,10 @@
 // ReSharper disable PartialTypeWithSinglePart
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_Convert
 {
     extension(Convert)
     {

diff --git a/PolyShim/Net50/DynamicallyAccessedMembersAttribute.cs b/PolyShim/Net50/DynamicallyAccessedMembersAttribute.cs
@@ -1,5 +1,6 @@
 #if (NETCOREAPP && !NET5_0_OR_GREATER) || (NETFRAMEWORK) || (NETSTANDARD)
 #nullable enable
+
 // ReSharper disable RedundantUsingDirective
 // ReSharper disable CheckNamespace
 // ReSharper disable InconsistentNaming

diff --git a/PolyShim/Net50/Enum.cs b/PolyShim/Net50/Enum.cs
@@ -6,8 +6,10 @@
 // ReSharper disable PartialTypeWithSinglePart
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_Enum
 {
     extension(Enum)
     {

diff --git a/PolyShim/Net50/Environment.cs b/PolyShim/Net50/Environment.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_Environment
 {
     extension(Environment)
     {

diff --git a/PolyShim/Net50/HttpClient.cs b/PolyShim/Net50/HttpClient.cs
@@ -11,8 +11,10 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_HttpClient
 {
 #if FEATURE_TASK
     extension(HttpClient httpClient)

diff --git a/PolyShim/Net50/HttpContent.cs b/PolyShim/Net50/HttpContent.cs
@@ -10,8 +10,10 @@
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_HttpContent
 {
 #if FEATURE_TASK
     extension(HttpContent httpContent)

diff --git a/PolyShim/Net50/IntPtr.cs b/PolyShim/Net50/IntPtr.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Globalization;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions2
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_IntPtr
 {
     extension(IntPtr)
     {

diff --git a/PolyShim/Net50/MemberNotNullAttribute.cs b/PolyShim/Net50/MemberNotNullAttribute.cs
@@ -1,5 +1,6 @@
 #if (NETCOREAPP && !NET5_0_OR_GREATER) || (NETFRAMEWORK) || (NETSTANDARD)
 #nullable enable
+
 // ReSharper disable RedundantUsingDirective
 // ReSharper disable CheckNamespace
 // ReSharper disable InconsistentNaming

diff --git a/PolyShim/Net50/MemberNotNullWhenAttribute.cs b/PolyShim/Net50/MemberNotNullWhenAttribute.cs
@@ -1,5 +1,6 @@
 #if (NETCOREAPP && !NET5_0_OR_GREATER) || (NETFRAMEWORK) || (NETSTANDARD)
 #nullable enable
+
 // ReSharper disable RedundantUsingDirective
 // ReSharper disable CheckNamespace
 // ReSharper disable InconsistentNaming

diff --git a/PolyShim/Net50/OperatingSystem.cs b/PolyShim/Net50/OperatingSystem.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Runtime.InteropServices;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_OperatingSystem
 {
     extension(OperatingSystem)
     {

diff --git a/PolyShim/Net50/Process.cs b/PolyShim/Net50/Process.cs
@@ -10,8 +10,10 @@
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_Process
 {
 #if FEATURE_TASK
     extension(Process process)

diff --git a/PolyShim/Net50/RequiresUnreferencedCodeAttribute.cs b/PolyShim/Net50/RequiresUnreferencedCodeAttribute.cs
@@ -1,5 +1,6 @@
 #if (NETCOREAPP && !NET5_0_OR_GREATER) || (NETFRAMEWORK) || (NETSTANDARD)
 #nullable enable
+
 // ReSharper disable RedundantUsingDirective
 // ReSharper disable CheckNamespace
 // ReSharper disable InconsistentNaming

diff --git a/PolyShim/Net50/TaskCompletionSourceOfT.cs b/PolyShim/Net50/TaskCompletionSourceOfT.cs
@@ -9,8 +9,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_TaskCompletionSourceOfT
 {
     extension<T>(TaskCompletionSource<T> source)
     {

diff --git a/PolyShim/Net50/Type.cs b/PolyShim/Net50/Type.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Reflection;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_Type
 {
     extension(Type type)
     {

diff --git a/PolyShim/Net50/UIntPtr.cs b/PolyShim/Net50/UIntPtr.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Globalization;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions3
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net50_UIntPtr
 {
     extension(UIntPtr)
     {

diff --git a/PolyShim/Net50/UnconditionalSuppressMessageAttribute.cs b/PolyShim/Net50/UnconditionalSuppressMessageAttribute.cs
@@ -1,5 +1,6 @@
 #if (NETCOREAPP && !NET5_0_OR_GREATER) || (NETFRAMEWORK) || (NETSTANDARD)
 #nullable enable
+
 // ReSharper disable RedundantUsingDirective
 // ReSharper disable CheckNamespace
 // ReSharper disable InconsistentNaming

diff --git a/PolyShim/Net60/ArgumentNullException.cs b/PolyShim/Net60/ArgumentNullException.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net60_ArgumentNullException
 {
     extension(ArgumentNullException)
     {

diff --git a/PolyShim/Net60/EnumerableExtensions.cs b/PolyShim/Net60/EnumerableExtensions.cs
@@ -6,10 +6,12 @@
 // ReSharper disable PartialTypeWithSinglePart
 
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace System.Linq;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net60_EnumerableExtensions
 {
     extension<T>(IEnumerable<T> source)
     {

diff --git a/PolyShim/Net60/Environment.cs b/PolyShim/Net60/Environment.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net60_Environment
 {
     extension(Environment)
     {

diff --git a/PolyShim/Net60/List.cs b/PolyShim/Net60/List.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net60_List
 {
     extension<T>(List<T> list)
     {

diff --git a/PolyShim/Net60/Math.cs b/PolyShim/Net60/Math.cs
@@ -6,8 +6,10 @@
 // ReSharper disable PartialTypeWithSinglePart
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net60_Math
 {
     extension(Math)
     {

diff --git a/PolyShim/Net60/Parallel.cs b/PolyShim/Net60/Parallel.cs
@@ -11,8 +11,10 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net60_Parallel
 {
     extension(Parallel)
     {

diff --git a/PolyShim/Net60/Random.cs b/PolyShim/Net60/Random.cs
@@ -6,14 +6,16 @@
 // ReSharper disable PartialTypeWithSinglePart
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 
 file static class RandomEx
 {
     [field: ThreadStatic]
     public static Random? Shared { get; set; }
 }
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net60_Random
 {
     extension(Random random)
     {

diff --git a/PolyShim/Net60/RequiresAssemblyFilesAttribute.cs b/PolyShim/Net60/RequiresAssemblyFilesAttribute.cs
@@ -1,5 +1,6 @@
 #if (NETCOREAPP && !NET6_0_OR_GREATER) || (NETFRAMEWORK) || (NETSTANDARD)
 #nullable enable
+
 // ReSharper disable RedundantUsingDirective
 // ReSharper disable CheckNamespace
 // ReSharper disable InconsistentNaming

diff --git a/PolyShim/Net60/String.cs b/PolyShim/Net60/String.cs
@@ -6,8 +6,10 @@
 // ReSharper disable PartialTypeWithSinglePart
 
 using System;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net60_String
 {
     extension(string str)
     {

diff --git a/PolyShim/Net60/Task.cs b/PolyShim/Net60/Task.cs
@@ -9,8 +9,10 @@
 using System;
 using System.Threading;
 using System.Threading.Tasks;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net60_Task
 {
     extension(Task task)
     {

diff --git a/PolyShim/Net70/ArgumentException.cs b/PolyShim/Net70/ArgumentException.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Runtime.CompilerServices;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net70_ArgumentException
 {
     extension(ArgumentException)
     {

diff --git a/PolyShim/Net70/Byte.cs b/PolyShim/Net70/Byte.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Globalization;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net70_Byte
 {
     extension(byte)
     {

diff --git a/PolyShim/Net70/DateTime.cs b/PolyShim/Net70/DateTime.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Globalization;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net70_DateTime
 {
     extension(DateTime)
     {

diff --git a/PolyShim/Net70/DateTimeOffset.cs b/PolyShim/Net70/DateTimeOffset.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Globalization;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net70_DateTimeOffset
 {
     extension(DateTimeOffset)
     {

diff --git a/PolyShim/Net70/Decimal.cs b/PolyShim/Net70/Decimal.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Globalization;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net70_Decimal
 {
     extension(decimal)
     {

diff --git a/PolyShim/Net70/Double.cs b/PolyShim/Net70/Double.cs
@@ -7,8 +7,10 @@
 
 using System;
 using System.Globalization;
+using System.Diagnostics.CodeAnalysis;
 
-internal static partial class PolyfillExtensions
+[ExcludeFromCodeCoverage]
+internal static class MemberPolyfills_Net70_Double
 {
     extension(double)
     {