Merge pull request #1100 from Microsoft/develop

merge DEVELOP to MASTER (prep 2.10-beta3)

Author: Timothy Mothra

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This changelog will be used to generate documentation on [release notes page](http://azure.microsoft.com/documentation/articles/app-insights-release-notes-dotnet/).
 
+## Version 2.10.0-beta3
+- No changes. Bumping version to match WebSDK release.
+
 ## Version 2.10.0-beta2
 - [Fix Transmission in NETCORE to handle partial success (206) response from backend.](https://github.com/Microsoft/ApplicationInsights-dotnet/issues/1047)
 - [Fix data losses in ServerTelemetryChannel.](https://github.com/Microsoft/ApplicationInsights-dotnet/issues/1049)

GlobalStaticVersion.props

@@ -9,7 +9,7 @@
     <SemanticVersionMinor>10</SemanticVersionMinor>
     <SemanticVersionPatch>0</SemanticVersionPatch>
     <!--Valid values: beta1, beta2, EMPTY for stable -->
-    <PreReleaseMilestone>beta2</PreReleaseMilestone>
+    <PreReleaseMilestone>beta3</PreReleaseMilestone>
     <!-- 
       Date when Semantic Version was changed. 
       Update for every public release.

src/ServerTelemetryChannel/Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel.targets

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Target Name="CopyApplicationInsightsConfigToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory" >
+    <Target Name="CopyApplicationInsightsConfigToOutputDirectory" AfterTargets="CopyFilesToOutputDirectory" Condition="Exists('ApplicationInsights.config')" >
         <!--Currently we cannot set the config's "Copy to Output Directory" property to "PreserveNewest.
           Workaround is to use this targets file to manually copy into output path."-->