Add support for .NET Trimming

.github/workflows/ci.yml

@@ -25,10 +25,10 @@ jobs:
       run: dotnet test -c Release ValveKeyValue/ValveKeyValue.Test/ValveKeyValue.Test.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=lcov /p:CoverletOutput='./lcov.info' /p:Include="[ValveKeyValue*]*"
 
     - name: Upload test coverage
-      uses: coverallsapp/github-action@v1.1.1
+      uses: coverallsapp/[email protected].3
       with:
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        path-to-lcov: ./ValveKeyValue/ValveKeyValue.Test/lcov.info
+        path-to-lcov: ./ValveKeyValue/ValveKeyValue.Test/lcov.net5.0.info
         flag-name: run-${{ matrix.test_number }}
         parallel: true
 
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Coveralls Finished
-      uses: coverallsapp/github-action@v1.1.1
+      uses: coverallsapp/[email protected].3
       with:
         github-token: ${{ secrets.github_token }}
         parallel-finished: true

Directory.Build.props

@@ -13,8 +13,6 @@
     <DebugType>embedded</DebugType>
     <DebugSymbols>true</DebugSymbols>
     <NeutralLanguage>en</NeutralLanguage>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <PropertyGroup>

ValveKeyValue/ValveKeyValue.Test/ValveKeyValue.Test.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFrameworks>netcoreapp3.1;net5.0</TargetFrameworks>
     <PackageId>ValveKeyValue.Test</PackageId>
     <Product>Valve KeyValue Library - Unit Tests</Product>
     <Description>Unit Tests for library to parse and write Valve KeyValue formats</Description>

ValveKeyValue/ValveKeyValue/DefaultObjectReflector.cs

@@ -1,15 +1,29 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 
 namespace ValveKeyValue
 {
     sealed class DefaultObjectReflector : IObjectReflector
     {
-        IEnumerable<IObjectMember> IObjectReflector.GetMembers(object @object)
+        IEnumerable<IObjectMember> IObjectReflector.GetMembers(
+#if NET5_0_OR_GREATER
+            [DynamicallyAccessedMembers(Trimming.Properties)]
+#endif
+            Type type,
+            object @object)
         {
+            Require.NotNull(type, nameof(type));
             Require.NotNull(@object, nameof(@object));
-            var properties = @object.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
 
+            var properties = type.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+            return GetMembersFromProperties(@object, properties);
+
+        }
+
+        static IEnumerable<IObjectMember> GetMembersFromProperties(object @object, PropertyInfo[] properties)
+        {
             foreach (var property in properties)
             {
                 if (property.GetCustomAttribute<KVIgnoreAttribute>() != null)

ValveKeyValue/ValveKeyValue/IObjectReflector.cs

@@ -1,9 +1,16 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 namespace ValveKeyValue
 {
     interface IObjectReflector
     {
-        IEnumerable<IObjectMember> GetMembers(object @object);
+        IEnumerable<IObjectMember> GetMembers(
+#if NET5_0_OR_GREATER
+            [DynamicallyAccessedMembers(Trimming.Properties)]
+#endif
+            Type type,
+            object @object);
     }
 }

ValveKeyValue/ValveKeyValue/KVSerializer.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using ValveKeyValue.Abstraction;
 using ValveKeyValue.Deserialization;
@@ -52,7 +53,11 @@ public KVObject Deserialize(Stream stream, KVSerializerOptions options = null)
         /// <param name="options">Options to use that can influence the deserialization process.</param>
         /// <returns>A <typeparamref name="TObject" /> instance representing the KeyValues structure in the stream.</returns>
         /// <typeparam name="TObject">The type of object to deserialize.</typeparam>;
+#if NET5_0_OR_GREATER
+        public TObject Deserialize<[DynamicallyAccessedMembers(Trimming.Constructors | Trimming.Properties)] TObject>(Stream stream, KVSerializerOptions options = null)
+#else
         public TObject Deserialize<TObject>(Stream stream, KVSerializerOptions options = null)
+#endif
         {
             Require.NotNull(stream, nameof(stream));
 
@@ -84,7 +89,11 @@ public void Serialize(Stream stream, KVObject data, KVSerializerOptions options
         /// <param name="name">The top-level object name</param>
         /// <param name="options">Options to use that can influence the serialization process.</param>
         /// <typeparam name="TData">The type of object to serialize.</typeparam>
+#if NET5_0_OR_GREATER
+        public void Serialize<[DynamicallyAccessedMembers(Trimming.Properties)] TData>(Stream stream, TData data, string name, KVSerializerOptions options = null)
+#else
         public void Serialize<TData>(Stream stream, TData data, string name, KVSerializerOptions options = null)
+#endif
         {
             Require.NotNull(stream, nameof(stream));