remove netcoreapp2.1 from source (#2350)

* removing netcoreapp2.1 from source

* removing netcoreapp2.1 from source

* cleanup preprocessors

BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Channel/TransmissionTest.cs

@@ -423,9 +423,7 @@ public async Task SendAsyncLogsIngestionReponseTimeEventCounter()
                         Assert.AreEqual("IngestionEndpoint-ResponseTimeMsec", payload["Name"].ToString());
                         Assert.IsTrue((int)payload["Count"] >= 5);
                         // Max should be more than 30 ms, as we introduced a delay of 30ms in SendAsync.
-#if NETCOREAPP2_1
-                        Assert.IsTrue((float)payload["Max"] >= 30);
-#elif NETCOREAPP3_1
+#if NETCOREAPP
                         Assert.IsTrue((double)payload["Max"] >= 30);
 #endif
                     }
@@ -470,9 +468,7 @@ public async Task SendAsyncLogsIngestionReponseTimeOnFailureEventCounter()
                         Assert.AreEqual("IngestionEndpoint-ResponseTimeMsec", payload["Name"].ToString());
                         Assert.IsTrue((int)payload["Count"] >= 5);
                         // Mean should be more than 30 ms, as we introduced a delay of 30ms in SendAsync.
-#if NETCOREAPP2_1
-                        Assert.IsTrue((float)payload["Mean"] >= 30);
-#elif NETCOREAPP3_1
+#if NETCOREAPP
                         Assert.IsTrue((double)payload["Mean"] >= 30);
 #endif
                     }

BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Authentication/MockCredential.cs

@@ -1,4 +1,4 @@
-#if NET461 || NETCOREAPP2_1 || NETCOREAPP3_1 || NET5_0
+#if NET461 || NETCOREAPP
 namespace Microsoft.ApplicationInsights.TestFramework.Extensibility.Implementation.Authentication
 {
     using System;

BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/ExceptionConverterTest.cs

@@ -84,8 +84,6 @@ public void TestNullMethodInfoInStack()
             Assert.AreEqual(0, stackFrame.line);
         }
 
-#if !NETCOREAPP2_0
-
         [TestMethod]
         public void CheckThatFileNameAndLineAreCorrectIfAvailable()
         {
@@ -110,25 +108,6 @@ public void CheckThatFileNameAndLineAreCorrectIfAvailable()
                 Assert.IsNull(stack[0].fileName);
             }
         }
-#endif
-
-#if NETCOREAPP2_0
-
-        [TestMethod]
-        public void CheckThatAssemblyNameHasCorrectValue()
-        {
-            var exp = this.CreateException(2);
-
-            ExceptionDetails expDetails = ExceptionConverter.ConvertToExceptionDetails(exp, null);
-
-            string assemblyFullName = Assembly.GetExecutingAssembly().FullName;
-
-            foreach (var stackFrame in expDetails.parsedStack)
-            {
-                Assert.AreEqual(assemblyFullName.ToLowerInvariant(), stackFrame.assembly.ToLowerInvariant());
-            }
-        }
-#endif
 
         [TestMethod]
         public void CheckLevelCorrespondsToFrameForLongStack()

BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/Implementation/Tracing/ExtensionsTest.cs

@@ -1,6 +1,5 @@
 namespace Microsoft.ApplicationInsights.Extensibility.Implementation.Tracing
 {
-#if !NETCOREAPP2_0
     using System;
     using System.Globalization;
     using System.Threading;
@@ -45,5 +44,4 @@ public void RestoresOriginalUICultureToPreserveGlobalStateOfApplication()
             }
         }
     }
-#endif
 }

BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Extensibility/TelemetryConfigurationFactoryTest.cs

@@ -504,7 +504,7 @@ public void LoadInstanceSetsInstancePropertiesOfTimeSpanTypeFromChildElementValu
         }
 
         [TestMethod]
