use ReadOnlyDictionary

punker76 · Nov 4, 2024 · ea75824 · ea75824
1 parent 91ab449
commit ea75824
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 1 deletion.
diff --git a/src/IconPacks.Avalonia.BoxIcons/IconPacks.Avalonia.BoxIcons.csproj b/src/IconPacks.Avalonia.BoxIcons/IconPacks.Avalonia.BoxIcons.csproj
@@ -3,7 +3,9 @@
     <PropertyGroup>
         <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
         <DefineConstants>$(DefineConstants);AVALONIA</DefineConstants>
+        <AnalysisLevel>latest</AnalysisLevel>
         <LangVersion>latest</LangVersion>
+        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
         <Nullable>disable</Nullable>
         <GenerateLibraryLayout>true</GenerateLibraryLayout>
     </PropertyGroup>

diff --git a/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj b/src/IconPacks.Avalonia.Core/IconPacks.Avalonia.Core.csproj
@@ -3,7 +3,9 @@
     <PropertyGroup>
         <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
         <DefineConstants>$(DefineConstants);AVALONIA</DefineConstants>
+        <AnalysisLevel>latest</AnalysisLevel>
         <LangVersion>latest</LangVersion>
+        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
         <Nullable>disable</Nullable>
         <GenerateLibraryLayout>true</GenerateLibraryLayout>
     </PropertyGroup>

diff --git a/src/IconPacks.Avalonia.Core/PackIconDataFactory.cs b/src/IconPacks.Avalonia.Core/PackIconDataFactory.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using Avalonia.Platform;
 
 namespace IconPacks.Avalonia
@@ -16,7 +17,9 @@ static PackIconDataFactory()
         public static IDictionary<TEnum, string> Create()
         {
             using var iconJsonStream = AssetLoader.Open(new Uri($"avares://{typeof(TEnum).Assembly.GetName().Name}/Resources/Icons.json"));
-            return System.Text.Json.JsonSerializer.Deserialize<Dictionary<TEnum, string>>(iconJsonStream);
+#pragma warning disable IL2026
+            return new ReadOnlyDictionary<TEnum, string>(System.Text.Json.JsonSerializer.Deserialize<Dictionary<TEnum, string>>(iconJsonStream) ?? new Dictionary<TEnum, string>());
+#pragma warning restore IL2026
         }
     }
 }
diff --git a/src/IconPacks.Avalonia/IconPacks.Avalonia.csproj b/src/IconPacks.Avalonia/IconPacks.Avalonia.csproj
@@ -3,7 +3,9 @@
     <PropertyGroup>
         <TargetFrameworks>net8.0;net6.0;netstandard2.0</TargetFrameworks>
         <DefineConstants>$(DefineConstants);AVALONIA</DefineConstants>
+        <AnalysisLevel>latest</AnalysisLevel>
         <LangVersion>latest</LangVersion>
+        <EnableTrimAnalyzer>true</EnableTrimAnalyzer>
         <Nullable>disable</Nullable>
         <GenerateLibraryLayout>true</GenerateLibraryLayout>
     </PropertyGroup>