more fixups

Author: mgravell

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "9.0.102",
     "rollForward": "latestMajor"
   }
 }

src/Dapper.AOT.Analyzers/CodeAnalysis/DapperInterceptorGenerator.cs

@@ -212,9 +212,11 @@ static string BuildParameterMap(in ParseState ctx, IInvocationOperation op, stri
 
     internal static class FeatureKeys
     {
-        public const string InterceptorsPreviewNamespaces = nameof(InterceptorsPreviewNamespaces),
+        public const string InterceptorsNamespaces = nameof(InterceptorsNamespaces),
+            InterceptorsPreviewNamespaces = nameof(InterceptorsPreviewNamespaces),
             CodegenNamespace = "Dapper.AOT";
         public static KeyValuePair<string, string> InterceptorsPreviewNamespacePair => new(InterceptorsPreviewNamespaces, CodegenNamespace);
+        public static KeyValuePair<string, string> InterceptorsNamespacePair => new(InterceptorsNamespaces, CodegenNamespace);
     }
 
     private static bool CheckPrerequisites(in GenerateState ctx)

src/Dapper.AOT/CommandT.Batch.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;
+using System.Data;
 using System.Data.Common;
 using System.Diagnostics;
 using System.Linq;
@@ -222,6 +223,7 @@ private int ExecuteMultiBatch(ReadOnlySpan<TArgs> source, int batchSize) // TODO
     {
         Debug.Assert(source.Length > 1);
         UnifiedCommand batch = default;
+        bool closeConnection = false;
         try
         {
             foreach (var arg in source)
@@ -231,6 +233,12 @@ private int ExecuteMultiBatch(ReadOnlySpan<TArgs> source, int batchSize) // TODO
             }
             if (!batch.HasBatch) return 0;
 
+            if (connection.State != ConnectionState.Open)
+            {
+                connection.Open();
+                closeConnection = true;
+            }
+
             var result = batch.AssertBatch.ExecuteNonQuery();
 
             if (commandFactory.RequirePostProcess)
@@ -241,9 +249,14 @@ private int ExecuteMultiBatch(ReadOnlySpan<TArgs> source, int batchSize) // TODO
         }
         finally
         {
+            if (closeConnection)
+            {
+                connection.Close();
+            }
             batch.Cleanup();
         }
     }
+
     private int ExecuteMultiBatch(IEnumerable<TArgs> source, int batchSize) // TODO: sub-batching
     {
         if (commandFactory.RequirePostProcess)
@@ -253,6 +266,7 @@ private int ExecuteMultiBatch(IEnumerable<TArgs> source, int batchSize) // TODO:
         }
 
         UnifiedCommand batch = default;
+        bool closeConnection = false;
         try
         {
             foreach (var arg in source)
@@ -262,6 +276,12 @@ private int ExecuteMultiBatch(IEnumerable<TArgs> source, int batchSize) // TODO:
             }
             if (!batch.HasBatch) return 0;
 
+            if (connection.State != ConnectionState.Open)
+            {
+                connection.Open();
+                closeConnection = true;
+            }
+
             var result = batch.AssertBatch.ExecuteNonQuery();
             if (commandFactory.RequirePostProcess)
             {
@@ -271,6 +291,10 @@ private int ExecuteMultiBatch(IEnumerable<TArgs> source, int batchSize) // TODO:
         }
         finally
         {
+            if (closeConnection)
+            {
+                connection.Close();
+            }
             batch.Cleanup();
         }
     }

src/Dapper.AOT/Internal/SyncCommandState.cs

@@ -38,7 +38,7 @@ private void OnBeforeExecute(DbCommand command)
             Debug.Assert(command?.Connection is not null);
             Command = command!;
             connection = command!.Connection;
