Skip to content

Fix source DLL file locking during development #21

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

Fix source DLL file locking during development #21

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
71 changes: 42 additions & 29 deletions CadAddinManager/Model/AssemLoader.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,22 @@ public AssemLoader()
copiedFiles = new Dictionary<string, DateTime>();
}

private static readonly HashSet<string> SkipCopyBackExtensions = new(StringComparer.OrdinalIgnoreCase)
{
".dll", ".pdb", ".exe"
};

public void CopyGeneratedFilesBack()
{
var files = Directory.GetFiles(tempFolder, "*.*", SearchOption.AllDirectories);
if(!files.Any()) return;
foreach (var text in files)
{
// Never copy compiled assemblies back — they don't change at runtime
// and copying them back locks the original files for MSBuild
var ext = Path.GetExtension(text);
if (SkipCopyBackExtensions.Contains(ext)) continue;

if (copiedFiles.ContainsKey(text))
{
var t = copiedFiles[text];
Expand Down Expand Up @@ -93,49 +103,52 @@ private string ResolveDuplicateMethod(string originalFilePath)
{

// AssemblyDefinition ass = AssemblyDefinition.ReadAssembly(originalFilePath);
AssemblyDefinition ass = GetAssemblyDef(originalFilePath);
foreach (ModuleDefinition def in ass.Modules)
string fileAssemblyTemp;
using (AssemblyDefinition ass = GetAssemblyDef(originalFilePath))
{
foreach (TypeDefinition d in def.Types)
foreach (ModuleDefinition def in ass.Modules)
{
foreach (MethodDefinition m in d.Methods)
foreach (TypeDefinition d in def.Types)
{
if (!m.IsConstructor && !m.IsRuntimeSpecialName && m.Name != "Main")
foreach (MethodDefinition m in d.Methods)
{
foreach (CustomAttribute customAttribute in m.CustomAttributes)
if (!m.IsConstructor && !m.IsRuntimeSpecialName && m.Name != "Main")
{
if (customAttribute.Constructor.DeclaringType.Name == "CommandMethodAttribute")
foreach (CustomAttribute customAttribute in m.CustomAttributes)
{
int count = customAttribute.ConstructorArguments.Count;
CustomAttribute newAttr = null;
if (count == 4)
{
newAttr = CreateCustomAttribute4Type(customAttribute);
}
if (count == 3)
if (customAttribute.Constructor.DeclaringType.Name == "CommandMethodAttribute")
{
newAttr = CreateCustomAttribute3Type(customAttribute);
int count = customAttribute.ConstructorArguments.Count;
CustomAttribute newAttr = null;
if (count == 4)
{
newAttr = CreateCustomAttribute4Type(customAttribute);
}
if (count == 3)
{
newAttr = CreateCustomAttribute3Type(customAttribute);
}
else if (count == 2)
{
newAttr = CreateCustomAttribute2Type(customAttribute);
}
else if (count == 1)
{
newAttr = CreateCustomAttribute1Type(customAttribute);
}
m.CustomAttributes.Remove(customAttribute);
m.CustomAttributes.Add(newAttr);
break;
}
else if (count == 2)
{
newAttr = CreateCustomAttribute2Type(customAttribute);
}
else if (count == 1)
{
newAttr = CreateCustomAttribute1Type(customAttribute);
}
m.CustomAttributes.Remove(customAttribute);
m.CustomAttributes.Add(newAttr);
break;
}
}
}
}
}
fileAssemblyTemp = SaveAssemblyModifyToTemp(originalFilePath);
ass.Write(fileAssemblyTemp, new WriterParameters() { WriteSymbols = true });
}
string fileAssemblyTemp = SaveAssemblyModifyToTemp(originalFilePath);
ass.Write(fileAssemblyTemp, new WriterParameters() { WriteSymbols = true });
return fileAssemblyTemp;
return fileAssemblyTemp;
}
public static AssemblyDefinition GetAssemblyDef(string assemblyPath)
{
Expand Down