Skip to content

Commit 84f236f

Browse files
heathsheaths
committed
Package VSIXBootstrapper into tools package
1 parent da6662a commit 84f236f

File tree

8 files changed

+119
-3
lines changed

8 files changed

+119
-3
lines changed

Diff for: ‎.nuget/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="NuProj" version="0.11.14-beta" />
4+
</packages>

Diff for: ‎CONTRIBUTING.md

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Contributing
2+
============
3+
4+
## Prerequisites
5+
6+
This project uses the following software. Newer versions may work but backward compatibility must be maintained.
7+
8+
* [Visual Studio 2015](https://www.visualstudio.com/en-us/downloads/visual-studio-2015-downloads-vs.aspx)
9+
10+
### Optional
11+
12+
Some projects require optional software to open or otherwise use in Visual Studio. They are not required to build the solution using MSBuild.
13+
14+
* [NuProj Package Project](https://marketplace.visualstudio.com/items?itemName=NuProjTeam.NuGetPackageProject)

Diff for: ‎VSIXBootstrapper.sln

+20-2
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,50 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26120.4
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "VSIXBootstrapper", "src\VSIXBootstrapper\VSIXBootstrapper.vcxproj", "{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}"
77
EndProject
88
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3A5D9917-703F-4280-81ED-F2E2BA648CB8}"
99
EndProject
1010
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{168CF38F-E3C9-43E1-BEC9-101BC97E926F}"
1111
ProjectSection(SolutionItems) = preProject
12+
CONTRIBUTING.md = CONTRIBUTING.md
1213
LICENSE.txt = LICENSE.txt
1314
EndProjectSection
1415
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "pkg", "pkg", "{8EB71D2B-70CF-418B-9EE8-9B3BE2EE2D9B}"
17+
EndProject
18+
Project("{FF286327-C783-4F7A-AB73-9BCBAD0D4460}") = "VSIXBootstrapper", "pkg\VSIXBootstrapper\VSIXBootstrapper.nuproj", "{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}"
19+
EndProject
1520
Global
1621
GlobalSection(SolutionConfigurationPlatforms) = preSolution
22+
Debug|Any CPU = Debug|Any CPU
1723
Debug|x86 = Debug|x86
24+
Release|Any CPU = Release|Any CPU
1825
Release|x86 = Release|x86
1926
EndGlobalSection
2027
GlobalSection(ProjectConfigurationPlatforms) = postSolution
28+
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}.Debug|Any CPU.ActiveCfg = Debug|Win32
2129
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}.Debug|x86.ActiveCfg = Debug|Win32
2230
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}.Debug|x86.Build.0 = Debug|Win32
31+
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}.Release|Any CPU.ActiveCfg = Release|Win32
2332
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}.Release|x86.ActiveCfg = Release|Win32
2433
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067}.Release|x86.Build.0 = Release|Win32
34+
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Debug|x86.ActiveCfg = Debug|Any CPU
37+
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Debug|x86.Build.0 = Debug|Any CPU
38+
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Release|x86.ActiveCfg = Release|Any CPU
41+
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB}.Release|x86.Build.0 = Release|Any CPU
2542
EndGlobalSection
2643
GlobalSection(SolutionProperties) = preSolution
2744
HideSolutionNode = FALSE
2845
EndGlobalSection
2946
GlobalSection(NestedProjects) = preSolution
3047
{22FFC1AB-F3E2-4379-B26E-67D67E2A1067} = {3A5D9917-703F-4280-81ED-F2E2BA648CB8}
48+
{8704FCB5-C4CA-4015-81AA-6B3AA577B3FB} = {8EB71D2B-70CF-418B-9EE8-9B3BE2EE2D9B}
3149
EndGlobalSection
3250
EndGlobal

