Merge branch 'main' of https://github.com/SimonCropp/Polyfill

SimonCropp · Aug 29, 2023 · 7839f46 · 7839f46
2 parents 44633e5 + 540ee91
commit 7839f46
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <Version>1.27.0</Version>
+    <Version>1.27.1</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>Polyfill</PackageTags>
     <DisableImplicitNamespaceImports>true</DisableImplicitNamespaceImports>
     <SignAssembly>false</SignAssembly>
-    <NoWarn>CS1591;NETSDK1138;NU1901;NU1902</NoWarn>
+    <NoWarn>CS1591;NETSDK1138;NU1901;NU1902;NU1903</NoWarn>
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <LangVersion>11</LangVersion>
     <ImplicitUsings>false</ImplicitUsings>

diff --git a/src/Polyfill/Nullability/NullabilityInfo.cs b/src/Polyfill/Nullability/NullabilityInfo.cs
@@ -5,6 +5,7 @@
 #nullable enable
 
 using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
@@ -15,7 +16,8 @@ namespace System.Reflection
     /// <summary>
     /// A class that represents nullability info
     /// </summary>
-    #if PolyPublic
+    [ExcludeFromCodeCoverage]
+#if PolyPublic
 public
 #endif
 sealed class NullabilityInfo

diff --git a/src/Polyfill/Nullability/NullabilityInfoContext.cs b/src/Polyfill/Nullability/NullabilityInfoContext.cs
@@ -5,6 +5,7 @@
 #nullable enable
 
 using System.Linq;
+using System.Diagnostics.CodeAnalysis;
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
@@ -18,7 +19,8 @@ namespace System.Reflection
     /// Provides APIs for populating nullability information/context from reflection members:
     /// <see cref="ParameterInfo"/>, <see cref="FieldInfo"/>, <see cref="PropertyInfo"/> and <see cref="EventInfo"/>.
     /// </summary>
-    #if PolyPublic
+    [ExcludeFromCodeCoverage]
+#if PolyPublic
 public
 #endif
 sealed class NullabilityInfoContext

diff --git a/src/Tests/NullabilitySync.cs b/src/Tests/NullabilitySync.cs
@@ -42,6 +42,7 @@ public async Task Run()
                      #nullable enable
 
                      using System.Linq;
+                     using System.Diagnostics.CodeAnalysis;
 
                      """;
 
@@ -73,6 +74,7 @@ static string MakeInternal(string source) =>
             .Replace(
                 "public sealed class",
                 """
+                    [ExcludeFromCodeCoverage]
                     #if PolyPublic
                     public
                     #endif

diff --git a/src/Tests/PolyfillExtensionsTests_IEnumerable.cs b/src/Tests/PolyfillExtensionsTests_IEnumerable.cs
@@ -46,10 +46,10 @@ public void Chunk_SizeOf3()
 
         var chunks = enumerable.Chunk(3).ToList();
 
-        Assert.AreEqual(new int[] { 1, 2, 3 }, chunks[0]);
-        Assert.AreEqual(new int[] { 4, 5, 6 }, chunks[1]);
-        Assert.AreEqual(new int[] { 7, 8, 9 }, chunks[2]);
-        Assert.AreEqual(new int[] { 10, 11 }, chunks[3]);
+        Assert.AreEqual(new[] { 1, 2, 3 }, chunks[0]);
+        Assert.AreEqual(new[] { 4, 5, 6 }, chunks[1]);
+        Assert.AreEqual(new[] { 7, 8, 9 }, chunks[2]);
+        Assert.AreEqual(new[] { 10, 11 }, chunks[3]);
     }
 
     [Test]
@@ -59,8 +59,8 @@ public void Chunk_SizeOf8()
 
         var chunks = enumerable.Chunk(8).ToList();
 
-        Assert.AreEqual(new int[] { 1, 2, 3, 4, 5, 6, 7, 8 }, chunks[0]);
-        Assert.AreEqual(new int[] { 9, 10, 11 }, chunks[1]);
+        Assert.AreEqual(new[] { 1, 2, 3, 4, 5, 6, 7, 8 }, chunks[0]);
+        Assert.AreEqual(new[] { 9, 10, 11 }, chunks[1]);
     }
 
     [Test]

diff --git a/src/Tests/UnreachableExceptionTests.cs b/src/Tests/UnreachableExceptionTests.cs
@@ -4,8 +4,6 @@ namespace Tests;
 public class UnreachableExceptionTests
 {
     [Test]
-    public void UnreachableException_Compatiblity_with_all_TargetFrameworks()
-    {
+    public void UnreachableException_Compatibility_with_all_TargetFrameworks() =>
         _ = Assert.Throws<UnreachableException>(() => throw new UnreachableException());
-    }
 }