Return empty string in InternalAssemblyBuilder.Location (#57396)

Return empty string in AssemblyBuilder.Location
dotnet · Aug 20, 2021 · 56d881f · 56d881f
1 parent 4cb2874
commit 56d881f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs
@@ -104,7 +104,7 @@ public override FileStream[] GetFiles(bool getResourceModules)
             throw new NotSupportedException(SR.NotSupported_DynamicAssembly);
         }
 
-        public override string Location => throw new NotSupportedException(SR.NotSupported_DynamicAssembly);
+        public override string Location => string.Empty;
 
         [RequiresAssemblyFiles(ThrowingMessageInRAF)]
         public override string? CodeBase => throw new NotSupportedException(SR.NotSupported_DynamicAssembly);

diff --git a/src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs b/src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs
@@ -10,7 +10,7 @@ public sealed partial class AssemblyBuilder : Assembly
     {
         [RequiresAssemblyFiles(ThrowingMessageInRAF)]
         public override string? CodeBase => throw new NotSupportedException(SR.NotSupported_DynamicAssembly);
-        public override string Location => throw new NotSupportedException(SR.NotSupported_DynamicAssembly);
+        public override string Location => string.Empty;
         public override MethodInfo? EntryPoint => null;
         public override bool IsDynamic => true;
 

diff --git a/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs b/src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs
@@ -3,7 +3,6 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using System.Runtime.InteropServices;
 using Xunit;
 
 namespace System.Reflection.Emit.Tests
@@ -424,7 +423,17 @@ void Invoke_Private_SameAssembly_ThrowsMethodAccessException()
 	    Assert.Throws<MethodAccessException>(() => d ());
 	}
 
+    [Fact]
+    public void DefineDynamicAssembly_AssemblyBuilderLocationIsEmpty_InternalAssemblyBuilderLocationIsEmpty()
+    {
+        AssemblyBuilder assembly = Helpers.DynamicAssembly(nameof(DefineDynamicAssembly_AssemblyBuilderLocationIsEmpty_InternalAssemblyBuilderLocationIsEmpty));
+        Assembly internalAssemblyBuilder  = AppDomain.CurrentDomain.GetAssemblies()
+                .FirstOrDefault(a => a.FullName == assembly.FullName);
 
+        Assert.Empty(assembly.Location);
+        Assert.NotNull(internalAssemblyBuilder);
+        Assert.Empty(internalAssemblyBuilder.Location);
+    }
 
     }
 }
diff --git a/src/libraries/System.Reflection/tests/CoreCLR/AssemblyTests.cs b/src/libraries/System.Reflection/tests/CoreCLR/AssemblyTests.cs
@@ -2,7 +2,6 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.IO;
-using System.Reflection.Emit;
 using System.Runtime.Loader;
 using Xunit;
 
@@ -30,13 +29,6 @@ public void LoadFromStream_Location_IsEmpty()
             Assert.Empty(assembly.Location);
         }
 
-        [Fact]
-        public void DynamicAssembly_Location_ThrowsNotSupportedException()
-        {
-            AssemblyBuilder builder = AssemblyBuilder.DefineDynamicAssembly(new AssemblyName("dynamic"), AssemblyBuilderAccess.Run);
-            Assert.Throws<NotSupportedException>(() => builder.Location);
-        }
-
         [Fact]
         public void EntryPoint()
         {