Additional bug fixes & tweaks

Author: bclothier

Rubberduck.Deployment.Build/RubberduckPostBuildTask.cs

@@ -84,7 +84,7 @@ public override bool Execute()
             {
                 this.LogMessage(FormatParameterList());
 
-                CleanOldImports(ProjectDir);
+                CleanOldImports(Path.Combine(ProjectDir, "LocalRegistryEntries"));
 
                 var dllFiles = FilesToExtract.Split(new[] {"|"}, StringSplitOptions.RemoveEmptyEntries);
                 var hasVCTools = TryGetVCToolsPath(out var batchPath);
@@ -341,6 +341,7 @@ private void UpdateDebugRegistration(IOrderedEnumerable<RegistryEntry> entries,
             // is a registry script with deletion instructions for the keys to be deleted
             // in the next build.
             var writer = new LocalDebugRegistryWriter();
+            writer.CurrentPath = TargetDir;
             var content = writer.Write(entries, parameters.DllFile, parameters.Tlb32File, parameters.Tlb64File);
             File.AppendAllText(RegFilePath, content, Encoding.ASCII);
         }

Rubberduck.Deployment.Build/RubberduckPreBuildTask.cs

@@ -37,7 +37,8 @@ private void VerifyFileLocks()
                 var files = Directory.GetFiles(OutputDir);
                 foreach (var file in files)
                 {
-                    if (file.StartsWith("Rubberduck") && file.EndsWith(".dll"))
+                    var fileName = Path.GetFileName(file);
+                    if (fileName.StartsWith("Rubberduck") && fileName.EndsWith(".dll"))
                     {
                         //If we can't delete it, then file is in use.
                         File.Delete(file);

Rubberduck.Deployment.Build/Writers/LocalDebugRegistryWriter.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Reflection;
 using System.Text;
 using Microsoft.Win32;
 using Rubberduck.Deployment.Build.Structs;
@@ -14,6 +14,8 @@ public class LocalDebugRegistryWriter : IRegistryWriter
         private string _dllName;
         private string _tlb32Name;
         private string _tlb64Name;
+        
+        public string CurrentPath { get; set; }
 
         public string Write(IOrderedEnumerable<RegistryEntry> entries, string dllName, string tlb32Name, string tlb64Name)
         {
@@ -78,37 +80,21 @@ private void MakeRegistryEntries(RegistryEntry entry, RegistryKey hKey)
             }
         }
 
-        //Cache the string so we call the AssemblyDirectory only once
-        private string _currentPath;
         private string ReplacePlaceholder(string value, Bitness bitness)
         {
-            if (_currentPath == null)
-            {
-                _currentPath = AssemblyDirectory;
-            }
+            Debug.Assert(!string.IsNullOrWhiteSpace(CurrentPath));
 
             switch (value)
             {
                 case PlaceHolders.InstallPath:
-                    return _currentPath;
+                    return CurrentPath;
                 case PlaceHolders.DllPath:
-                    return Path.Combine( _currentPath, _dllName);
+                    return Path.Combine(CurrentPath, _dllName);
                 case PlaceHolders.TlbPath:
-                    return Path.Combine(_currentPath,  bitness == Bitness.Is64Bit ? _tlb64Name : _tlb32Name);
+                    return Path.Combine(CurrentPath,  bitness == Bitness.Is64Bit ? _tlb64Name : _tlb32Name);
                 default:
                     return value;
             }
         }
-
-        public static string AssemblyDirectory
-        {
-            get
-            {
-                string codeBase = Assembly.GetExecutingAssembly().CodeBase;
-                UriBuilder uri = new UriBuilder(codeBase);
-                string path = Uri.UnescapeDataString(uri.Path);
-                return Path.GetDirectoryName(path);
-            }
-        }
     }
 }

Rubberduck.Deployment/Rubberduck.Deployment.csproj

@@ -46,7 +46,7 @@
   <Target Name="PreBuildTask" BeforeTargets="PreBuildEvent">
     <RubberduckPreBuildTask 
         WorkingDir="$(ProjectDir)" 
-        OutputDir="$(OutputPath)" />
+        OutputDir="$(TargetDir)" />
 
     <Message Text="Ran Rubberduck prebuild task" Importance="normal" />
   </Target>