Replace Polyfill by Meziantou.Polyfill and bring back internal OperatingSystem polyfills

Author: kevinchalet

Directory.Build.props

@@ -22,8 +22,6 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
     <AccelerateBuildsInVisualStudio>true</AccelerateBuildsInVisualStudio>
-    <PolyUseEmbeddedAttribute>true</PolyUseEmbeddedAttribute>
-    <PolyArgumentExceptions>true</PolyArgumentExceptions>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -36,6 +34,11 @@
     <PublicKeyToken>35a561290d20de2f</PublicKeyToken>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <MeziantouPolyfill_ExcludedPolyfills>$(MeziantouPolyfill_ExcludedPolyfills);M:System.OperatingSystem.</MeziantouPolyfill_ExcludedPolyfills>
+    <MeziantouPolyfill_ExcludedPolyfills>$(MeziantouPolyfill_ExcludedPolyfills);T:System.Net.Http.</MeziantouPolyfill_ExcludedPolyfills>
+  </PropertyGroup>
+
   <PropertyGroup Condition=" '$(DotNetRoot)' == '' ">
     <DotNetRoot Condition=" '$(DOTNET_HOST_PATH)' != '' ">$([System.IO.Path]::GetDirectoryName($(DOTNET_HOST_PATH)))</DotNetRoot>
     <DotNetRoot Condition=" '$(MSBuildRuntimeType)' != 'Core' ">$(ProgramFiles)\dotnet</DotNetRoot>

Directory.Build.targets

@@ -59,12 +59,15 @@
     <DefineConstants>$(DefineConstants);SUPPORTS_AUTHORIZATION_MIDDLEWARE</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_BCL_ASYNC_ENUMERABLE</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_BULK_DBSET_OPERATIONS</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_CHUNK_LINQ_EXTENSION</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_DBSET_VALUETASK_FINDASYNC</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_ENDPOINT_ROUTING</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_ENVIRONMENT_PROCESS_PATH</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_HEXADECIMAL_STRING_CONVERSION</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_HTTP_CLIENT_DEFAULT_REQUEST_VERSION</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_HTTP_CLIENT_DEFAULT_REQUEST_VERSION_POLICY</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_HTTP_CLIENT_RESILIENCE</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_INT32_RANDOM_NUMBER_GENERATOR_METHODS</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_MULTIPLE_VALUES_IN_QUERYHELPERS</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_NAMED_PIPE_STATIC_FACTORY_WITH_ACL</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_ONE_SHOT_HASHING_METHODS</DefineConstants>
@@ -73,6 +76,7 @@
     <DefineConstants>$(DefineConstants);SUPPORTS_PEM_ENCODED_KEY_IMPORT</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_REDIRECTION_ON_SIGN_IN</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_TEXT_ELEMENT_ENUMERATOR</DefineConstants>
+    <DefineConstants>$(DefineConstants);SUPPORTS_VALUETASK_COMPLETED_TASK</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_WINFORMS_TASK_DIALOG</DefineConstants>
     <DefineConstants>$(DefineConstants);SUPPORTS_ZLIB_COMPRESSION</DefineConstants>
   </PropertyGroup>
@@ -155,19 +159,6 @@
     <DefineConstants>$(DefineConstants);SUPPORTS_WINDOWS_RUNTIME</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup
-    Condition=" ('$(TargetFrameworkIdentifier)' == '.NETCore') Or
-                ('$(TargetFrameworkIdentifier)' == '.NETFramework' And $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '4.7'))) ">
-    <!--
-      Note: Polyfill only generates the OperatingSystem APIs if the System.Runtime.InteropServices.RuntimeInformation
-      package is referenced. Yet, this package isn't necessary on UWP and .NET Framework 4.7+ and is deliberately not
-      referenced by OpenIddict due to its problematic dependencies graph. To ensure the OperatingSystem APIs are
-      still correctly generated, the FeatureRuntimeInformation compilation flag is manually added here.
-    -->
-
-    <DefineConstants>$(DefineConstants);FeatureRuntimeInformation</DefineConstants>
-  </PropertyGroup>
-
   <!--
     Note: Entity Framework Core 2.x references System.Interactive.Async 3.x, that includes
     its own IAsyncEnumerable. To work around collisions between this type and the new type
@@ -223,21 +214,4 @@
   <Target Name="_CalculateXbfSupport"
           Condition=" '$(TargetFrameworkIdentifier)' == '.NETCore' And '$(TargetPlatformIdentifier)' == 'UAP' " />
 
-  <!--
-    Note: Polyfill internally references RequiredMemberAttribute without using "global::", which collides with
-    the type of the same name exposed by the iOS/Mac Catalyst/macOS reference assemblies. To work around that,
-    the RequiredMemberAttribute.cs file imported by Polyfill is excluded from compilation on these platforms.
-  -->
-
-  <Target Name="RemoveRequiredMemberAttribute" BeforeTargets="CoreCompile">
-    <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' And
-                          ('$(TargetPlatformIdentifier)'  == 'iOS'         Or
-                           '$(TargetPlatformIdentifier)'  == 'MacCatalyst' Or
-                           '$(TargetPlatformIdentifier)'  == 'macOS' ) ">
-      <Compile Remove="@(Compile)"
-        Condition=" %(Compile.NuGetPackageId) == 'Polyfill' And
-                   '%(Compile.Filename)%(Compile.Extension)' == 'RequiredMemberAttribute.cs' " />
-    </ItemGroup>
-  </Target>
-
 </Project>