Skip to content

Commit 0942b44

Browse files
committed
Build individual vsix packages: VS2010-VS2015 (vsixmanifest v1) and VS2017+
Also: * Replaced old msbuild helper on hMSBuild 2.1 https://github.com/3F/hMSBuild * Updated GetNuTool up to 1.7 https://github.com/3F/GetNuTool * Disabled Devenv for SDK15 * Changed id 1 to 0 for initToolPane / initToolPaneAsync
1 parent 86c2c92 commit 0942b44

31 files changed

Lines changed: 900 additions & 316 deletions

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## Specific
22

3+
/vsSolutionBuildEvent/source.extension.vsixmanifest
4+
35
/vsSolutionBuildEvent/Version.cs
46
/Bridge/Version.cs
57
/CI.MSBuild/Version.cs

.gnt/gnt.core

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

.vssbe

Lines changed: 118 additions & 62 deletions
Large diffs are not rendered by default.

CI.MSBuild/CI.MSBuild.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ REM # The documentation: http://vssbe.r-eg.net/doc/CI/CI.MSBuild/
33

44
set cimdll=CI.MSBuild.dll
55

6-
msbuild %* /l:"%~dp0%cimdll%" /nologo
6+
hMSBuild %* /l:"%~dp0%cimdll%" /nologo

CI.MSBuild/CI.MSBuild.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
<None Include="$(SolutionDir)\tools\gnt.bat">
9393
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9494
</None>
95-
<None Include="$(SolutionDir)\tools\msbuild.bat">
95+
<None Include="$(SolutionDir)\tools\hMSBuild.bat">
9696
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
9797
</None>
9898
<None Include="CI.MSBuild.bat">

Devenv/Devenv.AddIn

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
<Version>12.0</Version>
1414
</HostApplication>
1515
<Addin>
16-
<FriendlyName>vsSolutionBuildEvent Devenv Command-Line</FriendlyName>
17-
<Description>Add-in to vsSolutionBuildEvent</Description>
16+
<FriendlyName>vsSolutionBuildEvent Devenv</FriendlyName>
17+
<Description>vsSolutionBuildEvent Devenv Command-Line version</Description>
1818
<Assembly>Devenv/Devenv.dll</Assembly>
1919
<FullClassName>net.r_eg.vsSBE.Devenv.Connect</FullClassName>
2020
<LoadBehavior>4</LoadBehavior>

VsixLib.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
<!-- tools -->
4343
<VsixLib Include="$(SolutionDir)\tools\gnt.bat" />
44-
<VsixLib Include="$(SolutionDir)\tools\msbuild.bat" />
44+
<VsixLib Include="$(SolutionDir)\tools\hMSBuild.bat" />
4545

4646
</ItemGroup>
4747

appveyor.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

build.bat

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
@echo off
2+
3+
REM # Version of used CI.MSBuild
4+
set cimdll=packages\vsSBE.CI.MSBuild\bin\CI.MSBuild.dll
5+
6+
REM # MSBuild tools
7+
set _msbuild=tools\hMSBuild -notamd64
8+
9+
REM # Solution file by defualt
10+
set sln=vsSolutionBuildEvent.sln
11+
12+
REM # Platform by default
13+
set platform="Any CPU"
14+
15+
REM # Verbosity level by default: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic].
16+
set level=minimal
17+
18+
set _gnt=tools\gnt
19+
20+
:::: --------
21+
22+
REM # Configuration name without postfix _SDK...
23+
:: DBG == Debug; REL == Release; DCI == CI Debug; RCI == CI Release;
24+
25+
set reltype=%~1
26+
27+
if "%reltype%"=="" (
28+
set "reltype=DCI"
29+
)
30+
31+
:::: --------
32+
33+
set __p_call=1
34+
35+
:: Packages
36+
37+
call %_msbuild% ".gnt/gnt.core" /p:ngpath="%cd%/packages" /p:ngconfig="%cd%/.gnt/packages.config;%cd%/vsSolutionBuildEvent/packages.config;%cd%/vsSolutionBuildEventTest/packages.config" /nologo /v:m
38+
39+
:: Build
40+
41+
set bnode=%_msbuild% %sln% /m:4 /l:"%cimdll%" /p:Platform=%platform% /v:%level%
42+
43+
call %bnode% /p:Configuration=%reltype%_SDK10 /t:Rebuild || goto err
44+
call %bnode% /p:Configuration=%reltype%_SDK15 /t:Build || goto err
45+
46+
goto ok
47+
48+
:err
49+
50+
echo. Build failed. 1>&2
51+
exit /B 1
52+
53+
:ok
54+
exit /B 0

build/Readme.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)