Merge pull request #575 from Microsoft/develop

Merge dev to master

Author: cijothomas

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This changelog will be used to generate documentation on [release notes page](http://azure.microsoft.com/en-us/documentation/articles/app-insights-release-notes-dotnet/).
 
+## Version 2.4.0
+- Updated version of DiagnosticSource to 4.4.0 stable
+
 ## Version 2.4.0-beta5
 - Updated version of DiagnosticSource referenced.
 

GlobalStaticVersion.props

@@ -8,7 +8,7 @@
     <SemanticVersionMajor>2</SemanticVersionMajor>
     <SemanticVersionMinor>4</SemanticVersionMinor>
     <SemanticVersionPatch>0</SemanticVersionPatch>
-    <PreReleaseMilestone>beta5</PreReleaseMilestone>
+    <PreReleaseMilestone></PreReleaseMilestone>
     <!-- 
       Date when Semantic Version was changed. 
       Update for every public release.

clean.cmd

@@ -0,0 +1,2 @@
+rmdir /S /Q ..\bin
+rmdir /S /Q ..\obj

disablestrongnamevalidation.ps1

@@ -0,0 +1,2 @@
+& "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.2 Tools\x64\sn.exe" -Vr *,31bf3856ad364e35
+& "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.2 Tools\sn.exe" -Vr *,31bf3856ad364e35

enablestrongnamevalidation.ps1

@@ -0,0 +1,2 @@
+& "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.2 Tools\x64\sn.exe" -Vu *,31bf3856ad364e35
+& "C:\Program Files (x86)\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.6.2 Tools\sn.exe" -Vu *,31bf3856ad364e35

src/Core/Managed/Shared/Channel/InMemoryChannel.cs

@@ -137,7 +137,7 @@ public void Send(ITelemetry item)
             }
             catch (Exception e)
             {
-                CoreEventSource.Log.LogVerbose("TelemetryBuffer.Enqueue failed: ", e.ToString());
+                CoreEventSource.Log.LogVerbose("TelemetryBuffer.Enqueue failed: " + e.ToString());
             }
         }
 

src/Core/NuGet/Package.nuspec

@@ -23,18 +23,18 @@
         <dependency id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28"/>
       </group>
       <group targetFramework="net45">
-        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0-preview2-25405-01" />
+        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0" />
       </group>
       <group targetFramework="net46">
-        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0-preview2-25405-01" />
+        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0" />
       </group>
       <group targetFramework="wp8">
         <dependency id="Microsoft.Bcl.Async" version="1.0.168" />
       </group>
       <group targetFramework="netstandard1.3">
         <dependency id="NETStandard.Library" version="1.6.1" />
         <dependency id="System.Diagnostics.StackTrace" version="4.3.0" />
-        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0-preview2-25405-01" />
+        <dependency id="System.Diagnostics.DiagnosticSource" version="4.4.0" />
       </group>
     </dependencies>
   </metadata>