-            
+
             if (connection.State != ConnectionState.Open)
             {
                 connection.Open();

src/Dapper.AOT/UnifiedCommand.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
+using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics;
 using System.Runtime.CompilerServices;
 
 namespace Dapper;
@@ -16,8 +18,8 @@ namespace Dapper;
 #pragma warning restore IDE0079
 
 public readonly struct UnifiedCommand
-
 {
+
     /// <summary>
     /// The <see cref="System.Data.Common.DbCommand"/> associated with the current operation; this may be <c>null</c> for batch commands.
     /// </summary>

test/Dapper.AOT.Test.Integration/Setup/IntegrationTestsBase.cs

@@ -23,6 +23,7 @@ public abstract class IntegrationTestsBase
         .WithFeatures(new[]
         {
             new KeyValuePair<string, string>("InterceptorsPreviewNamespaces", "$(InterceptorsPreviewNamespaces);Dapper.AOT"),
+            new KeyValuePair<string, string>("InterceptorsNamespaces", "$(InterceptorsNamespaces);Dapper.AOT"),
         });
 
     protected readonly IDbConnection DbConnection;

test/Dapper.AOT.Test/Dapper.AOT.Test.csproj

@@ -36,8 +36,6 @@
         <PackageReference Include="Microsoft.Build.Utilities.Core" />
         <PackageReference Include="Oracle.ManagedDataAccess" Condition="'$(TargetFramework)'=='net48'" />
         <PackageReference Include="Oracle.ManagedDataAccess.Core" Condition="'$(TargetFramework)'!='net48'" />
-        <PackageReference Include="System.ComponentModel.Annotations" />
-        <PackageReference Include="System.Data.Common" />
         <PackageReference Include="System.Data.SqlClient" />
         <PackageReference Include="Microsoft.Data.SqlClient" />
         <PackageReference Include="xunit" />
@@ -61,6 +59,8 @@
     </ItemGroup>
     <ItemGroup Condition="'$(TargetFramework)'=='net48'">
         <PackageReference Include="Npgsql" VersionOverride="8.0.6" />
+        <PackageReference Include="System.Data.Common" />
+        <PackageReference Include="System.ComponentModel.Annotations" />
     </ItemGroup>
 
     <ItemGroup>

test/Dapper.AOT.Test/DapperApiTests.cs

@@ -27,10 +27,10 @@ public void DiscoveredMethodsAreExpected()
         var names = string.Join(",", methods);
         Log.WriteLine(names);
 
-        Assert.Equal("AsList<,AsTableValuedParameter,AsTableValuedParameter<,Execute,ExecuteAsync,ExecuteReader,ExecuteReaderAsync,ExecuteScalar,ExecuteScalar<,ExecuteScalarAsync,ExecuteScalarAsync<,GetRowParser,GetRowParser<,GetTypeName,Parse,Parse<,Query,Query<,QueryAsync,QueryAsync<,QueryFirst,QueryFirst<,QueryFirstAsync,QueryFirstAsync<,QueryFirstOrDefault,QueryFirstOrDefault<,QueryFirstOrDefaultAsync,QueryFirstOrDefaultAsync<,QueryMultiple,QueryMultipleAsync,QuerySingle,QuerySingle<,QuerySingleAsync,QuerySingleAsync<,QuerySingleOrDefault,QuerySingleOrDefault<,QuerySingleOrDefaultAsync,QuerySingleOrDefaultAsync<" + (IsNetFx ? "" : ",QueryUnbufferedAsync,QueryUnbufferedAsync<") + ",ReplaceLiterals,SetTypeName", names);
+        Assert.Equal("AsList<,AsTableValuedParameter,AsTableValuedParameter<,Execute,ExecuteAsync,ExecuteReader,ExecuteReaderAsync,ExecuteScalar,ExecuteScalar<,ExecuteScalarAsync,ExecuteScalarAsync<,GetRowParser,GetRowParser<,GetTypeName,Parse,Parse<,Query,Query<,QueryAsync,QueryAsync<,QueryFirst,QueryFirst<,QueryFirstAsync,QueryFirstAsync<,QueryFirstOrDefault,QueryFirstOrDefault<,QueryFirstOrDefaultAsync,QueryFirstOrDefaultAsync<,QueryMultiple,QueryMultipleAsync,QuerySingle,QuerySingle<,QuerySingleAsync,QuerySingleAsync<,QuerySingleOrDefault,QuerySingleOrDefault<,QuerySingleOrDefaultAsync,QuerySingleOrDefaultAsync<,QueryUnbufferedAsync,QueryUnbufferedAsync<,ReplaceLiterals,SetTypeName", names);
 
         var candidates = string.Join(",", methods.Where(DapperInterceptorGenerator.IsCandidate));
         Log.WriteLine(candidates);
-        Assert.Equal("Execute,ExecuteAsync,ExecuteReader,ExecuteReaderAsync,ExecuteScalar,ExecuteScalar<,ExecuteScalarAsync,ExecuteScalarAsync<,GetRowParser,GetRowParser<,Query,Query<,QueryAsync,QueryAsync<,QueryFirst,QueryFirst<,QueryFirstAsync,QueryFirstAsync<,QueryFirstOrDefault,QueryFirstOrDefault<,QueryFirstOrDefaultAsync,QueryFirstOrDefaultAsync<,QueryMultiple,QueryMultipleAsync,QuerySingle,QuerySingle<,QuerySingleAsync,QuerySingleAsync<,QuerySingleOrDefault,QuerySingleOrDefault<,QuerySingleOrDefaultAsync,QuerySingleOrDefaultAsync<" + (IsNetFx ? "" : ",QueryUnbufferedAsync,QueryUnbufferedAsync<"), candidates);
+        Assert.Equal("Execute,ExecuteAsync,ExecuteReader,ExecuteReaderAsync,ExecuteScalar,ExecuteScalar<,ExecuteScalarAsync,ExecuteScalarAsync<,GetRowParser,GetRowParser<,Query,Query<,QueryAsync,QueryAsync<,QueryFirst,QueryFirst<,QueryFirstAsync,QueryFirstAsync<,QueryFirstOrDefault,QueryFirstOrDefault<,QueryFirstOrDefaultAsync,QueryFirstOrDefaultAsync<,QueryMultiple,QueryMultipleAsync,QuerySingle,QuerySingle<,QuerySingleAsync,QuerySingleAsync<,QuerySingleOrDefault,QuerySingleOrDefault<,QuerySingleOrDefaultAsync,QuerySingleOrDefaultAsync<,QueryUnbufferedAsync,QueryUnbufferedAsync<", candidates);
     }
 }

