Changes:

- v0.14 version bump (not done yet)
- clean up of projbook project files on disk
- fix in path read in @snippet statement
- added references to System.Collections.Immutable to several projects
as it's indirectly loaded and will make docnet fail at runtime if
missing

src/DocNet/App.config

@@ -7,11 +7,11 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.3.0.0" newVersion="1.3.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-1.2.0.0" newVersion="1.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

src/DocNet/Docnet.csproj

@@ -33,11 +33,15 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=8.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Newtonsoft.Json.8.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Newtonsoft.Json.9.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Web" />
@@ -72,6 +76,9 @@
       <Name>MarkdownDeep</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <WCFMetadata Include="Service References\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

src/DocNet/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.13.2.0")]
-[assembly: AssemblyFileVersion("0.13.2")]
+[assembly: AssemblyVersion("0.14.0.0")]
+[assembly: AssemblyFileVersion("0.14.0")]

src/DocNet/SimpleNavigationElement.cs

@@ -68,7 +68,7 @@ public override void GenerateOutput(Config activeConfig, NavigatedPath activePat
 				this.MarkdownFromFile = File.ReadAllText(sourceFile, Encoding.UTF8);
 				// Check if the content contains @@include tag
 				content = Utils.IncludeProcessor(this.MarkdownFromFile, Utils.MakeAbsolutePath(activeConfig.Source, activeConfig.IncludeFolder));
-				content = Utils.ConvertMarkdownToHtml(content, Path.GetDirectoryName(destinationFile), activeConfig.Destination, _relativeH2LinksOnPage);
+				content = Utils.ConvertMarkdownToHtml(content, Path.GetDirectoryName(destinationFile), activeConfig.Destination, sourceFile, _relativeH2LinksOnPage);
 			}
 			else
 			{
@@ -90,7 +90,7 @@ public override void GenerateOutput(Config activeConfig, NavigatedPath activePat
 						defaultMarkdown.AppendFormat("* [{0}]({1}{2}){3}", sibling.Name, relativePathToRoot, HttpUtility.UrlPathEncode(sibling.TargetURL), Environment.NewLine);
 					}
 					defaultMarkdown.Append(Environment.NewLine);
-					content = Utils.ConvertMarkdownToHtml(defaultMarkdown.ToString(), Path.GetDirectoryName(destinationFile), activeConfig.Destination, _relativeH2LinksOnPage);
+					content = Utils.ConvertMarkdownToHtml(defaultMarkdown.ToString(), Path.GetDirectoryName(destinationFile), activeConfig.Destination, string.Empty, _relativeH2LinksOnPage);
 				}
 				else
 				{

src/DocNet/Utils.cs

@@ -39,15 +39,17 @@ public static class Utils
 		private static Regex includeRegex = new Regex(@"@@include\((.*)\)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
 		#endregion
 
-		/// <summary>
-		/// Converts the markdown to HTML.
-		/// </summary>
-		/// <param name="toConvert">The markdown string to convert.</param>
-		/// <param name="documentPath">The document path (without the document filename).</param>
-		/// <param name="siteRoot">The site root.</param>
-		/// <param name="createdAnchorCollector">The created anchor collector, for ToC sublinks for H2 headers.</param>
-		/// <returns></returns>
-		public static string ConvertMarkdownToHtml(string toConvert, string documentPath, string siteRoot, List<Tuple<string, string>> createdAnchorCollector)
+	    /// <summary>
+	    /// Converts the markdown to HTML.
+	    /// </summary>
+	    /// <param name="toConvert">The markdown string to convert.</param>
+	    /// <param name="destinationDocumentPath">The document path (without the document filename).</param>
+	    /// <param name="siteRoot">The site root.</param>
+	    /// <param name="sourceDocumentFilename">the filename of the source markdown file</param>
+	    /// <param name="createdAnchorCollector">The created anchor collector, for ToC sublinks for H2 headers.</param>
+	    /// <returns></returns>
+	    public static string ConvertMarkdownToHtml(string toConvert, string destinationDocumentPath, string siteRoot, string sourceDocumentFilename, 
+                                                   List<Tuple<string, string>> createdAnchorCollector)
 		{
 			var parser = new MarkdownDeep.Markdown
 						 {
@@ -56,8 +58,9 @@ public static string ConvertMarkdownToHtml(string toConvert, string documentPath
 							 AutoHeadingIDs = true,
 							 NewWindowForExternalLinks = true,
 							 DocNetMode = true,
-							 DocumentLocation = documentPath,
+							 DestinationDocumentLocation = destinationDocumentPath,
 							 DocumentRoot = siteRoot,
+                             SourceDocumentFilename = sourceDocumentFilename,
 							 HtmlClassTitledImages = "figure",
 						 };
 

src/DocNet/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="8.0.2" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="9.0.1" targetFramework="net461" />
+  <package id="System.Collections.Immutable" version="1.3.0" targetFramework="net461" />
 </packages>

src/MarkdownDeep/BlockProcessor.cs

@@ -1533,7 +1533,7 @@ private bool HandleSnippetExtension(Block b)
             }
 
             // extract the snippet, then build the fenced block to return.
-            var fullFilename = Path.Combine(Path.GetDirectoryName(m_markdown.DocumentLocation) ?? string.Empty, filename);
+            var fullFilename = Path.Combine(Path.GetDirectoryName(m_markdown.SourceDocumentFilename) ?? string.Empty, filename);
             var snippetText = extractor.Extract(fullFilename, pattern) ?? string.Empty;
             b.BlockType = BlockType.codeblock;
             b.Data = language;

src/MarkdownDeep/MardownDeep.cs

@@ -299,7 +299,7 @@ public virtual bool OnGetImageSize(string url, bool TitledImage, out int width,
 				return false;
 
 			// Work out base location
-			string str = url.StartsWith("/") ? DocumentRoot : DocumentLocation;
+			string str = url.StartsWith("/") ? DocumentRoot : DestinationDocumentLocation;
 			if (String.IsNullOrEmpty(str))
 				return false;
 
@@ -909,15 +909,19 @@ public string DocumentRoot
 			set;
 		}
 
-		// Local file system location of the current document.  Used to locate relative
+		// Local file system location of the current destination document.  Used to locate relative
 		// path images for image size.
 		// Typical value: c:\inetpub\www\wwwroot\subfolder
-		public string DocumentLocation
+		public string DestinationDocumentLocation
 		{
 			get;
 			set;
 		}
 
+
+	    public string SourceDocumentFilename { get; set; }
+
+
 		// Limit the width of images (0 for no limit)
 		public int MaxImageWidth
 		{

src/MarkdownDeep/MarkdownDeep.csproj

@@ -44,6 +44,8 @@
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>
+    </DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -111,6 +113,9 @@
       <Name>Projbook.Extension</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>

src/MarkdownDeep/app.config

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

src/MarkdownDeepTests/MarkdownDeepTests.csproj

@@ -51,6 +51,10 @@
       <HintPath>..\..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Collections.Immutable, Version=1.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.Collections.Immutable.1.3.0\lib\portable-net45+win8+wp8+wpa81\System.Collections.Immutable.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>

src/MarkdownDeepTests/app.config

@@ -10,4 +10,16 @@
 			<add key="ApartmentState" value="STA" />
 		</TestRunner>
 	</NUnit>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Reflection.Metadata" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.4.1.0" newVersion="1.4.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-1.2.1.0" newVersion="1.2.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

src/MarkdownDeepTests/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NUnit" version="2.5.10.11092" />
+  <package id="System.Collections.Immutable" version="1.3.0" targetFramework="net461" />
 </packages>