Enable DapperAOT (#2079)

mgravell · web-flow · commit ef48e1d803c9 · 2025-04-22T11:16:13.000-07:00
* Dapper usage:

- enable Dapper.AOT
- enable command caching
- enable strict type mapping
- use explicit column hints

* support older SDK interceptor usage
diff --git a/build/dependencies.props b/build/dependencies.props
@@ -41,7 +41,8 @@
     <MicrosoftIISTestingVersion90>9.0.0-*</MicrosoftIISTestingVersion90>
     <MicrosoftIISTestingVersion100>10.0.0-*</MicrosoftIISTestingVersion100>
 
-    <DapperVersion>2.1.35</DapperVersion>
+    <DapperVersion>2.1.66</DapperVersion>
+    <DapperAotVersion>1.0.48</DapperAotVersion>
     <RazorSlicesVersion>0.8.1</RazorSlicesVersion>
     <SystemCommandLineVersion>2.0.0-beta4.22272.1</SystemCommandLineVersion>
     <MicrosoftCrankEventSourcesVersion>0.2.0-alpha.24114.2</MicrosoftCrankEventSourcesVersion>
diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj
@@ -27,6 +27,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="$(DapperVersion)" />
+    <PackageReference Include="Dapper.AOT" Version="$(DapperAotVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
diff --git a/src/Benchmarks/Data/DapperDb.cs b/src/Benchmarks/Data/DapperDb.cs
@@ -12,6 +12,7 @@
 
 namespace Benchmarks.Data
 {
+    [DapperAot, CacheCommand, StrictTypes]
     public class DapperDb : IDb
     {
         private static readonly Comparison<World> WorldSortComparison = (a, b) => a.Id.CompareTo(b.Id);
@@ -38,6 +39,7 @@ public async Task<World> LoadSingleQueryRow()
             }
         }
 
+        [QueryColumns("id", "randomnumber")]
         Task<World> ReadSingleRow(DbConnection db)
         {
             return db.QueryFirstOrDefaultAsync<World>(
@@ -92,6 +94,7 @@ public async Task<World[]> LoadMultipleUpdatesRows(int count)
 
         }
 
+        [QueryColumns("id", "message")]
         public async Task<IEnumerable<FortuneUtf16>> LoadFortunesRows()
         {
             List<FortuneUtf16> result;
diff --git a/src/Benchmarks/Data/World.cs b/src/Benchmarks/Data/World.cs
@@ -3,6 +3,7 @@
 
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Runtime.Serialization;
+using Dapper;
 
 namespace Benchmarks.Data
 {
@@ -13,7 +14,7 @@ public class World
         public int Id { get; set; }
 
         [IgnoreDataMember]
-        [NotMapped]
+        [NotMapped, DbValue(Ignore = true)]
         public int _Id { get; set; }
 
         [Column("randomnumber")]
diff --git a/src/BenchmarksApps/TechEmpower/BlazorSSR/BlazorSSR.csproj b/src/BenchmarksApps/TechEmpower/BlazorSSR/BlazorSSR.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="$(DapperVersion)" />
+    <PackageReference Include="Dapper.AOT" Version="$(DapperAotVersion)" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion80)" />
     <PackageReference Include="Npgsql" Version="$(NpgsqlVersion80)" />
   </ItemGroup>
diff --git a/src/BenchmarksApps/TechEmpower/BlazorSSR/Database/Db.cs b/src/BenchmarksApps/TechEmpower/BlazorSSR/Database/Db.cs
@@ -17,6 +17,7 @@ public Db(AppSettings appSettings)
         _dataSource = new NpgsqlSlimDataSourceBuilder(appSettings.ConnectionString).Build();
     }
 
+    [DapperAot, CacheCommand, StrictTypes, QueryColumns("id", "message")]
     public async Task<List<Fortune>> LoadFortunesRowsDapper()
     {
         await using var connection = _dataSource.CreateConnection();
diff --git a/src/BenchmarksApps/TechEmpower/Minimal/Database/Db.cs b/src/BenchmarksApps/TechEmpower/Minimal/Database/Db.cs
@@ -4,6 +4,7 @@
 
 namespace Minimal.Database;
 
+[DapperAot, CacheCommand, StrictTypes]
 public class Db
 {
     private static readonly Comparison<Fortune> FortuneSortComparison = (a, b) => string.CompareOrdinal(a.Message, b.Message);
@@ -28,6 +29,7 @@ public async Task<World> LoadSingleQueryRow()
         return await ReadSingleRow(db);
     }
 
+    [QueryColumns("id", "randomnumber")]
     static Task<World> ReadSingleRow(DbConnection db)
     {
         return db.QueryFirstOrDefaultAsync<World>(
@@ -83,6 +85,7 @@ public async Task<World[]> LoadMultipleUpdatesRows(int count)
         return results;
     }
 
+    [QueryColumns("id", "message")]
     public async Task<List<Fortune>> LoadFortunesRows()
     {
         List<Fortune> result;
diff --git a/src/BenchmarksApps/TechEmpower/Minimal/Minimal.csproj b/src/BenchmarksApps/TechEmpower/Minimal/Minimal.csproj
@@ -11,6 +11,7 @@
   <ItemGroup>
     <PackageReference Include="Npgsql" Version="$(NpgsqlVersion80)" />
     <PackageReference Include="Dapper" Version="$(DapperVersion)" />
+    <PackageReference Include="Dapper.AOT" Version="$(DapperAotVersion)" />
     <PackageReference Include="RazorSlices" Version="$(RazorSlicesVersion)" />
   </ItemGroup>
 
diff --git a/src/BenchmarksApps/TechEmpower/Mvc/Database/DbDapper.cs b/src/BenchmarksApps/TechEmpower/Mvc/Database/DbDapper.cs
@@ -21,6 +21,7 @@ public DbDapper(AppSettings appSettings)
 #endif
     }
 
+    [DapperAot, CacheCommand, StrictTypes, QueryColumns("id", "message")]
     public async Task<List<Fortune>> LoadFortunesRowsDapper()
     {
         await using var connection = _dataSource.CreateConnection();
diff --git a/src/BenchmarksApps/TechEmpower/Mvc/Mvc.csproj b/src/BenchmarksApps/TechEmpower/Mvc/Mvc.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="$(DapperVersion)" />
+    <PackageReference Include="Dapper.AOT" Version="$(DapperAotVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
diff --git a/src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Data/DapperDb.cs b/src/BenchmarksApps/TechEmpower/PlatformBenchmarks/Data/DapperDb.cs
@@ -12,6 +12,7 @@ public sealed class DapperDb
     public DapperDb(AppSettings appSettings)
         => _connectionString = appSettings.ConnectionString;
 
+    [DapperAot, CacheCommand, StrictTypes, QueryColumns("id", "message")]
     public async Task<List<FortuneUtf16>> LoadFortunesRows()
     {
         List<FortuneUtf16> result;
diff --git a/src/BenchmarksApps/TechEmpower/PlatformBenchmarks/PlatformBenchmarks.csproj b/src/BenchmarksApps/TechEmpower/PlatformBenchmarks/PlatformBenchmarks.csproj
@@ -19,6 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="$(DapperVersion)" />
+    <PackageReference Include="Dapper.AOT" Version="$(DapperAotVersion)" />
     <PackageReference Include="RazorSlices" Version="$(RazorSlicesVersion)" />
   </ItemGroup>
 
diff --git a/src/BenchmarksApps/TechEmpower/RazorPages/Database/Db.cs b/src/BenchmarksApps/TechEmpower/RazorPages/Database/Db.cs
@@ -21,6 +21,7 @@ public Db(AppSettings appSettings)
 #endif
     }
 
+    [DapperAot, CacheCommand, StrictTypes, QueryColumns("id", "message")]
     public async Task<List<Fortune>> LoadFortunesRowsDapper()
     {
         await using var connection = _dataSource.CreateConnection();
diff --git a/src/BenchmarksApps/TechEmpower/RazorPages/RazorPages.csproj b/src/BenchmarksApps/TechEmpower/RazorPages/RazorPages.csproj
@@ -10,6 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Dapper" Version="$(DapperVersion)" />
+    <PackageReference Include="Dapper.AOT" Version="$(DapperAotVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -16,6 +16,11 @@
     <!-- Create database build configurations -->
     <Configurations>Debug;Release;Debug_Database;Release_Database</Configurations>
     <IsDatabase Condition="$(Configuration.EndsWith('_Database'))">true</IsDatabase>
+
+    <!-- enable interceptors language feature for Dapper globally (this by itself doesn't add AOT) -->
+    <InterceptorsNamespaces>$(InterceptorsNamespaces);Dapper.AOT</InterceptorsNamespaces>
+    <!-- for parity on down-level SDKs -->
+    <InterceptorsPreviewNamespaces>$(InterceptorsNamespaces)</InterceptorsPreviewNamespaces>
   </PropertyGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`
`13`	`13`	`namespace Benchmarks.Data`
`14`	`14`	`{`
	`15`	`+ [DapperAot, CacheCommand, StrictTypes]`
`15`	`16`	`public class DapperDb : IDb`
`16`	`17`	`{`
`17`	`18`	`private static readonly Comparison<World> WorldSortComparison = (a, b) => a.Id.CompareTo(b.Id);`
`@@ -38,6 +39,7 @@ public async Task<World> LoadSingleQueryRow()`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
	`42`	`+ [QueryColumns("id", "randomnumber")]`
`41`	`43`	`Task<World> ReadSingleRow(DbConnection db)`
`42`	`44`	`{`
`43`	`45`	`return db.QueryFirstOrDefaultAsync<World>(`
`@@ -92,6 +94,7 @@ public async Task<World[]> LoadMultipleUpdatesRows(int count)`
`92`	`94`
`93`	`95`	`}`
`94`	`96`
	`97`	`+ [QueryColumns("id", "message")]`
`95`	`98`	`public async Task<IEnumerable<FortuneUtf16>> LoadFortunesRows()`
`96`	`99`	`{`
`97`	`100`	`List<FortuneUtf16> result;`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ public Db(AppSettings appSettings)`
`17`	`17`	`_dataSource = new NpgsqlSlimDataSourceBuilder(appSettings.ConnectionString).Build();`
`18`	`18`	`}`
`19`	`19`
	`20`	`+ [DapperAot, CacheCommand, StrictTypes, QueryColumns("id", "message")]`
`20`	`21`	`public async Task<List<Fortune>> LoadFortunesRowsDapper()`
`21`	`22`	`{`
`22`	`23`	`await using var connection = _dataSource.CreateConnection();`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`
`5`	`5`	`namespace Minimal.Database;`
`6`	`6`
	`7`	`+[DapperAot, CacheCommand, StrictTypes]`
`7`	`8`	`public class Db`
`8`	`9`	`{`
`9`	`10`	`private static readonly Comparison<Fortune> FortuneSortComparison = (a, b) => string.CompareOrdinal(a.Message, b.Message);`
`@@ -28,6 +29,7 @@ public async Task<World> LoadSingleQueryRow()`
`28`	`29`	`return await ReadSingleRow(db);`
`29`	`30`	`}`
`30`	`31`
	`32`	`+ [QueryColumns("id", "randomnumber")]`
`31`	`33`	`static Task<World> ReadSingleRow(DbConnection db)`
`32`	`34`	`{`
`33`	`35`	`return db.QueryFirstOrDefaultAsync<World>(`
`@@ -83,6 +85,7 @@ public async Task<World[]> LoadMultipleUpdatesRows(int count)`
`83`	`85`	`return results;`
`84`	`86`	`}`
`85`	`87`
	`88`	`+ [QueryColumns("id", "message")]`
`86`	`89`	`public async Task<List<Fortune>> LoadFortunesRows()`
`87`	`90`	`{`
`88`	`91`	`List<Fortune> result;`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ public DbDapper(AppSettings appSettings)`
`21`	`21`	`#endif`
`22`	`22`	`}`
`23`	`23`
	`24`	`+ [DapperAot, CacheCommand, StrictTypes, QueryColumns("id", "message")]`
`24`	`25`	`public async Task<List<Fortune>> LoadFortunesRowsDapper()`
`25`	`26`	`{`
`26`	`27`	`await using var connection = _dataSource.CreateConnection();`