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.
This commit is contained in:
Andreia Gaita 2015-03-13 15:44:43 -07:00
Родитель cdc94c549b
Коммит 20af629985
3 изменённых файлов: 9 добавлений и 10 удалений

Просмотреть файл

@ -33,9 +33,6 @@
<Name>WixVSExtension</Name> <Name>WixVSExtension</Name>
</WixExtension> </WixExtension>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\GitHub.VisualStudio\GitHub.VisualStudio.csproj"> <ProjectReference Include="..\GitHub.VisualStudio\GitHub.VisualStudio.csproj">
<Name>GitHub.VisualStudio</Name> <Name>GitHub.VisualStudio</Name>
@ -46,8 +43,11 @@
<RefTargetDir>INSTALLFOLDER</RefTargetDir> <RefTargetDir>INSTALLFOLDER</RefTargetDir>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="packages.config" />
</ItemGroup>
<PropertyGroup> <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> <WixTargetsPath>$(WixToolPath)wix.targets</WixTargetsPath>
<WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath> <WixTasksPath>$(WixToolPath)WixTasks.dll</WixTasksPath>
</PropertyGroup> </PropertyGroup>

Просмотреть файл

@ -2,11 +2,11 @@
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension"
xmlns:VSExtension="http://schemas.microsoft.com/wix/VSExtension"> 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" /> <Package InstallerVersion="200" Compressed="yes" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> <MediaTemplate EmbedCab="yes"/>
<MediaTemplate />
<Feature Id="ProductFeature" Title="GitHub Extension for Visual Studio" Level="1"> <Feature Id="ProductFeature" Title="GitHub Extension for Visual Studio" Level="1">
<ComponentGroupRef Id="ProductComponents" /> <ComponentGroupRef Id="ProductComponents" />
@ -23,7 +23,6 @@
<Fragment> <Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> <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"> <Component Id="ProductComponent">
<VSExtension:VsixPackage File="VsixFile" PackageId="c3d3dc68-c977-411f-b3e8-03b0dccf7dfc" /> <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"/> <File Id="VsixFile" Name="GitHub.VisualStudio.vsix" Source="$(var.GitHub.VisualStudio.TargetDir)\GitHub.VisualStudio.vsix"/>

Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <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> </packages>