RMTP-120 Add path

Author: MichaelKetting

Core.UnitTests/CodeGeneration/ReflectionEmit/ModuleBuilderFactoryTest.cs

@@ -71,7 +71,7 @@ public void CreateModuleBuilder ()
     public void CreateModuleBuilder_AppliesTypePipeAssemblyAttribute ()
     {
       var assemblyName = c_assemblyName + Guid.NewGuid();
-      _factory.CreateModuleBuilder (assemblyName, assemblyDirectoryOrNull: null, strongNamed: false, keyFilePathOrNull: null);
+      var moduleBuilder = _factory.CreateModuleBuilder (assemblyName, assemblyDirectoryOrNull: null, strongNamed: false, keyFilePathOrNull: null);
 
       var assembly = AppDomain.CurrentDomain.GetAssemblies().SingleOrDefault(a => a.GetName().Name == assemblyName);
       Assert.That (assembly, Is.Not.Null);

Core/CodeGeneration/ReflectionEmit/Abstractions/AssemblyBuilderAdapter.cs

@@ -15,6 +15,7 @@
 // under the License.
 // 
 using System;
+using System.IO;
 using System.Reflection.Emit;
 using Remotion.Utilities;
 
@@ -33,22 +34,29 @@ public class AssemblyBuilderAdapter : BuilderAdapterBase, IAssemblyBuilder
   {
 #if NET9_0_OR_GREATER
     private readonly PersistedAssemblyBuilder _assemblyBuilder;
+    private readonly string _assemblyDirectory;
 #else
     private readonly AssemblyBuilder _assemblyBuilder;
 #endif
     private readonly ModuleBuilder _moduleBuilder;
 
 #if NET9_0_OR_GREATER
-    public AssemblyBuilderAdapter (PersistedAssemblyBuilder assemblyBuilder, ModuleBuilder moduleBuilder)
+    public AssemblyBuilderAdapter (PersistedAssemblyBuilder assemblyBuilder, ModuleBuilder moduleBuilder, string assemblyDirectory)
 #else
     public AssemblyBuilderAdapter (AssemblyBuilder assemblyBuilder, ModuleBuilder moduleBuilder)
 #endif
         : base (ArgumentUtility.CheckNotNull ("assemblyBuilder", assemblyBuilder).SetCustomAttribute)
     {
       ArgumentUtility.CheckNotNull ("moduleBuilder", moduleBuilder);
+#if NET9_0_OR_GREATER
+      ArgumentUtility.CheckNotNullOrEmpty ("assemblyDirectory", assemblyDirectory);
+#endif
 
       _assemblyBuilder = assemblyBuilder;
       _moduleBuilder = moduleBuilder;
+#if NET9_0_OR_GREATER
+      _assemblyDirectory = assemblyDirectory;
+#endif
     }
 
     public string AssemblyName
@@ -61,14 +69,30 @@ public byte[] PublicKey
       get { return _assemblyBuilder.GetName ().GetPublicKey (); }
     }
 
+#if NET9_0_OR_GREATER
+    public string AssemblyDirectory
+    {
+      get { return _assemblyDirectory; }
+    }
+#endif
+
     public string SaveToDisk ()
     {
-#if NETFRAMEWORK || NET9_0_OR_GREATER
+#if NETFRAMEWORK
       // Scope name is the module name or file name, i.e., assembly name + '.dll'.
       _assemblyBuilder.Save (_moduleBuilder.ScopeName);
 
       // This is the absolute path to the module, which is also the assembly file path for single-module assemblies.
       return _moduleBuilder.FullyQualifiedName;
+#elif NET9_0_OR_GREATER
+      // Scope name is the module name or file name, i.e., assembly name + '.dll'.
+      var modulePath = Path.Combine (_assemblyDirectory, _moduleBuilder.ScopeName);
+      using (var stream = new FileStream (modulePath, FileMode.Create, FileAccess.Write, FileShare.Read))
+      {
+        _assemblyBuilder.Save (stream);
+      }
+
+      return modulePath;
 #else
       throw new PlatformNotSupportedException ("Assembly persistence is not supported.");
 #endif

Core/CodeGeneration/ReflectionEmit/Abstractions/ModuleBuilderAdapter.cs

@@ -39,20 +39,25 @@ public IAssemblyBuilder AssemblyBuilder
       get { return _assemblyBuilder; }
     }
 
+#if NET9_0_OR_GREATER
+    public ModuleBuilderAdapter (ModuleBuilder moduleBuilder, string assemblyDirectory)
+#else
     public ModuleBuilderAdapter (ModuleBuilder moduleBuilder)
+#endif
         : base (ArgumentUtility.CheckNotNull ("moduleBuilder", moduleBuilder).SetCustomAttribute)
     {
 #if NET9_0_OR_GREATER
+      ArgumentUtility.CheckNotNullOrEmpty ("assemblyDirectory", assemblyDirectory);
       Assertion.IsTrue (moduleBuilder.Assembly is PersistedAssemblyBuilder);
 #else
       Assertion.IsTrue (moduleBuilder.Assembly is AssemblyBuilder);
 #endif
 
       _moduleBuilder = moduleBuilder;
 #if NET9_0_OR_GREATER
-      _assemblyBuilder = new AssemblyBuilderAdapter ((PersistedAssemblyBuilder) moduleBuilder.Assembly, moduleBuilder);
+      _assemblyBuilder = new AssemblyBuilderAdapter ((PersistedAssemblyBuilder) moduleBuilder.Assembly, moduleBuilder, assemblyDirectory);
 #else
-      _assemblyBuilder = new AssemblyBuilderAdapter (((AssemblyBuilder) moduleBuilder.Assembly), moduleBuilder);
+      _assemblyBuilder = new AssemblyBuilderAdapter ((AssemblyBuilder) moduleBuilder.Assembly, moduleBuilder);
 #endif
     }
 

Core/CodeGeneration/ReflectionEmit/ModuleBuilderFactory.cs

@@ -94,8 +94,12 @@ public IModuleBuilder CreateModuleBuilder (string assemblyName, string assemblyD
       var moduleBuilder = assemblyBuilder.DefineDynamicModule (moduleName);
 #endif
 
+#if NET9_0_OR_GREATER
+      var assmeblyDirectory =  assemblyDirectoryOrNull ?? Environment.CurrentDirectory;
+      var moduleBuilderAdapter = new ModuleBuilderAdapter (moduleBuilder, assmeblyDirectory);
+#else
       var moduleBuilderAdapter = new ModuleBuilderAdapter (moduleBuilder);
-
+#endif
       var typePipeAttribute = new CustomAttributeDeclaration (s_typePipeAssemblyAttributeCtor, new object[] { _participantConfigurationID });
       moduleBuilderAdapter.AssemblyBuilder.SetCustomAttribute (typePipeAttribute);