From c95ad55fd1a7edd91f8c45413a600aa9e606619b Mon Sep 17 00:00:00 2001
From: Timothy Mothra Lee <tilee@microsoft.com>
Date: Tue, 25 May 2021 14:02:04 -0700
Subject: [PATCH 1/2] cleanup frameworks in AspNetCore

---
 .../ApplicationInsightsExtensions.cs          |  2 --
 ...licationInsightsServiceConfigureOptions.cs |  2 --
 .../Extensions/RequestCollectionOptions.cs    |  4 ----
 .../ApplicationInsightsLogger.cs              |  2 +-
 .../ApplicationInsightsLoggerProvider.cs      |  9 ++++----
 ...soft.ApplicationInsights.AspNetCore.csproj |  2 +-
 .../SdkVersionUtils.cs                        |  2 +-
 .../ApplicationInsightsExtensions.cs          |  6 -----
 ...ainNameRoleInstanceTelemetryInitializer.cs |  2 +-
 .../AddApplicationInsightsTelemetryTests.cs   | 23 -------------------
 .../BaseTestClass.cs                          |  7 ++----
 .../ApplicationInsightsServiceOptionsTests.cs | 22 +-----------------
 ...pplicationInsights.AspNetCore.Tests.csproj |  6 -----
 .../SdkVersionTestUtils.cs                    |  2 +-
 ...meRoleInstanceTelemetryInitializerTests.cs |  2 +-
 15 files changed, 14 insertions(+), 79 deletions(-)

diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs
index a085df0c55..8f8c750b8e 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/ApplicationInsightsExtensions.cs
@@ -150,9 +150,7 @@ public static IServiceCollection AddApplicationInsightsTelemetry(this IServiceCo
 
                     // NetStandard2.0 has a package reference to Microsoft.Extensions.Logging.ApplicationInsights, and
                     // enables ApplicationInsightsLoggerProvider by default.
-#if NETSTANDARD2_0 || NET461
                     AddApplicationInsightsLoggerProvider(services);
-#endif
                 }
 
                 return services;
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs
index 62ba60da39..e1308b1955 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs
@@ -33,12 +33,10 @@ public void Configure(ApplicationInsightsServiceOptions options)
         {
             var configBuilder = new ConfigurationBuilder()
                 .SetBasePath(this.hostingEnvironment.ContentRootPath ?? Directory.GetCurrentDirectory());
-#if NETSTANDARD2_0 || NET461
             if (this.userConfiguration != null)
             {
                 configBuilder.AddConfiguration(this.userConfiguration);
             }
-#endif
             configBuilder.AddJsonFile("appsettings.json", true)
                          .AddJsonFile(string.Format(CultureInfo.InvariantCulture, "appsettings.{0}.json", this.hostingEnvironment.EnvironmentName), true)
                          .AddEnvironmentVariables();
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/RequestCollectionOptions.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/RequestCollectionOptions.cs
index f815698a99..d327830c47 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/RequestCollectionOptions.cs
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/RequestCollectionOptions.cs
@@ -17,11 +17,7 @@ public RequestCollectionOptions()
 
             // In NetStandard20, ApplicationInsightsLoggerProvider is enabled by default,
             // which captures Exceptions. Disabling it in RequestCollectionModule to avoid duplication.
-#if NETSTANDARD2_0 || NET461
             this.TrackExceptions = false;
-#else
-            this.TrackExceptions = true;
-#endif
         }
 
         /// <summary>
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Logging/Implementation/ApplicationInsightsLogger.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Logging/Implementation/ApplicationInsightsLogger.cs
index 6545cf0ee6..c2769bdf67 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Logging/Implementation/ApplicationInsightsLogger.cs
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Logging/Implementation/ApplicationInsightsLogger.cs
@@ -19,7 +19,7 @@
     [SuppressMessage("Documentation Rules", "SA1614:ElementParameterDocumentationMustHaveText", Justification = "This class is obsolete and will not be completely documented.")]
     internal class ApplicationInsightsLogger : ILogger
     {
-#if NET461
+#if NETFRAMEWORK
         /// <summary>
         /// SDK Version Prefix.
         /// </summary>
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Logging/Implementation/ApplicationInsightsLoggerProvider.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Logging/Implementation/ApplicationInsightsLoggerProvider.cs
index 9885a2a103..59d321280f 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Logging/Implementation/ApplicationInsightsLoggerProvider.cs
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Logging/Implementation/ApplicationInsightsLoggerProvider.cs
@@ -9,11 +9,12 @@
     /// <summary>
     /// <see cref="ILoggerProvider"/> implementation that creates returns instances of <see cref="ApplicationInsightsLogger"/>.
     /// </summary>
-#if !NETSTANDARD2_0 && !NET461
-    // For NETSTANDARD2.0 and NET461 We take dependency on Microsoft.Extensions.Logging.ApplicationInsights which has ApplicationInsightsProvider having the same ProviderAlias and don't want to clash with this ProviderAlias.
-    [ProviderAlias("ApplicationInsights")]
-#endif
+    /// <remarks>
+    /// THIS CLASS IS OBSOLETE.
+    /// For NETSTANDARD2.0 and NET461 We take dependency on Microsoft.Extensions.Logging.ApplicationInsights which has ApplicationInsightsProvider having the same ProviderAlias and don't want to clash with this ProviderAlias.
+    /// </remarks>
     [SuppressMessage("Documentation Rules", "SA1614:ElementParameterDocumentationMustHaveText", Justification = "This class is obsolete and will not be completely documented.")]
+    [Obsolete] 
     internal class ApplicationInsightsLoggerProvider : ILoggerProvider
     {
         private readonly TelemetryClient telemetryClient;
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj
index c5cff312b8..83bd6d100f 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj
@@ -37,7 +37,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.1.0" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'net461' ">
+  <ItemGroup>
     <!--
     Microsoft.AspNetCore.Http has a vulnerability https://msrc.microsoft.com/update-guide/vulnerability/CVE-2020-1045
     System.Text.Encodings.Web has a vulnerability https://msrc.microsoft.com/update-guide/vulnerability/CVE-2021-26701 
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/SdkVersionUtils.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/SdkVersionUtils.cs
index f5e13ed89e..b1226238f4 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/SdkVersionUtils.cs
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/SdkVersionUtils.cs
@@ -8,7 +8,7 @@
     /// </summary>
     internal class SdkVersionUtils
     {
-#if NET461
+#if NETFRAMEWORK
         /// <summary>
         /// SDK Version Prefix.
         /// </summary>
diff --git a/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs b/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs
index bbc35f99ec..9efb9357bf 100644
--- a/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs
+++ b/NETCORE/src/Shared/Extensions/ApplicationInsightsExtensions.cs
@@ -59,10 +59,8 @@ public static partial class ApplicationInsightsExtensions
         private const string DeveloperModeForWebSites = "APPINSIGHTS_DEVELOPER_MODE";
         private const string EndpointAddressForWebSites = "APPINSIGHTS_ENDPOINTADDRESS";
 
-#if NETSTANDARD2_0 || NET461
         private const string ApplicationInsightsSectionFromConfig = "ApplicationInsights";
         private const string TelemetryChannelSectionFromConfig = "ApplicationInsights:TelemetryChannel";
-#endif
 
         [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "Used in NetStandard2.0 build.")]
         private const string EventSourceNameForSystemRuntime = "System.Runtime";
@@ -242,10 +240,8 @@ internal static void AddTelemetryConfiguration(
         {
             try
             {
-#if NETSTANDARD2_0 || NET461
                 config.GetSection(ApplicationInsightsSectionFromConfig).Bind(serviceOptions);
                 config.GetSection(TelemetryChannelSectionFromConfig).Bind(serviceOptions);
-#endif
 
                 if (config.TryGetValue(primaryKey: ConnectionStringEnvironmentVariable, backupKey: ConnectionStringFromConfig, value: out string connectionStringValue))
                 {
@@ -405,7 +401,6 @@ private static void AddAndConfigureDependencyTracking(IServiceCollection service
         [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 || NET461
             services.AddLogging(loggingBuilder =>
             {
                 loggingBuilder.AddApplicationInsights();
@@ -435,7 +430,6 @@ private static void AddApplicationInsightsLoggerProvider(IServiceCollection serv
                             LogLevel.Warning,
                             null)));
             });
-#endif
         }
     }
 }
diff --git a/NETCORE/src/Shared/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializer.cs b/NETCORE/src/Shared/TelemetryInitializers/DomainNameRoleInstanceTelemetryInitializer.cs
index ec9fc7eb7a..4862208610 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 NET461
+#if NETFRAMEWORK
             string domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName;
             if (!hostName.EndsWith(domainName, StringComparison.OrdinalIgnoreCase))
             {
diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsTelemetryTests.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsTelemetryTests.cs
index de08c53c91..046e91fb4e 100644
--- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsTelemetryTests.cs
+++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/AddApplicationInsightsTelemetryTests.cs
@@ -101,9 +101,6 @@ public static void RegistersTelemetryConfigurationFactoryMethodThatCreatesDefaul
         /// Else, it invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller.
         /// </param>
         [Theory]
-#if !NET46
-        [InlineData(true)]
-#endif
         [InlineData(false)]
         public static void RegistersTelemetryConfigurationFactoryMethodThatReadsInstrumentationKeyFromConfiguration(bool useDefaultConfig)
         {
@@ -214,9 +211,6 @@ public static void RegistersTelemetryConfigurationFactoryMethodThatReadsDevelope
         /// Else, it invokes services.AddApplicationInsightsTelemetry(configuration) where IConfiguration object is supplied by caller.
         /// </param>
         [Theory]
-#if !NET46
-        [InlineData(true)]
-#endif
         [InlineData(false)]
         public static void RegistersTelemetryConfigurationFactoryMethodThatReadsEndpointAddressFromConfiguration(bool useDefaultConfig)
         {
@@ -697,12 +691,10 @@ public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesDepe
         /// </param>
         /// <param name="isEnable">Sets the value for property EnableLegacyCorrelationHeadersInjection.</param>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void RegistersTelemetryConfigurationFactoryMethodThatPopulatesDependencyCollectorWithCustomValues(string configType, bool isEnable)
@@ -1020,11 +1012,7 @@ public static void ConfigureRequestTrackingTelemetryDefaultOptions()
                                                                                                             == typeof(RequestTrackingTelemetryModule));
 
             Assert.True(requestTrackingModule.CollectionOptions.InjectResponseHeaders);
-#if NETCOREAPP || NET461
             Assert.False(requestTrackingModule.CollectionOptions.TrackExceptions);
-#else
-                Assert.True(requestTrackingModule.CollectionOptions.TrackExceptions);
-#endif
         }
 
         /// <summary>
@@ -1039,12 +1027,10 @@ public static void ConfigureRequestTrackingTelemetryDefaultOptions()
         /// </param>
         /// <param name="isEnable">Sets the value for property InjectResponseHeaders, TrackExceptions and EnableW3CDistributedTracing.</param>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void ConfigureRequestTrackingTelemetryCustomOptions(string configType, bool isEnable)
@@ -1141,12 +1127,10 @@ public static void AddsAddaptiveSamplingServiceToTheConfigurationByDefault()
         /// </param>
         /// <param name="isEnable">Sets the value for property EnableAdaptiveSampling.</param>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void DoesNotAddSamplingToConfigurationIfExplicitlyControlledThroughParameter(string configType, bool isEnable)
@@ -1357,12 +1341,10 @@ public static void AddsAutoCollectedMetricsExtractorProcessorToTheConfigurationB
         /// </param>
         /// <param name="isEnable">Sets the value for property AddAutoCollectedMetricExtractor.</param>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void DoesNotAddAutoCollectedMetricsExtractorToConfigurationIfExplicitlyControlledThroughParameter(string configType, bool isEnable)
@@ -1410,12 +1392,10 @@ public static void DoesNotAddQuickPulseProcessorToConfigurationIfExplicitlyContr
         /// </param>
         /// <param name="isEnable">Sets the value for property EnableAuthenticationTrackingJavaScript.</param>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void UserCanEnableAndDisableAuthenticationTrackingJavaScript(string configType, bool isEnable)
@@ -1530,8 +1510,6 @@ public static void NullLoggerCallbackAlowed()
             loggerProvider.AddApplicationInsights(serviceProvider, (s, level) => true, null);
         }
 
-#if NETCOREAPP || NET461
-
         /// <summary>
         /// Creates two copies of ApplicationInsightsServiceOptions. First object is created by calling services.AddApplicationInsightsTelemetry() or services.AddApplicationInsightsTelemetry(config).
         /// Second object is created directly from configuration file without using any of SDK functionality.
@@ -1723,6 +1701,5 @@ public static void ReadsFromAppSettingsIfNoSettingsFoundInDefaultConfiguration()
 
             Assert.Equal(appSettingsConfig["ApplicationInsights:InstrumentationKey"], telemetryConfiguration.InstrumentationKey);
         }
-#endif
     }
 }
diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/BaseTestClass.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/BaseTestClass.cs
index 7661757b53..e344619894 100644
--- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/BaseTestClass.cs
+++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsExtensionsTests/BaseTestClass.cs
@@ -59,10 +59,7 @@ public static ServiceCollection CreateServicesAndAddApplicationinsightsTelemetry
                 config = new ConfigurationBuilder().Build();
             }
 
-#if NET46
-            // In NET46, we don't read from default configuration or bind configuration. 
-            services.AddApplicationInsightsTelemetry(config);
-#else
+
             if (useDefaultConfig)
             {
                 services.AddSingleton<IConfiguration>(config);
@@ -72,7 +69,7 @@ public static ServiceCollection CreateServicesAndAddApplicationinsightsTelemetry
             {
                 services.AddApplicationInsightsTelemetry(config);
             }
-#endif
+
             if (serviceOptions != null)
             {
                 services.Configure(serviceOptions);
diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsServiceOptionsTests.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsServiceOptionsTests.cs
index 84d4c14b8e..f6d33b220c 100644
--- a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsServiceOptionsTests.cs
+++ b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/Extensions/ApplicationInsightsServiceOptionsTests.cs
@@ -100,10 +100,6 @@ private static ServiceCollection CreateServicesAndAddApplicationinsightsWorker(s
                 config = configBuilder.Build();
             }
 
-#if NET46
-            // In NET46, we don't read from default configuration or bind configuration. 
-            services.AddApplicationInsightsTelemetry(config);
-#else
             if (useDefaultConfig)
             {
                 services.AddSingleton<IConfiguration>(config);
@@ -113,7 +109,6 @@ private static ServiceCollection CreateServicesAndAddApplicationinsightsWorker(s
             {
                 services.AddApplicationInsightsTelemetry(config);
             }
-#endif
 
             servicesConfig?.Invoke(services);
 
@@ -135,12 +130,11 @@ private static ServiceCollection CreateServicesAndAddApplicationinsightsWorker(s
         /// Enabling this will copy the AspNetCore config to the TC.Active static instance.
         /// </summary>
         [Theory]
-#if !NET46
+
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void UserCanEnableAndDisableTelemetryConfigurationActive(string configType, bool isEnable)
@@ -190,12 +184,10 @@ public static void UserCanEnableAndDisableTelemetryConfigurationActive(string co
         /// User could enable or disable PerformanceCounterCollectionModule by setting EnablePerformanceCounterCollectionModule.
         /// </summary>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void UserCanEnableAndDisablePerfCollectorModule(string configType, bool isEnable)
@@ -234,12 +226,10 @@ public static void UserCanEnableAndDisableEventCounterCollectorModule(string con
         /// User could enable or disable DependencyTrackingTelemetryModule by setting EnableDependencyTrackingTelemetryModule.
         /// </summary>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void UserCanEnableAndDisableDependencyCollectorModule(string configType, bool isEnable)
@@ -255,12 +245,10 @@ public static void UserCanEnableAndDisableDependencyCollectorModule(string confi
         /// User could enable or disable QuickPulseCollectorModule by setting EnableQuickPulseMetricStream.
         /// </summary>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void UserCanEnableAndDisableQuickPulseCollectorModule(string configType, bool isEnable)
@@ -276,12 +264,10 @@ public static void UserCanEnableAndDisableQuickPulseCollectorModule(string confi
         /// User could enable or disable AzureInstanceMetadataModule by setting EnableAzureInstanceMetadataTelemetryModule.
         /// </summary>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void UserCanEnableAndDisableAzureInstanceMetadataModule(string configType, bool isEnable)
@@ -297,12 +283,10 @@ public static void UserCanEnableAndDisableAzureInstanceMetadataModule(string con
         /// User could enable or disable RequestTrackingTelemetryModule by setting EnableRequestTrackingTelemetryModule.
         /// </summary>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void UserCanEnableAndDisableRequestCounterCollectorModule(string configType, bool isEnable)
@@ -318,12 +302,10 @@ public static void UserCanEnableAndDisableRequestCounterCollectorModule(string c
         /// User could enable or disable AppServiceHeartbeatModule by setting EnableAppServicesHeartbeatTelemetryModule.
         /// </summary>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void UserCanEnableAndDisableAppServiceHeartbeatModule(string configType, bool isEnable)
@@ -339,12 +321,10 @@ public static void UserCanEnableAndDisableAppServiceHeartbeatModule(string confi
         /// User could enable or disable <see cref="DiagnosticsTelemetryModule"/> by setting <see cref="ApplicationInsightsServiceOptions.EnableDiagnosticsTelemetryModule"/>.
         /// </summary>
         [Theory]
-#if !NET46
         [InlineData("DefaultConfiguration", true)]
         [InlineData("DefaultConfiguration", false)]
         [InlineData("SuppliedConfiguration", true)]
         [InlineData("SuppliedConfiguration", false)]
-#endif
         [InlineData("Code", true)]
         [InlineData("Code", false)]
         public static void UserCanEnableAndDisableDiagnosticsTelemetryModule(string configType, bool isEnable)
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 34f252f64b..eee0f2452f 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
@@ -13,12 +13,6 @@
     <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
   </PropertyGroup>
 
-  <ItemGroup>
-    <None Update="content\*">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.ApplicationInsights.AspNetCore\Microsoft.ApplicationInsights.AspNetCore.csproj" />
   </ItemGroup>
diff --git a/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/SdkVersionTestUtils.cs b/NETCORE/test/Microsoft.ApplicationInsights.AspNetCore.Tests/SdkVersionTestUtils.cs
index a861685a6b..de8d0d4eab 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 NET452 || NET46 || NET461
+#if NETFRAMEWORK
         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 bfd22cc6d5..ac723ad0e4 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 || NET461
+#if NETFRAMEWORK
             string domainName = IPGlobalProperties.GetIPGlobalProperties().DomainName;
             if (hostName.EndsWith(domainName, StringComparison.OrdinalIgnoreCase) == false)
             {

From 6b92352a4c3d922a825ffd4ebab109aa36c5e592 Mon Sep 17 00:00:00 2001
From: Timothy Mothra Lee <tilee@microsoft.com>
Date: Tue, 25 May 2021 14:08:30 -0700
Subject: [PATCH 2/2] fix fxcop

---
 .../DefaultApplicationInsightsServiceConfigureOptions.cs         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs
index e1308b1955..d312dcce7e 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Extensions/DefaultApplicationInsightsServiceConfigureOptions.cs
@@ -37,6 +37,7 @@ public void Configure(ApplicationInsightsServiceOptions options)
             {
                 configBuilder.AddConfiguration(this.userConfiguration);
             }
+
             configBuilder.AddJsonFile("appsettings.json", true)
                          .AddJsonFile(string.Format(CultureInfo.InvariantCulture, "appsettings.{0}.json", this.hostingEnvironment.EnvironmentName), true)
                          .AddEnvironmentVariables();