Skip to content

fix generatetype assembly ref issue #13

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

Open
LumiaSnow wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix generatetype assembly ref issue #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 18 additions & 0 deletions src/Interception/Interception/CodeGeneration/CodeGenerationContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,24 @@ public sealed class CodeGenerationContext
typeof(CodeGenerationContext).Assembly
};

/// <summary>
/// Add reference, support generic type
/// </summary>
/// <param name="type"></param>
/// <returns></returns>
public ISet<Assembly> AddReference(Type type)
{
if (type.IsGenericType)
{
var types = type.GetGenericArguments();
foreach (var t in types)
return AddReference(t);
}
else
this.References.Add(type.Assembly);
return References;
}

/// <summary>Gets the indent level.</summary>
/// <value>The indent level.</value>
public int IndentLevel { get; private set; }
Expand Down
4 changes: 2 additions & 2 deletions src/Interception/Interception/CodeGeneration/InterfaceProxyGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ public override bool TryGenerate(ServiceDescriptor serviceDescriptor, CodeGenera

foreach (var method in methods)
{
codeGenerationContext.References.Add(method.ReturnType.Assembly);
codeGenerationContext.AddReference(method.ReturnType);
foreach (var parameter in method.GetParameters())
{
codeGenerationContext.References.Add(parameter.ParameterType.Assembly);
codeGenerationContext.AddReference(parameter.ParameterType);
}
}

Expand Down
4 changes: 2 additions & 2 deletions src/Interception/Interception/CodeGeneration/VirtualMethodProxyGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,10 +203,10 @@ public override bool TryGenerate(ServiceDescriptor serviceDescriptor, CodeGenera

foreach (var method in interceptableMethods)
{
codeGenerationContext.References.Add(method.ReturnType.Assembly);
codeGenerationContext.AddReference(method.ReturnType);
foreach (var parameter in method.GetParameters())
{
codeGenerationContext.References.Add(parameter.ParameterType.Assembly);
codeGenerationContext.AddReference(parameter.ParameterType);
}
}

Expand Down