Solution converted to VS2015, added the ability to display the solution or the master project

Author: Evengard

Logger.cs

@@ -28,6 +28,9 @@ public MsBuildToCCNetLogger()
 
         private string logfile;
         private string commonPrefix;
+
+        private string currentSolution = null;
+
         private int commonPrefixLength;
         MessageImportance loglevel;
 
@@ -101,6 +104,11 @@ private void WriteLog(XmlWriter w)
         {
             w.WriteStartDocument();
             w.WriteStartElement("msbuild");
+            if (currentSolution != null)
+            {
+                w.WriteAttributeString("solution_name", Path.GetFileName(currentSolution));
+                w.WriteAttributeString("solution_dir", Path.GetDirectoryName(currentSolution));
+            }
             w.WriteAttributeString("project_count", XmlConvert.ToString(projects.Count));
 
             int errorCount = 0;
@@ -185,6 +193,16 @@ private void WriteMessages(XmlWriter w, IEnumerable<Message> list)
 
         private void OnProjectStarted(object sender, ProjectStartedEventArgs e)
         {
+            if ( (currentSolution == null || currentSolution.EndsWith(".csproj")) && e.ProjectFile.EndsWith(".sln"))
+            {
+                currentSolution = RemoveCommonPrefix(e.ProjectFile);
+            }
+
+            if (currentSolution == null && e.ProjectFile.EndsWith(".csproj"))
+            {
+                currentSolution = RemoveCommonPrefix(e.ProjectFile);
+            }
+
             if (!file_to_project.TryGetValue(e.ProjectFile, out this.current_project))
             {
                 current_project = new Project(e.ProjectFile);

MsBuildToCCNet.csproj

@@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -17,6 +18,12 @@
     </SccAuxPath>
     <SccProvider>
     </SccProvider>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <OldToolsVersion>2.0</OldToolsVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

MsBuildToCCnet.sln

@@ -1,6 +1,8 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.23107.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MsBuildToCCNet", "MsBuildToCCNet.csproj", "{E9D3235E-2268-4846-B9EC-DFE24AAA438D}"
 EndProject
 Global

Project.cs

@@ -48,6 +48,11 @@ public int WarningCount
             get { return warnings.Count; }
         }
 
+        public int MessageCount
+        {
+            get { return messages.Count; }
+        }
+
         public void Add(Error e)
         {
             errors.Add(e);

ccnet/msbuild2ccnet.xsl

@@ -9,6 +9,7 @@
 	<xsl:template match="msbuild">
 		<table class="section-table" cellpadding="2" cellspacing="0" border="0" width="98%">
 		<tr><td class="sectionheader">
+      <b><xsl:value-of select="@solution_name"/></b> in <xsl:value-of select="@solution_dir"/>: 
 			<xsl:choose>
 				<xsl:when test="@error_count > 0">
 				    Build failed with <xsl:value-of select="@error_count"/> errors