Merge pull request #842 from Microsoft/develop

Dev to master fro 2.7.0-beta2

CHANGELOG.md

@@ -1,7 +1,11 @@
 # Changelog
 
-## Version 2.7.0-beta1
+## Version 2.7.0-beta2
 - Added NetStandard2.0 target.
+- Updated Web/Base SDK version dependency to 2.10.0-beta2
+
+## Version 2.6.1
+- Updated Web/Base SDK version dependency to 2.9.1
 
 ## Version 2.6.0
 - Updated Web/Base SDK version dependency to 2.9.0

src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>Microsoft.ApplicationInsights.AspNetCore</AssemblyName>
-    <VersionPrefix>2.6.0</VersionPrefix>
+    <VersionPrefix>2.7.0-beta2</VersionPrefix>
     <Authors>Microsoft</Authors>
     <Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
     <AssemblyTitle>Application Insights for ASP.NET Core Web Applications</AssemblyTitle>
@@ -81,11 +81,11 @@
   </ItemGroup>
   
   <ItemGroup>
-    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.9.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.9.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.9.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.9.0" />
-    <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.9.0" />
+    <PackageReference Include="Microsoft.ApplicationInsights" Version="2.10.0-beta2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.10.0-beta2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.10.0-beta2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer" Version="2.10.0-beta2" />
+    <PackageReference Include="Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel" Version="2.10.0-beta2" />
     <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="1.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="1.0.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />

test/EmptyApp20.FunctionalTests/Startup.cs

@@ -5,6 +5,7 @@
     using FunctionalTestUtils;
     using Microsoft.ApplicationInsights;
     using Microsoft.ApplicationInsights.AspNetCore.Extensions;
+    using Microsoft.ApplicationInsights.Channel;
     using Microsoft.ApplicationInsights.DataContracts;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Http;
@@ -21,6 +22,7 @@
 
             var builder = new ConfigurationBuilder();
             builder.AddApplicationInsightsSettings(instrumentationKey: InProcessServer.IKey, endpointAddress: endpointAddress.ConnectionString, developerMode: true);
+            services.AddSingleton(typeof(ITelemetryChannel), new InMemoryChannel());
             services.AddApplicationInsightsTelemetry(builder.Build());
         }
 

test/MVCFramework20.FunctionalTests/Startup.cs

@@ -33,6 +33,7 @@ namespace MVCFramework20.FunctionalTests
             applicationInsightsOptions.EndpointAddress = endpointAddress.ConnectionString;
             applicationInsightsOptions.InstrumentationKey = InProcessServer.IKey;
 
+            services.AddSingleton(typeof(ITelemetryChannel), new InMemoryChannel());
             services.AddApplicationInsightsTelemetry(applicationInsightsOptions);
             services.AddMvc();
         }

test/WebApi20.FunctionalTests/Startup.cs

@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using FunctionalTestUtils;
-
+using Microsoft.ApplicationInsights.Channel;
 
 namespace WebApi20.FunctionalTests
 {
@@ -24,6 +24,7 @@ namespace WebApi20.FunctionalTests
 
             var builder = new ConfigurationBuilder();
             builder.AddApplicationInsightsSettings(instrumentationKey: InProcessServer.IKey, endpointAddress: endpointAddress.ConnectionString, developerMode: true);
+            services.AddSingleton(typeof(ITelemetryChannel), new InMemoryChannel());
             services.AddApplicationInsightsTelemetry(builder.Build());
 
             services.AddMvc();