Find runtime in mock mode

JetBrains · Jan 18, 2022 · 83e981e · 83e981e
1 parent 8d45021
commit 83e981e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/src/Refasmer/Importer/MockupMethodBody.cs b/src/Refasmer/Importer/MockupMethodBody.cs
@@ -47,9 +47,9 @@ private EntityHandle FindOrCreateNotImplementedStringCtor()
                 return Import(ctorHandle);
             }
 
-            var mscorlibRef = FindOrCreateMscorlibReference();
+            var runtimeRef = FindOrCreateRuntimeReference();
 
-            var notImplExceptionTypeRef = _builder.AddTypeReference(mscorlibRef, _builder.GetOrAddString("System"), 
+            var notImplExceptionTypeRef = _builder.AddTypeReference(runtimeRef, _builder.GetOrAddString("System"), 
                 _builder.GetOrAddString("NotImplementedException"));
 
             var ctor = new BlobBuilder();

diff --git a/src/Refasmer/Importer/Utils.cs b/src/Refasmer/Importer/Utils.cs
@@ -78,22 +78,25 @@ private AssemblyReferenceHandle FindRuntimeReference()
             return FindSystemRuntimeReference();
         }
 
-        private AssemblyReferenceHandle FindOrCreateMscorlibReference()
+        private AssemblyReferenceHandle FindOrCreateRuntimeReference()
         {
-            var mscorlibRef = FindMscorlibReference();
+            var runtimeRef = FindRuntimeReference();
 
-            if (!IsNil(mscorlibRef))
-                return mscorlibRef;
+            if (!IsNil(runtimeRef))
+                return runtimeRef;
+
+            // For now always creating ref to mscorlib
+            // TODO: try to detect which runtime should be referenced
 
-            mscorlibRef = _builder.AddAssemblyReference(
+            runtimeRef = _builder.AddAssemblyReference(
                 _builder.GetOrAddString("mscorlib"),
                 new Version(4, 0, 0, 0),
                 default, _builder.GetOrAddBlob(MscorlibPublicKeyBlob),
                 default, default);
 
-            Trace?.Invoke($"Created mscorlib assembly reference {RowId(mscorlibRef)}");
+            Trace?.Invoke($"Created mscorlib assembly reference {RowId(runtimeRef)}");
 
-            return mscorlibRef;
+            return runtimeRef;
         }
     }
 }