diff --git a/src/ApiCodeGenerator.Abstraction/AssemblyResolver.cs b/src/ApiCodeGenerator.Abstraction/AssemblyResolver.cs
index f5dde37..a1119a4 100644
--- a/src/ApiCodeGenerator.Abstraction/AssemblyResolver.cs
+++ b/src/ApiCodeGenerator.Abstraction/AssemblyResolver.cs
@@ -72,7 +72,7 @@ public static void Register(object? assemblyLoadContext)
             {
                 var current = GetLoadContext();
                 var ev = assemblyLoadContextType.GetEvent("Resolving");
-                ev.AddEventHandler(current, new Func<object, AssemblyName, Assembly?>(AssemblyLoadContext_Resolving));
+                ev.AddEventHandler(current, AssemblyLoadContext_Resolving);
             }
         }
 
@@ -86,7 +86,7 @@ public static void Unregister()
             {
                 var current = GetLoadContext();
                 var ev = assemblyLoadContextType.GetEvent("Resolving");
-                ev.RemoveEventHandler(current, new Func<object, AssemblyName, Assembly?>(AssemblyLoadContext_Resolving));
+                ev.RemoveEventHandler(current, AssemblyLoadContext_Resolving);
             }
         }
 
diff --git a/test/ApiCodeGenerator.AsyncApi.Tests/AmqpFunctionalTests.cs b/test/ApiCodeGenerator.AsyncApi.Tests/AmqpFunctionalTests.cs
index 0c07756..bce59f6 100644
--- a/test/ApiCodeGenerator.AsyncApi.Tests/AmqpFunctionalTests.cs
+++ b/test/ApiCodeGenerator.AsyncApi.Tests/AmqpFunctionalTests.cs
@@ -161,7 +161,7 @@ public async Task Generate_ChannelBindingSubscriber()
         channelProperty.Value["bindings"] = JObject.FromObject(channelBinding); // add binding declaration
         json["channels"] = new JObject { channelProperty }; // for test use only last channel
 
-        var context = new GeneratorContext((t, s, v) => settings, new Core.ExtensionManager.Extensions(), new Dictionary<string, string>())
+        var context = new GeneratorContext((_, _, _) => settings, new Core.ExtensionManager.Extensions(), new Dictionary<string, string>())
         {
             DocumentReader = new StringReader(json.ToString()),
         };
diff --git a/test/ApiCodeGenerator.AsyncApi.Tests/AsyncApiContentGeneratorTests.cs b/test/ApiCodeGenerator.AsyncApi.Tests/AsyncApiContentGeneratorTests.cs
index c43ef14..570429a 100644
--- a/test/ApiCodeGenerator.AsyncApi.Tests/AsyncApiContentGeneratorTests.cs
+++ b/test/ApiCodeGenerator.AsyncApi.Tests/AsyncApiContentGeneratorTests.cs
@@ -15,7 +15,7 @@ public async Task LoadApiDocument(string fileName)
         var extensions = new Core.ExtensionManager.Extensions();
 
         var context = new GeneratorContext(
-            settingsFactory: (t, s, v) => null,
+            settingsFactory: (_, _, _) => null,
             extensions,
             variables: new Dictionary<string, string>())
         {
@@ -181,7 +181,7 @@ public async Task LoadApiDocument_WithExternalRef(string documentPath)
     }
 
     private static Func<Type, Newtonsoft.Json.JsonSerializer?, IReadOnlyDictionary<string, string>?, object?> GetSettingsFactory(string json)
