Resolve merge

martinothamar · Nov 17, 2022 · 726ddba · 726ddba
2 parents 12010a3 + 2f3b3d8
commit 726ddba
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/src/Mediator.SourceGenerator.Roslyn38/MediatorGenerator.cs b/src/Mediator.SourceGenerator.Roslyn38/MediatorGenerator.cs
@@ -3,7 +3,7 @@ namespace Mediator.SourceGenerator;
 [Generator]
 public sealed class MediatorGenerator : ISourceGenerator
 {
-    internal CompilationAnalyzer? CompilationAnalyzer { get; private set; }
+    internal CompilationAnalyzer? CompilationAnalyzer;
 
     public void Execute(GeneratorExecutionContext context)
     {
@@ -33,13 +33,15 @@ private void ExecuteInternal(in GeneratorExecutionContext context)
             context.CancellationToken
         );
 
-        CompilationAnalyzer = new CompilationAnalyzer(in analyzerContext);
+        var compilationAnalyzer = new CompilationAnalyzer(in analyzerContext);
 
-        CompilationAnalyzer.Initialize();
-        CompilationAnalyzer.Analyze();
+        compilationAnalyzer.Initialize();
+        compilationAnalyzer.Analyze();
+
+        CompilationAnalyzer = compilationAnalyzer;
 
         var mediatorImplementationGenerator = new MediatorImplementationGenerator();
-        mediatorImplementationGenerator.Generate(CompilationAnalyzer);
+        mediatorImplementationGenerator.Generate(compilationAnalyzer);
     }
 
     public void Initialize(GeneratorInitializationContext context)

diff --git a/src/Mediator.SourceGenerator.Roslyn40/IncrementalMediatorGenerator.cs b/src/Mediator.SourceGenerator.Roslyn40/IncrementalMediatorGenerator.cs
@@ -5,7 +5,7 @@ namespace Mediator.SourceGenerator;
 [Generator]
 public sealed class IncrementalMediatorGenerator : IIncrementalGenerator
 {
-    internal CompilationAnalyzer? CompilationAnalyzer { get; private set; }
+    internal CompilationAnalyzer? CompilationAnalyzer;
 
     private void ExecuteInternal(
         in SourceProductionContext context,
@@ -24,19 +24,21 @@ IReadOnlyList<InvocationExpressionSyntax> addMediatorCalls
             context.CancellationToken
         );
 
-        CompilationAnalyzer = new CompilationAnalyzer(in analyzerContext);
+        var compilationAnalyzer = new CompilationAnalyzer(in analyzerContext);
 
-        CompilationAnalyzer.Initialize();
-        CompilationAnalyzer.Analyze();
+        compilationAnalyzer.Initialize();
+        compilationAnalyzer.Analyze();
+
+        CompilationAnalyzer = compilationAnalyzer;
 
         var mediatorImplementationGenerator = new MediatorImplementationGenerator();
-        mediatorImplementationGenerator.Generate(CompilationAnalyzer);
+        mediatorImplementationGenerator.Generate(compilationAnalyzer);
     }
 
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
         context.RegisterPostInitializationOutput(
-            context =>
+            static context =>
             {
                 var generatorVersion = Versioning.GetVersion();
 

diff --git a/version.json b/version.json
@@ -17,4 +17,4 @@
     "branchName": "release/v{version}",
     "firstUnstableTag": "preview"
   }
-}
+}