BuildRegistryScript fixed for the deletion of both x86 and x64 registry keys when it proceeds.

Also cleaned a bit that branching in LocalDebugRegistryWriter.

Author: NelsonVides

Rubberduck.Deployment/BuildRegistryScript.ps1

@@ -95,9 +95,17 @@ try
 				if (Test-Path -Path $regFile -PathType Leaf)
 				{
 					$datetime = Get-Date;
-					& reg.exe import $regFile;
+					if ([Environment]::Is64BitOperatingSystem)
+					{
+						& reg.exe import $regFile /reg:32;
+						& reg.exe import $regFile /reg:64;
+					}
+					else 
+					{
+						& reg.exe import $regFile /reg:32;					
+					}
 					& reg.exe import ($dir + "\RubberduckAddinRegistry.reg");
-					Move-Item -Path $regFile -Destination ($regFile + ".imported_" + $datetime.ToUniversalTime().ToString("yyyyMMddhhmmss") + ".txt" )
+					Move-Item -Path $regFile -Destination ($regFile + ".imported_" + $datetime.ToUniversalTime().ToString("yyyyMMddHHmmss") + ".txt" )
 				}
 			}
 			else

Rubberduck.Deployment/Writers/LocalDebugRegistryWriter.cs

@@ -31,15 +31,11 @@ public string Write(IOrderedEnumerable<RegistryEntry> entries)
                     throw new InvalidOperationException("Unexpected registry entry: " + entry.Key);
                 }
 
+                MakeRegistryEntries(entry, Registry.CurrentUser);
                 if (Environment.Is64BitOperatingSystem)
                 {
-                    MakeRegistryEntries(entry, RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry32));
                     MakeRegistryEntries(entry, RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry64));
                 }
-                else 
-                {
-                    MakeRegistryEntries(entry, RegistryKey.OpenBaseKey(RegistryHive.CurrentUser, RegistryView.Registry32));
-                }
 
                 if (!distinctKeys.Contains(entry.Key))
                 {
@@ -53,7 +49,7 @@ public string Write(IOrderedEnumerable<RegistryEntry> entries)
                 sb.AppendLine("[-HKEY_CURRENT_USER\\" + key + "]" + Environment.NewLine);
             }
 
-            return sb.ToString(); //FIXME: this is not printing reg redirections.
+            return sb.ToString();
         }
 
         private void MakeRegistryEntries(RegistryEntry entry, RegistryKey hKey)