From 02755de003dde417d383d91d1094ee811a516774 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@github.com>
Date: Fri, 13 Mar 2015 13:59:14 -0700
Subject: [PATCH 1/7] Fix product id for msi

---
 src/MsiInstaller/Product.wxs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/MsiInstaller/Product.wxs b/src/MsiInstaller/Product.wxs
index 211c1b2c5..7ebbc9248 100644
--- a/src/MsiInstaller/Product.wxs
+++ b/src/MsiInstaller/Product.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
      xmlns:VSExtension="http://schemas.microsoft.com/wix/VSExtension">
-	<Product Id="*" Name="MsiInstaller" Language="1033" Version="1.0.0.0" Manufacturer="GitHub" UpgradeCode="ba510407-937d-43ab-a0d0-a23eb3efe376">
+	<Product Id="9DABDBBB-3AF1-4F38-A0E0-2B99DFE5057A" Name="MsiInstaller" Language="1033" Version="1.0.0.0" Manufacturer="GitHub" UpgradeCode="ba510407-937d-43ab-a0d0-a23eb3efe376">
 		<Package InstallerVersion="200" Compressed="yes" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
@@ -25,8 +25,8 @@
 		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
 			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
 			<Component Id="ProductComponent">
-        <VSExtension:VsixPackage File="VsixFile" PackageId="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" Target="pro" TargetVersion="14.0" />
-        <File Id="VsixFile" Name="GitHub.VisualStudio.vsix" Source="$(var.GitHub.VisualStudio.TargetDir)\GitHub.VisualStudio.vsix"/>
+		        <VSExtension:VsixPackage File="VsixFile" PackageId="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" />
+		        <File Id="VsixFile" Name="GitHub.VisualStudio.vsix" Source="$(var.GitHub.VisualStudio.TargetDir)\GitHub.VisualStudio.vsix"/>
 			</Component>
 		</ComponentGroup>
 	</Fragment>

From 88d7e09b49895efecbc94aeac67d8e598b9a75c0 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@github.com>
Date: Fri, 13 Mar 2015 13:59:47 -0700
Subject: [PATCH 2/7] Fix company name

---
 src/MsiInstaller/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MsiInstaller/Product.wxs b/src/MsiInstaller/Product.wxs
index 7ebbc9248..cd4e4e6be 100644
--- a/src/MsiInstaller/Product.wxs
+++ b/src/MsiInstaller/Product.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
      xmlns:VSExtension="http://schemas.microsoft.com/wix/VSExtension">
-	<Product Id="9DABDBBB-3AF1-4F38-A0E0-2B99DFE5057A" Name="MsiInstaller" Language="1033" Version="1.0.0.0" Manufacturer="GitHub" UpgradeCode="ba510407-937d-43ab-a0d0-a23eb3efe376">
+	<Product Id="9DABDBBB-3AF1-4F38-A0E0-2B99DFE5057A" Name="MsiInstaller" Language="1033" Version="1.0.0.0" Manufacturer="GitHub, Inc." UpgradeCode="ba510407-937d-43ab-a0d0-a23eb3efe376">
 		<Package InstallerVersion="200" Compressed="yes" />
 
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />

From cdc94c549b8631a759bbaed65ba3937b3529d4a2 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@github.com>
Date: Fri, 13 Mar 2015 14:00:12 -0700
Subject: [PATCH 3/7] Fix installer title

---
 src/MsiInstaller/Product.wxs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/MsiInstaller/Product.wxs b/src/MsiInstaller/Product.wxs
index cd4e4e6be..c249b4516 100644
--- a/src/MsiInstaller/Product.wxs
+++ b/src/MsiInstaller/Product.wxs
@@ -8,7 +8,7 @@
 		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 		<MediaTemplate />
 
-		<Feature Id="ProductFeature" Title="MsiInstaller" Level="1">
+		<Feature Id="ProductFeature" Title="GitHub Extension for Visual Studio" Level="1">
 			<ComponentGroupRef Id="ProductComponents" />
 		</Feature>
 	</Product>

From 20af629985d17e55d38e2566d79bcc9ee02d6cfb Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@github.com>
Date: Fri, 13 Mar 2015 15:44:43 -0700
Subject: [PATCH 4/7] Bump wix toolset support, fix titles

