Skip to content

Update DotnetExeCompilator.cs - Duplicate Asm fix #113

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update DotnetExeCompilator.cs - Duplicate Asm fix #113

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
22 changes: 14 additions & 8 deletions Assets/Scripts/Editor/Compilation/DotnetExeCompilator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,22 @@ private static string GenerateCompilerArgsRspFileContents(string outLibraryPath,
rspContents.AppendLine($"-define:{symbol}");
}

Dictionary<string, bool> nameLoaded = new Dictionary<string, bool>();
foreach (var referenceToAdd in ResolveReferencesToAdd(new List<string>()))
{
if (originalAssemblyPathToAsmWithInternalsVisibleToCompiled.TryGetValue(referenceToAdd, out var asmWithInternalsVisibleTo))
string key = Path.GetFileName(referenceToAdd);
if (!nameLoaded.ContainsKey(key)) // Avoid duplicates of the same assembly
{
//Changed assembly have InternalsVisibleTo added to it to avoid any issues where types are defined internal
rspContents.AppendLine($"-r:\"{asmWithInternalsVisibleTo}\"");
}
else
{
rspContents.AppendLine($"-r:\"{referenceToAdd}\"");
if (originalAssemblyPathToAsmWithInternalsVisibleToCompiled.TryGetValue(referenceToAdd, out var asmWithInternalsVisibleTo))
{
//Changed assembly have InternalsVisibleTo added to it to avoid any issues where types are defined internal
rspContents.AppendLine($"-r:\"{asmWithInternalsVisibleTo}\"");
}
else
{
rspContents.AppendLine($"-r:\"{referenceToAdd}\"");
}
nameLoaded.Add(key, true);
}
}

Expand Down Expand Up @@ -344,4 +350,4 @@ public HotReloadCompilationException(string message, Exception innerException, s
SourceCodeCombinedFileCreated = sourceCodeCombinedFileCreated;
}
}
}
}