Updated subproject and polyfills

Refactored and consolidated common polyfill definitions for better maintenance. Enabled type forwarding for `IsExternalInit` to align with .NET 5 constraints and utilized file-based inclusions instead of conditions within target files. Updated the attribute aliases for the string syntax in DateOnly and TimeOnly parse methods to comply with the consolidated definitions and avoid potential aliasing conflicts. Resolves issues with framework compatibility and standardizes attribute usage across the codebase.
dgmjr-io · Feb 21, 2024 · 5e49aa5 · 5e49aa5
1 parent b2040d5
commit 5e49aa5
Show file tree

Hide file tree

Showing 6 changed files with 80 additions and 68 deletions.
diff --git a/Extensions b/Extensions
diff --git a/System.Polyfills/System.Polyfills.props b/System.Polyfills/System.Polyfills.props
@@ -0,0 +1,7 @@
+<Project>
+  <ItemGroup>
+    <Using Include="System.Runtime.CompilerServices" />
+    <Using Include="System.Diagnostics.CodeAnalysis.StringSyntaxAttribute" Alias="StringSyntax" />
+    <Using Include="System.Diagnostics.CodeAnalysis.StringSyntaxAttribute" Alias="StringSyntaxAttribute" />
+  </ItemGroup>
+</Project>
diff --git a/System.Polyfills/System.Polyfills.targets b/System.Polyfills/System.Polyfills.targets
@@ -7,10 +7,6 @@
     <DefineConstants Condition="'$(TargetFramework)' == 'netstandard2.0'">$(DefineConstants);NOTNETSTANDARD21ORGREATER</DefineConstants>
     <DefineConstants Condition="$(TargetFramework.StartsWith('netstandard1')) OR $(TargetFramework.StartsWith('netcore'))">$(DefineConstants);NOTNETSTANDARD20ORGREATER</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition="'$(MSBuildProjectName)' != 'System.Private.CoreLib.Polyfills'">
-    <Using Include="System.Runtime.CompilerServices" />
-    <Using Include="System.Diagnostics.CodeAnalysis.StringSyntaxAttribute" Alias="StringSyntax" Condition="$(DefineConstants.Contains('NOTNET70ORGREATER'))" />
-  </ItemGroup>
 
   <!-- <UsingTask TaskName="CheckForDuplicateItems" AssemblyFile="$(MicrosoftNETBuildTasksAssembly)" /> -->
 

diff --git a/System.Polyfills/System.Runtime.CompilerServices/IsExternalInit.cs b/System.Polyfills/System.Runtime.CompilerServices/IsExternalInit.cs
@@ -1,16 +1,25 @@
-#if !NET6_0_OR_GREATER
+#if NET5_0_OR_GREATER
+
+[assembly: System.Runtime.CompilerServices.TypeForwardedTo(
+    typeof(System.Runtime.CompilerServices.IsExternalInit)
+)]
+
+#else
+
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
-
 using System.ComponentModel;
 
-namespace System.Runtime.CompilerServices
-{
-    /// <summary>
-    /// Reserved to be used by the compiler for tracking metadata. This class
-    /// should not be used by developers in source code.
-    /// </summary>
-    [EditorBrowsable(EditorBrowsableState.Never)]
-    public static class IsExternalInit { }
-}
+namespace System.Runtime.CompilerServices;
+
+// https://github.com/dotnet/runtime/blob/v8.0.0/src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/IsExternalInit.cs
+
+/// <summary>
+/// Reserved to be used by the compiler for tracking metadata.
+/// This class should not be used by developers in source code.
+/// </summary>
+[EditorBrowsable(EditorBrowsableState.Never)]
+public // polyfill!
+static class IsExternalInit { }
+
 #endif
diff --git a/System.Polyfills/System/DateOnly.cs b/System.Polyfills/System/DateOnly.cs
@@ -400,7 +400,7 @@ public static DateOnly Parse(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] ReadOnlySpan<char> format,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] ReadOnlySpan<char> format,
             IFormatProvider? provider = default,
             DateTimeStyles style = DateTimeStyles.None
         )
