Compile accessor for multiple target frameworks to get rid of deprecated System.Data.SqlClient reference

Author: C0nquistadore

.github/dependabot.yml

@@ -26,8 +26,6 @@ updates:
       interval: daily
     open-pull-requests-limit: 999
     rebase-strategy: disabled
-    ignore:
-      - dependency-name: System.Data.SqlClient # See reason in Directory.Packages.props
     groups:
       dotnet-packages-aligned-with-sdk-version:
         patterns:

Directory.Packages.props

@@ -44,16 +44,6 @@
     <PackageVersion Include="Newtonsoft.Json.Schema" Version="4.0.1" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
-    <!--
-      Be careful to update this package, because the latest and last version makes the usage obsolete,
-      recommending to use Microsoft.Data.SqlClient, which is perfectly reasonable.
-      However, we currently compile artifacts using only one target framework (.NETStandard).
-      Therefore we can't easily switch to Microsoft.Data.SqlClient, because the consumer might not be able to migrate easily.
-      If the consumer compiles for .NET Framework, there is nothing to worry about, because System.Data is still supported,
-      and the .NETStandard framework simply serves the purpose of API compatibility, the NuGet package itself will not be used.
-      If the consumer compiles for .NET 8, he will use Microsoft.Data.SqlClient, because of compilation symbols.
-    -->
-    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageVersion Include="System.Diagnostics.EventLog" Version="10.0.6" />
     <PackageVersion Include="System.IO.Packaging" Version="10.0.6" />
     <PackageVersion Include="System.Reflection.Emit" Version="4.7.0" />

build/build.ps1

@@ -51,8 +51,8 @@ try
         'Dibix.Sdk.CodeGeneration'
         'Dibix.Sdk'
         'Dibix.Sdk.Cli'
-        'Dibix.Testing'
         'Dibix.Testing.Generators'
+        'Dibix.Testing'
         'Dibix.Worker.Abstractions'
     )
 

shared/Utilities/MetadataReferenceFactory.cs

@@ -1,9 +1,12 @@
-using Microsoft.CodeAnalysis;
+using System.Reflection;
+using Microsoft.CodeAnalysis;
 
 namespace Dibix
 {
     internal static class MetadataReferenceFactory
     {
-        public static MetadataReference FromType<T>() => MetadataReference.CreateFromFile(typeof(T).Assembly.Location);
+        public static MetadataReference FromType<T>() => FromAssembly(typeof(T).Assembly);
+
+        public static MetadataReference FromAssembly(Assembly assembly) => MetadataReference.CreateFromFile(assembly.Location);
     }
 }

src/Dibix.Dapper/Dibix.Dapper.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
+    <TargetFrameworks>net10.0;net48</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 

src/Dibix.Http.Server.AspNet/Dibix.Http.Server.AspNet.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net48</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 

src/Dibix.Http.Server/Dibix.Http.Server.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net48</TargetFrameworks>
+    <TargetFrameworks>net10.0;net48</TargetFrameworks>
     <SignAssembly>true</SignAssembly>
   </PropertyGroup>
 

src/Dibix.Sdk.CodeGeneration/Output/AccessorCodeGenerator.cs

@@ -23,9 +23,9 @@ protected override IEnumerable<ArtifactWriterBase> SelectWriters(CodeGenerationM
             yield return new ApiControllerClassWriter(model);
         }
 
-        protected override IEnumerable<CSharpAnnotation> CollectGlobalAnnotations(CodeGenerationModel model)
+        protected override IEnumerable<CSharpGlobalAnnotation> CollectGlobalAnnotations(CodeGenerationModel model)
         {
-            yield return new CSharpAnnotation("ArtifactAssembly");
+            yield return new CSharpGlobalAnnotation("ArtifactAssembly");
         }
 
         protected override void OnContextCreated(CodeGenerationContext context)

src/Dibix.Sdk.CodeGeneration/Output/ApiClientWriter.cs

@@ -30,7 +30,7 @@ public override void Write(CodeGenerationContext context)
 
             IDictionary<string, SecurityScheme> securitySchemeMap = context.Model.SecuritySchemes.ToDictionary(x => x.SchemeName);
 
-            CSharpStatementScope output = context.CreateOutputScope();
+            CSharpStatementScope output = context.Namespace();
             for (int i = 0; i < controllers.Count; i++)
             {
                 ControllerDefinition controller = controllers[i];

src/Dibix.Sdk.CodeGeneration/Output/ApiControllerClassWriter.cs

@@ -34,7 +34,9 @@ public override void Write(CodeGenerationContext context)
         {
             context.AddUsing("Dibix");
 
-            CSharpStatementScope scope = context.CreateOutputScope();
+            CSharpStatementScope scope = context.PreProcessorDirective(PreprocessorDirective.IfNetFramework)
+                                                .Namespace(context.CurrentNamespace);
+
             foreach (KeyValuePair<string, IList<ReflectionActionDescriptor>> entry in _map)
             {
                 string className = $"{entry.Key}Base";