diff --git a/.props/_GlobalStaticVersion.props b/.props/_GlobalStaticVersion.props index b41d63c8b4..5b667e7aef 100644 --- a/.props/_GlobalStaticVersion.props +++ b/.props/_GlobalStaticVersion.props @@ -13,7 +13,7 @@ 2 14 0 - beta4 + beta5 - + - + diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/SdkVersionUtils.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/SdkVersionUtils.cs index 02bf47ce30..0a0137af1c 100644 --- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/SdkVersionUtils.cs +++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/SdkVersionUtils.cs @@ -8,7 +8,7 @@ /// internal class SdkVersionUtils { -#if NET451 || NET46 +#if NET451 || NET46 || NET461 /// /// SDK Version Prefix. /// diff --git a/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs b/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs index 585cfffcce..997afe311b 100644 --- a/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs +++ b/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs @@ -446,7 +446,7 @@ private static void ConfigureEventCounterModuleWithAspNetCounters(IServiceCollec [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "services parameter is used in only NetStandard 2.0 build.")] private static void AddApplicationInsightsLoggerProvider(IServiceCollection services) { -#if NETSTANDARD2_0 +#if NETSTANDARD2_0 || NET461 services.AddLogging(loggingBuilder => { loggingBuilder.AddApplicationInsights(); diff --git a/NETCORE/src/Shared/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializer.cs b/NETCORE/src/Shared/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializer.cs index de13c505df..e3ba5420fa 100644 --- a/NETCORE/src/Shared/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializer.cs +++ b/NETCORE/src/Shared/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializer.cs @@ -43,7 +43,7 @@ private string GetMachineName() string hostName = Dns.GetHostName(); // Issue #61: For dnxcore machine name does not have domain name like in full framework -#if NET451 || NET46 +#if NET451 || NET46 || NET461 string domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName; if (!hostName.EndsWith(domainName, StringComparison.OrdinalIgnoreCase)) { diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs index 3332d28403..9499fd40c6 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests.cs @@ -632,19 +632,13 @@ public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesEven var eventCounterModule = modules.OfType().Single(); //VALIDATE - Assert.Equal(23, eventCounterModule.Counters.Count); + Assert.Equal(19, eventCounterModule.Counters.Count); // sanity check with a sample counter. var cpuCounterRequest = eventCounterModule.Counters.FirstOrDefault( eventCounterCollectionRequest => eventCounterCollectionRequest.EventSourceName == "System.Runtime" && eventCounterCollectionRequest.EventCounterName == "cpu-usage"); - Assert.NotNull(cpuCounterRequest); - - // sanity check - asp.net counters should be added - var aspnetCounterRequest = eventCounterModule.Counters.Where( - eventCounterCollectionRequest => eventCounterCollectionRequest.EventSourceName == "Microsoft.AspNetCore.Hosting"); - Assert.NotNull(aspnetCounterRequest); - Assert.True(aspnetCounterRequest.Count() == 4); + Assert.NotNull(cpuCounterRequest); } #endif @@ -989,7 +983,7 @@ public static void ConfigureRequestTrackingTelemetryDefaultOptions() == typeof(RequestTrackingTelemetryModule)); Assert.True(requestTrackingModule.CollectionOptions.InjectResponseHeaders); -#if NETCOREAPP2_0 +#if NETCOREAPP2_0 || NET461 Assert.False(requestTrackingModule.CollectionOptions.TrackExceptions); #else Assert.True(requestTrackingModule.CollectionOptions.TrackExceptions); diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj index a2b86ce3ab..c6065ab442 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Microsoft.ApplicationInsights.AspNetCore.Tests.csproj @@ -4,8 +4,9 @@ 2.0.0 - netcoreapp2.0;net46 - netcoreapp2.0 + netcoreapp2.0;net46;net461 + netcoreapp2.0 + true true Microsoft.ApplicationInsights.AspNetCore.Tests Microsoft.ApplicationInsights.AspNetCore.Tests @@ -25,25 +26,25 @@ - + - + - + - + diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/SdkVersionTestUtils.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/SdkVersionTestUtils.cs index 5c4ef4530a..b9f932b42a 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/SdkVersionTestUtils.cs +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/SdkVersionTestUtils.cs @@ -2,7 +2,7 @@ { public class SdkVersionTestUtils { -#if NET451 || NET46 +#if NET451 || NET46 || NET461 public const string VersionPrefix = "aspnet5f:"; #else public const string VersionPrefix = "aspnet5c:"; diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializerTests.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializerTests.cs index 67e7c297c5..bfd22cc6d5 100644 --- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializerTests.cs +++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializerTests.cs @@ -24,7 +24,7 @@ public void RoleInstanceNameIsSetToDomainAndHost() string hostName = Dns.GetHostName(); -#if NET46 +#if NET46 || NET461 string domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName; if (hostName.EndsWith(domainName, StringComparison.OrdinalIgnoreCase) == false) { diff --git a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/LoggerTests.cs b/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/LoggerTests.cs index 9a363c220e..84397ed272 100644 --- a/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/LoggerTests.cs +++ b/NETCORE/test/WebApi20.FunctionalTests/FunctionalTest/LoggerTests.cs @@ -36,7 +36,7 @@ public LoggerTests(ITestOutputHelper output) : base (output) public void TestIloggerWarningOrAboveIsCapturedByDefault() { -#if NETCOREAPP2_0 +#if NETCOREAPP2_0 || NET461 using (var server = new InProcessServer(assemblyName, this.output)) { // Make request to this path, which sents one log of each severity Error, Warning, Information, Trace @@ -59,7 +59,7 @@ public void TestIloggerWarningOrAboveIsCapturedByDefault() public void TestIloggerDefaultsCanBeOverridenByUserForAllCategories() { -#if NETCOREAPP2_0 +#if NETCOREAPP2_0 || NET461 void ConfigureServices(IServiceCollection services) { // ARRANGE @@ -88,7 +88,7 @@ void ConfigureServices(IServiceCollection services) public void TestIloggerDefaultsCanBeOverridenByUserForSpecificCategory() { -#if NETCOREAPP2_0 +#if NETCOREAPP2_0 || NET461 void ConfigureServices(IServiceCollection services) { // ARRANGE