Merge pull request #278 from microsoftgraph/feature/trimming

- adds support for trimming
microsoftgraph · Nov 9, 2023 · 0b5ddfe · 0b5ddfe
2 parents 608d8ea + 1299fd5
commit 0b5ddfe
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/src/Microsoft.Graph.Cli.Core/Configuration/ConfigurationRoot.cs b/src/Microsoft.Graph.Cli.Core/Configuration/ConfigurationRoot.cs
@@ -1,3 +1,5 @@
+using System.Text.Json.Serialization;
+
 namespace Microsoft.Graph.Cli.Core.Configuration;
 
 /// <summary>
@@ -10,3 +12,8 @@ public class ConfigurationRoot
     /// </summary>
     public AuthenticationOptions AuthenticationOptions { get; set; } = new AuthenticationOptions();
 }
+
+[JsonSerializable(typeof(ConfigurationRoot))]
+internal partial class SourceGenerationContext : JsonSerializerContext
+{
+}
diff --git a/src/Microsoft.Graph.Cli.Core/IO/AuthenticationCacheManager.cs b/src/Microsoft.Graph.Cli.Core/IO/AuthenticationCacheManager.cs
@@ -174,7 +174,7 @@ private void DeleteAuthenticationRecord()
 
         try
         {
-            return await JsonSerializer.DeserializeAsync<Configuration.ConfigurationRoot>(fileStream, cancellationToken: cancellationToken);
+            return await JsonSerializer.DeserializeAsync(fileStream, SourceGenerationContext.Default.ConfigurationRoot, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
         catch (Exception)
         {
@@ -188,7 +188,7 @@ private async Task WriteConfigurationAsync(string path, ConfigurationRoot config
         try
         {
             using FileStream fileStream = File.Open(path, FileMode.Create, FileAccess.Write);
-            await JsonSerializer.SerializeAsync(fileStream, configuration, cancellationToken: cancellationToken);
+            await JsonSerializer.SerializeAsync(fileStream, configuration, SourceGenerationContext.Default.ConfigurationRoot, cancellationToken: cancellationToken).ConfigureAwait(false);
         }
         catch (DirectoryNotFoundException)
         {

diff --git a/src/Microsoft.Graph.Cli.Core/Microsoft.Graph.Cli.Core.csproj b/src/Microsoft.Graph.Cli.Core/Microsoft.Graph.Cli.Core.csproj
@@ -9,6 +9,7 @@
     <DebugType>embedded</DebugType>
     <VersionPrefix>1.0.0</VersionPrefix>
     <VersionSuffix>preview.8</VersionSuffix>
+    <IsTrimmable>true</IsTrimmable>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/src/sample/sample.csproj b/src/sample/sample.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net7.0</TargetFramework>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <NoWarn>$(NoWarn);CS8669</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -20,4 +21,4 @@
     <ProjectReference Include="..\Microsoft.Graph.Cli.Core\Microsoft.Graph.Cli.Core.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>