From cf264d72684cd03186ac2fe6807bd347b4a9b6f0 Mon Sep 17 00:00:00 2001
From: Martin Othamar <martin@othamar.net>
Date: Tue, 27 Jun 2023 20:41:26 +0200
Subject: [PATCH 1/3] Remove old Roslyn3.8 code, simplify projects

---
 Mediator.sln                                  | 72 ++---------------
 README.md                                     | 12 +++
 .../Mediator.Benchmarks.Large.csproj          |  5 +-
 .../Mediator.Benchmarks.csproj                |  5 +-
 samples/ASPNET_Core/ASPNET_Core.csproj        |  5 +-
 .../AspNetCoreSample.Application.csproj       |  5 +-
 .../AspNetCoreIndirect.Application.csproj     |  5 +-
 .../AspNetCoreIndirect.BaseClasses.csproj     |  2 +-
 samples/SimpleConsole/SimpleConsole.csproj    |  5 +-
 .../SimpleConsoleAOT/SimpleConsoleAOT.csproj  |  5 +-
 samples/SimpleEndToEnd/SimpleEndToEnd.csproj  |  5 +-
 .../SimpleStreaming/SimpleStreaming.csproj    |  5 +-
 .../Handlers/ICommandHandler.cs               |  0
 .../Handlers/INotificationHandler.cs          |  0
 .../Handlers/IQueryHandler.cs                 |  0
 .../Handlers/IRequestHandler.cs               |  0
 .../Handlers/IStreamCommandHandler.cs         |  0
 .../Handlers/IStreamQueryHandler.cs           |  0
 .../Handlers/IStreamRequestHandler.cs         |  0
 .../IMediator.cs                              |  0
 .../IPublisher.cs                             |  0
 .../ISender.cs                                |  0
 .../InvalidMessageException.cs                |  0
 .../Mediator.Abstractions.csproj}             |  0
 .../Messages/IBaseCommand.cs                  |  0
 .../Messages/IBaseQuery.cs                    |  0
 .../Messages/IBaseRequest.cs                  |  0
 .../Messages/ICommand.cs                      |  0
 .../Messages/IMessage.cs                      |  0
 .../Messages/INotification.cs                 |  0
 .../Messages/IQuery.cs                        |  0
 .../Messages/IRequest.cs                      |  0
 .../Messages/IStreamCommand.cs                |  0
 .../Messages/IStreamMessage.cs                |  0
 .../Messages/IStreamQuery.cs                  |  0
 .../Messages/IStreamRequest.cs                |  0
 .../Messages/Unit.cs                          |  0
 .../MissingMessageHandlerException.cs         |  0
 .../Pipeline/IPipelineBehavior.cs             |  0
 .../Pipeline/IStreamPipelineBehavior.cs       |  0
 .../Pipeline/MessageExceptionHandler.cs       |  0
 .../Pipeline/MessageHandlerDelegate.cs        |  0
 .../Pipeline/MessagePostProcessor.cs          |  0
 .../Pipeline/MessagePreProcessor.cs           |  0
 .../Pipeline/StreamHandlerDelegate.cs         |  0
 ...ator.SourceGenerator.Implementation.csproj | 37 ---------
 .../Mediator.SourceGenerator.Roslyn38.csproj  | 27 -------
 .../MediatorGenerator.cs                      | 51 ------------
 .../Mediator.SourceGenerator.Roslyn40.csproj  | 27 -------
 .../Analysis/CompilationAnalyzer.cs           |  0
 .../Analysis/InvocationSyntaxReceiver.cs      |  0
 .../Analysis/MessageHandler.cs                |  0
 .../Analysis/NotificationMessage.cs           |  0
 .../Analysis/NotificationMessageHandler.cs    |  0
 .../Analysis/RequestMessage.cs                |  0
 .../Analysis/RequestMessageHandler.cs         |  0
 .../Analysis/RequestMessageHandlerWrapper.cs  |  0
 .../Analysis/SymbolMetadata.cs                |  0
 .../Constants.cs                              |  0
 .../Diagnostics.cs                            |  0
 .../EmbeddedResource.cs                       |  0
 .../Extensions/IsExternalInit.cs              |  0
 .../Extensions/RoslynExtensions.cs            |  0
 .../IncrementalMediatorGenerator.cs           |  0
 .../Mediator.SourceGenerator.csproj           | 34 ++++++--
 .../MediatorGenerationContext.cs              |  0
 .../MediatorImplementationGenerator.cs        |  0
 .../MediatorOptionsGenerator.cs               |  0
 .../Versioning.cs                             |  0
 .../resources/Mediator.sbn-cs                 |  0
 .../resources/MediatorFallback.sbn-cs         |  0
 .../resources/MediatorOptions.sbn-cs          |  0
 .../resources/MediatorOptionsAttribute.sbn-cs |  0
 .../Mediator.MemAllocationTests.csproj        |  5 +-
 ...iator.Samples.SourceGenerator.Tests.csproj |  2 +-
 .../Mediator.SmokeTestConsole.csproj          |  7 +-
 .../SamplesTests.cs                           | 58 --------------
 .../SourceGenVerifier.cs                      | 78 -------------------
 ...ator.SourceGenerator.Roslyn40.Tests.csproj | 52 -------------
 .../AssertExtensions.cs                       |  0
 .../Assertions.cs                             |  0
 .../Fixture.cs                                |  0
 .../GeneratorResult.cs                        |  0
 .../Global.cs                                 |  0
 .../LifetimeOptionTests.cs                    |  0
 .../Mediator.SourceGenerator.Tests.csproj}    | 46 ++++++-----
 .../ReportingTests.cs                         |  0
 .../SamplesTests.cs                           | 58 ++++++++++++++
 .../SourceGenVerifier.cs                      | 78 +++++++++++++++++++
 .../resources/AbstractHandlerProgram.cs       |  0
 .../resources/ByteArrayResponseProgram.cs     |  0
 .../resources/ConfigurationConflictProgram.cs |  0
 .../resources/ConstVariablesConfig.cs         |  0
 .../resources/DeepNamespaceProgram.cs         |  0
 .../resources/DuplicateHandlersProgram.cs     |  0
 .../resources/IntCastLifetime.cs              |  0
 .../resources/InvalidVariablesConfig.cs       |  0
 .../resources/LocalLiteralVariableConfig.cs   |  0
 .../LocalVariablesReferencingConstsConfig.cs  |  0
 .../resources/MultipleAddMediatorCalls.cs     |  0
 .../resources/MultipleErrorsProgram.cs        |  0
 .../resources/NoMessagesProgram.cs            |  0
 .../NotificationWithoutHandlerProgram.cs      |  0
 .../resources/NullNamespaceVariable.cs        |  0
 .../resources/RequestWithoutHandlerProgram.cs |  0
 .../resources/StaticNestedHandlerProgram.cs   |  0
 .../resources/StreamingProgram.cs             |  0
 .../resources/StructHandlerProgram.cs         |  0
 .../UnassignedLifetimeVariableConfig.cs       |  0
 .../UnassignedNamespaceVariableConfig.cs      |  0
 .../resources/UnassignedVariablesConfig.cs    |  0
 .../Mediator.Tests.Common.csproj              |  2 +-
 .../Mediator.Tests.ScopedLifetime.csproj      |  9 +--
 .../Mediator.Tests.TransientLifetime.csproj   |  9 +--
 test/Mediator.Tests/Mediator.Tests.csproj     |  5 +-
 115 files changed, 243 insertions(+), 473 deletions(-)
 rename src/{Mediator => Mediator.Abstractions}/Handlers/ICommandHandler.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Handlers/INotificationHandler.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Handlers/IQueryHandler.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Handlers/IRequestHandler.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Handlers/IStreamCommandHandler.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Handlers/IStreamQueryHandler.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Handlers/IStreamRequestHandler.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/IMediator.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/IPublisher.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/ISender.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/InvalidMessageException.cs (100%)
 rename src/{Mediator/Mediator.csproj => Mediator.Abstractions/Mediator.Abstractions.csproj} (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IBaseCommand.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IBaseQuery.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IBaseRequest.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/ICommand.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IMessage.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/INotification.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IQuery.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IRequest.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IStreamCommand.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IStreamMessage.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IStreamQuery.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/IStreamRequest.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Messages/Unit.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/MissingMessageHandlerException.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Pipeline/IPipelineBehavior.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Pipeline/IStreamPipelineBehavior.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Pipeline/MessageExceptionHandler.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Pipeline/MessageHandlerDelegate.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Pipeline/MessagePostProcessor.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Pipeline/MessagePreProcessor.cs (100%)
 rename src/{Mediator => Mediator.Abstractions}/Pipeline/StreamHandlerDelegate.cs (100%)
 delete mode 100644 src/Mediator.SourceGenerator.Implementation/Mediator.SourceGenerator.Implementation.csproj
 delete mode 100644 src/Mediator.SourceGenerator.Roslyn38/Mediator.SourceGenerator.Roslyn38.csproj
 delete mode 100644 src/Mediator.SourceGenerator.Roslyn38/MediatorGenerator.cs
 delete mode 100644 src/Mediator.SourceGenerator.Roslyn40/Mediator.SourceGenerator.Roslyn40.csproj
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Analysis/CompilationAnalyzer.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Analysis/InvocationSyntaxReceiver.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Analysis/MessageHandler.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Analysis/NotificationMessage.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Analysis/NotificationMessageHandler.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Analysis/RequestMessage.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Analysis/RequestMessageHandler.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Analysis/RequestMessageHandlerWrapper.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Analysis/SymbolMetadata.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Constants.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Diagnostics.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/EmbeddedResource.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Extensions/IsExternalInit.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Extensions/RoslynExtensions.cs (100%)
 rename src/{Mediator.SourceGenerator.Roslyn40 => Mediator.SourceGenerator}/IncrementalMediatorGenerator.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/MediatorGenerationContext.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/MediatorImplementationGenerator.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/MediatorOptionsGenerator.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/Versioning.cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/resources/Mediator.sbn-cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/resources/MediatorFallback.sbn-cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/resources/MediatorOptions.sbn-cs (100%)
 rename src/{Mediator.SourceGenerator.Implementation => Mediator.SourceGenerator}/resources/MediatorOptionsAttribute.sbn-cs (100%)
 delete mode 100644 test/Mediator.SourceGenerator.Roslyn38.Tests/SamplesTests.cs
 delete mode 100644 test/Mediator.SourceGenerator.Roslyn38.Tests/SourceGenVerifier.cs
 delete mode 100644 test/Mediator.SourceGenerator.Roslyn40.Tests/Mediator.SourceGenerator.Roslyn40.Tests.csproj
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/AssertExtensions.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/Assertions.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/Fixture.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/GeneratorResult.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn40.Tests => Mediator.SourceGenerator.Tests}/Global.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/LifetimeOptionTests.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests/Mediator.SourceGenerator.Roslyn38.Tests.csproj => Mediator.SourceGenerator.Tests/Mediator.SourceGenerator.Tests.csproj} (76%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/ReportingTests.cs (100%)
 create mode 100644 test/Mediator.SourceGenerator.Tests/SamplesTests.cs
 create mode 100644 test/Mediator.SourceGenerator.Tests/SourceGenVerifier.cs
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/AbstractHandlerProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/ByteArrayResponseProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/ConfigurationConflictProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/ConstVariablesConfig.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/DeepNamespaceProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/DuplicateHandlersProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/IntCastLifetime.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/InvalidVariablesConfig.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/LocalLiteralVariableConfig.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/LocalVariablesReferencingConstsConfig.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/MultipleAddMediatorCalls.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/MultipleErrorsProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/NoMessagesProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/NotificationWithoutHandlerProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/NullNamespaceVariable.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/RequestWithoutHandlerProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/StaticNestedHandlerProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/StreamingProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/StructHandlerProgram.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/UnassignedLifetimeVariableConfig.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/UnassignedNamespaceVariableConfig.cs (100%)
 rename test/{Mediator.SourceGenerator.Roslyn38.Tests => Mediator.SourceGenerator.Tests}/resources/UnassignedVariablesConfig.cs (100%)

diff --git a/Mediator.sln b/Mediator.sln
index 46ede32..4bde0cf 100644
--- a/Mediator.sln
+++ b/Mediator.sln
@@ -17,7 +17,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{ED1809FC-7
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.Tests", "test\Mediator.Tests\Mediator.Tests.csproj", "{488A6892-3435-4E72-9B74-A847F2E4197F}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator", "src\Mediator\Mediator.csproj", "{DFB554A5-48A4-4C69-A857-1080B6CE89F9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.Abstractions", "src\Mediator.Abstractions\Mediator.Abstractions.csproj", "{DFB554A5-48A4-4C69-A857-1080B6CE89F9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{D3569CDD-7E19-429E-B9AD-75CC05F6C4AA}"
 EndProject
@@ -41,8 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreSample.Applicatio
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreSample.Domain", "samples\ASPNET_Core_CleanArchitecture\AspNetCoreSample.Domain\AspNetCoreSample.Domain.csproj", "{E98D92E0-2029-47D8-9EEE-E3A19DF9354A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.SourceGenerator.Roslyn38.Tests", "test\Mediator.SourceGenerator.Roslyn38.Tests\Mediator.SourceGenerator.Roslyn38.Tests.csproj", "{A36EE34F-9EA1-460E-841F-C84BC603929B}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleConsoleAOT", "samples\SimpleConsoleAOT\SimpleConsoleAOT.csproj", "{45FC79C1-76EB-4B30-B54F-DD1762BA15EE}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreSample.Infrastructure", "samples\ASPNET_Core_CleanArchitecture\AspNetCoreSample.Infrastructure\AspNetCoreSample.Infrastructure.csproj", "{CE5A582D-3CC6-44D7-AF3F-CD741BA53833}"
@@ -72,13 +70,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleStreaming", "samples\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASPNET_Core", "samples\ASPNET_Core\ASPNET_Core.csproj", "{35D4B136-E164-48A3-ADC3-E22237CCDC9C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.SourceGenerator.Roslyn38", "src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj", "{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.SourceGenerator.Roslyn40", "src\Mediator.SourceGenerator.Roslyn40\Mediator.SourceGenerator.Roslyn40.csproj", "{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.SourceGenerator.Implementation", "src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj", "{22984D49-8DDF-4263-8375-D018643E44B2}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.SourceGenerator.Roslyn40.Tests", "test\Mediator.SourceGenerator.Roslyn40.Tests\Mediator.SourceGenerator.Roslyn40.Tests.csproj", "{E4EE80C5-179C-4483-9E91-3107B3E1CD5A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.SourceGenerator.Tests", "test\Mediator.SourceGenerator.Tests\Mediator.SourceGenerator.Tests.csproj", "{E4EE80C5-179C-4483-9E91-3107B3E1CD5A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.SmokeTestConsole", "test\Mediator.SmokeTestConsole\Mediator.SmokeTestConsole.csproj", "{65D8C0F8-E4CF-452D-86FB-482FE63C7C89}"
 EndProject
@@ -92,15 +84,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Mediator.Benchmarks.Large",
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ASPNET_Core_Indirect", "ASPNET_Core_Indirect", "{BC759BA5-C064-460E-ACB0-9B2DA12B9284}"
 	ProjectSection(SolutionItems) = preProject
-		samples\ASPNET_Core_Indirect\README.md = samples\ASPNET_Core_Indirect\README.md
 		samples\ASPNET_Core_Indirect\get-weather-forecast.http = samples\ASPNET_Core_Indirect\get-weather-forecast.http
+		samples\ASPNET_Core_Indirect\README.md = samples\ASPNET_Core_Indirect\README.md
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCoreIndirect.BaseClasses", "samples\ASPNET_Core_Indirect\AspNetCoreIndirect.BaseClasses\AspNetCoreIndirect.BaseClasses.csproj", "{EBB07938-94A7-4349-9D0F-F2A6088EB42E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreIndirect.BaseClasses", "samples\ASPNET_Core_Indirect\AspNetCoreIndirect.BaseClasses\AspNetCoreIndirect.BaseClasses.csproj", "{EBB07938-94A7-4349-9D0F-F2A6088EB42E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCoreIndirect.Application", "samples\ASPNET_Core_Indirect\AspNetCoreIndirect.Application\AspNetCoreIndirect.Application.csproj", "{DB9A7862-14B1-4DAC-878C-D6B02038F068}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreIndirect.Application", "samples\ASPNET_Core_Indirect\AspNetCoreIndirect.Application\AspNetCoreIndirect.Application.csproj", "{DB9A7862-14B1-4DAC-878C-D6B02038F068}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AspNetCoreIndirect.Implementations", "samples\ASPNET_Core_Indirect\AspNetCoreIndirect.Implementations\AspNetCoreIndirect.Implementations.csproj", "{7F7DB4D8-3D94-4648-99FA-E7E06A913FCD}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCoreIndirect.Implementations", "samples\ASPNET_Core_Indirect\AspNetCoreIndirect.Implementations\AspNetCoreIndirect.Implementations.csproj", "{7F7DB4D8-3D94-4648-99FA-E7E06A913FCD}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -208,18 +200,6 @@ Global
 		{E98D92E0-2029-47D8-9EEE-E3A19DF9354A}.Release|x64.Build.0 = Release|Any CPU
 		{E98D92E0-2029-47D8-9EEE-E3A19DF9354A}.Release|x86.ActiveCfg = Release|Any CPU
 		{E98D92E0-2029-47D8-9EEE-E3A19DF9354A}.Release|x86.Build.0 = Release|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Debug|x64.Build.0 = Debug|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Debug|x86.Build.0 = Debug|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Release|x64.ActiveCfg = Release|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Release|x64.Build.0 = Release|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Release|x86.ActiveCfg = Release|Any CPU
-		{A36EE34F-9EA1-460E-841F-C84BC603929B}.Release|x86.Build.0 = Release|Any CPU
 		{45FC79C1-76EB-4B30-B54F-DD1762BA15EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{45FC79C1-76EB-4B30-B54F-DD1762BA15EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{45FC79C1-76EB-4B30-B54F-DD1762BA15EE}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -304,42 +284,6 @@ Global
 		{35D4B136-E164-48A3-ADC3-E22237CCDC9C}.Release|x64.Build.0 = Release|Any CPU
 		{35D4B136-E164-48A3-ADC3-E22237CCDC9C}.Release|x86.ActiveCfg = Release|Any CPU
 		{35D4B136-E164-48A3-ADC3-E22237CCDC9C}.Release|x86.Build.0 = Release|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Debug|x64.Build.0 = Debug|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Debug|x86.Build.0 = Debug|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Release|x64.ActiveCfg = Release|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Release|x64.Build.0 = Release|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Release|x86.ActiveCfg = Release|Any CPU
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5}.Release|x86.Build.0 = Release|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Debug|x64.Build.0 = Debug|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Debug|x86.Build.0 = Debug|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Release|x64.ActiveCfg = Release|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Release|x64.Build.0 = Release|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Release|x86.ActiveCfg = Release|Any CPU
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E}.Release|x86.Build.0 = Release|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Debug|x64.Build.0 = Debug|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Debug|x86.Build.0 = Debug|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Release|x64.ActiveCfg = Release|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Release|x64.Build.0 = Release|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Release|x86.ActiveCfg = Release|Any CPU
-		{22984D49-8DDF-4263-8375-D018643E44B2}.Release|x86.Build.0 = Release|Any CPU
 		{E4EE80C5-179C-4483-9E91-3107B3E1CD5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{E4EE80C5-179C-4483-9E91-3107B3E1CD5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E4EE80C5-179C-4483-9E91-3107B3E1CD5A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -462,7 +406,6 @@ Global
 		{05746941-ABD5-46C6-9E9A-9B107F6B0076} = {B0120C11-5024-491A-B3AD-821E1D2CD8F2}
 		{BEF59A60-ED18-4F08-A0A4-F99D64F71E18} = {B0120C11-5024-491A-B3AD-821E1D2CD8F2}
 		{E98D92E0-2029-47D8-9EEE-E3A19DF9354A} = {B0120C11-5024-491A-B3AD-821E1D2CD8F2}
-		{A36EE34F-9EA1-460E-841F-C84BC603929B} = {ED1809FC-733B-4D9E-8FEE-70D3BB0BBD84}
 		{45FC79C1-76EB-4B30-B54F-DD1762BA15EE} = {D3569CDD-7E19-429E-B9AD-75CC05F6C4AA}
 		{CE5A582D-3CC6-44D7-AF3F-CD741BA53833} = {B0120C11-5024-491A-B3AD-821E1D2CD8F2}
 		{B9E8DA69-C6FA-446F-B949-EF48856551D8} = {D3569CDD-7E19-429E-B9AD-75CC05F6C4AA}
@@ -470,9 +413,6 @@ Global
 		{6FC1A2EC-7178-4A3E-93DF-1ABDF09F4943} = {ED1809FC-733B-4D9E-8FEE-70D3BB0BBD84}
 		{D24BCAD4-0C17-40D0-8ADC-B8A5E8700047} = {D3569CDD-7E19-429E-B9AD-75CC05F6C4AA}
 		{35D4B136-E164-48A3-ADC3-E22237CCDC9C} = {D3569CDD-7E19-429E-B9AD-75CC05F6C4AA}
-		{FCB31060-4C23-4BB7-9A95-4C636B43F6B5} = {438C928E-FBB5-45B2-9CD2-7ED3341AC75E}
-		{C5AD8C4D-D731-4DDD-96BD-A6776A1FF20E} = {438C928E-FBB5-45B2-9CD2-7ED3341AC75E}
-		{22984D49-8DDF-4263-8375-D018643E44B2} = {438C928E-FBB5-45B2-9CD2-7ED3341AC75E}
 		{E4EE80C5-179C-4483-9E91-3107B3E1CD5A} = {ED1809FC-733B-4D9E-8FEE-70D3BB0BBD84}
 		{65D8C0F8-E4CF-452D-86FB-482FE63C7C89} = {ED1809FC-733B-4D9E-8FEE-70D3BB0BBD84}
 		{EECFACC8-E841-4EF5-A1D7-A64C84B7DBCD} = {ED1809FC-733B-4D9E-8FEE-70D3BB0BBD84}
diff --git a/README.md b/README.md
index dc7bd0a..3c3b0e1 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,18 @@
 >
 > **Version 3.0** is currently being developed. See status and provide feedback [here (#98)](https://github.com/martinothamar/Mediator/issues/98)
 
+## 3.0
+
+Mediator.Abstractions (abstractions + source generator for impl + DI)
+Mediator.SourceGenerator (the runtime DI)
+
+Init scenarios:
+* Scoped - lazy init
+* Transient - lazy init
+* Singleton - eager init
+
+---
+
 This is a high performance .NET implementation of the Mediator pattern using the [source generators](https://devblogs.microsoft.com/dotnet/introducing-c-source-generators/) feature introduced in .NET 5.
 The API and usage is mostly based on the great [MediatR](https://github.com/jbogard/MediatR) library, with some deviations to allow for better performance.
 Packages are .NET Standard 2.1 compatible.
diff --git a/benchmarks/Mediator.Benchmarks.Large/Mediator.Benchmarks.Large.csproj b/benchmarks/Mediator.Benchmarks.Large/Mediator.Benchmarks.Large.csproj
index f4f76db..0c20e4e 100644
--- a/benchmarks/Mediator.Benchmarks.Large/Mediator.Benchmarks.Large.csproj
+++ b/benchmarks/Mediator.Benchmarks.Large/Mediator.Benchmarks.Large.csproj
@@ -38,9 +38,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn40\Mediator.SourceGenerator.Roslyn40.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
 </Project>
diff --git a/benchmarks/Mediator.Benchmarks/Mediator.Benchmarks.csproj b/benchmarks/Mediator.Benchmarks/Mediator.Benchmarks.csproj
index 680c301..03aa3ce 100644
--- a/benchmarks/Mediator.Benchmarks/Mediator.Benchmarks.csproj
+++ b/benchmarks/Mediator.Benchmarks/Mediator.Benchmarks.csproj
@@ -39,9 +39,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn40\Mediator.SourceGenerator.Roslyn40.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/ASPNET_Core/ASPNET_Core.csproj b/samples/ASPNET_Core/ASPNET_Core.csproj
index 6b15e76..bdebdb4 100644
--- a/samples/ASPNET_Core/ASPNET_Core.csproj
+++ b/samples/ASPNET_Core/ASPNET_Core.csproj
@@ -11,9 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/ASPNET_Core_CleanArchitecture/AspNetCoreSample.Application/AspNetCoreSample.Application.csproj b/samples/ASPNET_Core_CleanArchitecture/AspNetCoreSample.Application/AspNetCoreSample.Application.csproj
index 0ba6788..83ece0a 100644
--- a/samples/ASPNET_Core_CleanArchitecture/AspNetCoreSample.Application/AspNetCoreSample.Application.csproj
+++ b/samples/ASPNET_Core_CleanArchitecture/AspNetCoreSample.Application/AspNetCoreSample.Application.csproj
@@ -11,9 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Mediator\Mediator.csproj" />
-    <ProjectReference Include="..\..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
     <ProjectReference Include="..\AspNetCoreSample.Domain\AspNetCoreSample.Domain.csproj" />
   </ItemGroup>
 
diff --git a/samples/ASPNET_Core_Indirect/AspNetCoreIndirect.Application/AspNetCoreIndirect.Application.csproj b/samples/ASPNET_Core_Indirect/AspNetCoreIndirect.Application/AspNetCoreIndirect.Application.csproj
index fd69067..e008105 100644
--- a/samples/ASPNET_Core_Indirect/AspNetCoreIndirect.Application/AspNetCoreIndirect.Application.csproj
+++ b/samples/ASPNET_Core_Indirect/AspNetCoreIndirect.Application/AspNetCoreIndirect.Application.csproj
@@ -11,9 +11,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Mediator\Mediator.csproj" />
-    <ProjectReference Include="..\..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
+    <ProjectReference Include="..\..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
     <ProjectReference Include="..\AspNetCoreIndirect.Implementations\AspNetCoreIndirect.Implementations.csproj" />
   </ItemGroup>
 
diff --git a/samples/ASPNET_Core_Indirect/AspNetCoreIndirect.BaseClasses/AspNetCoreIndirect.BaseClasses.csproj b/samples/ASPNET_Core_Indirect/AspNetCoreIndirect.BaseClasses/AspNetCoreIndirect.BaseClasses.csproj
index fa0b9f3..176ea94 100644
--- a/samples/ASPNET_Core_Indirect/AspNetCoreIndirect.BaseClasses/AspNetCoreIndirect.BaseClasses.csproj
+++ b/samples/ASPNET_Core_Indirect/AspNetCoreIndirect.BaseClasses/AspNetCoreIndirect.BaseClasses.csproj
@@ -11,7 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/SimpleConsole/SimpleConsole.csproj b/samples/SimpleConsole/SimpleConsole.csproj
index 046245e..d0a02f1 100644
--- a/samples/SimpleConsole/SimpleConsole.csproj
+++ b/samples/SimpleConsole/SimpleConsole.csproj
@@ -19,9 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <!--<ItemGroup>
diff --git a/samples/SimpleConsoleAOT/SimpleConsoleAOT.csproj b/samples/SimpleConsoleAOT/SimpleConsoleAOT.csproj
index fad9333..5b95ede 100644
--- a/samples/SimpleConsoleAOT/SimpleConsoleAOT.csproj
+++ b/samples/SimpleConsoleAOT/SimpleConsoleAOT.csproj
@@ -12,9 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/SimpleEndToEnd/SimpleEndToEnd.csproj b/samples/SimpleEndToEnd/SimpleEndToEnd.csproj
index 3b85679..22cc2d6 100644
--- a/samples/SimpleEndToEnd/SimpleEndToEnd.csproj
+++ b/samples/SimpleEndToEnd/SimpleEndToEnd.csproj
@@ -12,9 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/SimpleStreaming/SimpleStreaming.csproj b/samples/SimpleStreaming/SimpleStreaming.csproj
index 3b85679..22cc2d6 100644
--- a/samples/SimpleStreaming/SimpleStreaming.csproj
+++ b/samples/SimpleStreaming/SimpleStreaming.csproj
@@ -12,9 +12,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Mediator/Handlers/ICommandHandler.cs b/src/Mediator.Abstractions/Handlers/ICommandHandler.cs
similarity index 100%
rename from src/Mediator/Handlers/ICommandHandler.cs
rename to src/Mediator.Abstractions/Handlers/ICommandHandler.cs
diff --git a/src/Mediator/Handlers/INotificationHandler.cs b/src/Mediator.Abstractions/Handlers/INotificationHandler.cs
similarity index 100%
rename from src/Mediator/Handlers/INotificationHandler.cs
rename to src/Mediator.Abstractions/Handlers/INotificationHandler.cs
diff --git a/src/Mediator/Handlers/IQueryHandler.cs b/src/Mediator.Abstractions/Handlers/IQueryHandler.cs
similarity index 100%
rename from src/Mediator/Handlers/IQueryHandler.cs
rename to src/Mediator.Abstractions/Handlers/IQueryHandler.cs
diff --git a/src/Mediator/Handlers/IRequestHandler.cs b/src/Mediator.Abstractions/Handlers/IRequestHandler.cs
similarity index 100%
rename from src/Mediator/Handlers/IRequestHandler.cs
rename to src/Mediator.Abstractions/Handlers/IRequestHandler.cs
diff --git a/src/Mediator/Handlers/IStreamCommandHandler.cs b/src/Mediator.Abstractions/Handlers/IStreamCommandHandler.cs
similarity index 100%
rename from src/Mediator/Handlers/IStreamCommandHandler.cs
rename to src/Mediator.Abstractions/Handlers/IStreamCommandHandler.cs
diff --git a/src/Mediator/Handlers/IStreamQueryHandler.cs b/src/Mediator.Abstractions/Handlers/IStreamQueryHandler.cs
similarity index 100%
rename from src/Mediator/Handlers/IStreamQueryHandler.cs
rename to src/Mediator.Abstractions/Handlers/IStreamQueryHandler.cs
diff --git a/src/Mediator/Handlers/IStreamRequestHandler.cs b/src/Mediator.Abstractions/Handlers/IStreamRequestHandler.cs
similarity index 100%
rename from src/Mediator/Handlers/IStreamRequestHandler.cs
rename to src/Mediator.Abstractions/Handlers/IStreamRequestHandler.cs
diff --git a/src/Mediator/IMediator.cs b/src/Mediator.Abstractions/IMediator.cs
similarity index 100%
rename from src/Mediator/IMediator.cs
rename to src/Mediator.Abstractions/IMediator.cs
diff --git a/src/Mediator/IPublisher.cs b/src/Mediator.Abstractions/IPublisher.cs
similarity index 100%
rename from src/Mediator/IPublisher.cs
rename to src/Mediator.Abstractions/IPublisher.cs
diff --git a/src/Mediator/ISender.cs b/src/Mediator.Abstractions/ISender.cs
similarity index 100%
rename from src/Mediator/ISender.cs
rename to src/Mediator.Abstractions/ISender.cs
diff --git a/src/Mediator/InvalidMessageException.cs b/src/Mediator.Abstractions/InvalidMessageException.cs
similarity index 100%
rename from src/Mediator/InvalidMessageException.cs
rename to src/Mediator.Abstractions/InvalidMessageException.cs
diff --git a/src/Mediator/Mediator.csproj b/src/Mediator.Abstractions/Mediator.Abstractions.csproj
similarity index 100%
rename from src/Mediator/Mediator.csproj
rename to src/Mediator.Abstractions/Mediator.Abstractions.csproj
diff --git a/src/Mediator/Messages/IBaseCommand.cs b/src/Mediator.Abstractions/Messages/IBaseCommand.cs
similarity index 100%
rename from src/Mediator/Messages/IBaseCommand.cs
rename to src/Mediator.Abstractions/Messages/IBaseCommand.cs
diff --git a/src/Mediator/Messages/IBaseQuery.cs b/src/Mediator.Abstractions/Messages/IBaseQuery.cs
similarity index 100%
rename from src/Mediator/Messages/IBaseQuery.cs
rename to src/Mediator.Abstractions/Messages/IBaseQuery.cs
diff --git a/src/Mediator/Messages/IBaseRequest.cs b/src/Mediator.Abstractions/Messages/IBaseRequest.cs
similarity index 100%
rename from src/Mediator/Messages/IBaseRequest.cs
rename to src/Mediator.Abstractions/Messages/IBaseRequest.cs
diff --git a/src/Mediator/Messages/ICommand.cs b/src/Mediator.Abstractions/Messages/ICommand.cs
similarity index 100%
rename from src/Mediator/Messages/ICommand.cs
rename to src/Mediator.Abstractions/Messages/ICommand.cs
diff --git a/src/Mediator/Messages/IMessage.cs b/src/Mediator.Abstractions/Messages/IMessage.cs
similarity index 100%
rename from src/Mediator/Messages/IMessage.cs
rename to src/Mediator.Abstractions/Messages/IMessage.cs
diff --git a/src/Mediator/Messages/INotification.cs b/src/Mediator.Abstractions/Messages/INotification.cs
similarity index 100%
rename from src/Mediator/Messages/INotification.cs
rename to src/Mediator.Abstractions/Messages/INotification.cs
diff --git a/src/Mediator/Messages/IQuery.cs b/src/Mediator.Abstractions/Messages/IQuery.cs
similarity index 100%
rename from src/Mediator/Messages/IQuery.cs
rename to src/Mediator.Abstractions/Messages/IQuery.cs
diff --git a/src/Mediator/Messages/IRequest.cs b/src/Mediator.Abstractions/Messages/IRequest.cs
similarity index 100%
rename from src/Mediator/Messages/IRequest.cs
rename to src/Mediator.Abstractions/Messages/IRequest.cs
diff --git a/src/Mediator/Messages/IStreamCommand.cs b/src/Mediator.Abstractions/Messages/IStreamCommand.cs
similarity index 100%
rename from src/Mediator/Messages/IStreamCommand.cs
rename to src/Mediator.Abstractions/Messages/IStreamCommand.cs
diff --git a/src/Mediator/Messages/IStreamMessage.cs b/src/Mediator.Abstractions/Messages/IStreamMessage.cs
similarity index 100%
rename from src/Mediator/Messages/IStreamMessage.cs
rename to src/Mediator.Abstractions/Messages/IStreamMessage.cs
diff --git a/src/Mediator/Messages/IStreamQuery.cs b/src/Mediator.Abstractions/Messages/IStreamQuery.cs
similarity index 100%
rename from src/Mediator/Messages/IStreamQuery.cs
rename to src/Mediator.Abstractions/Messages/IStreamQuery.cs
diff --git a/src/Mediator/Messages/IStreamRequest.cs b/src/Mediator.Abstractions/Messages/IStreamRequest.cs
similarity index 100%
rename from src/Mediator/Messages/IStreamRequest.cs
rename to src/Mediator.Abstractions/Messages/IStreamRequest.cs
diff --git a/src/Mediator/Messages/Unit.cs b/src/Mediator.Abstractions/Messages/Unit.cs
similarity index 100%
rename from src/Mediator/Messages/Unit.cs
rename to src/Mediator.Abstractions/Messages/Unit.cs
diff --git a/src/Mediator/MissingMessageHandlerException.cs b/src/Mediator.Abstractions/MissingMessageHandlerException.cs
similarity index 100%
rename from src/Mediator/MissingMessageHandlerException.cs
rename to src/Mediator.Abstractions/MissingMessageHandlerException.cs
diff --git a/src/Mediator/Pipeline/IPipelineBehavior.cs b/src/Mediator.Abstractions/Pipeline/IPipelineBehavior.cs
similarity index 100%
rename from src/Mediator/Pipeline/IPipelineBehavior.cs
rename to src/Mediator.Abstractions/Pipeline/IPipelineBehavior.cs
diff --git a/src/Mediator/Pipeline/IStreamPipelineBehavior.cs b/src/Mediator.Abstractions/Pipeline/IStreamPipelineBehavior.cs
similarity index 100%
rename from src/Mediator/Pipeline/IStreamPipelineBehavior.cs
rename to src/Mediator.Abstractions/Pipeline/IStreamPipelineBehavior.cs
diff --git a/src/Mediator/Pipeline/MessageExceptionHandler.cs b/src/Mediator.Abstractions/Pipeline/MessageExceptionHandler.cs
similarity index 100%
rename from src/Mediator/Pipeline/MessageExceptionHandler.cs
rename to src/Mediator.Abstractions/Pipeline/MessageExceptionHandler.cs
diff --git a/src/Mediator/Pipeline/MessageHandlerDelegate.cs b/src/Mediator.Abstractions/Pipeline/MessageHandlerDelegate.cs
similarity index 100%
rename from src/Mediator/Pipeline/MessageHandlerDelegate.cs
rename to src/Mediator.Abstractions/Pipeline/MessageHandlerDelegate.cs
diff --git a/src/Mediator/Pipeline/MessagePostProcessor.cs b/src/Mediator.Abstractions/Pipeline/MessagePostProcessor.cs
similarity index 100%
rename from src/Mediator/Pipeline/MessagePostProcessor.cs
rename to src/Mediator.Abstractions/Pipeline/MessagePostProcessor.cs
diff --git a/src/Mediator/Pipeline/MessagePreProcessor.cs b/src/Mediator.Abstractions/Pipeline/MessagePreProcessor.cs
similarity index 100%
rename from src/Mediator/Pipeline/MessagePreProcessor.cs
rename to src/Mediator.Abstractions/Pipeline/MessagePreProcessor.cs
diff --git a/src/Mediator/Pipeline/StreamHandlerDelegate.cs b/src/Mediator.Abstractions/Pipeline/StreamHandlerDelegate.cs
similarity index 100%
rename from src/Mediator/Pipeline/StreamHandlerDelegate.cs
rename to src/Mediator.Abstractions/Pipeline/StreamHandlerDelegate.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Mediator.SourceGenerator.Implementation.csproj b/src/Mediator.SourceGenerator.Implementation/Mediator.SourceGenerator.Implementation.csproj
deleted file mode 100644
index ba30afe..0000000
--- a/src/Mediator.SourceGenerator.Implementation/Mediator.SourceGenerator.Implementation.csproj
+++ /dev/null
@@ -1,37 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageScribanIncludeSource>true</PackageScribanIncludeSource>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <InternalsVisibleTo Include="Mediator.SourceGenerator.Tests" />
-    <InternalsVisibleTo Include="Mediator.SourceGenerator.Roslyn38" />
-    <InternalsVisibleTo Include="Mediator.SourceGenerator.Roslyn40" />
-    <InternalsVisibleTo Include="Mediator.SourceGenerator.Roslyn38.Tests" />
-    <InternalsVisibleTo Include="Mediator.SourceGenerator.Roslyn40.Tests" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Include="Microsoft.CodeAnalysis" />
-    <Using Include="Microsoft.CodeAnalysis.CSharp.Syntax" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Remove="resources\**" />
-    <EmbeddedResource Include="resources\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetVersion)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(DotNetVersion)" />
-    <PackageReference Include="Scriban" Version="5.4.6" IncludeAssets="Build" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="all" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Mediator.SourceGenerator.Roslyn38/Mediator.SourceGenerator.Roslyn38.csproj b/src/Mediator.SourceGenerator.Roslyn38/Mediator.SourceGenerator.Roslyn38.csproj
deleted file mode 100644
index 3152348..0000000
--- a/src/Mediator.SourceGenerator.Roslyn38/Mediator.SourceGenerator.Roslyn38.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Using Include="Microsoft.CodeAnalysis" />
-    <Using Include="Microsoft.CodeAnalysis.CSharp.Syntax" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <InternalsVisibleTo Include="Mediator.SourceGenerator.Roslyn38.Tests" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <ProjectReference Include="..\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Mediator.SourceGenerator.Roslyn38/MediatorGenerator.cs b/src/Mediator.SourceGenerator.Roslyn38/MediatorGenerator.cs
deleted file mode 100644
index 171d08f..0000000
--- a/src/Mediator.SourceGenerator.Roslyn38/MediatorGenerator.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-namespace Mediator.SourceGenerator;
-
-[Generator]
-public sealed class MediatorGenerator : ISourceGenerator
-{
-    internal CompilationAnalyzer? CompilationAnalyzer;
-
-    public void Execute(GeneratorExecutionContext context)
-    {
-        var debugOptionExists = context.AnalyzerConfigOptions.GlobalOptions.TryGetValue(
-            "build_property.Mediator_AttachDebugger",
-            out _
-        );
-
-        if (debugOptionExists && !System.Diagnostics.Debugger.IsAttached)
-            System.Diagnostics.Debugger.Launch();
-
-        ExecuteInternal(in context);
-    }
-
-    private void ExecuteInternal(in GeneratorExecutionContext context)
-    {
-        var generatorVersion = Versioning.GetVersion();
-
-        MediatorOptionsGenerator.Generate(context.AddSource, generatorVersion);
-
-        var analyzerContext = new CompilationAnalyzerContext(
-            context.Compilation,
-            (context.SyntaxReceiver as SyntaxReceiver)?.AddMediatorCalls,
-            generatorVersion,
-            context.ReportDiagnostic,
-            context.AddSource,
-            context.CancellationToken
-        );
-
-        var compilationAnalyzer = new CompilationAnalyzer(in analyzerContext);
-
-        compilationAnalyzer.Initialize();
-        compilationAnalyzer.Analyze();
-
-        CompilationAnalyzer = compilationAnalyzer;
-
-        var mediatorImplementationGenerator = new MediatorImplementationGenerator();
-        mediatorImplementationGenerator.Generate(compilationAnalyzer);
-    }
-
-    public void Initialize(GeneratorInitializationContext context)
-    {
-        context.RegisterForSyntaxNotifications(() => new SyntaxReceiver());
-    }
-}
diff --git a/src/Mediator.SourceGenerator.Roslyn40/Mediator.SourceGenerator.Roslyn40.csproj b/src/Mediator.SourceGenerator.Roslyn40/Mediator.SourceGenerator.Roslyn40.csproj
deleted file mode 100644
index 06f4512..0000000
--- a/src/Mediator.SourceGenerator.Roslyn40/Mediator.SourceGenerator.Roslyn40.csproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Using Include="Microsoft.CodeAnalysis" />
-    <Using Include="Microsoft.CodeAnalysis.CSharp.Syntax" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <InternalsVisibleTo Include="Mediator.SourceGenerator.Roslyn40.Tests" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.0.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/src/Mediator.SourceGenerator.Implementation/Analysis/CompilationAnalyzer.cs b/src/Mediator.SourceGenerator/Analysis/CompilationAnalyzer.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Analysis/CompilationAnalyzer.cs
rename to src/Mediator.SourceGenerator/Analysis/CompilationAnalyzer.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Analysis/InvocationSyntaxReceiver.cs b/src/Mediator.SourceGenerator/Analysis/InvocationSyntaxReceiver.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Analysis/InvocationSyntaxReceiver.cs
rename to src/Mediator.SourceGenerator/Analysis/InvocationSyntaxReceiver.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Analysis/MessageHandler.cs b/src/Mediator.SourceGenerator/Analysis/MessageHandler.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Analysis/MessageHandler.cs
rename to src/Mediator.SourceGenerator/Analysis/MessageHandler.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Analysis/NotificationMessage.cs b/src/Mediator.SourceGenerator/Analysis/NotificationMessage.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Analysis/NotificationMessage.cs
rename to src/Mediator.SourceGenerator/Analysis/NotificationMessage.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Analysis/NotificationMessageHandler.cs b/src/Mediator.SourceGenerator/Analysis/NotificationMessageHandler.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Analysis/NotificationMessageHandler.cs
rename to src/Mediator.SourceGenerator/Analysis/NotificationMessageHandler.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Analysis/RequestMessage.cs b/src/Mediator.SourceGenerator/Analysis/RequestMessage.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Analysis/RequestMessage.cs
rename to src/Mediator.SourceGenerator/Analysis/RequestMessage.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Analysis/RequestMessageHandler.cs b/src/Mediator.SourceGenerator/Analysis/RequestMessageHandler.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Analysis/RequestMessageHandler.cs
rename to src/Mediator.SourceGenerator/Analysis/RequestMessageHandler.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Analysis/RequestMessageHandlerWrapper.cs b/src/Mediator.SourceGenerator/Analysis/RequestMessageHandlerWrapper.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Analysis/RequestMessageHandlerWrapper.cs
rename to src/Mediator.SourceGenerator/Analysis/RequestMessageHandlerWrapper.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Analysis/SymbolMetadata.cs b/src/Mediator.SourceGenerator/Analysis/SymbolMetadata.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Analysis/SymbolMetadata.cs
rename to src/Mediator.SourceGenerator/Analysis/SymbolMetadata.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Constants.cs b/src/Mediator.SourceGenerator/Constants.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Constants.cs
rename to src/Mediator.SourceGenerator/Constants.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Diagnostics.cs b/src/Mediator.SourceGenerator/Diagnostics.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Diagnostics.cs
rename to src/Mediator.SourceGenerator/Diagnostics.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/EmbeddedResource.cs b/src/Mediator.SourceGenerator/EmbeddedResource.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/EmbeddedResource.cs
rename to src/Mediator.SourceGenerator/EmbeddedResource.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Extensions/IsExternalInit.cs b/src/Mediator.SourceGenerator/Extensions/IsExternalInit.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Extensions/IsExternalInit.cs
rename to src/Mediator.SourceGenerator/Extensions/IsExternalInit.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Extensions/RoslynExtensions.cs b/src/Mediator.SourceGenerator/Extensions/RoslynExtensions.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Extensions/RoslynExtensions.cs
rename to src/Mediator.SourceGenerator/Extensions/RoslynExtensions.cs
diff --git a/src/Mediator.SourceGenerator.Roslyn40/IncrementalMediatorGenerator.cs b/src/Mediator.SourceGenerator/IncrementalMediatorGenerator.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Roslyn40/IncrementalMediatorGenerator.cs
rename to src/Mediator.SourceGenerator/IncrementalMediatorGenerator.cs
diff --git a/src/Mediator.SourceGenerator/Mediator.SourceGenerator.csproj b/src/Mediator.SourceGenerator/Mediator.SourceGenerator.csproj
index 18e180a..f567dec 100644
--- a/src/Mediator.SourceGenerator/Mediator.SourceGenerator.csproj
+++ b/src/Mediator.SourceGenerator/Mediator.SourceGenerator.csproj
@@ -11,20 +11,42 @@
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <DevelopmentDependency>true</DevelopmentDependency>
+    <PackageScribanIncludeSource>true</PackageScribanIncludeSource>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" IncludeAssets="none" PrivateAssets="none" ExcludeAssets="all" />
-    <ProjectReference Include="..\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" IncludeAssets="none" PrivateAssets="none" ExcludeAssets="all" />
-    <ProjectReference Include="..\Mediator.SourceGenerator.Roslyn40\Mediator.SourceGenerator.Roslyn40.csproj" IncludeAssets="none" PrivateAssets="none" ExcludeAssets="all" />
-    <None Include="$(OutputPath)\Mediator.SourceGenerator.Implementation.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
-    <None Include="$(OutputPath)\Mediator.SourceGenerator.Roslyn38.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn3.8/cs" Visible="false" />
-    <None Include="$(OutputPath)\Mediator.SourceGenerator.Roslyn40.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.0/cs" Visible="false" />
+    <InternalsVisibleTo Include="Mediator.SourceGenerator.Tests" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.CodeAnalysis" />
+    <Using Include="Microsoft.CodeAnalysis.CSharp.Syntax" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="resources\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="resources\*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="$(DotNetVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(DotNetVersion)" />
+    <PackageReference Include="Scriban" Version="5.4.6" IncludeAssets="Build" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Mediator.SourceGenerator.Implementation/MediatorGenerationContext.cs b/src/Mediator.SourceGenerator/MediatorGenerationContext.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/MediatorGenerationContext.cs
rename to src/Mediator.SourceGenerator/MediatorGenerationContext.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/MediatorImplementationGenerator.cs b/src/Mediator.SourceGenerator/MediatorImplementationGenerator.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/MediatorImplementationGenerator.cs
rename to src/Mediator.SourceGenerator/MediatorImplementationGenerator.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/MediatorOptionsGenerator.cs b/src/Mediator.SourceGenerator/MediatorOptionsGenerator.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/MediatorOptionsGenerator.cs
rename to src/Mediator.SourceGenerator/MediatorOptionsGenerator.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/Versioning.cs b/src/Mediator.SourceGenerator/Versioning.cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/Versioning.cs
rename to src/Mediator.SourceGenerator/Versioning.cs
diff --git a/src/Mediator.SourceGenerator.Implementation/resources/Mediator.sbn-cs b/src/Mediator.SourceGenerator/resources/Mediator.sbn-cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/resources/Mediator.sbn-cs
rename to src/Mediator.SourceGenerator/resources/Mediator.sbn-cs
diff --git a/src/Mediator.SourceGenerator.Implementation/resources/MediatorFallback.sbn-cs b/src/Mediator.SourceGenerator/resources/MediatorFallback.sbn-cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/resources/MediatorFallback.sbn-cs
rename to src/Mediator.SourceGenerator/resources/MediatorFallback.sbn-cs
diff --git a/src/Mediator.SourceGenerator.Implementation/resources/MediatorOptions.sbn-cs b/src/Mediator.SourceGenerator/resources/MediatorOptions.sbn-cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/resources/MediatorOptions.sbn-cs
rename to src/Mediator.SourceGenerator/resources/MediatorOptions.sbn-cs
diff --git a/src/Mediator.SourceGenerator.Implementation/resources/MediatorOptionsAttribute.sbn-cs b/src/Mediator.SourceGenerator/resources/MediatorOptionsAttribute.sbn-cs
similarity index 100%
rename from src/Mediator.SourceGenerator.Implementation/resources/MediatorOptionsAttribute.sbn-cs
rename to src/Mediator.SourceGenerator/resources/MediatorOptionsAttribute.sbn-cs
diff --git a/test/Mediator.MemAllocationTests/Mediator.MemAllocationTests.csproj b/test/Mediator.MemAllocationTests/Mediator.MemAllocationTests.csproj
index 2cda3fd..145932c 100644
--- a/test/Mediator.MemAllocationTests/Mediator.MemAllocationTests.csproj
+++ b/test/Mediator.MemAllocationTests/Mediator.MemAllocationTests.csproj
@@ -30,9 +30,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn40\Mediator.SourceGenerator.Roslyn40.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
     <ProjectReference Include="..\Mediator.Tests.Common\Mediator.Tests.Common.csproj" />
   </ItemGroup>
 
diff --git a/test/Mediator.Samples.SourceGenerator.Tests/Mediator.Samples.SourceGenerator.Tests.csproj b/test/Mediator.Samples.SourceGenerator.Tests/Mediator.Samples.SourceGenerator.Tests.csproj
index 4015587..81ceceb 100644
--- a/test/Mediator.Samples.SourceGenerator.Tests/Mediator.Samples.SourceGenerator.Tests.csproj
+++ b/test/Mediator.Samples.SourceGenerator.Tests/Mediator.Samples.SourceGenerator.Tests.csproj
@@ -22,6 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn40\Mediator.SourceGenerator.Roslyn40.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" />
   </ItemGroup>
 </Project>
diff --git a/test/Mediator.SmokeTestConsole/Mediator.SmokeTestConsole.csproj b/test/Mediator.SmokeTestConsole/Mediator.SmokeTestConsole.csproj
index b48e876..0d1ab9e 100644
--- a/test/Mediator.SmokeTestConsole/Mediator.SmokeTestConsole.csproj
+++ b/test/Mediator.SmokeTestConsole/Mediator.SmokeTestConsole.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
-    
+
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
   </PropertyGroup>
@@ -16,9 +16,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn40\Mediator.SourceGenerator.Roslyn40.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/SamplesTests.cs b/test/Mediator.SourceGenerator.Roslyn38.Tests/SamplesTests.cs
deleted file mode 100644
index 8768a06..0000000
--- a/test/Mediator.SourceGenerator.Roslyn38.Tests/SamplesTests.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using System.Threading.Tasks;
-
-namespace Mediator.SourceGenerator.Tests;
-
-using Microsoft.CodeAnalysis.Testing;
-using Verifier = CSharpSourceGeneratorVerifier<MediatorGenerator>;
-
-public sealed class SamplesTests
-{
-    [Fact]
-    public async Task Test_SimpleConsole()
-    {
-        var source = await Fixture.SourceFromResourceFile("SimpleConsoleProgram.cs");
-
-        var tester = new Verifier.Test
-        {
-            TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
-            TestState = { Sources = { source }, },
-        };
-        await tester.RunAsync();
-    }
-
-    [Fact]
-    public async Task Test_SimpleEndToEnd()
-    {
-        var source = await Fixture.SourceFromResourceFile("SimpleEndToEndProgram.cs");
-
-        await new Verifier.Test
-        {
-            TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
-            TestState = { Sources = { source }, },
-        }.RunAsync();
-    }
-
-    [Fact]
-    public async Task Test_SimpleStreaming()
-    {
-        var source = await Fixture.SourceFromResourceFile("SimpleStreamingProgram.cs");
-
-        await new Verifier.Test
-        {
-            TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
-            TestState = { Sources = { source }, },
-        }.RunAsync();
-    }
-
-    [Fact]
-    public async Task Test_Multiple_AddMediator_Calls()
-    {
-        var source = await Fixture.SourceFromResourceFile("MultipleAddMediatorCalls.cs");
-
-        await new Verifier.Test
-        {
-            TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
-            TestState = { Sources = { source }, },
-        }.RunAsync();
-    }
-}
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/SourceGenVerifier.cs b/test/Mediator.SourceGenerator.Roslyn38.Tests/SourceGenVerifier.cs
deleted file mode 100644
index 905eb76..0000000
--- a/test/Mediator.SourceGenerator.Roslyn38.Tests/SourceGenVerifier.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-using Mediator.SourceGenerator.Tests;
-using Microsoft.CodeAnalysis;
-using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.CSharp.Testing;
-using Microsoft.CodeAnalysis.Testing.Verifiers;
-using System;
-using System.Collections.Immutable;
-using System.Linq;
-
-public static class CSharpSourceGeneratorVerifier<TSourceGenerator> where TSourceGenerator : ISourceGenerator, new()
-{
-    public class Test : CSharpSourceGeneratorTest<TSourceGenerator, XUnitVerifier>
-    {
-        public Test()
-        {
-            var refs = Fixture.AssemblyReferencesForCodegen.Select(a => a.Location).ToImmutableArray();
-
-            var metadataRefs = refs.Select(l => MetadataReference.CreateFromFile(l)).ToImmutableArray();
-
-            this.ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60.WithAssemblies(
-                refs
-            );
-
-            this.SolutionTransforms.Add(
-                (sln, projectId) =>
-                {
-                    var compilationOptions = ((CSharpCompilationOptions)sln.GetProject(projectId)!.CompilationOptions!)
-                        .WithOutputKind(OutputKind.ConsoleApplication)
-                        .WithUsings(
-                            "System",
-                            "System.Collections.Generic",
-                            "System.IO",
-                            "System.Linq",
-                            "System.Net.Http",
-                            "System.Threading",
-                            "System.Threading.Tasks"
-                        );
-
-                    sln = sln.AddMetadataReferences(projectId, metadataRefs)
-                        .WithProjectCompilationOptions(projectId, compilationOptions);
-                    return sln;
-                }
-            );
-        }
-
-        public TSourceGenerator SourceGenerator => (TSourceGenerator)GetSourceGenerators().Single();
-
-        protected override CompilationOptions CreateCompilationOptions()
-        {
-            var compilationOptions = base.CreateCompilationOptions();
-            return compilationOptions
-                .WithSpecificDiagnosticOptions(
-                    compilationOptions.SpecificDiagnosticOptions.SetItems(GetNullableWarningsFromCompiler())
-                )
-                .WithOutputKind(OutputKind.ConsoleApplication);
-        }
-
-        public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.Latest;
-
-        private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler()
-        {
-            string[] args = { "/warnaserror:nullable" };
-            var commandLineArguments = CSharpCommandLineParser.Default.Parse(
-                args,
-                baseDirectory: Environment.CurrentDirectory,
-                sdkDirectory: Environment.CurrentDirectory
-            );
-            var nullableWarnings = commandLineArguments.CompilationOptions.SpecificDiagnosticOptions;
-
-            return nullableWarnings;
-        }
-
-        protected override ParseOptions CreateParseOptions()
-        {
-            return ((CSharpParseOptions)base.CreateParseOptions()).WithLanguageVersion(LanguageVersion);
-        }
-    }
-}
diff --git a/test/Mediator.SourceGenerator.Roslyn40.Tests/Mediator.SourceGenerator.Roslyn40.Tests.csproj b/test/Mediator.SourceGenerator.Roslyn40.Tests/Mediator.SourceGenerator.Roslyn40.Tests.csproj
deleted file mode 100644
index 163a767..0000000
--- a/test/Mediator.SourceGenerator.Roslyn40.Tests/Mediator.SourceGenerator.Roslyn40.Tests.csproj
+++ /dev/null
@@ -1,52 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Using Include="Xunit" />
-    <Using Include="System.Runtime.CompilerServices" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.0.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.0.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
-    <PackageReference Include="NuGet.ProjectModel" Version="6.1.0" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Mediator.SourceGenerator.Roslyn38.Tests\**\*.cs" Exclude="..\Mediator.SourceGenerator.Roslyn38.Tests\obj\**;..\Mediator.SourceGenerator.Roslyn38.Tests\bin\**;..\Mediator.SourceGenerator.Roslyn38.Tests\resources\**;..\Mediator.SourceGenerator.Roslyn38.Tests\SamplesTests.cs;..\Mediator.SourceGenerator.Roslyn38.Tests\SourceGenVerifier.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-    <None Include="..\Mediator.SourceGenerator.Roslyn38.Tests\resources\**">
-      <Link>%(RecursiveDir)\resources\%(Filename)%(Extension)</Link>
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn40\Mediator.SourceGenerator.Roslyn40.csproj" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
-  </ItemGroup>
-
-</Project>
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/AssertExtensions.cs b/test/Mediator.SourceGenerator.Tests/AssertExtensions.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/AssertExtensions.cs
rename to test/Mediator.SourceGenerator.Tests/AssertExtensions.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/Assertions.cs b/test/Mediator.SourceGenerator.Tests/Assertions.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/Assertions.cs
rename to test/Mediator.SourceGenerator.Tests/Assertions.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/Fixture.cs b/test/Mediator.SourceGenerator.Tests/Fixture.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/Fixture.cs
rename to test/Mediator.SourceGenerator.Tests/Fixture.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/GeneratorResult.cs b/test/Mediator.SourceGenerator.Tests/GeneratorResult.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/GeneratorResult.cs
rename to test/Mediator.SourceGenerator.Tests/GeneratorResult.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn40.Tests/Global.cs b/test/Mediator.SourceGenerator.Tests/Global.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn40.Tests/Global.cs
rename to test/Mediator.SourceGenerator.Tests/Global.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/LifetimeOptionTests.cs b/test/Mediator.SourceGenerator.Tests/LifetimeOptionTests.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/LifetimeOptionTests.cs
rename to test/Mediator.SourceGenerator.Tests/LifetimeOptionTests.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/Mediator.SourceGenerator.Roslyn38.Tests.csproj b/test/Mediator.SourceGenerator.Tests/Mediator.SourceGenerator.Tests.csproj
similarity index 76%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/Mediator.SourceGenerator.Roslyn38.Tests.csproj
rename to test/Mediator.SourceGenerator.Tests/Mediator.SourceGenerator.Tests.csproj
index a4e4570..6c7280c 100644
--- a/test/Mediator.SourceGenerator.Roslyn38.Tests/Mediator.SourceGenerator.Roslyn38.Tests.csproj
+++ b/test/Mediator.SourceGenerator.Tests/Mediator.SourceGenerator.Tests.csproj
@@ -11,24 +11,6 @@
     <Using Include="System.Runtime.CompilerServices" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\..\samples\SimpleConsole\Program.cs" Link="resources\SimpleConsoleProgram.cs">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
@@ -46,9 +28,31 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <PackageReference Include="FluentAssertions" Version="6.6.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="3.1.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.Build.Locator" Version="1.4.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing.XUnit" Version="1.1.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="4.0.1" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.0.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" PrivateAssets="all" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
+    <PackageReference Include="NuGet.ProjectModel" Version="6.1.0" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/ReportingTests.cs b/test/Mediator.SourceGenerator.Tests/ReportingTests.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/ReportingTests.cs
rename to test/Mediator.SourceGenerator.Tests/ReportingTests.cs
diff --git a/test/Mediator.SourceGenerator.Tests/SamplesTests.cs b/test/Mediator.SourceGenerator.Tests/SamplesTests.cs
new file mode 100644
index 0000000..ce875ef
--- /dev/null
+++ b/test/Mediator.SourceGenerator.Tests/SamplesTests.cs
@@ -0,0 +1,58 @@
+//using System.Threading.Tasks;
+
+//namespace Mediator.SourceGenerator.Tests;
+
+//using Microsoft.CodeAnalysis.Testing;
+//using Verifier = CSharpSourceGeneratorVerifier<MediatorGenerator>;
+
+//public sealed class SamplesTests
+//{
+//    [Fact]
+//    public async Task Test_SimpleConsole()
+//    {
+//        var source = await Fixture.SourceFromResourceFile("SimpleConsoleProgram.cs");
+
+//        var tester = new Verifier.Test
+//        {
+//            TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
+//            TestState = { Sources = { source }, },
+//        };
+//        await tester.RunAsync();
+//    }
+
+//    [Fact]
+//    public async Task Test_SimpleEndToEnd()
+//    {
+//        var source = await Fixture.SourceFromResourceFile("SimpleEndToEndProgram.cs");
+
+//        await new Verifier.Test
+//        {
+//            TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
+//            TestState = { Sources = { source }, },
+//        }.RunAsync();
+//    }
+
+//    [Fact]
+//    public async Task Test_SimpleStreaming()
+//    {
+//        var source = await Fixture.SourceFromResourceFile("SimpleStreamingProgram.cs");
+
+//        await new Verifier.Test
+//        {
+//            TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
+//            TestState = { Sources = { source }, },
+//        }.RunAsync();
+//    }
+
+//    [Fact]
+//    public async Task Test_Multiple_AddMediator_Calls()
+//    {
+//        var source = await Fixture.SourceFromResourceFile("MultipleAddMediatorCalls.cs");
+
+//        await new Verifier.Test
+//        {
+//            TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck,
+//            TestState = { Sources = { source }, },
+//        }.RunAsync();
+//    }
+//}
diff --git a/test/Mediator.SourceGenerator.Tests/SourceGenVerifier.cs b/test/Mediator.SourceGenerator.Tests/SourceGenVerifier.cs
new file mode 100644
index 0000000..6158c66
--- /dev/null
+++ b/test/Mediator.SourceGenerator.Tests/SourceGenVerifier.cs
@@ -0,0 +1,78 @@
+//using Mediator.SourceGenerator.Tests;
+//using Microsoft.CodeAnalysis;
+//using Microsoft.CodeAnalysis.CSharp;
+//using Microsoft.CodeAnalysis.CSharp.Testing;
+//using Microsoft.CodeAnalysis.Testing.Verifiers;
+//using System;
+//using System.Collections.Immutable;
+//using System.Linq;
+
+//public static class CSharpSourceGeneratorVerifier<TSourceGenerator> where TSourceGenerator : ISourceGenerator, new()
+//{
+//    public class Test : CSharpSourceGeneratorTest<TSourceGenerator, XUnitVerifier>
+//    {
+//        public Test()
+//        {
+//            var refs = Fixture.AssemblyReferencesForCodegen.Select(a => a.Location).ToImmutableArray();
+
+//            var metadataRefs = refs.Select(l => MetadataReference.CreateFromFile(l)).ToImmutableArray();
+
+//            this.ReferenceAssemblies = Microsoft.CodeAnalysis.Testing.ReferenceAssemblies.Net.Net60.WithAssemblies(
+//                refs
+//            );
+
+//            this.SolutionTransforms.Add(
+//                (sln, projectId) =>
+//                {
+//                    var compilationOptions = ((CSharpCompilationOptions)sln.GetProject(projectId)!.CompilationOptions!)
+//                        .WithOutputKind(OutputKind.ConsoleApplication)
+//                        .WithUsings(
+//                            "System",
+//                            "System.Collections.Generic",
+//                            "System.IO",
+//                            "System.Linq",
+//                            "System.Net.Http",
+//                            "System.Threading",
+//                            "System.Threading.Tasks"
+//                        );
+
+//                    sln = sln.AddMetadataReferences(projectId, metadataRefs)
+//                        .WithProjectCompilationOptions(projectId, compilationOptions);
+//                    return sln;
+//                }
+//            );
+//        }
+
+//        public TSourceGenerator SourceGenerator => (TSourceGenerator)GetSourceGenerators().Single();
+
+//        protected override CompilationOptions CreateCompilationOptions()
+//        {
+//            var compilationOptions = base.CreateCompilationOptions();
+//            return compilationOptions
+//                .WithSpecificDiagnosticOptions(
+//                    compilationOptions.SpecificDiagnosticOptions.SetItems(GetNullableWarningsFromCompiler())
+//                )
+//                .WithOutputKind(OutputKind.ConsoleApplication);
+//        }
+
+//        public LanguageVersion LanguageVersion { get; set; } = LanguageVersion.Latest;
+
+//        private static ImmutableDictionary<string, ReportDiagnostic> GetNullableWarningsFromCompiler()
+//        {
+//            string[] args = { "/warnaserror:nullable" };
+//            var commandLineArguments = CSharpCommandLineParser.Default.Parse(
+//                args,
+//                baseDirectory: Environment.CurrentDirectory,
+//                sdkDirectory: Environment.CurrentDirectory
+//            );
+//            var nullableWarnings = commandLineArguments.CompilationOptions.SpecificDiagnosticOptions;
+
+//            return nullableWarnings;
+//        }
+
+//        protected override ParseOptions CreateParseOptions()
+//        {
+//            return ((CSharpParseOptions)base.CreateParseOptions()).WithLanguageVersion(LanguageVersion);
+//        }
+//    }
+//}
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/AbstractHandlerProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/AbstractHandlerProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/AbstractHandlerProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/AbstractHandlerProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/ByteArrayResponseProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/ByteArrayResponseProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/ByteArrayResponseProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/ByteArrayResponseProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/ConfigurationConflictProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/ConfigurationConflictProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/ConfigurationConflictProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/ConfigurationConflictProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/ConstVariablesConfig.cs b/test/Mediator.SourceGenerator.Tests/resources/ConstVariablesConfig.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/ConstVariablesConfig.cs
rename to test/Mediator.SourceGenerator.Tests/resources/ConstVariablesConfig.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/DeepNamespaceProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/DeepNamespaceProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/DeepNamespaceProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/DeepNamespaceProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/DuplicateHandlersProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/DuplicateHandlersProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/DuplicateHandlersProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/DuplicateHandlersProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/IntCastLifetime.cs b/test/Mediator.SourceGenerator.Tests/resources/IntCastLifetime.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/IntCastLifetime.cs
rename to test/Mediator.SourceGenerator.Tests/resources/IntCastLifetime.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/InvalidVariablesConfig.cs b/test/Mediator.SourceGenerator.Tests/resources/InvalidVariablesConfig.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/InvalidVariablesConfig.cs
rename to test/Mediator.SourceGenerator.Tests/resources/InvalidVariablesConfig.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/LocalLiteralVariableConfig.cs b/test/Mediator.SourceGenerator.Tests/resources/LocalLiteralVariableConfig.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/LocalLiteralVariableConfig.cs
rename to test/Mediator.SourceGenerator.Tests/resources/LocalLiteralVariableConfig.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/LocalVariablesReferencingConstsConfig.cs b/test/Mediator.SourceGenerator.Tests/resources/LocalVariablesReferencingConstsConfig.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/LocalVariablesReferencingConstsConfig.cs
rename to test/Mediator.SourceGenerator.Tests/resources/LocalVariablesReferencingConstsConfig.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/MultipleAddMediatorCalls.cs b/test/Mediator.SourceGenerator.Tests/resources/MultipleAddMediatorCalls.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/MultipleAddMediatorCalls.cs
rename to test/Mediator.SourceGenerator.Tests/resources/MultipleAddMediatorCalls.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/MultipleErrorsProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/MultipleErrorsProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/MultipleErrorsProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/MultipleErrorsProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/NoMessagesProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/NoMessagesProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/NoMessagesProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/NoMessagesProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/NotificationWithoutHandlerProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/NotificationWithoutHandlerProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/NotificationWithoutHandlerProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/NotificationWithoutHandlerProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/NullNamespaceVariable.cs b/test/Mediator.SourceGenerator.Tests/resources/NullNamespaceVariable.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/NullNamespaceVariable.cs
rename to test/Mediator.SourceGenerator.Tests/resources/NullNamespaceVariable.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/RequestWithoutHandlerProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/RequestWithoutHandlerProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/RequestWithoutHandlerProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/RequestWithoutHandlerProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/StaticNestedHandlerProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/StaticNestedHandlerProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/StaticNestedHandlerProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/StaticNestedHandlerProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/StreamingProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/StreamingProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/StreamingProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/StreamingProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/StructHandlerProgram.cs b/test/Mediator.SourceGenerator.Tests/resources/StructHandlerProgram.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/StructHandlerProgram.cs
rename to test/Mediator.SourceGenerator.Tests/resources/StructHandlerProgram.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/UnassignedLifetimeVariableConfig.cs b/test/Mediator.SourceGenerator.Tests/resources/UnassignedLifetimeVariableConfig.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/UnassignedLifetimeVariableConfig.cs
rename to test/Mediator.SourceGenerator.Tests/resources/UnassignedLifetimeVariableConfig.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/UnassignedNamespaceVariableConfig.cs b/test/Mediator.SourceGenerator.Tests/resources/UnassignedNamespaceVariableConfig.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/UnassignedNamespaceVariableConfig.cs
rename to test/Mediator.SourceGenerator.Tests/resources/UnassignedNamespaceVariableConfig.cs
diff --git a/test/Mediator.SourceGenerator.Roslyn38.Tests/resources/UnassignedVariablesConfig.cs b/test/Mediator.SourceGenerator.Tests/resources/UnassignedVariablesConfig.cs
similarity index 100%
rename from test/Mediator.SourceGenerator.Roslyn38.Tests/resources/UnassignedVariablesConfig.cs
rename to test/Mediator.SourceGenerator.Tests/resources/UnassignedVariablesConfig.cs
diff --git a/test/Mediator.Tests.Common/Mediator.Tests.Common.csproj b/test/Mediator.Tests.Common/Mediator.Tests.Common.csproj
index 373d9bc..13bf283 100644
--- a/test/Mediator.Tests.Common/Mediator.Tests.Common.csproj
+++ b/test/Mediator.Tests.Common/Mediator.Tests.Common.csproj
@@ -9,7 +9,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/test/Mediator.Tests.ScopedLifetime/Mediator.Tests.ScopedLifetime.csproj b/test/Mediator.Tests.ScopedLifetime/Mediator.Tests.ScopedLifetime.csproj
index e1b5173..92d0cf3 100644
--- a/test/Mediator.Tests.ScopedLifetime/Mediator.Tests.ScopedLifetime.csproj
+++ b/test/Mediator.Tests.ScopedLifetime/Mediator.Tests.ScopedLifetime.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="$(CompilerGeneratedFilesOutputPath)/**/*.cs"/>
-    <None Include="$(CompilerGeneratedFilesOutputPath)/**/*.cs"/>
+    <Compile Remove="$(CompilerGeneratedFilesOutputPath)/**/*.cs" />
+    <None Include="$(CompilerGeneratedFilesOutputPath)/**/*.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,9 +39,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Mediator.Tests.TransientLifetime/Mediator.Tests.TransientLifetime.csproj b/test/Mediator.Tests.TransientLifetime/Mediator.Tests.TransientLifetime.csproj
index e1b5173..92d0cf3 100644
--- a/test/Mediator.Tests.TransientLifetime/Mediator.Tests.TransientLifetime.csproj
+++ b/test/Mediator.Tests.TransientLifetime/Mediator.Tests.TransientLifetime.csproj
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="$(CompilerGeneratedFilesOutputPath)/**/*.cs"/>
-    <None Include="$(CompilerGeneratedFilesOutputPath)/**/*.cs"/>
+    <Compile Remove="$(CompilerGeneratedFilesOutputPath)/**/*.cs" />
+    <None Include="$(CompilerGeneratedFilesOutputPath)/**/*.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -39,9 +39,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Mediator.Tests/Mediator.Tests.csproj b/test/Mediator.Tests/Mediator.Tests.csproj
index 4625bbd..eab417c 100644
--- a/test/Mediator.Tests/Mediator.Tests.csproj
+++ b/test/Mediator.Tests/Mediator.Tests.csproj
@@ -39,9 +39,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Implementation\Mediator.SourceGenerator.Implementation.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator.SourceGenerator.Roslyn38\Mediator.SourceGenerator.Roslyn38.csproj" OutputItemType="Analyzer" />
-    <ProjectReference Include="..\..\src\Mediator\Mediator.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.Abstractions\Mediator.Abstractions.csproj" />
+    <ProjectReference Include="..\..\src\Mediator.SourceGenerator\Mediator.SourceGenerator.csproj" OutputItemType="Analyzer" />
     <ProjectReference Include="..\Mediator.Tests.Common\Mediator.Tests.Common.csproj" />
   </ItemGroup>
 

From af97e6bb3096f4223c138fb8eefde06604ab8ea1 Mon Sep 17 00:00:00 2001
From: Martin Othamar <martin@othamar.net>
Date: Wed, 28 Jun 2023 09:59:01 +0200
Subject: [PATCH 2/3] Simplify handler lookup in src gen

---
 .../resources/Mediator.sbn-cs                 | 51 +++++++------------
 test/Mediator.SmokeTestConsole/Program.cs     |  4 +-
 test/Mediator.Tests/SmokeTests.FastLazy.cs    |  2 +-
 3 files changed, 20 insertions(+), 37 deletions(-)

diff --git a/src/Mediator.SourceGenerator/resources/Mediator.sbn-cs b/src/Mediator.SourceGenerator/resources/Mediator.sbn-cs
index c5a5491..1d5dcfd 100644
--- a/src/Mediator.SourceGenerator/resources/Mediator.sbn-cs
+++ b/src/Mediator.SourceGenerator/resources/Mediator.sbn-cs
@@ -316,43 +316,20 @@ namespace {{ MediatorNamespace }}
 
         {{ if IsTestRun }}internal{{ else }}private{{ end }} readonly struct DICache
         {
-            private readonly global::System.IServiceProvider _sp;
+            public readonly {{ if ServiceLifetimeIsSingleton }}global::System.Object{{ else }}global::System.Func<global::System.Object>{{ end }}[] Reqs =
+                new {{ if ServiceLifetimeIsSingleton }}global::System.Object{{ else }}global::System.Func<global::System.Object>{{ end }}[{{ object.size RequestMessages }}];
 
-            {{~ if ServiceLifetimeIsSingleton ~}}
-            {{~ for message in RequestMessages ~}}
-            public readonly {{ message.HandlerWrapperTypeNameWithGenericTypeArguments }} {{ message.HandlerWrapperPropertyName }};
-            {{~ end ~}}
-            {{~ for message in NotificationMessages ~}}
-            public readonly global::Mediator.INotificationHandler<{{ message.FullName }}>[] Handlers_For_{{ message.IdentifierFullName }};
-            {{~ end ~}}
-            {{~ else ~}}
-            {{~ for message in RequestMessages ~}}
-            public {{ message.HandlerWrapperTypeNameWithGenericTypeArguments }} {{ message.HandlerWrapperPropertyName }}
-            {
-                [global::System.Runtime.CompilerServices.MethodImpl(global::System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-                get => _sp.GetRequiredService<{{ message.HandlerWrapperTypeNameWithGenericTypeArguments }}>();
-            }
-            {{~ end ~}}
-            {{~ for message in NotificationMessages ~}}
-            public global::System.Collections.Generic.IEnumerable<global::Mediator.INotificationHandler<{{ message.FullName }}>> Handlers_For_{{ message.IdentifierFullName }}
-            {
-                [global::System.Runtime.CompilerServices.MethodImpl(global::System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
-                get => _sp.GetServices<global::Mediator.INotificationHandler<{{ message.FullName }}>>();
-            }
-            {{~ end ~}}
-            {{~ end ~}}
+            public readonly {{ if ServiceLifetimeIsSingleton }}global::System.Object{{ else }}global::System.Func<global::System.Object>{{ end }}[] Nots =
+                new {{ if ServiceLifetimeIsSingleton }}global::System.Object{{ else }}global::System.Func<global::System.Object>{{ end }}[{{ object.size NotificationMessages }}];
 
             public DICache(global::System.IServiceProvider sp)
             {
-                _sp = sp;
-
-                {{~ if ServiceLifetimeIsSingleton ~}}
                 {{~ for message in RequestMessages ~}}
-                {{ message.HandlerWrapperPropertyName }} = sp.GetRequiredService<{{ message.HandlerWrapperTypeNameWithGenericTypeArguments }}>();
+                Reqs[{{ for.index }}] = {{ if !ServiceLifetimeIsSingleton }}() => {{ end }}sp.GetRequiredService<{{ message.HandlerWrapperTypeNameWithGenericTypeArguments }}>();
                 {{~ end ~}}
+
                 {{~ for message in NotificationMessages ~}}
-                Handlers_For_{{ message.IdentifierFullName }} = sp.GetServices<global::Mediator.INotificationHandler<{{ message.FullName }}>>().ToArray();
-                {{~ end ~}}
+                Nots[{{ for.index }}] = {{ if !ServiceLifetimeIsSingleton }}() => {{ end }}sp.GetServices<global::Mediator.INotificationHandler<{{ message.FullName }}>>(){{ if ServiceLifetimeIsSingleton }}.ToArray(){{ end }};
                 {{~ end ~}}
             }
         }
@@ -375,11 +352,15 @@ namespace {{ MediatorNamespace }}
             {{- if message.IsClass }}
             ThrowIfNull(message, nameof(message));
             {{ end }}
+
             {{~ if ServiceLifetimeIsSingleton ~}}
-            return _diCacheLazy.Value.{{ message.HandlerWrapperPropertyName }}.Handle({{- message.ParameterModifier -}}message, cancellationToken);
+            var handlerObj = _diCacheLazy.Value.Reqs[{{ for.index }}];
             {{~ else ~}}
-            return _diCache.{{ message.HandlerWrapperPropertyName }}.Handle({{- message.ParameterModifier -}}message, cancellationToken);
+            var handlerObj = _diCache.Reqs[{{ for.index }}]();
             {{~ end ~}}
+
+            var handler = global::System.Runtime.CompilerServices.Unsafe.As<global::System.Object, {{ message.HandlerWrapperTypeNameWithGenericTypeArguments }}>(ref handlerObj);
+            return handler.Handle({{- message.ParameterModifier -}}message, cancellationToken);
         }
         {{~ end ~}}
 
@@ -862,9 +843,11 @@ namespace {{ MediatorNamespace }}
             {{ end }}
 
             {{~ if ServiceLifetimeIsSingleton ~}}
-            var handlers = _diCacheLazy.Value.Handlers_For_{{ message.IdentifierFullName }};
+            var handlersObj = _diCacheLazy.Value.Nots[{{ for.index }}];
+            var handlers = global::System.Runtime.CompilerServices.Unsafe.As<global::System.Object, global::Mediator.INotificationHandler<{{ message.FullName }}>[]>(ref handlersObj);
             {{~ else ~}}
-            var handlers = _diCache.Handlers_For_{{ message.IdentifierFullName }};
+            var handlersObj = _diCache.Nots[{{ for.index }}]();
+            var handlers = global::System.Runtime.CompilerServices.Unsafe.As<global::System.Object, global::System.Collections.Generic.IEnumerable<global::Mediator.INotificationHandler<{{ message.FullName }}>>>(ref handlersObj);
             {{~ end ~}}
 
             {{~ if ServiceLifetimeIsSingleton ~}}
diff --git a/test/Mediator.SmokeTestConsole/Program.cs b/test/Mediator.SmokeTestConsole/Program.cs
index 321367d..6436bc8 100644
--- a/test/Mediator.SmokeTestConsole/Program.cs
+++ b/test/Mediator.SmokeTestConsole/Program.cs
@@ -64,9 +64,9 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
             start.SetResult();
             var values = await Task.WhenAll(threads).ConfigureAwait(false);
             var states = values.Select(v => v.State).ToArray();
-            var firstHandlers = values.Select(v => v.Cache.Wrapper_For_Request).ToArray();
+            var firstHandlers = values.Select(v => v.Cache.Reqs[0]).ToArray();
             var firstHandler = firstHandlers[0];
-            var lastHandlers = values.Select(v => v.Cache.Wrapper_For_Request5).ToArray();
+            var lastHandlers = values.Select(v => v.Cache.Reqs[4]).ToArray();
             var lastHandler = lastHandlers[0];
 
             var hasInvalidHandler =
diff --git a/test/Mediator.Tests/SmokeTests.FastLazy.cs b/test/Mediator.Tests/SmokeTests.FastLazy.cs
index b14b225..0b1b3af 100644
--- a/test/Mediator.Tests/SmokeTests.FastLazy.cs
+++ b/test/Mediator.Tests/SmokeTests.FastLazy.cs
@@ -37,7 +37,7 @@ public async Task Test_FastLazy(long concurrency)
         Assert.DoesNotContain(LazyDICache.INVALID, states);
         Assert.Single(states.Where(s => s == LazyDICache.UNINIT));
 
-        var handlers = values.Select(v => v.Cache.Wrapper_For_Mediator_Tests_TestTypes_SomeRequest).ToArray();
+        var handlers = values.Select(v => v.Cache.Reqs[0]).ToArray();
         var handler = handlers[0];
 
         Assert.All(handlers, h => Assert.Same(handler, h));

From 6e8b0878f2a190304a43292861d86b476cfc1f40 Mon Sep 17 00:00:00 2001
From: Martin Othamar <martin@othamar.net>
Date: Wed, 28 Jun 2023 12:52:42 +0200
Subject: [PATCH 3/3] notes

---
 README.md | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/README.md b/README.md
index 3c3b0e1..1242c6e 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,42 @@ Init scenarios:
 * Scoped - lazy init
 * Transient - lazy init
 * Singleton - eager init
+---
+
+### A
+FastMediator:
+* Added to any project
+* src gens
+  * Project-implementation (ProjectMediator) - IF there are handlers
+  * Global-implementation (GlobalMediator) - IF `AddMediator(params Assembly[])` is called
+  * Configuration - `internal AddMediator(params Assembly[])` (registers GlobalMediator), `public AddMediatorProject()` (registers handlers + ProjectMediator)
+  * Interceptors
+* Interceptors -
+  * Take calls to the global mediator, and translates them to <TRequest, TResponse>
+  * TypeIndex maps to correct handler in correct (concrete) ProjectMediator
+
+- requires interceptor
+- extra indirection
+- complicated with several mediator impls
++ explicit assemblies config
+
+---
+
+### B
+FastMediator:
+* Added to any project
+* src gens
+  * Global-implementation (GlobalMediator) - IF `AddMediator(params Assembly[])` is called
+  * Handler proxies - ONLY for internal handlers
+  * Configuration - `public AddMediator(params Assembly[])` (registers GlobalMediator and handlers/proxies)
+  * Interceptors
+* Interceptors -
+  * Take calls to the global mediator, and translates them to <TRequest, TResponse>
+  * TypeIndex maps to correct handler in correct (concrete) ProjectMediator
+
+- requires interceptor
+- extra indirection (only for internal handlers)
++ explicit assemblies config
 
 ---
 
@@ -52,6 +88,9 @@ See this great video by [@Elfocrash / Nick Chapsas](https://github.com/Elfocrash
 ## Table of Contents
 
 - [Mediator](#mediator)
+  - [3.0](#30)
+    - [A](#a)
+    - [B](#b)
   - [Table of Contents](#table-of-contents)
   - [2. Benchmarks](#2-benchmarks)
   - [3. Usage and abstractions](#3-usage-and-abstractions)