Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Return empty string in InternalAssemblyBuilder.Location #57396

Merged
merged 7 commits into from
Aug 20, 2021
Merged

Return empty string in InternalAssemblyBuilder.Location #57396

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
def91f6
return empty string in AssemblyBuilder.Location
pedrobsaila Aug 14, 2021
9bc1a72
add test for InternalAssemblyBuilder.Location = string.Empty
pedrobsaila Aug 15, 2021
3f1a183
drop private reflection
pedrobsaila Aug 15, 2021
5a96ce7
rename test assembly
pedrobsaila Aug 15, 2021
ce26197
fix ko unit test on mono
pedrobsaila Aug 17, 2021
d5d8ae1
drop duplicate obsolete test
pedrobsaila Aug 17, 2021
8ef110f
assert on assembly builder location emptiness
pedrobsaila Aug 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/coreclr/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/libraries/System.Private.CoreLib/src/System/Reflection/Emit/AssemblyBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
10 changes: 9 additions & 1 deletion src/libraries/System.Reflection.Emit/tests/AssemblyBuilderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

using System.Collections.Generic;
using System.Linq;
using System.Runtime.InteropServices;
using Xunit;

namespace System.Reflection.Emit.Tests
Expand Down Expand Up @@ -424,7 +423,16 @@ void Invoke_Private_SameAssembly_ThrowsMethodAccessException()
Assert.Throws<MethodAccessException>(() => d ());
}

[Fact]
public void DefineDynamicAssembly_InternalAssemblyLocationIsEmpty()
{
AssemblyBuilder assembly = Helpers.DynamicAssembly(nameof(DefineDynamicAssembly_InternalAssemblyLocationIsEmpty));
Assembly internalAssemblyBuilder = AppDomain.CurrentDomain.GetAssemblies()
vitek-karas marked this conversation as resolved.
Show resolved Hide resolved
.FirstOrDefault(a => a.FullName == assembly.FullName);

Assert.NotNull(internalAssemblyBuilder);
Assert.Empty(internalAssemblyBuilder.Location);
}

}
}
8 changes: 0 additions & 8 deletions src/libraries/System.Reflection/tests/CoreCLR/AssemblyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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()
{
Expand Down