Various updates

Author: ejsmith

samples/ConsoleSample/ConsoleSample.csproj

@@ -9,10 +9,11 @@
     <!-- Emit compiler generated files for debugging purposes -->
     <CompilerGeneratedFilesOutputPath>Generated</CompilerGeneratedFilesOutputPath>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-    <InterceptorsNamespaces>$(InterceptorsNamespaces);Foundatio.Mediator</InterceptorsNamespaces>
+    <DisableMediatorInterceptors>true</DisableMediatorInterceptors>
   </PropertyGroup>
 
   <ItemGroup>
+    <CompilerVisibleProperty Include="DisableMediatorInterceptors" />
     <!-- Exclude the output of source generators from the compilation -->
     <Compile Remove="$(CompilerGeneratedFilesOutputPath)/**/*.cs" />
   </ItemGroup>

src/Foundatio.Mediator.SourceGenerator/DIRegistrationGenerator.cs

@@ -70,7 +70,7 @@ public static string GenerateDIRegistration(List<HandlerInfo> handlers, List<Mid
                 else
                 {
                     // For sync handlers, we need to provide a dummy async wrapper that calls the sync method
-                    source.AppendLine($"                (mediator, message, cancellationToken, responseType) => new ValueTask<object>({wrapperClassName}.UntypedHandle(mediator, message, cancellationToken, responseType)),");
+                    source.AppendLine($"                (mediator, message, cancellationToken, responseType) => new ValueTask<object?>({wrapperClassName}.UntypedHandle(mediator, message, cancellationToken, responseType)),");
                     source.AppendLine($"                {wrapperClassName}.UntypedHandle,");
                 }
 

src/Foundatio.Mediator.SourceGenerator/Foundatio.Mediator.SourceGenerator.csproj

@@ -15,6 +15,8 @@
   <ItemGroup>
     <None Include="$(OutputPath)\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
     <None Include="..\Foundatio.Mediator\bin\$(Configuration)\netstandard2.0\Foundatio.Mediator.dll" Pack="true" PackagePath="lib/netstandard2.0" Visible="false" />
+    <None Include="Foundatio.Mediators.SourceGenerator.props" Pack="true" PackagePath="build" Visible="true" />
+    <None Include="Foundatio.Mediators.SourceGenerator.targets" Pack="true" PackagePath="build" Visible="true" />
   </ItemGroup>
 
 </Project>

src/Foundatio.Mediator.SourceGenerator/Foundatio.Mediator.SourceGenerator.props

@@ -0,0 +1,5 @@
+<Project>
+  <ItemGroup>
+    <CompilerVisibleProperty Include="DisableMediatorInterceptors" />
+  </ItemGroup>
+</Project>

src/Foundatio.Mediator.SourceGenerator/Foundatio.Mediator.SourceGenerator.targets

@@ -0,0 +1,8 @@
+<Project InitialTargets="Foundatio_Mediator_Interceptors">
+  <Target Name="Foundatio_Mediator_Interceptors">
+    <PropertyGroup Condition="'$(DisableMediatorInterceptors)' != 'true'">
+      <InterceptorsNamespaces>$(InterceptorsNamespaces);Foundatio.Mediators</InterceptorsNamespaces>
+      <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Foundatio.Mediators</InterceptorsPreviewNamespaces>
+    </PropertyGroup>
+  </Target>
+</Project>

src/Foundatio.Mediator.SourceGenerator/HandlerInfo.cs

@@ -13,6 +13,7 @@ public readonly record struct HandlerInfo
     public readonly bool IsStatic;
     public readonly EquatableArray<ParameterInfo> Parameters;
     public readonly EquatableArray<string> MessageTypeHierarchy;
+    public readonly EquatableArray<CallSiteInfo> CallSites;
 
     public HandlerInfo(
         string handlerTypeName,
@@ -23,7 +24,8 @@ public HandlerInfo(
         bool isAsync,
         bool isStatic,
         List<ParameterInfo> parameters,
-        List<string> messageTypeHierarchy)
+        List<string> messageTypeHierarchy,
+        List<CallSiteInfo> callSites)
     {
         HandlerTypeName = handlerTypeName;
         MessageTypeName = messageTypeName;
@@ -34,6 +36,7 @@ public HandlerInfo(
         IsStatic = isStatic;
         Parameters = new(parameters.ToArray());
         MessageTypeHierarchy = new(messageTypeHierarchy.ToArray());
+        CallSites = new(callSites.ToArray());
     }
 }