@@ -419,7 +419,7 @@ public static DateOnly ParseExact(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string[] formats
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string[] formats
         ) => ParseExact(s, formats, null, DateTimeStyles.None);
 
         /// <summary>
@@ -436,7 +436,7 @@ public static DateOnly ParseExact(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string[] formats,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string[] formats,
             IFormatProvider? provider,
             DateTimeStyles style = DateTimeStyles.None
         )
@@ -479,7 +479,7 @@ public static DateOnly Parse(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] ReadOnlySpan<char> format,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] ReadOnlySpan<char> format,
             IFormatProvider? provider = default,
             DateTimeStyles style = DateTimeStyles.None
         )
@@ -500,7 +500,7 @@ public static DateOnly ParseExact(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string[] formats
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string[] formats
         ) => ParseExact(s, formats, null, DateTimeStyles.None);
 
         /// <summary>
@@ -517,7 +517,7 @@ public static DateOnly ParseExact(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string[] formats,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string[] formats,
             IFormatProvider? provider,
             DateTimeStyles style = DateTimeStyles.None
         )
@@ -565,7 +565,7 @@ public static DateOnly Parse(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             string s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string format
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string format
         ) => ParseExact(s, format, null, DateTimeStyles.None);
 
         /// <summary>
@@ -582,7 +582,7 @@ public static DateOnly ParseExact(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             string s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string format,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string format,
             IFormatProvider? provider,
             DateTimeStyles style = DateTimeStyles.None
         )
@@ -601,7 +601,7 @@ public static DateOnly ParseExact(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             string s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string[] formats
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string[] formats
         ) => ParseExact(s, formats, null, DateTimeStyles.None);
 
         /// <summary>
@@ -618,7 +618,7 @@ public static DateOnly ParseExact(
         /// <exception cref="FormatException"><paramref name="s"/> does not contain a valid string representation of a date.</exception>
         public static DateOnly ParseExact(
             string s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string[] formats,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string[] formats,
             IFormatProvider? provider,
             DateTimeStyles style = DateTimeStyles.None
         )
@@ -686,7 +686,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] ReadOnlySpan<char> format,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] ReadOnlySpan<char> format,
             out DateOnly result
         ) => TryParseExact(s, format, null, DateTimeStyles.None, out result);
 
@@ -707,7 +707,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] ReadOnlySpan<char> format,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] ReadOnlySpan<char> format,
             IFormatProvider? provider,
             DateTimeStyles style,
             out DateOnly result
@@ -731,7 +731,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             ReadOnlySpan<char> s,
-            [NotNullWhen(true), @StringSyntax(StringSyntaxAttribute.DateOnlyFormat)]
+            [NotNullWhen(true), @StringSyntax(StringSyntax.DateOnlyFormat)]
                 string?[]? formats,
             out DateOnly result
         ) => TryParseExact(s, formats, null, DateTimeStyles.None, out result);
@@ -752,7 +752,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             ReadOnlySpan<char> s,
-            [NotNullWhen(true), @StringSyntax(StringSyntaxAttribute.DateOnlyFormat)]
+            [NotNullWhen(true), @StringSyntax(StringSyntax.DateOnlyFormat)]
                 string?[]? formats,
             IFormatProvider? provider,
             DateTimeStyles style,
@@ -821,7 +821,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] ReadOnlySpan<char> format,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] ReadOnlySpan<char> format,
             out DateOnly result
         ) => TryParseExact(s, format, null, DateTimeStyles.None, out result);
 
@@ -842,7 +842,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             ReadOnlySpan<char> s,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] ReadOnlySpan<char> format,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] ReadOnlySpan<char> format,
             IFormatProvider? provider,
             DateTimeStyles style,
             out DateOnly result