Bundle a custom build of wix with vs2015
extension installation support
(https://github.com/shana/WiX.Toolset.NuGet).
Fix titles for installer.
---
 src/MsiInstaller/MsiInstaller.wixproj | 8 ++++----
 src/MsiInstaller/Product.wxs          | 9 ++++-----
 src/MsiInstaller/packages.config      | 2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/MsiInstaller/MsiInstaller.wixproj b/src/MsiInstaller/MsiInstaller.wixproj
index 2e0c087ca..a25950f29 100644
--- a/src/MsiInstaller/MsiInstaller.wixproj
+++ b/src/MsiInstaller/MsiInstaller.wixproj
@@ -33,9 +33,6 @@
       <Name>WixVSExtension</Name>
     </WixExtension>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\GitHub.VisualStudio\GitHub.VisualStudio.csproj">
       <Name>GitHub.VisualStudio</Name>
@@ -46,8 +43,11 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="packages.config" />
+  </ItemGroup>
   <PropertyGroup>
-    <WixToolPath>$(SolutionDir)packages\WiX.Toolset.2015.3.10.0.1502\tools\wix\</WixToolPath>
+    <WixToolPath>$(SolutionDir)packages\WiX.Toolset.2015.3.10.0.1503\tools\wix\</WixToolPath>
     <WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>
     <WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>
   </PropertyGroup>
diff --git a/src/MsiInstaller/Product.wxs b/src/MsiInstaller/Product.wxs
index c249b4516..501eeeffc 100644
--- a/src/MsiInstaller/Product.wxs
+++ b/src/MsiInstaller/Product.wxs
@@ -2,11 +2,11 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
      xmlns:VSExtension="http://schemas.microsoft.com/wix/VSExtension">
-	<Product Id="9DABDBBB-3AF1-4F38-A0E0-2B99DFE5057A" Name="MsiInstaller" Language="1033" Version="1.0.0.0" Manufacturer="GitHub, Inc." UpgradeCode="ba510407-937d-43ab-a0d0-a23eb3efe376">
+	<Product Id="9DABDBBB-3AF1-4F38-A0E0-2B99DFE5057A" Name="GitHub Extension for Visual Studio"
+           Language="1033" Version="1.0.0.0" Manufacturer="GitHub, Inc." UpgradeCode="ba510407-937d-43ab-a0d0-a23eb3efe376">
 		<Package InstallerVersion="200" Compressed="yes" />
-
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-		<MediaTemplate />
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+		<MediaTemplate EmbedCab="yes"/>
 
 		<Feature Id="ProductFeature" Title="GitHub Extension for Visual Studio" Level="1">
 			<ComponentGroupRef Id="ProductComponents" />
@@ -23,7 +23,6 @@
 
 	<Fragment>
 		<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-			<!-- TODO: Remove the comments around this Component element and the ComponentRef below in order to add resources to this installer. -->
 			<Component Id="ProductComponent">
 		        <VSExtension:VsixPackage File="VsixFile" PackageId="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" />
 		        <File Id="VsixFile" Name="GitHub.VisualStudio.vsix" Source="$(var.GitHub.VisualStudio.TargetDir)\GitHub.VisualStudio.vsix"/>
diff --git a/src/MsiInstaller/packages.config b/src/MsiInstaller/packages.config
index 52a5af51c..d1c0c4a34 100644
--- a/src/MsiInstaller/packages.config
+++ b/src/MsiInstaller/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="WiX.Toolset.2015" version="3.10.0.1502" targetFramework="net4000" />
+  <package id="WiX.Toolset.2015" version="3.10.0.1503" targetFramework="net4000" />
 </packages>
\ No newline at end of file

From 7477346342e9e848540bd105a51954a1e0e14d35 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@github.com>
Date: Fri, 13 Mar 2015 16:04:59 -0700
Subject: [PATCH 5/7] Let's see if this works

---
 src/GitHub.VisualStudio/packages.config |  1 -
 src/MsiInstaller/MsiInstaller.wixproj   | 24 ++++++++++++------------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/GitHub.VisualStudio/packages.config b/src/GitHub.VisualStudio/packages.config
index 7ca9c49bf..af637e82e 100644
--- a/src/GitHub.VisualStudio/packages.config
+++ b/src/GitHub.VisualStudio/packages.config
@@ -9,5 +9,4 @@
   <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
   <package id="Rx-XAML" version="2.2.5" targetFramework="net45" />
-  <package id="WiX.Toolset.2015" version="3.10.0.1502" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/MsiInstaller/MsiInstaller.wixproj b/src/MsiInstaller/MsiInstaller.wixproj
index a25950f29..3da2d9a85 100644
--- a/src/MsiInstaller/MsiInstaller.wixproj
+++ b/src/MsiInstaller/MsiInstaller.wixproj
@@ -24,6 +24,18 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|x86' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|Any CPU' ">
+    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
   </ItemGroup>
@@ -55,18 +67,6 @@
   <PropertyGroup>
     <PostBuildEvent />
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|x86' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|Any CPU' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
 	Other similar extension points exist, see Wix.targets.

From c8d42a9b8f1650df79e841d6c6063289a6d16fb5 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@github.com>
Date: Fri, 13 Mar 2015 16:13:34 -0700
Subject: [PATCH 6/7] Nope, doesn't work.

We need to have a non-wix project to install the wix toolset
package, it's an egg-and-chicken problem (wix project won't load
unless the package is installed, package won't be installed until
project is loaded)
---
 src/GitHub.VisualStudio/packages.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/GitHub.VisualStudio/packages.config b/src/GitHub.VisualStudio/packages.config
