github
/
VisualStudio
зеркало из https://github.com/github/VisualStudio.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merge pull request #87 from github/shana/installer 

Installer fixes
This commit is contained in:
Phil Haack 2015-03-13 17:04:56 -07:00
Родитель e99c17fd7d f444297c9e
Коммит e8fc6d521e
5 изменённых файлов: 30 добавлений и 28 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
.gitignore поставляемый
Просмотреть файл

@ -231,4 +231,5 @@ $RECYCLE.BIN/
*.msp
AkavacheSqliteLinkerOverride.cs
NuGetBuild
NuGetBuild
WiX.Toolset.DummyFile.txt

2
src/GitHub.VisualStudio/packages.config
Просмотреть файл

@ -9,5 +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.1502" targetFramework="net45" />
<package id="WiX.Toolset.2015" version="3.10.0.1503" targetFramework="net45" />
</packages>

36
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,6 +23,20 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|x86' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<SuppressAllWarnings>False</SuppressAllWarnings>
<Pedantic>True</Pedantic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|AnyCPU' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<SuppressAllWarnings>False</SuppressAllWarnings>
<Pedantic>True</Pedantic>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Publish|Any CPU' ">
<OutputPath>bin\$(Configuration)\</OutputPath>
<IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
<SuppressAllWarnings>False</SuppressAllWarnings>
<Pedantic>True</Pedantic>
</PropertyGroup>
<ItemGroup>
<Compile Include="Product.wxs" />
@ -33,9 +47,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 +57,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>
@ -55,18 +69,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.

15
src/MsiInstaller/Product.wxs
Просмотреть файл

@ -2,13 +2,13 @@
<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="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 EmbedCab="yes"/>
<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>
@ -23,10 +23,9 @@
<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" 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>

2
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>