-#if NETCOREAPP3_1 || NET5_0
+#if NETCOREAPP
         [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'TimeSpanProperty' Reason: String 'TestValue' was not recognized as a valid TimeSpan.")]
 #else
         [ExpectedExceptionWithMessage(typeof(ArgumentException), "Failed to parse configuration value. Property: 'TimeSpanProperty' Reason: String was not recognized as a valid TimeSpan.")]

BASE/Test/Microsoft.ApplicationInsights.Test/Standalone/AppInsightsStandaloneTests.cs

@@ -30,7 +30,7 @@ public void Cleanup()
             Directory.Delete(this.tempPath, true);
         }
 
-#if NETCOREAPP2_1 || NETCOREAPP3_1
+#if NETCOREAPP3_1
         [Ignore("Missing netstandard dependencies.")]
 #endif
         [TestMethod]

BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Helpers/LocalInProcHttpServer.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP2_1
+#if NETCOREAPP
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.AspNetCore.Http;
 using System;
@@ -47,6 +47,5 @@ public void Dispose()
             }
         }
     }
-
 }
-#endif
+#endif

BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Helpers/MockCredential.cs

@@ -1,4 +1,4 @@
-#if NET461 || NETCOREAPP2_1 || NETCOREAPP3_1 || NET5_0
+#if NET461 || NETCOREAPP
 namespace Microsoft.ApplicationInsights.TestFramework.Helpers
 {
     using System;

BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/Implementation/TransmissionStorageTest.cs

@@ -61,7 +61,6 @@ public void InitializeThrowsArgumentNullExceptionToPreventUsageErrors()
             // [TestMethod]
             public void IsThreadSafe()
             {
-#if !NETCOREAPP2_1
                 const int NumberOfThreads = 16;
                 const int NumberOfFilesPerThread = 64;
                 var storage = new TransmissionStorage();
@@ -94,7 +93,6 @@ public void IsThreadSafe()
                     {
                     }
                 }
-#endif
             }
         }
 

BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/ServerTelemetryChannelE2ETests.cs

@@ -1,4 +1,4 @@
-#if NETCOREAPP2_1
+#if NETCOREAPP
 namespace Microsoft.ApplicationInsights.WindowsServer.Channel
 {    
     using System.Collections.Generic;

BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj

@@ -34,6 +34,9 @@
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <PackageReference Include="Azure.Core" Version="1.14.0" />
+
+    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
   </ItemGroup>
 
   <Import Project="..\..\..\Test\TestFramework\Shared\TestFramework.Shared.projitems" Label="TestFramework.Shared" />

IntegrationTests.sln

@@ -33,10 +33,8 @@ EndProject
 Global
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
 		NETCORE\src\Shared\Shared.projitems*{079e8118-28b3-4567-a384-ea337a0ed9fb}*SharedItemsImports = 5
-		BASE\src\Common\Common\Common.projitems*{07f570e4-3a43-44d4-99a0-1d961b8e2a70}*SharedItemsImports = 5
 		WEB\Src\Common\Common.projitems*{33478fb4-05fc-4cbd-a04d-17d0d6ba5b13}*SharedItemsImports = 5
 		WEB\Src\Common\Common.projitems*{56c361c2-724c-4688-b4e1-f94c0681ec33}*SharedItemsImports = 5
-		BASE\src\Common\Common\Common.projitems*{893dfa71-0f4f-4bbf-ae8f-72208be237ba}*SharedItemsImports = 5
 		WEB\Src\Common\Common.projitems*{a8d39e66-af60-4f51-aedc-2464a2d86dea}*SharedItemsImports = 5
 		WEB\Src\PerformanceCollector\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems*{a8d39e66-af60-4f51-aedc-2464a2d86dea}*SharedItemsImports = 5
 		LOGGING\src\CommonShared\CommonShared.projitems*{dd8682e9-bdcf-459b-b1a6-97966c3e9b6a}*SharedItemsImports = 5

NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/CorrelationMvcTests.cs

@@ -21,28 +21,29 @@ public CorrelationMvcTests(ITestOutputHelper output) : base(output)
         [Fact]
         public void CorrelationInfoIsPropagatedToDependendedService()
         {
-#if netcoreapp2_0 // Correlation works on .Net core.
-            using (var server = new InProcessServer(assemblyName, this.output))
-            {
-                using (var httpClient = new HttpClient())
-                {
-                    var task = httpClient.GetAsync(server.BaseHost + "/");
-                    task.Wait(TestTimeoutMs);
-                }
-
-                var actual = server.Execute<Envelope>(() => server.Listener.ReceiveItems(2, TestListenerTimeoutInMs));
-                this.DebugTelemetryItems(actual);
-
-                var dependencyTelemetry = actual.OfType<TelemetryItem<RemoteDependencyData>>().FirstOrDefault();
-                Assert.NotNull(dependencyTelemetry);                         
-
-                var requestTelemetry = actual.OfType<TelemetryItem<RequestData>>().FirstOrDefault();
-                Assert.NotNull(requestTelemetry);
-
-                Assert.Equal(requestTelemetry.tags["ai.operation.id"], dependencyTelemetry.tags["ai.operation.id"]);
-                Assert.Contains(dependencyTelemetry.tags["ai.operation.id"], requestTelemetry.tags["ai.operation.parentId"]);               
-            }
-#endif
+            // TODO: THIS IS A TESTING GAP
+//#if NETCOREAPP // Correlation works on .Net core.
+//            using (var server = new InProcessServer(assemblyName, this.output))
+//            {
+//                using (var httpClient = new HttpClient())
+//                {
+//                    var task = httpClient.GetAsync(server.BaseHost + "/");
+//                    task.Wait(TestTimeoutMs);
+//                }
+
+//                var actual = server.Execute<Envelope>(() => server.Listener.ReceiveItems(2, TestListenerTimeoutInMs));
+//                this.DebugTelemetryItems(actual);
+
+//                var dependencyTelemetry = actual.OfType<TelemetryItem<RemoteDependencyData>>().FirstOrDefault();
+//                Assert.NotNull(dependencyTelemetry);                         
+
+//                var requestTelemetry = actual.OfType<TelemetryItem<RequestData>>().FirstOrDefault();
+//                Assert.NotNull(requestTelemetry);
+
+//                Assert.Equal(requestTelemetry.tags["ai.operation.id"], dependencyTelemetry.tags["ai.operation.id"]);
+//                Assert.Contains(dependencyTelemetry.tags["ai.operation.id"], requestTelemetry.tags["ai.operation.parentId"]);               
+//            }
+//#endif
         }
     }
 }

NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTest/DependencyTelemetryMvcTests.cs

@@ -26,38 +26,39 @@ public DependencyTelemetryMvcTests(ITestOutputHelper output) : base(output)
         [Fact]
         public void CorrelationInfoIsNotAddedToRequestHeaderIfUserAddDomainToExcludedList()
         {
-#if netcoreapp2_0 // Correlation is supported on .Net core.
-            using (var server = new InProcessServer(assemblyName, this.output))
-            {
-                var dependencyCollectorModule = server.ApplicationServices.GetServices<ITelemetryModule>().OfType<DependencyTrackingTelemetryModule>().Single();
-                dependencyCollectorModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Add(server.BaseHost);
-
-                using (var httpClient = new HttpClient())
-                {
-                    var task = httpClient.GetAsync(server.BaseHost + "/");
-                    task.Wait(TestTimeoutMs);
-                }
-
-                var actual = server.Execute<Envelope>(() => server.Listener.ReceiveItems(TestListenerTimeoutInMs));
-                this.DebugTelemetryItems(actual);
-
-                try
-                {
-                    var dependencyTelemetry = actual.OfType<TelemetryItem<RemoteDependencyData>>().FirstOrDefault();
-                    Assert.NotNull(dependencyTelemetry);                         
-
-                    var requestTelemetry = actual.OfType<TelemetryItem<RequestData>>().FirstOrDefault();
-                    Assert.NotNull(requestTelemetry);
-
-                    Assert.NotEqual(requestTelemetry.tags["ai.operation.id"], dependencyTelemetry.tags["ai.operation.id"]);
-                }
-                catch (Exception e)
-                {
-                    string data = DebugTelemetryItems(actual);
-                    throw new Exception(data, e);
-                }
-            }
-#endif
+            // TODO: THIS IS A TESTING GAP
+//#if NETCOREAPP // Correlation is supported on .Net core.
+//            using (var server = new InProcessServer(assemblyName, this.output))
+//            {
+//                var dependencyCollectorModule = server.ApplicationServices.GetServices<ITelemetryModule>().OfType<DependencyTrackingTelemetryModule>().Single();
+//                dependencyCollectorModule.ExcludeComponentCorrelationHttpHeadersOnDomains.Add(server.BaseHost);
+
+//                using (var httpClient = new HttpClient())
+//                {
+//                    var task = httpClient.GetAsync(server.BaseHost + "/");
+//                    task.Wait(TestTimeoutMs);
+//                }
+
+//                var actual = server.Execute<Envelope>(() => server.Listener.ReceiveItems(TestListenerTimeoutInMs));
+//                this.DebugTelemetryItems(actual);
+
+//                try
+//                {
+//                    var dependencyTelemetry = actual.OfType<TelemetryItem<RemoteDependencyData>>().FirstOrDefault();
+//                    Assert.NotNull(dependencyTelemetry);                         
+
+//                    var requestTelemetry = actual.OfType<TelemetryItem<RequestData>>().FirstOrDefault();
+//                    Assert.NotNull(requestTelemetry);
+
+//                    Assert.NotEqual(requestTelemetry.tags["ai.operation.id"], dependencyTelemetry.tags["ai.operation.id"]);
+//                }
+//                catch (Exception e)
+//                {
+//                    string data = DebugTelemetryItems(actual);
+//                    throw new Exception(data, e);
+//                }
+//            }
+//#endif
         }
 
         [Fact]