test/Dapper.AOT.Test/Helpers/TestFramework.cs

@@ -13,11 +13,15 @@ internal static class TestFramework
             Enum.GetValues<Net>()
 #endif
             .Select(static x => x.ToString())
-            .ToHashSet();
+            .ToHashSet(StringComparer.OrdinalIgnoreCase);
 
             public static Net DetermineNetVersion()
         {
-#if NET6_0_OR_GREATER
+#if NET9_0_OR_GREATER
+            return Net.Net9;
+#elif NET8_0_OR_GREATER
+            return Net.Net8;
+#elif NET6_0_OR_GREATER
             return Net.Net6;
 #else
             return Net.Net48;
@@ -27,7 +31,9 @@ public static Net DetermineNetVersion()
         public enum Net
         {
             Net48,
-            Net6
+            Net6,
+            Net8,
+            Net9,
         }
     }
 }

test/Dapper.AOT.Test/InterceptorTests.cs

@@ -28,7 +28,11 @@ public static IEnumerable<object[]> GetFiles()
                 if (TestFramework.NetVersions.Contains(fileNetVersionStr))
                 {
                     // it has to be the same or greater version
-                    var fileNetVersion = (TestFramework.Net)Enum.Parse(typeof(TestFramework.Net), fileNetVersionStr);
+#if NET48
+                    var fileNetVersion = (TestFramework.Net)Enum.Parse(typeof(TestFramework.Net), fileNetVersionStr, true);
+#else
+                    var fileNetVersion = Enum.Parse<TestFramework.Net>(fileNetVersionStr, true);
+#endif
                     if (currentNetVersion < fileNetVersion)
                     {
                         // skip if current version is lower than specified in the input file name