Fix trimming warnings in Microsoft.Data.Sqlite (#30728)

dotnet · Apr 19, 2023 · d4599b1 · d4599b1
1 parent cf290d3
commit d4599b1
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 15 deletions.
diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteConnection.cs b/src/Microsoft.Data.Sqlite.Core/SqliteConnection.cs
@@ -8,6 +8,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
+using System.Runtime.CompilerServices;
 using Microsoft.Data.Sqlite.Properties;
 using SQLitePCL;
 using static SQLitePCL.raw;
@@ -52,36 +53,40 @@ static SqliteConnection()
                 ?.GetRuntimeMethod("Init", Type.EmptyTypes)
                 ?.Invoke(null, null);
 
+            var appDataType = Type.GetType("Windows.Storage.ApplicationData, Windows, ContentType=WindowsRuntime")
+                ?? Type.GetType("Windows.Storage.ApplicationData, Microsoft.Windows.SDK.NET");
+
+            var storageFolderType = Type.GetType("Windows.Storage.StorageFolder, Windows, ContentType=WindowsRuntime")
+                ?? Type.GetType("Windows.Storage.StorageFolder, Microsoft.Windows.SDK.NET");
+
+            object? currentAppData = null;
             try
             {
-                var currentAppData = Type.GetType("Windows.Storage.ApplicationData, Windows, ContentType=WindowsRuntime")
-                    ?? Type.GetType("Windows.Storage.ApplicationData, Microsoft.Windows.SDK.NET")
-                    ?.GetRuntimeProperty("Current")?.GetValue(null);
+                currentAppData = appDataType?.GetRuntimeProperty("Current")?.GetValue(null);
+            }
+            catch (TargetInvocationException)
+            {
+                // Ignore "The process has no package identity."
+            }
 
-                var localFolder = currentAppData?.GetType()
-                    .GetRuntimeProperty("LocalFolder")?.GetValue(currentAppData);
-                var localFolderPath = (string?)localFolder?.GetType()
-                    .GetRuntimeProperty("Path")?.GetValue(localFolder);
+            if (currentAppData != null)
+            {
+                var localFolder = appDataType?.GetRuntimeProperty("LocalFolder")?.GetValue(currentAppData);
+                var localFolderPath = (string?)storageFolderType?.GetRuntimeProperty("Path")?.GetValue(localFolder);
                 if (localFolderPath != null)
                 {
                     var rc = sqlite3_win32_set_directory(SQLITE_WIN32_DATA_DIRECTORY_TYPE, localFolderPath);
                     Debug.Assert(rc == SQLITE_OK);
                 }
 
-                var tempFolder = currentAppData?.GetType()
-                    .GetRuntimeProperty("TemporaryFolder")?.GetValue(currentAppData);
-                var tempFolderPath = (string?)tempFolder?.GetType()
-                    .GetRuntimeProperty("Path")?.GetValue(tempFolder);
+                var tempFolder = appDataType?.GetRuntimeProperty("TemporaryFolder")?.GetValue(currentAppData);
+                var tempFolderPath = (string?)storageFolderType?.GetRuntimeProperty("Path")?.GetValue(tempFolder);
                 if (tempFolderPath != null)
                 {
                     var rc = sqlite3_win32_set_directory(SQLITE_WIN32_TEMP_DIRECTORY_TYPE, tempFolderPath);
                     Debug.Assert(rc == SQLITE_OK);
                 }
             }
-            catch
-            {
-                // Ignore "The process has no package identity."
-            }
         }
 
         /// <summary>

diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteDataReader.cs b/src/Microsoft.Data.Sqlite.Core/SqliteDataReader.cs
@@ -7,6 +7,7 @@
 using System.Data;
 using System.Data.Common;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Text;
 using System.Threading;
@@ -311,6 +312,9 @@ public override string GetDataTypeName(int ordinal)
         /// </summary>
         /// <param name="ordinal">The zero-based column ordinal.</param>
         /// <returns>The data type of the column.</returns>
+#if NET6_0_OR_GREATER
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
+#endif
         public override Type GetFieldType(int ordinal)
             => _closed
                 ? throw new InvalidOperationException(Resources.DataReaderClosed(nameof(GetFieldType)))

diff --git a/src/Microsoft.Data.Sqlite.Core/SqliteDataRecord.cs b/src/Microsoft.Data.Sqlite.Core/SqliteDataRecord.cs
@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -191,6 +192,9 @@ public virtual string GetDataTypeName(int ordinal)
             }
         }
 
+#if NET6_0_OR_GREATER
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
+#endif
         public virtual Type GetFieldType(int ordinal)
         {
             var sqliteType = GetSqliteType(ordinal);
@@ -207,6 +211,9 @@ public virtual Type GetFieldType(int ordinal)
             return GetFieldTypeFromSqliteType(sqliteType);
         }
 
+#if NET6_0_OR_GREATER
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
+#endif
         internal static Type GetFieldTypeFromSqliteType(int sqliteType)
         {
             switch (sqliteType)
@@ -228,6 +235,9 @@ internal static Type GetFieldTypeFromSqliteType(int sqliteType)
             }
         }
 
+#if NET6_0_OR_GREATER
+        [return: DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties | DynamicallyAccessedMemberTypes.PublicFields)]
+#endif
         public static Type GetFieldType(string type)
         {
             switch (type)