Add AOT/trimming compat, increment lib versions

Singulink · Mar 23, 2024 · 6d7b441 · 6d7b441
1 parent 1c1c110
commit 6d7b441
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 118 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,22 +1,29 @@
-# Singulink Collections Version History
-
-## V3.0
-### Singulink.Collections
-- Breaking change: Deprecated `Singulink.Collections.Abstractions` package. Types have been merged into the main `Singulink.Collections` package.
-- Performance improvements to `ListDictionary<,>.ValueList` and `HashSetDictionary<,>.ValueSet`.
-- Documentation updates.
-
-## V2.0.1
-### Singulink.Collections.Weak
-- Documentation updates.
-
-## V2.0
-### All packages
-- Removed support for end-of-life .NET and .NET Framework runtimes with a build warning if used on an unsupported runtime
-- Minor memory usage/GC pressure/performance optimizations
-
-### Singulink.Collections.Weak
-- Minor bug fix to validation of `AutoCleanAddCount` property setters in `Collections.Weak` (thanks [@procudin](https://github.com/procudin)!)
-
-### Singulink.Collections
-- Breaking change: `AsTransient()` methods on value lists and value sets was renamed to `AsTransientReadOnly()`
+# Singulink Collections Version History
+
+## Singulink.Collections
+
+### V3.1
+- Full support for AOT and trimming
+
+### V3.0
+- Breaking change: Deprecated `Singulink.Collections.Abstractions` package. Types have been merged into the main `Singulink.Collections` package
+- Performance improvements to `ListDictionary<,>.ValueList` and `HashSetDictionary<,>.ValueSet`
+- Documentation updates
+
+### V2.0
+- Breaking change: `AsTransient()` methods on value lists and value sets was renamed to `AsTransientReadOnly()`
+- Removed support for end-of-life .NET and .NET Framework runtimes with a build warning if used on an unsupported runtime
+- Minor memory usage/GC pressure/performance optimizations
+
+## Singulink.Collections.Weak
+
+### V2.1
+- Full support for AOT and trimming
+
+### V2.0.1
+- Documentation updates
+
+### V2.0
+- Removed support for end-of-life .NET and .NET Framework runtimes with a build warning if used on an unsupported runtime
+- Minor memory usage/GC pressure/performance optimizations
+- Minor bug fix to validation of `AutoCleanAddCount` property setters in `Collections.Weak` (thanks [@procudin](https://github.com/procudin)!)
diff --git a/Singulink.Collections.sln b/Singulink.Collections.sln
@@ -45,6 +45,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source Items", "Source Item
 	ProjectSection(SolutionItems) = preProject
 		Source\Directory.Build.props = Source\Directory.Build.props
 		Source\Directory.Build.targets = Source\Directory.Build.targets
+		Source\key.snk = Source\key.snk
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test Items", "Test Items", "{3C98511D-3E04-4D16-B96C-8EFC5216CF4E}"

diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
@@ -6,6 +6,12 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Copyright>© Singulink. All rights reserved.</Copyright>
     <PackageIcon>Singulink Icon 128x128.png</PackageIcon>
+
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+
+    <IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net6.0'))">true</IsAotCompatible>
   </PropertyGroup>
 
   <PropertyGroup Label="Source Link" Condition="'$(Configuration)' == 'Release'">
@@ -16,9 +22,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\Resources\Singulink Icon 128x128.png">
-      <Pack>True</Pack>
-      <PackagePath></PackagePath>
-    </None>
+    <None Include="..\..\Resources\Singulink Icon 128x128.png" Pack="true" PackagePath="\"/>
   </ItemGroup>
 </Project>
diff --git a/Source/Singulink.Collections.Weak/FodyWeavers.xsd b/Source/Singulink.Collections.Weak/FodyWeavers.xsd
diff --git a/Source/Singulink.Collections.Weak/Singulink.Collections.Weak.csproj b/Source/Singulink.Collections.Weak/Singulink.Collections.Weak.csproj
@@ -1,24 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <RootNamespace>Singulink.Collections</RootNamespace>
 
-    <Version>2.0.1</Version>
+    <Version>2.1.0</Version>
     <PackageTags>weak, dictionary, value, collection, list</PackageTags>
     <Description>Collection classes that store weak references to values so that they can be garbage collected when they are no longer needed.</Description>
     <PackageProjectUrl>https://github.com/Singulink/Singulink.Collections.Weak</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="..\..\README.md" Link="README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('netstandard2.1', '$(TargetFramework)'))">
     <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/Source/Singulink.Collections.Weak/key.snk b/Source/Singulink.Collections.Weak/key.snk
diff --git a/Source/Singulink.Collections/FodyWeavers.xsd b/Source/Singulink.Collections/FodyWeavers.xsd
diff --git a/Source/Singulink.Collections/Singulink.Collections.csproj b/Source/Singulink.Collections/Singulink.Collections.csproj
@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
     <NoWarn>$(NoWarn);CA1034</NoWarn>
 
-    <Version>3.0.0</Version>
+    <Version>3.1.0</Version>
     <PackageTags>List; Dictionary; HashSet; Set</PackageTags>
     <Description>
       Widely useful highly optimized collections that are missing from the .NET BCL.
@@ -17,17 +17,13 @@
     </Description>
     <PackageProjectUrl>https://github.com/Singulink/Singulink.Collections</PackageProjectUrl>
     <PackageReadmeFile>README.md</PackageReadmeFile>
-
-    <SignAssembly>true</SignAssembly>
-    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="..\..\README.md" Link="README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'netstandard2.1'">
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('netstandard2.1', '$(TargetFramework)'))">
     <PackageReference Include="PolySharp" Version="1.14.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/Source/Singulink.Collections/key.snk → Source/key.snk b/Source/Singulink.Collections/key.snk → Source/key.snk