Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@ private string ReplaceGenericSignature(IClassDeclaration? classDeclaration)
{
if (attribute.GenericTypeAssignment.isPoco)
{
genericSignature = genericSignature.Replace(genericType, $"Pocos.{fieldDeclaresGenericType?.Type.FullyQualifiedName}");
genericSignature = genericSignature.Replace(attribute.GenericTypeAssignment.type, $"Pocos.{fieldDeclaresGenericType?.Type.FullyQualifiedName}");
}
else
{
genericSignature = genericSignature.Replace(genericType, fieldDeclaresGenericType?.Type.FullyQualifiedName);
genericSignature = genericSignature.Replace(attribute.GenericTypeAssignment.type, fieldDeclaresGenericType?.Type.FullyQualifiedName);
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion src/AXSharp.compiler/src/ixc/Properties/launchSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@
},
"ixc-simple-template": {
"commandName": "Project",
"workingDirectory": "C:\\W\\Develop\\gh\\ix-ax\\ix.framework\\src\\templates.simple\\ctrl"
"workingDirectory": "C:\\W\\Develop\\gh\\ix-ax\\ix.framework\\src\\templates.simple\\ctrl\\"
},
"ixc-template-ref": {
"commandName": "Project",
"workingDirectory": "C:\\W\\Develop\\gh\\ix-ax\\axopen\\src\\templates.simple\\ctrl"
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ public async Task<IEnumerable<ITwinPrimitive>> PlainToShadowAsync(Pocos.Generics
}
}

public partial class Extendee2 : Generics.Extender<Generics.SomeType, Generics.SomeType>
public partial class Extendee2 : Generics.Extender<Generics.SomeType, Pocos.Generics.SomeType>
{
public Generics.SomeType SomeType { get; }

Expand Down