NETCORE/test/IntegrationTests.WebApp/Program.cs

@@ -13,16 +13,7 @@ namespace IntegrationTests.WebApp
 {
     public class Program
     {
-#if NETCOREAPP2_1
-        public static void Main(string[] args)
-        {
-            CreateWebHostBuilder(args).Build().Run();
-        }
-
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
-                .UseStartup<Startup_netcoreapp_2_1>();
-#elif NET5_0
+#if NET5_0
         public static void Main(string[] args)
         {
             CreateHostBuilder(args).Build().Run();

WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyTrackingTelemetryModuleTestNetCore.cs

@@ -488,6 +488,7 @@ private void ValidateTelemetryForDiagnosticSource(
                     }
                     else
                     {
+                        // TODO: THIS IS A TESTING GAP
 #if NETCOREAPP2_1
                         // even though we don't inject back-compatible request-id, .NET Core 2.0 will inject one that will look like traceparent
                         Assert.AreEqual(expectedTraceParentHeader, request.Headers.GetValues(RequestResponseHeaders.RequestIdHeader).Single());

WEB/Src/PerformanceCollector/Perf.Tests/PerformanceCollectorModuleTests.cs

@@ -394,7 +394,7 @@ private static PerformanceCollectorModule CreatePerformanceCollectionModule(IPer
         [TestMethod]
         public void PerformanceCollectorModuleDefaultContainsExpectedCountersNonWindows()
         {
-#if NETCOREAPP2_1 || NETCOREAPP3_1
+#if NETCOREAPP
             PerformanceCounterUtility.isAzureWebApp = null;
             var original = PerformanceCounterUtility.IsWindows;
             PerformanceCounterUtility.IsWindows = false;
@@ -458,7 +458,7 @@ public void PerformanceCollectorModuleDefaultContainsExpectedCountersWindows()
         {
             PerformanceCounterUtility.isAzureWebApp = null;
             var module = new PerformanceCollectorModule();
-#if NETCOREAPP2_1 || NETCOREAPP3_1
+#if NETCOREAPP
             var original = PerformanceCounterUtility.IsWindows;
             PerformanceCounterUtility.IsWindows = true;
 #endif
@@ -490,7 +490,7 @@ public void PerformanceCollectorModuleDefaultContainsExpectedCountersWindows()
             finally
             {
                 module.Dispose();
-#if NETCOREAPP2_1 || NETCOREAPP3_1
+#if NETCOREAPP
             PerformanceCounterUtility.IsWindows = original;
 #endif
             }