Making all pathways through preview or write commands "know" when to …

…and when not to use the server variable source
JasperFx · May 8, 2024 · 97c324f · 97c324f
1 parent 4671bd9
commit 97c324f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
   <PropertyGroup>
-    <VersionPrefix>3.5.1</VersionPrefix>
+    <VersionPrefix>3.5.2</VersionPrefix>
     <LangVersion>10.0</LangVersion>
     <Authors>Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko</Authors>
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>

diff --git a/src/JasperFx.CodeGeneration/DynamicCodeBuilder.cs b/src/JasperFx.CodeGeneration/DynamicCodeBuilder.cs
@@ -79,7 +79,7 @@ public void WriteGeneratedCode(Action<string> onFileWritten)
                 var generatedAssembly = collection.StartAssembly(collection.Rules);
                 file.AssembleTypes(generatedAssembly);
 
-                var code = generatedAssembly.GenerateCode(ServiceVariableSource);
+                var code = collection is ICodeFileCollectionWithServices ? generatedAssembly.GenerateCode(ServiceVariableSource) : generatedAssembly.GenerateCode(null);
                 var fileName = Path.Combine(exportDirectory, file.FileName.Replace(" ", "_") + ".cs");
                 File.WriteAllText(fileName, code);
                 onFileWritten(fileName);

diff --git a/src/JasperFx.RuntimeCompiler/CodeFileExtensions.cs b/src/JasperFx.RuntimeCompiler/CodeFileExtensions.cs
@@ -21,7 +21,7 @@ public static async Task Initialize(this ICodeFile file, GenerationRules rules,
 
                 var generatedAssembly = parent.StartAssembly(rules);
                 file.AssembleTypes(generatedAssembly);
-                var serviceVariables = services?.GetService(typeof(IServiceVariableSource)) as IServiceVariableSource;
+                var serviceVariables = parent is ICodeFileCollectionWithServices ? services?.GetService(typeof(IServiceVariableSource)) as IServiceVariableSource : null;
 
                 var compiler = new AssemblyGenerator();
                 compiler.Compile(generatedAssembly, serviceVariables);
@@ -89,7 +89,7 @@ public static void InitializeSynchronously(this ICodeFile file, GenerationRules
 
                 var generatedAssembly = parent.StartAssembly(rules);
                 file.AssembleTypes(generatedAssembly);
-                var serviceVariables = services?.GetService(typeof(IServiceVariableSource)) as IServiceVariableSource;
+                var serviceVariables = parent is ICodeFileCollectionWithServices ? services?.GetService(typeof(IServiceVariableSource)) as IServiceVariableSource : null;
 
                 var compiler = new AssemblyGenerator();
                 compiler.Compile(generatedAssembly, serviceVariables);