@@ -872,7 +872,7 @@ out var dateTime
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             ReadOnlySpan<char> s,
-            [NotNullWhen(true), @StringSyntax(StringSyntaxAttribute.DateOnlyFormat)]
+            [NotNullWhen(true), @StringSyntax(StringSyntax.DateOnlyFormat)]
                 string?[]? formats,
             out DateOnly result
         ) => TryParseExact(s, formats, null, DateTimeStyles.None, out result);
@@ -893,7 +893,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             ReadOnlySpan<char> s,
-            [NotNullWhen(true), @StringSyntax(StringSyntaxAttribute.DateOnlyFormat)]
+            [NotNullWhen(true), @StringSyntax(StringSyntax.DateOnlyFormat)]
                 string?[]? formats,
             IFormatProvider? provider,
             DateTimeStyles style,
@@ -963,7 +963,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             [NotNullWhen(true)] string? s,
-            [NotNullWhen(true), @StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string? format,
+            [NotNullWhen(true), @StringSyntax(StringSyntax.DateOnlyFormat)] string? format,
             out DateOnly result
         ) => TryParseExact(s, format, null, DateTimeStyles.None, out result);
 
@@ -983,7 +983,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             [NotNullWhen(true)] string? s,
-            [NotNullWhen(true), @StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string? format,
+            [NotNullWhen(true), @StringSyntax(StringSyntax.DateOnlyFormat)] string? format,
             IFormatProvider? provider,
             DateTimeStyles style,
             out DateOnly result
@@ -1006,7 +1006,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             [NotNullWhen(true)] string? s,
-            [NotNullWhen(true), @StringSyntax(StringSyntaxAttribute.DateOnlyFormat)]
+            [NotNullWhen(true), @StringSyntax(StringSyntax.DateOnlyFormat)]
                 string?[]? formats,
             out DateOnly result
         ) => TryParseExact(s, formats, null, DateTimeStyles.None, out result);
@@ -1026,7 +1026,7 @@ out DateOnly result
         /// otherwise, <see langword="false"/>.</returns>
         public static bool TryParseExact(
             [NotNullWhen(true)] string? s,
-            [NotNullWhen(true), @StringSyntax(StringSyntaxAttribute.DateOnlyFormat)]
+            [NotNullWhen(true), @StringSyntax(StringSyntax.DateOnlyFormat)]
                 string?[]? formats,
             IFormatProvider? provider,
             DateTimeStyles style,
@@ -1063,7 +1063,7 @@ out DateOnly result
         /// <param name="format">A standard or custom date format string.</param>
         /// <returns>A string representation of value of the current <see cref="DateOnly"/> object as specified by <paramref name="format"/>.</returns>
         public string ToString(
-            [@StringSyntax(@StringSyntaxAttribute.DateOnlyFormat)] string? format
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string? format
         )
         {
             if (string.IsNullOrEmpty(format))
@@ -1089,7 +1089,7 @@ public string ToString(
         /// <param name="provider">An object that supplies culture-specific formatting information.</param>
         /// <returns>A string representation of value of the current <see cref="DateOnly"/> object as specified by format and provider.</returns>
         public string ToString(
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)] string? format,
+            [@StringSyntax(StringSyntax.DateOnlyFormat)] string? format,
             IFormatProvider? provider
         )
         {
@@ -1117,7 +1117,7 @@ public string ToString(
         public bool TryFormat(
             Span<char> destination,
             out int charsWritten,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)]
+            [@StringSyntax(StringSyntax.DateOnlyFormat)]
                 ReadOnlySpan<char> format = default(ReadOnlySpan<char>),
             IFormatProvider? provider = null
         )
@@ -1144,7 +1144,7 @@ public bool TryFormat(
         public bool TryFormat(
             Span<char> destination,
             out int charsWritten,
-            [@StringSyntax(StringSyntaxAttribute.DateOnlyFormat)]
+            [@StringSyntax(StringSyntax.DateOnlyFormat)]
                 ReadOnlySpan<char> format = default(ReadOnlySpan<char>),
             IFormatProvider? provider = null
         )