Fix IsTrimmable property and found issues

microsoft · Feb 5, 2024 · b037aec · b037aec
1 parent db542c1
commit b037aec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 11 deletions.
diff --git a/src/Microsoft.Kiota.Serialization.Text.csproj b/src/Microsoft.Kiota.Serialization.Text.csproj
@@ -33,7 +33,7 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <NoWarn>$(NoWarn);NU5048;NETSDK1138</NoWarn>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetFrameworkVersion)' == 'net5.0'">  
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net5.0'">  
     <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 

diff --git a/src/TextParseNode.cs b/src/TextParseNode.cs
@@ -66,15 +66,15 @@ public TextParseNode(string? text)
     /// <inheritdoc />
     public Time? GetTimeValue() => DateTime.TryParse(Text, out var result) ? new Time(result) : null;
     /// <inheritdoc />
-    #if NET5_0_OR_GREATER
-    public IEnumerable<T?> GetCollectionOfEnumValues<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>() where T : struct, Enum
+#if NET5_0_OR_GREATER
+    public IEnumerable<T?> GetCollectionOfEnumValues<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>() where T : struct, Enum
 #else
     public IEnumerable<T?> GetCollectionOfEnumValues<T>() where T : struct, Enum
 #endif
     => throw new InvalidOperationException(NoStructuredDataMessage);
     /// <inheritdoc />
-    #if NET5_0_OR_GREATER
-    public T? GetEnumValue<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>() where T : struct, Enum
+#if NET5_0_OR_GREATER
+    public T? GetEnumValue<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>() where T : struct, Enum
 #else
     public T? GetEnumValue<T>() where T : struct, Enum
 #endif

diff --git a/src/TextSerializationWriter.cs b/src/TextSerializationWriter.cs
@@ -15,7 +15,8 @@ namespace Microsoft.Kiota.Serialization.Text;
 /// <summary>
 /// The <see cref="ISerializationWriter"/> implementation for text content types.
 /// </summary>
-public class TextSerializationWriter : ISerializationWriter, IDisposable {
+public class TextSerializationWriter : ISerializationWriter, IDisposable
+{
     private readonly MemoryStream _stream = new MemoryStream();
     private readonly StreamWriter _writer;
     /// <summary>
@@ -45,7 +46,8 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
     /// <inheritdoc />
-    public Stream GetSerializedContent() {
+    public Stream GetSerializedContent()
+    {
         _writer.Flush();
         _stream.Position = 0;
         return _stream;
@@ -92,7 +94,8 @@ public void WriteStringValue(string? key, string? value)
         if(!string.IsNullOrEmpty(value))
             if(_written)
                 throw new InvalidOperationException("a value was already written for this serialization writer, text content only supports a single value");
-            else {
+            else
+            {
                 _writer.Write(value);
                 _written = true;
             }
@@ -102,14 +105,14 @@ public void WriteStringValue(string? key, string? value)
     /// <inheritdoc />
     public void WriteTimeValue(string? key, Time? value) => WriteStringValue(key, value?.ToString());
     /// <inheritdoc />
-    #if NET5_0_OR_GREATER
-    public void WriteCollectionOfEnumValues<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>(string? key, IEnumerable<T?>? values) where T : struct, Enum
+#if NET5_0_OR_GREATER
+    public void WriteCollectionOfEnumValues<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.All)] T>(string? key, IEnumerable<T?>? values) where T : struct, Enum
 #else
     public void WriteCollectionOfEnumValues<T>(string? key, IEnumerable<T?>? values) where T : struct, Enum
 #endif
     => throw new InvalidOperationException(TextParseNode.NoStructuredDataMessage);
     /// <inheritdoc />
-    #if NET5_0_OR_GREATER
+#if NET5_0_OR_GREATER
     public void WriteEnumValue<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicFields)] T>(string? key, T? value) where T : struct, Enum
 #else
     public void WriteEnumValue<T>(string? key, T? value) where T : struct, Enum