Skip to content

Commit 5b4db44

Browse files
3F3F
committed
New NuGet packages vsSBE.CI.MSBuild -> vsSolutionBuildEvent
.\tools folder .\cim.cmd helper +added StackTrace to inspect possible #43 in future
1 parent b8b8990 commit 5b4db44

14 files changed

Lines changed: 73 additions & 64 deletions

File tree

‎.vssbe‎

Lines changed: 27 additions & 24 deletions
Large diffs are not rendered by default.

‎CI.MSBuild/.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.7.0
1+
1.7

‎CI.MSBuild/CI.MSBuild.bat‎

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

‎CI.MSBuild/CI.MSBuild.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
<None Include="$(SolutionDir)\tools\hMSBuild.bat">
100100
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
101101
</None>
102-
<None Include="CI.MSBuild.bat">
102+
<None Include="cim.cmd">
103103
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
104104
</None>
105105
<None Include="key.snk" />

‎CI.MSBuild/Initializer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ public ILibrary load(InitializerProperties prop)
149149
prop.LibraryPath
150150
);
151151

152-
log.info("Library: loaded from '{0}' :: v{1} [{2}] API: v{3} /'{4}':{5}",
152+
log.info("Core Library: v{1}+{2} API: v{3} /'{4}':{5}; '{0}'",
153153
library.Dllpath,
154154
library.Version.Number.ToString(),
155155
library.Version.BranchSha1,

‎CI.MSBuild/cim.cmd‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
@echo off
2+
REM # https://github.com/3F/vsSolutionBuildEvent
3+
4+
set "_wdir=%~dp0\tools"
5+
set cimdll=%_wdir%\CI.MSBuild.dll
6+
7+
%_wdir%\hMSBuild %* /l:"%cimdll%" /nologo

‎build.bat‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ call %_gnt% /p:ngpath="%cd%/packages" /p:ngconfig="%cd%/.gnt/packages.config" ||
4343

4444
set bnode=%_msbuild% %sln% /m:4 /l:"%cimdll%" /p:Platform=%platform% /v:%level% /nologo
4545

46-
call %bnode% /p:Configuration=%reltype%_SDK10 /t:Rebuild || goto err
46+
rem call git clean -x -e \.vs -e \.user -d
47+
call %bnode% /p:Configuration=%reltype%_SDK10 /t:Build || goto err
4748
call %bnode% /p:Configuration=%reltype%_SDK15 /t:Build || goto err
4849

4950
goto ok

tools/vsSBE.CI.MSBuild.nuspec renamed to tools/vsSolutionBuildEvent.nuspec

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata>
4-
<id>vsSBE.CI.MSBuild</id>
5-
<title>vsSolutionBuildEvent CI.MSBuild</title>
4+
<id>vsSolutionBuildEvent</id>
5+
<title>vsSolutionBuildEvent</title>
66
<version>%CIM%</version>
77
<authors>github.com/3F/vsSolutionBuildEvent</authors>
88
<license type="file">bin\LICENSE</license>
@@ -22,11 +22,9 @@
2222
https://github.com/3F/E-MSBuild
2323

2424
* Visual Studio VSIX: https://visualstudiogallery.msdn.microsoft.com/0d1dbfd7-ed8a-40af-ae39-281bfeca2334/
25-
26-
Package %CIM% includes vsSolutionBuildEvent %vsSBE%
27-
25+
2826
=======================================
29-
gnt /p:ngpackages="vsSBE.CI.MSBuild/%CIM%"
27+
gnt /p:ngpackages="vsSolutionBuildEvent/%CIM%"
3028
================== https://github.com/3F/GetNuTool
3129

3230

@@ -35,11 +33,8 @@
3533
{build_info}
3634

3735
</description>
38-
<summary>Event-Catcher with variety of advanced Actions to service projects, libraries, the build processes and processes at runtime from Visual Studio and MSBuild Tools.</summary>
39-
<releaseNotes>
40-
Updated the vsSolutionBuildEvent library: v%vsSBE%
41-
Changelog here: https://github.com/3F/vsSolutionBuildEvent/blob/master/changelog.txt
42-
</releaseNotes>
36+
<summary>Control everything: Visual Studio, MSBuild Tools, CI, and more …</summary>
37+
<releaseNotes>https://github.com/3F/vsSolutionBuildEvent/blob/master/changelog.txt</releaseNotes>
4338
<copyright>Copyright (c) 2013-2016,2019 Denis Kuzmin &lt; entry.reg@gmail.com &gt; GitHub/3F</copyright>
4439
<tags>Build Tools automation Scripts DevOps Events CI DevTools SobaScript E-MSBuild Projects AppVeyor Azure TeamCity Continuous-Integration logger Build-automation Compiler AzureDevOps Version 7z 7zip post-build scripting Varhead EvMSBuild zip http Productivity sln Files ftp Commands NuGet MSBuild pre-build Versioning downloader archiver GetNuTool vsSBE vsSolutionBuildEvent</tags>
4540
</metadata>

‎vsSolutionBuildEvent.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{849DD790
5050
ProjectSection(SolutionItems) = preProject
5151
tools\gnt.bat = tools\gnt.bat
5252
tools\hMSBuild.bat = tools\hMSBuild.bat
53-
tools\vsSBE.CI.MSBuild.nuspec = tools\vsSBE.CI.MSBuild.nuspec
53+
tools\vsSolutionBuildEvent.nuspec = tools\vsSolutionBuildEvent.nuspec
5454
EndProjectSection
5555
EndProject
5656
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VsixLib", "VsixLib", "{A6FD95A3-7093-47C2-9183-5629ABC4A955}"

‎vsSolutionBuildEvent/API/EventLevel.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@ public int onProjectPre(IVsHierarchy pHierProj, IVsCfg pCfgProj, IVsCfg pCfgSln,
246246
return ret;
247247
}
248248
catch(Exception ex) {
249-
Log.Error("Failed Project.Pre-binding: '{0}'", ex.Message);
249+
Log.Error($"Failed Project.Pre-binding: '{ex.Message}'");
250+
Log.Debug(ex.StackTrace); // to an unclear issue #43
250251
}
251252
return Codes.Failed;
252253
}
@@ -266,7 +267,8 @@ public int onProjectPre(string project)
266267
return ret;
267268
}
268269
catch(Exception ex) {
269-
Log.Error("Failed Project.Pre-binding/simple: '{0}'", ex.Message);
270+
Log.Error($"Failed Project.Pre-binding/simple: '{ex.Message}'");
271+
Log.Debug(ex.StackTrace); // to an unclear issue #43
270272
}
271273
return Codes.Failed;
272274
}
@@ -295,7 +297,8 @@ public int onProjectPost(IVsHierarchy pHierProj, IVsCfg pCfgProj, IVsCfg pCfgSln
295297
return ret;
296298
}
297299
catch(Exception ex) {
298-
Log.Error("Failed Project.Post-binding: '{0}'", ex.Message);
300+
Log.Error($"Failed Project.Post-binding: '{ex.Message}'");
301+
Log.Debug(ex.StackTrace); // to an unclear issue #43
299302
}
300303
return Codes.Failed;
301304
}
@@ -316,7 +319,8 @@ public int onProjectPost(string project, int fSuccess)
316319
return ret;
317320
}
318321
catch(Exception ex) {
319-
Log.Error("Failed Project.Post-binding/simple: '{0}'", ex.Message);
322+
Log.Error($"Failed Project.Post-binding/simple: '{ex.Message}'");
323+
Log.Debug(ex.StackTrace); // to an unclear issue #43
320324
}
321325
return Codes.Failed;
322326
}

0 commit comments

Comments
 (0)