Merge branch 'master' into develop

Author: kbond-stackify

.gitignore

@@ -29,3 +29,4 @@ packages/
 
 **/bin/*
 **/obj/*
+BuildOutput/

Dlls/StackifyLib.ELMAH/StackifyLib.ELMAH.dll

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.5.0.2" targetFramework="net462" />
-  <package id="bootstrap" version="3.3.7" targetFramework="net462" />
+  <package id="bootstrap" version="3.4.1" targetFramework="net462" />
   <package id="jQuery" version="3.3.1" targetFramework="net462" />
   <package id="log4net" version="2.0.8" targetFramework="net462" />
   <package id="Microsoft.AspNet.Mvc" version="5.2.4" targetFramework="net462" />

Dlls/StackifyLib.log4net.v1_2_10/StackifyLib.log4net.dll

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading;
 using StackifyLib.Internal.Logs;
 using StackifyLib.Models;
 using StackifyLib.Utils;
@@ -321,7 +322,7 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
                     }
                 }
             }
-#if NETFULL
+
             foreach (string mdcKey in _LogicalThreadContextKeys)
             {
                 object mdcValue = Apache_log4net.LogicalThreadContext.Properties[mdcKey];
@@ -355,8 +356,8 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
                     properties[mdcKey.ToLower()] = mdcValue;
                 }
             }
-            
 
+#if NETFULL
             foreach (string key in _CallContextKeys)
             {
                 object value = System.Runtime.Remoting.Messaging.CallContext.LogicalGetData(key);
@@ -366,7 +367,6 @@ private Dictionary<string, object> GetDiagnosticContextProperties()
                     properties[key.ToLower()] = value;
                 }
             }
-
 #endif
 
             return properties;

Src/FFWebApp462/packages.config

@@ -13,7 +13,7 @@
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
     <GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
-    <Version>2.1.0</Version>
+    <Version>2.1.5</Version>
     <PackageLicenseUrl>https://github.com/stackify/stackify-api-dotnet/blob/master/LICENSE</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/stackify/stackify-api-dotnet</PackageProjectUrl>
     <RepositoryUrl>https://github.com/stackify/stackify-api-dotnet</RepositoryUrl>