Merge pull request #875 from Sergio0694/dev/d2d-intrinsics-constant-r…

…equired Centralize and update PolySharp references
Sergio0694 · Nov 21, 2024 · 86a5073 · 86a5073
2 parents e1ffe5a + 763c856
commit 86a5073
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 38 deletions.
diff --git a/build/Directory.Build.props b/build/Directory.Build.props
@@ -176,4 +176,30 @@
     <AssemblyOriginatorKeyFile>$(MSBuildThisFileDirectory)..\build\computesharp.snk</AssemblyOriginatorKeyFile>
     <AssemblySignPublicKey>00240000048000009400000006020000002400005253413100040000010001001DA244ACFEE0D02ADF2D7F464B5E2562BB1AEF50B32DCD8B2DADEC659A5ED8B6C5817B03EB5E723067718A7972C936F626879DCE8E85636E7812B92CAB100D4947E3E6655AD49359E279A09F34B65E5ECA5FD5D8941C70BD48E56D8739A3BFF4F1C85071B7494D0B3A692F16CA6CC40585BCA8AD5B24BB2E7B834F15B6E667BB</AssemblySignPublicKey>
   </PropertyGroup>
+
+  <!--
+    We need PolySharp for all .NET Standard 2.0 polyfills. We do not want to use polyfills in published projects,
+    as those should just adhere to the available APIs in each LTS release of .NET, so we only enable this reference
+    for projects which are not published (ie. tests and samples), or just for the source generator projects.
+  -->
+  <PropertyGroup>
+    <IsPolySharpPackageReferenceNeeded>false</IsPolySharpPackageReferenceNeeded>
+    <IsPolySharpPackageReferenceNeeded Condition="'$(IsPublishedProject)' == 'false' OR '$(IsSourceGeneratorProject)' == 'true'">true</IsPolySharpPackageReferenceNeeded>
+  </PropertyGroup>
+
+  <!-- Add the package reference, if needed -->
+  <ItemGroup Condition="'$(IsPolySharpPackageReferenceNeeded)' == 'true'">
+    <PackageReference Include="PolySharp" Version="1.15.0" PrivateAssets="all" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
+  <!-- Define the type alias for [UnmanagedCallersOnly] when on the .NET Standard 2.0 target -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <Using Include="System.Runtime.InteropServices2.UnmanagedCallersOnlyAttribute" Alias="UnmanagedCallersOnlyAttribute" />
+  </ItemGroup>
+
+  <!-- Configure PolySharp options -->
+  <PropertyGroup>
+    <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
+    <PolySharpUseInteropServices2NamespaceForUnmanagedCallersOnlyAttribute>true</PolySharpUseInteropServices2NamespaceForUnmanagedCallersOnlyAttribute>
+  </PropertyGroup>
 </Project>
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -9,12 +9,4 @@
     <!-- Ignore platform compatibility warnings -->
     <NoWarn>$(NoWarn);CA1416</NoWarn>
   </PropertyGroup>
-
-  <!-- Reference PolySharp for all sample projects -->
-  <ItemGroup>
-    <PackageReference Include="PolySharp" Version="1.14.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>build;analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -83,26 +83,4 @@
     <!-- Pack the license file, if present -->
     <None Condition="$(IsLicenseFileAvailableForPacking)" Include="LICENSE.txt" Pack="true" PackagePath="\" Visible="False" />
   </ItemGroup>
-
-  <!--
-    Reference PolySharp for all .NET Standard 2.0 polyfills.
-    Only needed for the .Core project and all source generators.
-  -->
-  <ItemGroup Condition="'$(MSBuildProjectName)' == 'ComputeSharp.Core' OR $(IsSourceGeneratorProject)">
-    <PackageReference Include="PolySharp" Version="1.14.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>build;analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <!-- Define the type alias for [UnmanagedCallersOnly] when on the .NET Standard 2.0 target -->
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
-    <Using Include="System.Runtime.InteropServices2.UnmanagedCallersOnlyAttribute" Alias="UnmanagedCallersOnlyAttribute" />
-  </ItemGroup>
-
-  <!-- Configure PolySharp options -->
-  <PropertyGroup>
-    <PolySharpIncludeRuntimeSupportedAttributes>true</PolySharpIncludeRuntimeSupportedAttributes>
-    <PolySharpUseInteropServices2NamespaceForUnmanagedCallersOnlyAttribute>true</PolySharpUseInteropServices2NamespaceForUnmanagedCallersOnlyAttribute>
-  </PropertyGroup>
 </Project>
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -15,12 +15,4 @@
     <!-- Missing readonly modifier for readonly struct members (not needed in tests) -->
     <NoWarn>$(NoWarn);IDE0251</NoWarn>
   </PropertyGroup>
-
-  <!-- Reference PolySharp for all test projects -->
-  <ItemGroup>
-    <PackageReference Include="PolySharp" Version="1.14.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>build;analyzers</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>
 </Project>