~rahmadani/bzr-visualstudio/+git/trunk:grokys/build-for-2017-on-2015

Last commit made on 2016-11-23
Get this branch:
git clone -b grokys/build-for-2017-on-2015 https://git.launchpad.net/~rahmadani/bzr-visualstudio/+git/trunk

Branch merges

Branch information

Name:
grokys/build-for-2017-on-2015
Repository:
lp:~rahmadani/bzr-visualstudio/+git/trunk

Recent commits

545b125... by Steven Kirk <email address hidden>

Updated scripts for building VS2017 vsix packages on VS2015.

6c4209d... by Steven Kirk <email address hidden>

Allow building .vsix packages for VS2017 on VS2015.

Until VS2017 is out we need the option of building .vsix packages for
VS2017 on VS2015. To do this supply the `/p:VsixVersion=15` option to
msbuild. This will use a slightly the hacked
`lib\Microsoft.VsSDK.targets` instead of the standard one.

6063987... by Steven Kirk <email address hidden>

Update Publish configuration.

Set all projects to not build under `Publish` except
`GitHub.VisualStudio` and the configuration on that set to `Publish`.

bbc0ae8... by Steven Kirk <email address hidden>

Update StartPage submodule again.

6242fc7... by Steven Kirk <email address hidden>

Bump version to 2.2.0.0

c7d43e3... by Steven Kirk <email address hidden>

Removed duplicate <ApplicationVersion> element.

50c502c... by Steven Kirk <email address hidden>

Updated StartPage submodule to build on VS2015.

bc321e2... by Steven Kirk <email address hidden>

Merge branch 'release/2.1.0'

 Conflicts:
 src/GitHub.App/SampleData/SampleViewModels.cs
 src/GitHub.App/ViewModels/RepositoryCloneViewModel.cs
 src/GitHub.Exports.Reactive/ViewModels/IRepositoryCloneViewModel.cs
 src/GitHub.VisualStudio.UI/Resources.resx
 src/GitHub.VisualStudio/GitHubPackage.cs
 src/GitHub.VisualStudio/source.extension.vsixmanifest
 src/MsiInstaller/Version.wxi
 src/common/SolutionInfo.cs

Also had to downgrade Microsoft.VSSDK.BuildTools to version 14.

c8411f0... by Andreia Gaita <email address hidden>

Merge pull request #693 from github/fixes/692-info-panel-icon

Set default info panel icon color and type

736158e... by Jasmine Greenaway <email address hidden>

set icon and icon color to info type