Diff for: ‎pkg/VSIXBootstrapper/VSIXBootstrapper.nuproj

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|AnyCPU">
5+
<Configuration>Debug</Configuration>
6+
<Platform>AnyCPU</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|AnyCPU">
9+
<Configuration>Release</Configuration>
10+
<Platform>AnyCPU</Platform>
11+
</ProjectConfiguration>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<ProjectReference Include="..\..\src\VSIXBootstrapper\VSIXBootstrapper.vcxproj">
15+
<PackageDirectory>Tools</PackageDirectory>
16+
</ProjectReference>
17+
</ItemGroup>
18+
<ItemGroup>
19+
<Content Include="build\VSIXBootstrapper.props" />
20+
<None Include="packages.config" />
21+
</ItemGroup>
22+
<PropertyGroup Label="Globals">
23+
<ProjectGuid>8704fcb5-c4ca-4015-81aa-6b3aa577b3fb</ProjectGuid>
24+
</PropertyGroup>
25+
<PropertyGroup>
26+
<NuProjPath Condition=" '$(NuProjPath)' == '' ">$(MSBuildExtensionsPath)\NuProj\</NuProjPath>
27+
<VersionDependsOn>$(VersionDependsOn);GetNuPkgVersion</VersionDependsOn>
28+
</PropertyGroup>
29+
<Import Project="$(NuProjPath)\NuProj.props" Condition="Exists('$(NuProjPath)\NuProj.props')" />
30+
<PropertyGroup Label="Configuration">
31+
<Id>VSIXBootstrapper</Id>
32+
<Version>1.0.0</Version>
33+
<Title>VSIX Installer Bootstrapper</Title>
34+
<Authors>Microsoft Corporation</Authors>
35+
<Owners>Microsoft Corporation</Owners>
36+
<Summary>VSIX Installer Bootstrapper</Summary>
37+
<Description>An installer that can be chained with other packages to locate the latest VSIXInstaller.exe to use for installing VSIX extensions.</Description>
38+
<ReleaseNotes>
39+
</ReleaseNotes>
40+
<ProjectUrl>https://github.com/Microsoft/vsixbootstrapper</ProjectUrl>
41+
<LicenseUrl>https://github.com/Microsoft/vsixbootstrapper/raw/develop/LICENSE.txt</LicenseUrl>
42+
<Copyright>Copyright (C) Microsoft Corporation. All rights reserved.</Copyright>
43+
<Tags>VisualStudio VSIX Installer</Tags>
44+
<DevelopmentDependency>true</DevelopmentDependency>
45+
</PropertyGroup>
46+
<Target Name="GetNuPkgVersion" DependsOnTargets="GetBuildVersion">
47+
<PropertyGroup>
48+
<Version>$(NuGetPackageVersion)</Version>
49+
</PropertyGroup>
50+
</Target>
51+
<Import Project="$(NuProjPath)\NuProj.targets" />
52+
<ImportGroup Label="ExtensionTargets">
53+
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.62\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.62\build\NerdBank.GitVersioning.targets')" />
54+
</ImportGroup>
55+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
56+
<PropertyGroup>
57+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
58+
</PropertyGroup>
59+
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.62\build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.62\build\NerdBank.GitVersioning.targets'))" />
60+
</Target>
61+
</Project>

Diff for: ‎pkg/VSIXBootstrapper/build/VSIXBootstrapper.props

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<VSIXBootstrapperDir>$(MSBuildThisFileDirectory)..\tools\</VSIXBootstrapperDir>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<Content Include="$(VSIXBootstrapperDir)VSIXBootstrapper.exe">
8+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
9+
<Link>VSIXBootstrapper.exe</Link>
10+
</Content>
11+
</ItemGroup>
12+
</Project>

Diff for: ‎pkg/VSIXBootstrapper/packages.config

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Nerdbank.GitVersioning" version="1.5.62" targetFramework="native" developmentDependency="true" />
4+
</packages>

Diff for: ‎src/VSIXBootstrapper/VSIXBootstrapper.vcxproj

+3-1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@
127127
<Import Project="..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.5.125-rc\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets" Condition="Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.5.125-rc\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" />
128128
<Import Project="..\..\packages\Nerdbank.GitVersioning.1.5.62\build\NerdBank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.1.5.62\build\NerdBank.GitVersioning.targets')" />
129129
<Import Project="..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets" Condition="Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" />
130+
<Import Project="..\..\packages\NuProj.Common.0.11.14-beta\build\NuProj.Common.targets" Condition="Exists('..\..\packages\NuProj.Common.0.11.14-beta\build\NuProj.Common.targets')" />
130131
</ImportGroup>
131132
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
132133
<PropertyGroup>
@@ -136,5 +137,6 @@
136137
<Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.1.5.62\build\NerdBank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.1.5.62\build\NerdBank.GitVersioning.targets'))" />
137138
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.props'))" />
138139
<Error Condition="!Exists('..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\MicroBuild.Core.0.2.0\build\MicroBuild.Core.targets'))" />
140+
<Error Condition="!Exists('..\..\packages\NuProj.Common.0.11.14-beta\build\NuProj.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NuProj.Common.0.11.14-beta\build\NuProj.Common.targets'))" />
139141
</Target>
140-
</Project>
142+
</Project>

Diff for: ‎src/VSIXBootstrapper/packages.config

+1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@
33
<package id="MicroBuild.Core" version="0.2.0" targetFramework="native" developmentDependency="true" />
44
<package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.5.125-rc" targetFramework="native" developmentDependency="true" />
55
<package id="Nerdbank.GitVersioning" version="1.5.62" targetFramework="native" developmentDependency="true" />
6+
<package id="NuProj.Common" version="0.11.14-beta" targetFramework="native" developmentDependency="true" />
67
</packages>

0 commit comments

Comments
 (0)