-        => (t, s, v) => (s ?? new()).Deserialize(new StringReader(json), t);
+        => (t, s, _) => (s ?? new()).Deserialize(new StringReader(json), t);
 
     private void ValidateDocument(AsyncApiDocument document)
     {
diff --git a/test/ApiCodeGenerator.AsyncApi.Tests/Infrastructure/TestHelpers.cs b/test/ApiCodeGenerator.AsyncApi.Tests/Infrastructure/TestHelpers.cs
index 2496b61..4045a41 100644
--- a/test/ApiCodeGenerator.AsyncApi.Tests/Infrastructure/TestHelpers.cs
+++ b/test/ApiCodeGenerator.AsyncApi.Tests/Infrastructure/TestHelpers.cs
@@ -47,7 +47,7 @@ public static GeneratorContext CreateContext(string settingsJson, string schemaF
         var docReader = File.OpenText(GetAsyncApiPath(schemaFile));
 
         return new GeneratorContext(
-            (t, s, v) => s!.Deserialize(jReader, t),
+            (t, s, _) => s!.Deserialize(jReader, t),
             extensions ?? new(AcgExtension.CodeGenerators, GetOperationGenerators()),
             new Dictionary<string, string>())
         {
@@ -263,7 +263,7 @@ public static IReadOnlyDictionary<string, IReadOnlyCollection<Type>> GetOperatio
 
     private static Task<IContentGenerator> CreateGenerator(TextReader document, CSharpClientGeneratorSettings settings)
     {
-        var context = new GeneratorContext((t, s, v) => settings, new Core.ExtensionManager.Extensions(), new Dictionary<string, string>())
+        var context = new GeneratorContext((_, _, _) => settings, new Core.ExtensionManager.Extensions(), new Dictionary<string, string>())
         {
             DocumentReader = document,
         };
diff --git a/test/ApiCodeGenerator.Core.Tests/ExtensionLoaderTests.cs b/test/ApiCodeGenerator.Core.Tests/ExtensionLoaderTests.cs
index 186499b..ad5103f 100644
--- a/test/ApiCodeGenerator.Core.Tests/ExtensionLoaderTests.cs
+++ b/test/ApiCodeGenerator.Core.Tests/ExtensionLoaderTests.cs
@@ -12,7 +12,7 @@ public void LoadExtensions()
         var extensions = ExtensionLoader.LoadExtensions(
             [nameof(AcgExt1), nameof(AcgExt2)],
             a => Assembly.GetCallingAssembly(),
-            (ap, asm) => GetType().GetNestedType(ap, BindingFlags.NonPublic) ?? throw new InvalidOperationException($"Type {ap} not found"));
+            (ap, _) => GetType().GetNestedType(ap, BindingFlags.NonPublic) ?? throw new InvalidOperationException($"Type {ap} not found"));
 
         Assert.That(extensions.CodeGenerators, Does.ContainKey("gen1"));
         Assert.AreEqual(new ContentGeneratorFactory(Gen1).Method, extensions.CodeGenerators["gen1"].Method);
diff --git a/test/ApiCodeGenerator.Core.Tests/GeneratorTests.cs b/test/ApiCodeGenerator.Core.Tests/GeneratorTests.cs
index bd38ce7..1fbd8c3 100644
--- a/test/ApiCodeGenerator.Core.Tests/GeneratorTests.cs
+++ b/test/ApiCodeGenerator.Core.Tests/GeneratorTests.cs
@@ -127,7 +127,7 @@ public async Task ApiDocumentLoadError()
             var expectedError = $"Unable load OpenApi document from '{OpenApiFilePath}'";
             var documentFactoryMock = new Mock<INswagDocumentFactory>();
             documentFactoryMock.Setup(df => df.LoadNswagDocument(It.IsAny<string>(), It.IsAny<VariablesDict>(), null))
-                .Returns<string, VariablesDict, JObject?>((p, v, b) => LoadNswag(nswag, v));
+                .Returns<string, VariablesDict, JObject?>((_, v, _) => LoadNswag(nswag, v));
 
             var extensions = new ExtensionManager.Extensions(
                 FakeGenerator());
diff --git a/test/ApiCodeGenerator.OpenApi.Tests/FunctionalTests.cs b/test/ApiCodeGenerator.OpenApi.Tests/FunctionalTests.cs
index 5020cd3..9a69e77 100644
--- a/test/ApiCodeGenerator.OpenApi.Tests/FunctionalTests.cs
+++ b/test/ApiCodeGenerator.OpenApi.Tests/FunctionalTests.cs
@@ -28,7 +28,7 @@ public async Task ReplaceCharsInNames_On(string schema, string replaceParams, st
             var fileProviderMock = new Mock<IFileProvider>(MockBehavior.Strict);
             fileProviderMock.Setup(f => f.Exists(It.IsAny<string>())).Returns(true);
             fileProviderMock.Setup(p => p.WriteAllTextAsync(It.IsAny<string>(), It.IsAny<string>()))
-                .Callback<string, string>((path, content) => generatedText = content);
+                .Callback<string, string>((_, content) => generatedText = content);
 
             var task = CreateGenerator(fileProviderMock, settingsJson, schema);