chore: use source generated polyfills

riok · Aug 3, 2023 · 98518a1 · 98518a1
1 parent de36cdd
commit 98518a1
Show file tree

Hide file tree

Showing 31 changed files with 100 additions and 491 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -7,4 +7,10 @@
     <Authors>Mapperly Contributors, Lars Tönz, Manuel Allenspach</Authors>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Meziantou.Polyfill" Version="1.0.21">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
 </Project>
diff --git a/benchmarks/Riok.Mapperly.Benchmarks/MappingBenchmarks.cs b/benchmarks/Riok.Mapperly.Benchmarks/MappingBenchmarks.cs
@@ -8,7 +8,6 @@ namespace Riok.Mapperly.Benchmarks;
 
 [MemoryDiagnoser]
 [InProcess]
-[HtmlExporter]
 [JsonExporterAttribute.Full]
 public class MappingBenchmarks
 {

diff --git a/benchmarks/Riok.Mapperly.Benchmarks/Riok.Mapperly.Benchmarks.csproj b/benchmarks/Riok.Mapperly.Benchmarks/Riok.Mapperly.Benchmarks.csproj
@@ -23,9 +23,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Riok.Mapperly\Riok.Mapperly.csproj" />
-    <ProjectReference Include="..\..\src\Riok.Mapperly\Riok.Mapperly.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
-    <ProjectReference Include="..\..\src\Riok.Mapperly.Abstractions\Riok.Mapperly.Abstractions.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="true" />
+    <ProjectReference Include="..\..\src\Riok.Mapperly\Riok.Mapperly.csproj">
+      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Riok.Mapperly\Riok.Mapperly.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false">
+      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Riok.Mapperly.Abstractions\Riok.Mapperly.Abstractions.csproj">
+      <SetTargetFramework>TargetFramework=netstandard2.0</SetTargetFramework>
+    </ProjectReference>
     <ProjectReference Include="..\..\test\Riok.Mapperly.IntegrationTests\Riok.Mapperly.IntegrationTests.csproj" />
   </ItemGroup>
 </Project>
diff --git a/benchmarks/Riok.Mapperly.Benchmarks/SourceGeneratorBenchmarks.cs b/benchmarks/Riok.Mapperly.Benchmarks/SourceGeneratorBenchmarks.cs
@@ -10,7 +10,6 @@ namespace Riok.Mapperly.Benchmarks;
 
 [MemoryDiagnoser]
 [InProcess]
-[HtmlExporter]
 [JsonExporterAttribute.Full]
 public class SourceGeneratorBenchmarks
 {

diff --git a/build/package.sh b/build/package.sh
@@ -18,6 +18,7 @@ for roslyn_version in "${roslyn_versions[@]}"; do
     dotnet pack \
         "${script_dir}/../src/Riok.Mapperly" \
         -c Release \
+        /p:TargetFrameworks="netstandard2.0" \
         /p:ROSLYN_VERSION="${roslyn_version}" \
         -o "${artifacts_dir}/roslyn-${roslyn_version}" \
         /p:Version="${RELEASE_VERSION}" \

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -3,7 +3,7 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
     <DebugType>embedded</DebugType>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
@@ -15,22 +15,12 @@
     <LangVersion>11</LangVersion>
   </PropertyGroup>
 
-
   <ItemGroup>
-    <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
-      <_Parameter1>Riok.Mapperly.IntegrationTests</_Parameter1>
-    </AssemblyAttribute>
     <AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
       <_Parameter1>$(MSBuildProjectName).Tests</_Parameter1>
     </AssemblyAttribute>
   </ItemGroup>
 
-  <!-- nullables for netstandard2.0 -->
-  <!-- see https://www.meziantou.net/how-to-use-nullable-reference-types-in-dotnet-standard-2-0-and-dotnet-.htm -->
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)/Polyfills/*.cs" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
     <PackageReference Include="Meziantou.Analyzer" Version="2.0.80">

diff --git a/src/Polyfills/IsExternalInit.cs b/src/Polyfills/IsExternalInit.cs
diff --git a/src/Polyfills/Nullable.cs b/src/Polyfills/Nullable.cs
diff --git a/src/Riok.Mapperly.Abstractions/ReferenceHandling/Internal/PreserveReferenceHandler.cs b/src/Riok.Mapperly.Abstractions/ReferenceHandling/Internal/PreserveReferenceHandler.cs
@@ -37,7 +37,7 @@ private ReferenceHolder GetReferenceHolder<TSource, TTarget>()
 
     private class ReferenceHolder
     {
-        private readonly Dictionary<object, object> _references = new(ReferenceEqualityComparer<object>.Instance);
+        private readonly Dictionary<object, object> _references = new(ReferenceEqualityComparer.Instance);
 
         public bool TryGetRef<TSource, TTarget>(TSource source, [NotNullWhen(true)] out TTarget? target)
             where TSource : notnull

diff --git a/src/Riok.Mapperly.Abstractions/ReferenceHandling/Internal/ReferenceEqualityComparer.cs b/src/Riok.Mapperly.Abstractions/ReferenceHandling/Internal/ReferenceEqualityComparer.cs
diff --git a/src/Riok.Mapperly/Configuration/AttributeDataAccessor.cs b/src/Riok.Mapperly/Configuration/AttributeDataAccessor.cs
@@ -21,7 +21,8 @@ public T AccessSingle<T>(ISymbol symbol)
         where T : Attribute => Access<T, T>(symbol).Single();
 
     public TData? AccessFirstOrDefault<TAttribute, TData>(ISymbol symbol)
-        where TAttribute : Attribute => Access<TAttribute, TData>(symbol).FirstOrDefault();
+        where TAttribute : Attribute
+        where TData : notnull => Access<TAttribute, TData>(symbol).FirstOrDefault();
 
     public IEnumerable<TAttribute> Access<TAttribute>(ISymbol symbol)
         where TAttribute : Attribute => Access<TAttribute, TAttribute>(symbol);
@@ -39,6 +40,7 @@ public IEnumerable<TAttribute> Access<TAttribute>(ISymbol symbol)
     /// <exception cref="InvalidOperationException">If a property or ctor argument of <see cref="TData"/> could not be read on the attribute.</exception>
     public IEnumerable<TData> Access<TAttribute, TData>(ISymbol symbol)
         where TAttribute : Attribute
+        where TData : notnull
     {
         var attrType = typeof(TAttribute);
         var dataType = typeof(TData);
@@ -64,6 +66,7 @@ public IEnumerable<TData> Access<TAttribute, TData>(ISymbol symbol)
     }
 
     private TData Create<TData>(IReadOnlyCollection<ITypeSymbol> typeArguments, IReadOnlyCollection<TypedConstant> constructorArguments)
+        where TData : notnull
     {
         // The data class should have a constructor
         // with generic type parameters of the attribute class
@@ -81,7 +84,8 @@ private TData Create<TData>(IReadOnlyCollection<ITypeSymbol> typeArguments, IRea
                 (arg, i) => BuildArgumentValue(arg, parameters[i + typeArguments.Count].ParameterType)
             );
             var constructorTypeAndValueArguments = typeArguments.Concat(constructorArgumentValues).ToArray();
-            return (TData)Activator.CreateInstance(typeof(TData), constructorTypeAndValueArguments);
+            return (TData?)Activator.CreateInstance(typeof(TData), constructorTypeAndValueArguments)
+                ?? throw new InvalidOperationException($"Could not create instance of {typeof(TData)}");
         }
 
         throw new InvalidOperationException($"{typeof(TData)} does not have a constructor with {argCount} parameters");