Merge 2.1.0-beta1 changes to develop. (#374)

* Updated version of referenced signing plugin.
* Updated changelog.

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## Version 2.1.0-beta1
+
+- Bug fixes
+- Removed UserAgentTelemetryInitializer and associated tests.
+- Added instrumentation key header
+- [Added OperationCorrelationTelemetryInitializer](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/333)
+- [Set Id instead of OperationId for request dependency correlation](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/340)
+- [Set Id in thread-safe location](https://github.com/Microsoft/ApplicationInsights-aspnetcore/issues/342)
+- Updated SDK version dependency to 2.3.0-beta3.
+
 ## Version 2.0.0
 
 - Added a configuration overload for AddApplicationInsightsTelemetry.

global.json

@@ -1,3 +1,6 @@
 {
-  "projects": [ "src", "test" ]
+  "projects": [ "src", "test" ],
+  "sdk": {
+    "version": "1.0.0-preview2-003131"
+  }
 }

src/Microsoft.ApplicationInsights.AspNetCore/project.json

@@ -3,7 +3,7 @@
     "summary": "Application Insights for ASP.NET Core web applications.",
     "description": "Application Insights for ASP.NET Core web applications. See https://azure.microsoft.com/en-us/documentation/articles/app-insights-asp-net-five/ for more information. Privacy statement: https://go.microsoft.com/fwlink/?LinkId=512156",
     "authors": [ "Microsoft" ],
-    "version": "2.0.0",
+    "version": "2.1.0-beta1",
     "copyright": "Copyright © Microsoft. All Rights Reserved.",
     "packOptions": {
         "projectUrl": "http://go.microsoft.com/fwlink/?LinkId=392727",
@@ -30,7 +30,7 @@
             "version": "1.2.0-beta2",
             "type": "build"
         },
-      "Microsoft.ApplicationInsights": "2.3.0-beta3",
+        "Microsoft.ApplicationInsights": "2.3.0-beta3",
         "Microsoft.AspNetCore.Hosting": "1.0.0",
         "Microsoft.Extensions.Configuration": "1.0.0",
         "Microsoft.Extensions.Configuration.Json": "1.0.0",
@@ -76,27 +76,27 @@
         //    "version": "1.2.0-beta2",
         //    "type": "build"
         //},
-      "System.Threading.Tasks.Analyzers": {
-        "version": "1.2.0-beta2",
-        "type": "build"
-      }
-      //"Text.Analyzers": {
-      //    "version": "1.2.0-beta2",
-      //    "type": "build"
-      //},
-      //"XmlDocumentationComments.Analyzers": {
-      //    "version": "1.2.0-beta2",
-      //    "type": "build"
-      //},
+        "System.Threading.Tasks.Analyzers": {
+            "version": "1.2.0-beta2",
+            "type": "build"
+        }
+        //"Text.Analyzers": {
+        //    "version": "1.2.0-beta2",
+        //    "type": "build"
+        //},
+        //"XmlDocumentationComments.Analyzers": {
+        //    "version": "1.2.0-beta2",
+        //    "type": "build"
+        //},
     },
 
     "frameworks": {
         "net451": {
-          "dependencies": {
-            "Microsoft.ApplicationInsights.DependencyCollector": "2.3.0-beta3",
-            "Microsoft.ApplicationInsights.PerfCounterCollector": "2.3.0-beta3",
-            "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.3.0-beta3"
-          }
+            "dependencies": {
+                "Microsoft.ApplicationInsights.DependencyCollector": "2.3.0-beta3",
+                "Microsoft.ApplicationInsights.PerfCounterCollector": "2.3.0-beta3",
+                "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel": "2.3.0-beta3"
+            }
         },
         "netstandard1.6": {
             "dependencies": {