Additional reorganization of install scripts & supporting classes

Update the code to handle all needed parameterization Create writers, with Inno Setup writer to generate a .iss file for inclusion
rubberduck-vba · Mar 17, 2018 · 2e841e1 · 2e841e1
1 parent c956099
commit 2e841e1
Show file tree

Hide file tree

Showing 13 changed files with 624 additions and 219 deletions.
diff --git a/Rubberduck.API/Rubberduck.API.csproj b/Rubberduck.API/Rubberduck.API.csproj
@@ -74,5 +74,8 @@
   <ItemGroup>
     <Folder Include="API\Plugin\" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/Rubberduck.API/app.config b/Rubberduck.API/app.config
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Castle.Core" publicKeyToken="407dd0808d44fbdc" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/Rubberduck.Core/Rubberduck.Core.csproj b/Rubberduck.Core/Rubberduck.Core.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -256,10 +255,6 @@
     <Reference Include="Infralution.Localization.Wpf">
       <HintPath>..\libs\Infralution.Localization.Wpf.dll</HintPath>
     </Reference>
-    <Reference Include="LibGit2Sharp, Version=0.24.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\LibGit2Sharp.0.24.0\lib\net40\LibGit2Sharp.dll</HintPath>
-    </Reference>
     <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>
     </Reference>
@@ -1404,7 +1399,6 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.185\build\LibGit2Sharp.NativeBinaries.props'))" />
   </Target>
   <PropertyGroup>
     <PostBuildEvent>

diff --git a/Rubberduck.Core/app.config b/Rubberduck.Core/app.config
diff --git a/Rubberduck.Core/packages.config b/Rubberduck.Core/packages.config
@@ -6,8 +6,6 @@
   <package id="Castle.Windsor" version="4.0.0" targetFramework="net45" />
   <package id="EasyHook" version="2.7.6270" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9.5" targetFramework="net45" />
-  <package id="LibGit2Sharp" version="0.24.0" targetFramework="net45" />
-  <package id="LibGit2Sharp.NativeBinaries" version="1.0.185" targetFramework="net45" />
   <package id="NLog" version="4.4.12" targetFramework="net45" />
   <package id="NLog.Schema" version="4.4.12" targetFramework="net45" />
   <package id="System.ValueTuple" version="4.4.0" targetFramework="net45" />

diff --git a/Rubberduck.Deployment/BuildRegistryScript.ps1 b/Rubberduck.Deployment/BuildRegistryScript.ps1
@@ -15,13 +15,15 @@
 #  -wixToolsDir '$(SolutionDir)packages\WiX.Toolset.3.9.1208.0\tools\wix\' 
 #  -sourceDir '$(TargetDir)' 
 #  -targetDir '$(TargetDir)' 
+#  -includeDir '$(ProjectDir)InnoSetup\Includes\'
 #  -filesToExtract 'Rubberduck.dll'"
 param (
 	[Parameter(Mandatory=$true)][string]$builderAssemblyPath,
 	[Parameter(Mandatory=$true)][string]$netToolsDir,
 	[Parameter(Mandatory=$true)][string]$wixToolsDir,
 	[Parameter(Mandatory=$true)][string]$sourceDir,
 	[Parameter(Mandatory=$true)][string]$targetDir,
+	[Parameter(Mandatory=$true)][string]$includeDir,
 	[Parameter(Mandatory=$true)][string]$filesToExtract
 )
 
@@ -68,7 +70,11 @@ try
 		# $entries | Format-Table | Out-String |% {Write-Host $_};
 
 		$writer = New-Object Rubberduck.Deployment.Writers.InnoSetupRegistryWriter
-		$writer.Write($entries) > ($targetDir + ($file -replace ".dll", ".reg.iss"))
+		$content = $writer.Write($entries);
+
+		$regFile = ($includeDir + ($file -replace ".dll", ".reg.iss"))
+		$Utf8NoBomEncoding = New-Object System.Text.UTF8Encoding $False
+		[System.IO.File]::WriteAllLines($regFile, $content, $Utf8NoBomEncoding)
 	}
 }
 catch

diff --git a/Rubberduck.Deployment/Builders/RegistryEntryBuilder.cs b/Rubberduck.Deployment/Builders/RegistryEntryBuilder.cs
@@ -15,6 +15,8 @@ public class RegistryEntryBuilder
         private List<ClassMap> classMapList;
         private Dictionary<string, List<RegistryEntry>> recordMap;
 
