Fix Issue #9 - Add GlobalParams back to installer

Fix regression caused by removal of "old" addin
iswix-llc · Nov 17, 2018 · 7e1c071 · 7e1c071
1 parent 67b3037
commit 7e1c071
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/Source/Application/IsWiXNewAddIn/IsWiXNewAddIn.csproj b/Source/Application/IsWiXNewAddIn/IsWiXNewAddIn.csproj
@@ -71,6 +71,9 @@
     <Reference Include="envdte90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="GlobalParams">
+      <HintPath>..\..\..\ExternalAssemblies\GlobalParams.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
     <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">

diff --git a/Source/Installer/IsWiXNewAddInMM/IsWiXNewAddInMMcustom.wxs b/Source/Installer/IsWiXNewAddInMM/IsWiXNewAddInMMcustom.wxs
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Fragment>
-    
+
     <!-- Reference Custom Components Below -->
     <ComponentGroup Id="Custom">
-
+      <ComponentRef Id="globalparams"/>
     </ComponentGroup>
 
     <!-- Author Custom Components Below -->
     <DirectoryRef Id="MergeRedirectFolder">
-
-    </DirectoryRef>
 
+    </DirectoryRef>
+    <DirectoryRef Id="TARGETDIR">
+      <Directory Id="GlobalAssemblyCache" Name="GlobalAssemblyCache">
+        <Component Id="globalparams" Guid="{B07FF430-AAB4-49E6-8035-60142942F325}" Permanent="yes">
+          <File Id="globalparams" Source="..\..\..\ExternalAssemblies\GlobalParams.dll" KeyPath="yes" Assembly=".net"/>
+        </Component>
+      </Directory>
+    </DirectoryRef>
   </Fragment>
 </Wix>