index af637e82e..db9dacc89 100644
--- a/src/GitHub.VisualStudio/packages.config
+++ b/src/GitHub.VisualStudio/packages.config
@@ -9,4 +9,5 @@
   <package id="Rx-Main" version="2.2.5" targetFramework="net45" />
   <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net45" />
   <package id="Rx-XAML" version="2.2.5" targetFramework="net45" />
+  <package id="WiX.Toolset.2015" version="3.10.0.1503" targetFramework="net45" />
 </packages>
\ No newline at end of file

From f444297c9ecc93d9f0367916885a066dd62fb4d6 Mon Sep 17 00:00:00 2001
From: Andreia Gaita <shana@github.com>
Date: Fri, 13 Mar 2015 16:26:34 -0700
Subject: [PATCH 7/7] Fix msi filename, upgrade code

---
 .gitignore                            |  3 ++-
 src/MsiInstaller/MsiInstaller.wixproj | 20 +++++++++++---------
 src/MsiInstaller/Product.wxs          |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index aed167395..b10381250 100644
--- a/.gitignore
+++ b/.gitignore
@@ -231,4 +231,5 @@ $RECYCLE.BIN/
 *.msp
 
 AkavacheSqliteLinkerOverride.cs
-NuGetBuild
\ No newline at end of file
+NuGetBuild
+WiX.Toolset.DummyFile.txt
\ No newline at end of file
diff --git a/src/MsiInstaller/MsiInstaller.wixproj b/src/MsiInstaller/MsiInstaller.wixproj
index 3da2d9a85..d42e45035 100644
--- a/src/MsiInstaller/MsiInstaller.wixproj
+++ b/src/MsiInstaller/MsiInstaller.wixproj
@@ -6,7 +6,7 @@
     <ProductVersion>3.9</ProductVersion>
     <ProjectGuid>1ed83084-2a57-4f89-915c-8a2167c0d6bc</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>GitHub.VisualStudio</OutputName>
+    <OutputName>ghfvs</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -23,18 +23,20 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|x86' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <SuppressAllWarnings>False</SuppressAllWarnings>
+    <Pedantic>True</Pedantic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressAllWarnings>False</SuppressAllWarnings>
+    <Pedantic>True</Pedantic>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|Any CPU' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
+    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressAllWarnings>False</SuppressAllWarnings>
+    <Pedantic>True</Pedantic>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
diff --git a/src/MsiInstaller/Product.wxs b/src/MsiInstaller/Product.wxs
index 501eeeffc..cb4bb86bd 100644
--- a/src/MsiInstaller/Product.wxs
+++ b/src/MsiInstaller/Product.wxs
@@ -3,7 +3,7 @@
      xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
      xmlns:VSExtension="http://schemas.microsoft.com/wix/VSExtension">
 	<Product Id="9DABDBBB-3AF1-4F38-A0E0-2B99DFE5057A" Name="GitHub Extension for Visual Studio"
-           Language="1033" Version="1.0.0.0" Manufacturer="GitHub, Inc." UpgradeCode="ba510407-937d-43ab-a0d0-a23eb3efe376">
+           Language="1033" Version="1.0.0.0" Manufacturer="GitHub, Inc." UpgradeCode="BA510407-937D-43AB-A0D0-A23EB3EFE376">
 		<Package InstallerVersion="200" Compressed="yes" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
 		<MediaTemplate EmbedCab="yes"/>