+        private const string baseFolder = @"Software\Classes\";
+
         public IOrderedEnumerable<RegistryEntry> Parse(string tlbHeatOutputXmlPath, string dllHeatOutputXmlPath)
         {
             var tlbXml = new XmlDocument();
@@ -80,7 +82,7 @@ public TypeLibMap ExtractTypeLib(XmlNode node)
                 [HKEY_LOCAL_MACHINE\Software\Classes\TypeLib\{E07C841C-14B4-4890-83E9-8C80B06DD59D}\2.1\HELPDIR]
                 @="C:\\Github\\Rubberduck\\Rubberduck\\RetailCoder.VBE\\bin\\Debug"
             */
-            const string basePath = @"Software\Classes\TypeLib\";
+            const string basePath = baseFolder + @"TypeLib\";
             var libGuid = node.Attributes["Id"].Value;
             var libDesc = node.Attributes["Description"].Value;
             var language = node.Attributes["Language"].Value;
@@ -145,27 +147,27 @@ public TypeLibMap ExtractTypeLib(XmlNode node)
                     "Version"="2.1"
                 */
 
-                const string netMarshalGuid = "{00020424-0000-0000-C000-000000000046}";
+                const string universalMarshalerGuid = "{00020424-0000-0000-C000-000000000046}";
 
                 var guid = node.Attributes["Id"].Value;
                 var name = node.Attributes["Name"].Value;
                 var proxy = node.Attributes["ProxyStubClassId"]?.Value;
                 var proxy32 = node.Attributes["ProxyStubClassId32"]?.Value;
 
                 var entries = new List<RegistryEntry>();
-                entries.Add(new RegistryEntry($@"Interface\{guid}", null, name, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
+                entries.Add(new RegistryEntry($@"{baseFolder}Interface\{guid}", null, name, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
                 if (proxy != null)
                 {
-                    entries.Add(new RegistryEntry($@"Interface\{guid}\{proxy}", null, netMarshalGuid,
+                    entries.Add(new RegistryEntry($@"{baseFolder}Interface\{guid}\{proxy}", null, universalMarshalerGuid,
                         RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
                 }
                 if (proxy32 != null)
                 {
-                    entries.Add(new RegistryEntry($@"Interface\{guid}\{proxy32}", null, netMarshalGuid,
+                    entries.Add(new RegistryEntry($@"{baseFolder}Interface\{guid}\{proxy32}", null, universalMarshalerGuid,
                         RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
                 }
-                entries.Add(new RegistryEntry($@"Interface\{guid}\TypeLib", null, typeLibMap.Guid, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
-                entries.Add(new RegistryEntry($@"Interface\{guid}\TypeLib", "Version", typeLibMap.Version, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
+                entries.Add(new RegistryEntry($@"{baseFolder}Interface\{guid}\TypeLib", null, typeLibMap.Guid, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
+                entries.Add(new RegistryEntry($@"{baseFolder}Interface\{guid}\TypeLib", "Version", typeLibMap.Version, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
 
                 dict.Add(guid, entries);
             }
@@ -185,7 +187,7 @@ public TypeLibMap ExtractTypeLib(XmlNode node)
             var dict = new Dictionary<string, List<RegistryEntry>>();
             foreach (XmlNode node in recordList)
             {
-                var key = node.Attributes["Key"].Value;
+                var key = baseFolder + node.Attributes["Key"].Value;
                 var name = node.Attributes["Name"].Value;
                 var value = node.Attributes["Value"].Value;
                 var type = ParseRegistryType(node.Attributes["Type"].Value);
@@ -233,10 +235,10 @@ public List<ClassMap> ExtractClasses(XmlNode componentXml, TypeLibMap typeLibMap
                     [HKEY_LOCAL_MACHINE\Software\Classes\Wow6432Node\CLSID\{28754D11-10CC-45FD-9F6A-525A65412B7A}\ProgId]
                     @="Rubberduck.ParserState"                 
                 */
-                entries.Add(new RegistryEntry($@"CLSID\{guid}", null, description, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
-                entries.Add(new RegistryEntry($@"CLSID\{guid}\{context}", null, foreignServer, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
-                entries.Add(new RegistryEntry($@"CLSID\{guid}\{context}", "ThreadingModel", threadingModel, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
-                entries.Add(new RegistryEntry($@"CLSID\{guid}\ProgId", null, progId, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
+                entries.Add(new RegistryEntry($@"{baseFolder}CLSID\{guid}", null, description, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
+                entries.Add(new RegistryEntry($@"{baseFolder}CLSID\{guid}\{context}", null, foreignServer, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
+                entries.Add(new RegistryEntry($@"{baseFolder}CLSID\{guid}\{context}", "ThreadingModel", threadingModel, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
+                entries.Add(new RegistryEntry($@"{baseFolder}CLSID\{guid}\ProgId", null, progId, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
 
                 foreach (XmlNode registryNode in componentXml.SelectNodes($@"//RegistryValue[starts-with(@Key, 'CLSID\{guid}')]"))
                 {
@@ -253,7 +255,7 @@ public List<ClassMap> ExtractClasses(XmlNode componentXml, TypeLibMap typeLibMap
                         <RegistryValue Root="HKCR" Key="CLSID\{28754D11-10CC-45FD-9F6A-525A65412B7A}\InprocServer32" Name="CodeBase" Value="file:///[#filEC54EFF475370C463E57905243620C96]" Type="string" Action="write" />                
                     */
 
-                    var key = registryNode.Attributes["Key"].Value;
+                    var key = baseFolder + registryNode.Attributes["Key"].Value;
                     var name = registryNode.Attributes["Name"]?.Value;
                     var value = registryNode.Attributes["Value"].Value;
                     var type = ParseRegistryType(registryNode.Attributes["Type"].Value);
@@ -269,8 +271,8 @@ public List<ClassMap> ExtractClasses(XmlNode componentXml, TypeLibMap typeLibMap
                         @="{28754D11-10CC-45FD-9F6A-525A65412B7A}" 
                     */
 
-                    entries.Add(new RegistryEntry(progId, null, progIdDescription, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
-                    entries.Add(new RegistryEntry(progId + @"\CLSID", null, guid, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
+                    entries.Add(new RegistryEntry(baseFolder + progId, null, progIdDescription, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
+                    entries.Add(new RegistryEntry(baseFolder + progId + @"\CLSID", null, guid, RegistryValueKind.String, Bitness.IsPlatformDependent, fileMap));
                 }
 
                 classMaps.Add(new ClassMap(guid, context, description, threadingModel, progId, progIdDescription, entries));
@@ -300,3 +302,4 @@ private RegistryValueKind ParseRegistryType(string type)
         }
     }
 }
+