diff --git a/.github/workflows/build-and-test-BASE.yml b/.github/workflows/build-and-test-BASE.yml
index ccab0420a4..b0b07cda96 100644
--- a/.github/workflows/build-and-test-BASE.yml
+++ b/.github/workflows/build-and-test-BASE.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
+        framework: [net462, net472, net480, net481, net6.0, net7.0, net8.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
@@ -36,7 +36,6 @@ jobs:
       uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: |
-            3.1.x
             6.0.x
             7.0.x
             8.0.x
diff --git a/.github/workflows/build-and-test-LOGGING.yml b/.github/workflows/build-and-test-LOGGING.yml
index 9ce794e976..11048796c6 100644
--- a/.github/workflows/build-and-test-LOGGING.yml
+++ b/.github/workflows/build-and-test-LOGGING.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
+        framework: [net462, net472, net480, net481, net6.0, net7.0, net8.0]
 
     steps:
     - uses: actions/checkout@v4
@@ -33,7 +33,6 @@ jobs:
       uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: |
-            3.1.x
             6.0.x
             7.0.x
             8.0.x
diff --git a/.github/workflows/build-and-test-NETCORE.yml b/.github/workflows/build-and-test-NETCORE.yml
index dd094a9bba..e5d0cbdec3 100644
--- a/.github/workflows/build-and-test-NETCORE.yml
+++ b/.github/workflows/build-and-test-NETCORE.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
+        framework: [net462, net472, net480, net481, net6.0, net7.0, net8.0]
         include: 
           - os: ubuntu-latest
             args: "--filter TestCategory!=WindowsOnly"
@@ -36,7 +36,6 @@ jobs:
       uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: |
-            3.1.x
             6.0.x
             7.0.x
             8.0.x
diff --git a/.github/workflows/build-and-test-WEB.yml b/.github/workflows/build-and-test-WEB.yml
index 9f86bfdf54..e225d84a69 100644
--- a/.github/workflows/build-and-test-WEB.yml
+++ b/.github/workflows/build-and-test-WEB.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [windows-latest]
-        framework: [net452, net462, net472, net480, net481, netcoreapp3.1, net6.0, net7.0, net8.0]
+        framework: [net462, net472, net480, net481, net6.0, net7.0, net8.0]
 
     steps:
     - uses: actions/checkout@v4
@@ -33,7 +33,6 @@ jobs:
       uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: |
-            3.1.x
             6.0.x
             7.0.x
             8.0.x
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ce448c6866..3ffcce4c49 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -30,9 +30,9 @@ jobs:
       uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: |
-            3.1.x
             6.0.x
             7.0.x
+            8.0.x
 
     - uses: nuget/setup-nuget@v2
       with:
diff --git a/.github/workflows/redfield-sanity-check.yml b/.github/workflows/redfield-sanity-check.yml
index 696bdb0264..b91cfaf3f8 100644
--- a/.github/workflows/redfield-sanity-check.yml
+++ b/.github/workflows/redfield-sanity-check.yml
@@ -24,7 +24,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest]
-        framework: [netcoreapp3.1,net6.0,net7.0,net8.0]
+        framework: [net6.0,net7.0,net8.0]
         include: 
             - os: ubuntu-latest
               args: "--filter TestCategory!=WindowsOnly"
@@ -36,7 +36,6 @@ jobs:
       uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: |
-            3.1.x
             6.0.x
             7.0.x
             8.0.x
diff --git a/.github/workflows/sanity.yml b/.github/workflows/sanity.yml
index 6d2f026c56..f75d0b544a 100644
--- a/.github/workflows/sanity.yml
+++ b/.github/workflows/sanity.yml
@@ -35,7 +35,6 @@ jobs:
       uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: |
-            3.1.x
             6.0.x
             7.0.x
             8.0.x
diff --git a/.props/Test.props b/.props/Test.props
index f80c0e89e3..e2e2305785 100644
--- a/.props/Test.props
+++ b/.props/Test.props
@@ -20,7 +20,7 @@
           - net7.0 (GA Nov 2022)
     -->
 
-    <SupportedFrameworks_NetCore>net8.0;net7.0;net6.0;netcoreapp3.1;</SupportedFrameworks_NetCore>
+    <SupportedFrameworks_NetCore>net8.0;net7.0;net6.0;</SupportedFrameworks_NetCore>
     <SupportedFrameworks_NetFx Condition="$(OS) == 'Windows_NT'">net481;net480;net472;net462;</SupportedFrameworks_NetFx>
     <LegacyFrameworks_NetFx Condition="$(OS) == 'Windows_NT'">net46;net452;</LegacyFrameworks_NetFx>
     
diff --git a/.props/_GlobalStaticVersion.props b/.props/_GlobalStaticVersion.props
index cf76e59b8b..5278602302 100644
--- a/.props/_GlobalStaticVersion.props
+++ b/.props/_GlobalStaticVersion.props
@@ -10,10 +10,10 @@
       Semantic Version. See http://semver.org for full details.
       Update for every public release.
     -->
-    <SemanticVersionMajor>2</SemanticVersionMajor>
-    <SemanticVersionMinor>22</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
+    <SemanticVersionMajor>3</SemanticVersionMajor>
+    <SemanticVersionMinor>0</SemanticVersionMinor> <!-- If changing the Minor version, also update the Date value. -->
     <SemanticVersionPatch>0</SemanticVersionPatch>
-    <PreReleaseMilestone></PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
+    <PreReleaseMilestone>beta1</PreReleaseMilestone> <!--Valid values: beta1, beta2, EMPTY for stable -->
     <PreReleaseMilestone Condition="'$(Redfield)' == 'True'">redfield</PreReleaseMilestone>
     <PreReleaseMilestone Condition="'$(NightlyBuild)' == 'True'">nightly</PreReleaseMilestone> <!-- Overwrite this property for nightly builds from the DEVELOP branch. -->
     <!--
@@ -23,7 +23,7 @@
       as it will restart file versions so 2.4.0-beta1 may have higher
       file version (like 2.4.0.2222) than 2.4.0-beta2 (like 2.4.0.1111)
     -->
-    <SemanticVersionDate>2022-07-20</SemanticVersionDate>
+    <SemanticVersionDate>2024-03-15</SemanticVersionDate>
 
     <!--
       BuildNumber uniquely identifies all builds (The max allowed value is UInt16.MaxValue = 65535).
diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj b/BASE/Test/Microsoft.ApplicationInsights.Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj
index cc1946dff2..cd25622f6b 100644
--- a/BASE/Test/Microsoft.ApplicationInsights.Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj
+++ b/BASE/Test/Microsoft.ApplicationInsights.Test/ApplicationInsightsTypes/ApplicationInsightsTypes.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(PropsRoot)\Test.props" />
   
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0</TargetFrameworks>
   </PropertyGroup>
   
diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj
index 4a1e9e883b..95879998e5 100644
--- a/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj
+++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Microsoft.ApplicationInsights.Tests/Microsoft.ApplicationInsights.Tests.csproj
@@ -3,8 +3,6 @@
 
   <PropertyGroup>
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
-    <TargetFrameworks>$(TargetFrameworks_WithLegacy)</TargetFrameworks>
-    
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
diff --git a/BASE/Test/Microsoft.ApplicationInsights.Test/Standalone/Microsoft.ApplicationInsights.Isolated.Tests.csproj b/BASE/Test/Microsoft.ApplicationInsights.Test/Standalone/Microsoft.ApplicationInsights.Isolated.Tests.csproj
index a160c05006..ef20347ebb 100644
--- a/BASE/Test/Microsoft.ApplicationInsights.Test/Standalone/Microsoft.ApplicationInsights.Isolated.Tests.csproj
+++ b/BASE/Test/Microsoft.ApplicationInsights.Test/Standalone/Microsoft.ApplicationInsights.Isolated.Tests.csproj
@@ -4,12 +4,12 @@
   <PropertyGroup>
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
     <ProjectGuid>{2759BC71-7F47-44DA-8579-AE2D8C8C684D}</ProjectGuid>
-    <TargetFrameworks>net46;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(OS) != 'Windows_NT'">
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="$(OS) == 'Windows_NT'">
diff --git a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj
index b50ea2488e..cc6b3f6dbc 100644
--- a/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj
+++ b/BASE/Test/ServerTelemetryChannel.Test/TelemetryChannel.Tests/TelemetryChannel.Tests.csproj
@@ -3,8 +3,6 @@
 
   <PropertyGroup>
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
-    <TargetFrameworks>$(TargetFrameworks_WithLegacy)</TargetFrameworks>
-    
     <AssemblyName>Microsoft.ApplicationInsights.TelemetryChannel.Tests</AssemblyName>
   </PropertyGroup>
 
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/BaseDefaultHeartbeatPropertyProvider.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/BaseDefaultHeartbeatPropertyProvider.cs
index 1e82c2da54..173ac6fa7d 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/BaseDefaultHeartbeatPropertyProvider.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/BaseDefaultHeartbeatPropertyProvider.cs
@@ -109,6 +109,8 @@ private static string GetBaseSdkTargetFramework()
             return "net452";
 #elif NET46
             return "net46";
+#elif NET462
+            return "net462";
 #elif NETSTANDARD2_0
             return "netstandard2.0";
 #else
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/SelfDiagnostics/SelfDiagnosticsConfigParser.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/SelfDiagnostics/SelfDiagnosticsConfigParser.cs
index b58299c5ee..c4b73a2c17 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/SelfDiagnostics/SelfDiagnosticsConfigParser.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/Implementation/Tracing/SelfDiagnostics/SelfDiagnosticsConfigParser.cs
@@ -53,7 +53,7 @@ public bool TryGetConfiguration(out string logDirectory, out int fileSizeInKB, o
                 // Second, check using current working directory.
                 else if (!File.Exists(configFilePath))
                 {
-#if NET452
+#if NETFRAMEWORK
                     configFilePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, ConfigFileName);
 #else
                     configFilePath = Path.Combine(AppContext.BaseDirectory, ConfigFileName);
diff --git a/BASE/src/Microsoft.ApplicationInsights/Extensibility/SdkInternalOperationsMonitor.cs b/BASE/src/Microsoft.ApplicationInsights/Extensibility/SdkInternalOperationsMonitor.cs
index a6496f256c..456c930257 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Extensibility/SdkInternalOperationsMonitor.cs
+++ b/BASE/src/Microsoft.ApplicationInsights/Extensibility/SdkInternalOperationsMonitor.cs
@@ -1,6 +1,6 @@
 namespace Microsoft.ApplicationInsights.Extensibility
 {
-#if NET452
+#if NETFRAMEWORK
     using System;
     using System.Runtime.Remoting.Messaging;
 
diff --git a/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj b/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj
index 2f3fa9ec64..a5ca49c7bc 100644
--- a/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj
+++ b/BASE/src/Microsoft.ApplicationInsights/Microsoft.ApplicationInsights.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.ApplicationInsights</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights</AssemblyName>
-    <TargetFrameworks>net452;net46;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
diff --git a/BASE/src/ServerTelemetryChannel/Implementation/ApplicationFolderProvider.cs b/BASE/src/ServerTelemetryChannel/Implementation/ApplicationFolderProvider.cs
index ac4eeb45b3..f7653daee8 100644
--- a/BASE/src/ServerTelemetryChannel/Implementation/ApplicationFolderProvider.cs
+++ b/BASE/src/ServerTelemetryChannel/Implementation/ApplicationFolderProvider.cs
@@ -119,7 +119,7 @@ public IPlatformFolder GetApplicationFolder()
 
         internal static bool IsWindowsOperatingSystem()
         {
-#if NET452
+#if NETFRAMEWORK
             return true;
 #else
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
diff --git a/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj b/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj
index ddb6f0b0c3..4ed3e2e36b 100644
--- a/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj
+++ b/BASE/src/ServerTelemetryChannel/TelemetryChannel.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel</RootNamespace>
     <AssemblyName>Microsoft.AI.ServerTelemetryChannel</AssemblyName>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -19,7 +19,7 @@
     <ProjectReference Include="..\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <PackageReference Include="Microsoft.Diagnostics.Tracing.EventRegister" Version="1.1.28">
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e782641d7..763f82197e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 ## VNext
 
+## Version 2.23.0
+- [remove target frameworks net452;net46; because they are no longer supported.](https://github.com/microsoft/ApplicationInsights-dotnet/issues/2850)
+affected projects: DependencyCollector, TelemetryChannel, Perf, WindowsServer, Microsoft.ApplicationInsights.
+- Microsoft.ApplicationInsights.AspNetCore targets net6 to enable framework reference to Microsoft.AspNetCore.App.
+
 ## Version 2.22.0
 - no changes since beta.
 
diff --git a/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj b/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj
index 4e22038644..de03c083b4 100644
--- a/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj
+++ b/LOGGING/src/DiagnosticSourceListener/DiagnosticSourceListener.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(PropsRoot)\Product.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <RootNamespace>Microsoft.ApplicationInsights.DiagnosticSourceListener</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.DiagnosticSourceListener</AssemblyName>
   </PropertyGroup>
diff --git a/LOGGING/src/EtwCollector/EtwCollector.csproj b/LOGGING/src/EtwCollector/EtwCollector.csproj
index cf5b4d454b..b92d0f2fcc 100644
--- a/LOGGING/src/EtwCollector/EtwCollector.csproj
+++ b/LOGGING/src/EtwCollector/EtwCollector.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(PropsRoot)\Product.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <RootNamespace>Microsoft.ApplicationInsights.EtwCollector</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.EtwCollector</AssemblyName>
   </PropertyGroup>
diff --git a/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj b/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj
index 09c31336dd..dcb1334919 100644
--- a/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj
+++ b/LOGGING/src/Log4NetAppender/Log4NetAppender.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(PropsRoot)\Product.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <RootNamespace>Microsoft.ApplicationInsights.Log4NetAppender</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.Log4NetAppender</AssemblyName>
   </PropertyGroup>
diff --git a/LOGGING/src/NLogTarget/NLogTarget.csproj b/LOGGING/src/NLogTarget/NLogTarget.csproj
index e6c2e9ddae..c159f99463 100644
--- a/LOGGING/src/NLogTarget/NLogTarget.csproj
+++ b/LOGGING/src/NLogTarget/NLogTarget.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(PropsRoot)\Product.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <RootNamespace>Microsoft.ApplicationInsights.NLogTarget</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.NLogTarget</AssemblyName>
   </PropertyGroup>
diff --git a/LOGGING/src/TraceListener/TraceListener.csproj b/LOGGING/src/TraceListener/TraceListener.csproj
index e6e70e646a..0078c8414d 100644
--- a/LOGGING/src/TraceListener/TraceListener.csproj
+++ b/LOGGING/src/TraceListener/TraceListener.csproj
@@ -2,7 +2,7 @@
   <Import Project="$(PropsRoot)\Product.props" />
 
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
     <RootNamespace>Microsoft.ApplicationInsights.TraceListener</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.TraceListener</AssemblyName>
   </PropertyGroup>
diff --git a/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj b/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj
index 2c78f0521e..7a805fb15b 100644
--- a/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj
+++ b/LOGGING/test/DiagnosticSourceListener.Tests/DiagnosticSourceListener.Tests.csproj
@@ -5,7 +5,7 @@
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
     <RootNamespace>Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.DiagnosticSourceListener.Tests</AssemblyName>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj b/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj
index c1afa7942f..6d350b88b0 100644
--- a/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj
+++ b/LOGGING/test/EtwCollector.Tests/EtwCollector.Tests.csproj
@@ -5,7 +5,7 @@
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
     <RootNamespace>Microsoft.ApplicationInsights.EtwCollector.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.EtwCollector.Tests</AssemblyName>
-    <TargetFrameworks>net46</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj b/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj
index d3b188001d..d7d272a3cf 100644
--- a/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj
+++ b/LOGGING/test/EventSourceListener.Tests/EventSourceListener.Tests.csproj
@@ -5,7 +5,7 @@
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
     <RootNamespace>Microsoft.ApplicationInsights.EventSourceListener.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.EventSourceListener.Tests</AssemblyName>
-    <TargetFrameworks>netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>    
diff --git a/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj b/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj
index 03214bb5a1..83071d76f0 100644
--- a/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj
+++ b/LOGGING/test/Log4NetAppender.Tests/Log4NetAppender.Tests.csproj
@@ -5,7 +5,7 @@
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
     <RootNamespace>Microsoft.ApplicationInsights.Log4NetAppender.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.Log4NetAppender.Tests</AssemblyName>
-    <TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\..\src\Log4NetAppender\Log4NetAppender.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Net.Http" />
   </ItemGroup>
 
diff --git a/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj b/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj
index 65941f93c8..f487932353 100644
--- a/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj
+++ b/LOGGING/test/NLogTarget.Tests/NLogTarget.Tests.csproj
@@ -5,7 +5,7 @@
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
     <RootNamespace>Microsoft.ApplicationInsights.NLogTarget.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.NLogTarget.Tests</AssemblyName>
-    <TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\..\src\NLogTarget\NLogTarget.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Net.Http" />
   </ItemGroup>
 
diff --git a/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj b/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj
index 8a7d124b6b..1aaf12a71c 100644
--- a/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj
+++ b/LOGGING/test/TraceListener.Tests/TraceListener.Tests.csproj
@@ -5,7 +5,7 @@
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
     <RootNamespace>Microsoft.ApplicationInsights.TraceListener.Tests</RootNamespace>
     <AssemblyName>Microsoft.ApplicationInsights.TraceListener.Tests</AssemblyName>
-    <TargetFrameworks>net452;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net462;net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,7 +17,7 @@
     <ProjectReference Include="..\..\src\TraceListener\TraceListener.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <Reference Include="System.Net.Http" />
   </ItemGroup>
   
diff --git a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj
index a62259cd6b..98157b2f39 100644
--- a/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj
+++ b/NETCORE/src/Microsoft.ApplicationInsights.AspNetCore/Microsoft.ApplicationInsights.AspNetCore.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.ApplicationInsights.AspNetCore</AssemblyName>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
 
     <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.0</TargetFrameworks>
     <DefineConstants>$(DefineConstants);AI_ASPNETCORE_WEB;</DefineConstants>
@@ -24,6 +24,10 @@
 
   <Import Project="..\Shared\Shared.projitems" Label="Shared" />
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj" />
     <ProjectReference Include="..\..\..\BASE\src\ServerTelemetryChannel\TelemetryChannel.csproj" />
@@ -33,31 +37,6 @@
     <ProjectReference Include="..\..\..\WEB\Src\EventCounterCollector\EventCounterCollector\EventCounterCollector.csproj" />
     <ProjectReference Include="..\..\..\LOGGING\src\ILogger\ILogger.csproj" />
     
-    <PackageReference Include="Microsoft.AspNetCore.Hosting" Version="2.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.0" />
-  </ItemGroup>
-
-  <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 
-    
-    These are both implicit dependencies from Microsoft.AspNetCore.Hosting.
-    (Microsoft.AspNetCore.Hosting > Microsoft.AspNetCore.Http)
-    (Microsoft.AspNetCore.Hosting > Microsoft.AspNetCore.Hosting.Abstractions > Microsoft.AspNetCore.Http.Abstractions > System.Text.Encodings.Web)
-    -->
-    
-    <!--
-    Taking a dependency on Microsoft.AspNetCore.Hosting v2.2.0 would resolve this issue, but would also break support for NetCore v2.1.
-    Instead I'm taking a direct dependency on the fixed version Microsoft.AspNetCore.Http.
-    We can remove this when NetCore v2.1 reaches EOL on August 21, 2021.
-    -->
-    <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.1.22" />
-
-    <!-- 
-    We must take a temporary dependency on this newer version until Microsoft.AspNetCore.Hosting updates their dependencies.
-    -->
-    <PackageReference Include="System.Text.Encodings.Web" Version="4.7.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj
index 5a2e26e08b..9cbb066d40 100644
--- a/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj
+++ b/NETCORE/test/FunctionalTests.MVC.Tests/FunctionalTests.MVC.Tests.csproj
@@ -14,6 +14,17 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
   </PropertyGroup>
+  
+  <ItemGroup>
+    <Content Include="Views\Home\About.cshtml" />
+    <Content Include="Views\Home\Contact.cshtml" />
+    <Content Include="Views\Home\Index.cshtml" />
+    <Content Include="Views\Shared\Error.cshtml" />
+    <Content Include="Views\Shared\_Layout.cshtml" />
+    <Content Include="Views\Shared\_ValidationScriptsPartial.cshtml" />
+    <Content Include="Views\_ViewImports.cshtml" />
+    <Content Include="Views\_ViewStart.cshtml" />
+  </ItemGroup>
 
   <ItemGroup>
     <None Update="App.config">
@@ -26,9 +37,9 @@
     <None Update="xunit.runner.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="wwwroot\**\*;Views\**\*">
+    <Content Update="wwwroot\**\*;Views\**\*">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
+    </Content>
   </ItemGroup>
 
   <ItemGroup>
@@ -37,17 +48,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.39" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.TagHelpers" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="2.2.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
@@ -55,9 +55,14 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.27" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
   </ItemGroup>
diff --git a/NETCORE/test/FunctionalTests.MVC.Tests/Startup.cs b/NETCORE/test/FunctionalTests.MVC.Tests/Startup.cs
index 5d7db3ca1c..1ab869c668 100644
--- a/NETCORE/test/FunctionalTests.MVC.Tests/Startup.cs
+++ b/NETCORE/test/FunctionalTests.MVC.Tests/Startup.cs
@@ -35,7 +35,10 @@ public void ConfigureServices(IServiceCollection services)
 
             services.AddSingleton(typeof(ITelemetryChannel), new InMemoryChannel());
             services.AddApplicationInsightsTelemetry(applicationInsightsOptions);
-            services.AddMvc();
+
+            services.AddMvcCore();
+            services.AddControllersWithViews()
+                .AddRazorRuntimeCompilation();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -53,11 +56,13 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
 
             app.UseStaticFiles();
 
-            app.UseMvc(routes =>
+            app.UseRouting();
+
+            app.UseEndpoints(endpoints =>
             {
-                routes.MapRoute(
+                endpoints.MapControllerRoute(
                     name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                    pattern: "{controller=Home}/{action=Index}/{id?}");
             });
         }
     }
diff --git a/NETCORE/test/FunctionalTests.Utils/TelemetryTestsBase.cs b/NETCORE/test/FunctionalTests.Utils/TelemetryTestsBase.cs
index 9bae62bdb9..c0b9f7c8d1 100644
--- a/NETCORE/test/FunctionalTests.Utils/TelemetryTestsBase.cs
+++ b/NETCORE/test/FunctionalTests.Utils/TelemetryTestsBase.cs
@@ -131,6 +131,8 @@ protected HttpResponseMessage ExecuteRequest(string requestPath, Dictionary<stri
 
             using (HttpClient httpClient = new HttpClient(httpClientHandler, true))
             {
+                httpClient.Timeout = TimeSpan.FromMilliseconds(TestListenerTimeoutInMs);
+
                 this.output.WriteLine($"{DateTime.Now:MM/dd/yyyy hh:mm:ss.fff tt}: Executing request: {requestPath}");
                 HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestPath);
                 if (headers != null)
diff --git a/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/DependencyController.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/DependencyController.cs
index 4a81170296..f770553e1f 100644
--- a/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/DependencyController.cs
+++ b/NETCORE/test/FunctionalTests.WebApi.Tests/Controllers/DependencyController.cs
@@ -18,7 +18,7 @@ public async Task Get()
             {
                 // Microsoft.com will return a redirect to a specific lang version.
                 // This redirect is not detected in versions older that Net6.0.
-                await hc.GetAsync("https://www.microsoft.com/en-us/").ContinueWith(t => { }); // ignore all errors
+                await hc.GetAsync("https://visualstudio.microsoft.com/msdn-platforms/").ContinueWith(t => { }); // ignore all errors
             }
         }
     }
diff --git a/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCorrelationTests.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCorrelationTests.cs
index 35b1737bef..94dc865854 100644
--- a/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCorrelationTests.cs
+++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTest/RequestCorrelationTests.cs
@@ -217,7 +217,7 @@ public void TestRequestWithRequestIdAndTraceParentHeader()
         }
 
         [Fact]
-        public void TestRequestWithRequestIdAndTraceParentHeaderWithW3CDisabled()
+        public void TestRequestWithRequestIdHeaderWithW3CDisabled()
         {
             try
             {
@@ -239,8 +239,10 @@ public void TestRequestWithRequestIdAndTraceParentHeaderWithW3CDisabled()
                     {
                         // Both request id and traceparent
                         ["Request-Id"] = "|8ee8641cbdd8dd280d239fa2121c7e4e.df07da90a5b27d93.",
-                        ["traceparent"] = "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01",
-                        ["tracestate"] = "some=state",
+                        // If traceparent is sent in the request, it seems that is has more priority then Request-Id
+                        // so, do not send traceparent and tracestate if you want to use Request-Id and test Hierchical Tracing
+                        //["traceparent"] = "00-4bf92f3577b34da6a3ce929d0e0e4736-00f067aa0ba902b7-01",
+                        //["tracestate"] = "some=state",
                         ["Correlation-Context"] = "k1=v1,k2=v2"
                     };
 
diff --git a/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj
index 76b1866330..a568a8f48e 100644
--- a/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj
+++ b/NETCORE/test/FunctionalTests.WebApi.Tests/FunctionalTests.WebApi.Tests.csproj
@@ -25,11 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.WebApiCompatShim" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
@@ -39,6 +34,10 @@
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
   </ItemGroup>
 
+  <ItemGroup>
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
+  </ItemGroup>
+
   <ItemGroup>
     <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0" />
   </ItemGroup>
diff --git a/NETCORE/test/FunctionalTests.WebApi.Tests/Startup.cs b/NETCORE/test/FunctionalTests.WebApi.Tests/Startup.cs
index 78eee6b87a..39b426947e 100644
--- a/NETCORE/test/FunctionalTests.WebApi.Tests/Startup.cs
+++ b/NETCORE/test/FunctionalTests.WebApi.Tests/Startup.cs
@@ -23,7 +23,7 @@ public void ConfigureServices(IServiceCollection services)
             services.AddSingleton<EndpointAddress>(endpointAddress);
             services.AddSingleton(typeof(ITelemetryChannel), new InMemoryChannel() { EndpointAddress = endpointAddress.ConnectionString, DeveloperMode = true });
             services.AddApplicationInsightsTelemetry(InProcessServer.IKey);
-            services.AddMvc();
+            services.AddControllers();
         }
 
         // This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
@@ -34,10 +34,11 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
                 app.UseDeveloperExceptionPage();
             }
 
-            app.UseMvc(routes =>
+            app.UseRouting();
+
+            app.UseEndpoints(endpoints =>
             {
-                // Add the following route for porting Web API 2 controllers.
-                routes.MapWebApiRoute("DefaultApi", "api/{controller}/{id?}");
+                endpoints.MapControllers();
             });
         }
     }
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 39bb5f9b7e..e960449d28 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
@@ -21,12 +21,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(IsNetCore)' == 'True'">
-    <!-- TODO: Can't switch to FrameworkReference yet; 
-         'IHostingEnvironment' is obsolete: 'This type is obsolete and will be removed in a future version. 
-         The recommended alternative is Microsoft.AspNetCore.Hosting.IWebHostEnvironment.' -->
-    <!--<FrameworkReference Include="Microsoft.AspNetCore.App" />-->
-
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
+    <FrameworkReference Include="Microsoft.AspNetCore.App" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj
index e25d8c3efe..b0c7f8e3ed 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj
+++ b/WEB/Src/DependencyCollector/DependencyCollector.Tests/DependencyCollector.Tests.csproj
@@ -3,8 +3,6 @@
 
   <PropertyGroup>
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
-    <TargetFrameworks>$(TargetFrameworks_WithLegacy)</TargetFrameworks>
-    
     <AssemblyName>Microsoft.ApplicationInsights.DependencyCollector.Tests</AssemblyName>
     <PackageId>Microsoft.AI.DependencyCollector.Tests</PackageId>
   </PropertyGroup>
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj
index 11fd6ca6d6..b6653beecb 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj
+++ b/WEB/Src/DependencyCollector/DependencyCollector/DependencyCollector.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.ApplicationInsights.DependencyCollector</RootNamespace>
     <AssemblyName>Microsoft.AI.DependencyCollector</AssemblyName>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0</TargetFrameworks>
     <Prefer32Bit>false</Prefer32Bit>
     <!-- net45 -->
@@ -29,13 +29,13 @@
     <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourcePkgVer)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <PackageReference Include="Microsoft.ApplicationInsights.Agent.Intercept" Version="2.4.0" />
 
     <Reference Include="System.Net.Http" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <!--Framework References-->
     <Reference Include="System.Runtime.Caching" />
   </ItemGroup>
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs b/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs
index 12ce39323b..a4f62f602e 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/DependencyTrackingTelemetryModule.cs
@@ -24,7 +24,7 @@ public class DependencyTrackingTelemetryModule : ITelemetryModule, IDisposable
     {
         private readonly object lockObject = new object();
 
-#if NET452
+#if NETFRAMEWORK
         private HttpDesktopDiagnosticSourceListener httpDesktopDiagnosticSourceListener;
         private FrameworkHttpEventListener httpEventListener;
         private FrameworkSqlEventListener sqlEventListener;
@@ -231,7 +231,7 @@ protected virtual void Dispose(bool disposing)
             {
                 if (disposing)
                 {
-#if NET452
+#if NETFRAMEWORK
                     // Net40 does not support framework event source and diagnostic source
                     if (this.httpDesktopDiagnosticSourceListener != null)
                     {
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
index a5495a4b2d..392fbba47b 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/AzureSdk/AzureSdkEventListener.cs
@@ -87,7 +87,7 @@ protected sealed override void OnEventWritten(EventWrittenEventArgs eventData)
                 trace.Properties["EventId"] = eventData.EventId.ToString(CultureInfo.InvariantCulture);
             }
 
-#if !NET452
+#if !NETFRAMEWORK
             if (!string.IsNullOrEmpty(eventData.EventName))
             {
                 trace.Properties["EventName"] = eventData.EventName;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ClientServerDependencyTracker.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ClientServerDependencyTracker.cs
index f0e50e7b9e..2104c99cf0 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ClientServerDependencyTracker.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ClientServerDependencyTracker.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyTableStore.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyTableStore.cs
index 3d60d06d7f..93d371e6a6 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyTableStore.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DependencyTableStore.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DesktopDiagnosticSourceHttpProcessing.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DesktopDiagnosticSourceHttpProcessing.cs
index 4fe70b43d5..346e369af8 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DesktopDiagnosticSourceHttpProcessing.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/DesktopDiagnosticSourceHttpProcessing.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkHttpEventListener.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkHttpEventListener.cs
index 9812ad786b..6ee91dd5eb 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkHttpEventListener.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkHttpEventListener.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkHttpProcessing.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkHttpProcessing.cs
index 61a945a413..8288060c6e 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkHttpProcessing.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkHttpProcessing.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkSqlEventListener.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkSqlEventListener.cs
index 6d6b077eed..7bc010e428 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkSqlEventListener.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkSqlEventListener.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkSqlProcessing.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkSqlProcessing.cs
index fc3cdbcd5d..575f296a00 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkSqlProcessing.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/FrameworkSqlProcessing.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpDesktopDiagnosticSourceListener.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpDesktopDiagnosticSourceListener.cs
index 8313fb88bb..42114a5d02 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpDesktopDiagnosticSourceListener.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpDesktopDiagnosticSourceListener.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpDesktopDiagnosticSourceSubscriber.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpDesktopDiagnosticSourceSubscriber.cs
index 54cb2f2e67..707a1c319c 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpDesktopDiagnosticSourceSubscriber.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpDesktopDiagnosticSourceSubscriber.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpProcessing.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpProcessing.cs
index abccd0d7ab..f69398100c 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpProcessing.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/HttpProcessing.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/Operation/CacheBasedOperationHolder.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/Operation/CacheBasedOperationHolder.cs
index a2012405b6..02c3990b5c 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/Operation/CacheBasedOperationHolder.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/Operation/CacheBasedOperationHolder.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation.Operation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerHttpProcessing.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerHttpProcessing.cs
index ef474bc6eb..77b930ab3c 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerHttpProcessing.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerHttpProcessing.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerRuntimeInstrumentation.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerRuntimeInstrumentation.cs
index 4c428eb351..0937535762 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerRuntimeInstrumentation.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerRuntimeInstrumentation.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using Microsoft.Diagnostics.Instrumentation.Extensions.Intercept;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlCommandProcessing.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlCommandProcessing.cs
index 9152f35d4a..95cce3577b 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlCommandProcessing.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlCommandProcessing.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System.Data;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlConnectionProcessing.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlConnectionProcessing.cs
index 294c62ecb7..9bd0bbcd3d 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlConnectionProcessing.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlConnectionProcessing.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System.Data.SqlClient;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlProcessingBase.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlProcessingBase.cs
index c4c9c4c203..4ccb1f51f3 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlProcessingBase.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/ProfilerSqlProcessingBase.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/RetryPolicy.cs b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/RetryPolicy.cs
index 43a4f95594..b93cd2957e 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/Implementation/RetryPolicy.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/Implementation/RetryPolicy.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector.Implementation
 {
     using System;
diff --git a/WEB/Src/DependencyCollector/DependencyCollector/TelemetryExtensionsForDependencyCollector.cs b/WEB/Src/DependencyCollector/DependencyCollector/TelemetryExtensionsForDependencyCollector.cs
index f007ca49ae..f49a413344 100644
--- a/WEB/Src/DependencyCollector/DependencyCollector/TelemetryExtensionsForDependencyCollector.cs
+++ b/WEB/Src/DependencyCollector/DependencyCollector/TelemetryExtensionsForDependencyCollector.cs
@@ -1,4 +1,4 @@
-#if NET452
+#if NETFRAMEWORK
 namespace Microsoft.ApplicationInsights.DependencyCollector
 {
     using System;
diff --git a/WEB/Src/PerformanceCollector/Perf.Tests/Perf.Tests.csproj b/WEB/Src/PerformanceCollector/Perf.Tests/Perf.Tests.csproj
index d7d07e32c6..12186720fe 100644
--- a/WEB/Src/PerformanceCollector/Perf.Tests/Perf.Tests.csproj
+++ b/WEB/Src/PerformanceCollector/Perf.Tests/Perf.Tests.csproj
@@ -3,8 +3,6 @@
 
   <PropertyGroup>
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
-    <TargetFrameworks>$(TargetFrameworks_WithLegacy)</TargetFrameworks>
-    
     <AssemblyName>Microsoft.AI.PerformanceCollector.Tests</AssemblyName>
     <RootNamespace>Microsoft.ApplicationInsights.Tests</RootNamespace>
   </PropertyGroup>
diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterUtility.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterUtility.cs
index fd4925ad8b..63604bd594 100644
--- a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterUtility.cs
+++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/PerformanceCounterUtility.cs
@@ -19,7 +19,7 @@
     /// <summary>
     /// Utility functionality for performance counter collection.
     /// </summary>
-    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "This class has different code for Net452/NetCore")]
+    [SuppressMessage("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields", Justification = "This class has different code for Net462/NetCore")]
     internal static class PerformanceCounterUtility
     {
 #if NETSTANDARD2_0
@@ -74,7 +74,7 @@ public static bool IsPerfCounterSupported()
             return true;
         }
 
-#if NET452
+#if NETFRAMEWORK
         public static IPerformanceCollector GetPerformanceCollector()
         {
             IPerformanceCollector collector;
@@ -353,7 +353,7 @@ internal static string GetInstanceFromApplicationDomain(string domainFriendlyNam
             return nameWithoutTrailingData.Replace('/', '_');
         }
 
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "This method has different code for Net452/NetCore")]
+        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "This method has different code for Net462/NetCore")]
         internal static string GetInstanceForWin32Process(IEnumerable<string> win32Instances)
         {
             return FindProcessInstance(
@@ -363,7 +363,7 @@ internal static string GetInstanceForWin32Process(IEnumerable<string> win32Insta
                 Win32ProcessCounterName);
         }
 
-        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "This method has different code for Net452/NetCore")]
+        [SuppressMessage("Microsoft.Usage", "CA1801:ReviewUnusedParameters", Justification = "This method has different code for Net462/NetCore")]
         internal static string GetInstanceForClrProcess(IEnumerable<string> clrInstances)
         {
             return FindProcessInstance(
diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CacheHelper.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CacheHelper.cs
index e80fd5d498..98fcb658fa 100644
--- a/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CacheHelper.cs
+++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Implementation/WebAppPerformanceCollector/CacheHelper.cs
@@ -13,7 +13,7 @@
     /// <summary>
     /// Class to contain the one cache for all Gauges.
     /// </summary>
-    [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification="This class targets both net452 and netstandard. Net Standard implementation has instance members.")]
+    [SuppressMessage("Microsoft.Performance", "CA1822:MarkMembersAsStatic", Justification="This class targets both net462 and netstandard. Net Standard implementation has instance members.")]
     internal class CacheHelper : ICachedEnvironmentVariableAccess, IDisposable
     {
         /// <summary>
diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj b/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj
index 5526b41b0c..d54e2a5e5c 100644
--- a/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj
+++ b/WEB/Src/PerformanceCollector/PerformanceCollector/Perf.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.ApplicationInsights.Extensibility.PerfCounterCollector</RootNamespace>
     <AssemblyName>Microsoft.AI.PerfCounterCollector</AssemblyName>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -21,7 +21,7 @@
     <ProjectReference Include="..\..\..\..\BASE\src\Microsoft.ApplicationInsights\Microsoft.ApplicationInsights.csproj" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <!--Framework References-->
     <Reference Include="System.Runtime.Caching" />
     <Reference Include="System.Web" />
@@ -45,7 +45,7 @@
     <AdditionalFiles Include="$(PublicApiRoot)\$(AssemblyName).dll\$(TargetFramework)\PublicAPI.Unshipped.txt" />
   </ItemGroup>
   <Import Project="..\..\Common\Common.projitems" Label="Shared" />
-  <Import Project="..\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems" Label="Shared" Condition="'$(TargetFramework)' == 'net452'" />
+  <Import Project="..\Perf.Shared.NetFull\Perf.Shared.NetFull.projitems" Label="Shared" Condition="'$(TargetFramework)' == 'net462'" />
   <Import Project="..\Perf.Shared.NetStandard\Perf.Shared.NetStandard.projitems" Label="Shared" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
 
 </Project>
\ No newline at end of file
diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/PerformanceCollectorModule.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/PerformanceCollectorModule.cs
index 0b5a542393..b34f066e08 100644
--- a/WEB/Src/PerformanceCollector/PerformanceCollector/PerformanceCollectorModule.cs
+++ b/WEB/Src/PerformanceCollector/PerformanceCollector/PerformanceCollectorModule.cs
@@ -160,7 +160,7 @@ public void Initialize(TelemetryConfiguration configuration)
                             this.DefaultCounters.Add(new PerformanceCounterCollectionRequest(@"\Process(??APP_WIN32_PROC??)\% Processor Time Normalized", @"\Process(??APP_WIN32_PROC??)\% Processor Time Normalized"));
                             this.DefaultCounters.Add(new PerformanceCounterCollectionRequest(@"\Process(??APP_WIN32_PROC??)\Private Bytes", @"\Process(??APP_WIN32_PROC??)\Private Bytes"));
 
-#if NET452         // The following are Asp.Net specific counters.
+#if NETFRAMEWORK         // The following are Asp.Net specific counters.
                             this.DefaultCounters.Add(new PerformanceCounterCollectionRequest(@"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests/Sec", @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Requests/Sec"));
                             this.DefaultCounters.Add(new PerformanceCounterCollectionRequest(@"\.NET CLR Exceptions(??APP_CLR_PROC??)\# of Exceps Thrown / sec", @"\.NET CLR Exceptions(??APP_CLR_PROC??)\# of Exceps Thrown / sec"));
                             this.DefaultCounters.Add(new PerformanceCounterCollectionRequest(@"\ASP.NET Applications(??APP_W3SVC_PROC??)\Request Execution Time", @"\ASP.NET Applications(??APP_W3SVC_PROC??)\Request Execution Time"));
diff --git a/WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryProcessor.cs b/WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryProcessor.cs
index fe18c96a94..a2c15ff678 100644
--- a/WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryProcessor.cs
+++ b/WEB/Src/PerformanceCollector/PerformanceCollector/QuickPulseTelemetryProcessor.cs
@@ -626,7 +626,7 @@ private void ProcessTelemetry(ITelemetry telemetry)
         private ITelemetryDocument ConvertRequestToTelemetryDocument(RequestTelemetry requestTelemetry)
         {
             var url = requestTelemetry.Url;
-#if NET452
+#if NETFRAMEWORK
             if (this.EvaluateDisabledTrackingProperties && url == null)
             {
                 try
diff --git a/WEB/Src/Web/Web.Tests/Web.Tests.csproj b/WEB/Src/Web/Web.Tests/Web.Tests.csproj
index c43c44fd29..715f92ddee 100644
--- a/WEB/Src/Web/Web.Tests/Web.Tests.csproj
+++ b/WEB/Src/Web/Web.Tests/Web.Tests.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
     <!-- Important: This project is exclusively NetFramework. This will not be upgraded to NetStandard nor NetCore. -->
-    <TargetFrameworks>$(TargetFrameworks_NetFrameworkOnly)</TargetFrameworks>
+    <TargetFrameworks>$(SupportedFrameworks_NetFx)</TargetFrameworks>
     
     <AssemblyName>Microsoft.ApplicationInsights.Web.Tests</AssemblyName>
   </PropertyGroup>
diff --git a/WEB/Src/Web/Web/Implementation/WebEventSource.cs b/WEB/Src/Web/Web/Implementation/WebEventSource.cs
index 5402b0a778..1fd8daaaa8 100644
--- a/WEB/Src/Web/Web/Implementation/WebEventSource.cs
+++ b/WEB/Src/Web/Web/Implementation/WebEventSource.cs
@@ -2,7 +2,7 @@
 {
     using System;
     using System.Diagnostics.CodeAnalysis;
-#if NET452
+#if NETFRAMEWORK
     using System.Diagnostics.Tracing;
 #endif
     using Microsoft.ApplicationInsights.Common;
diff --git a/WEB/Src/Web/Web/Web.csproj b/WEB/Src/Web/Web/Web.csproj
index 236b1938f7..1d951247bd 100644
--- a/WEB/Src/Web/Web/Web.csproj
+++ b/WEB/Src/Web/Web/Web.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.ApplicationInsights.Web</RootNamespace>
     <AssemblyName>Microsoft.AI.Web</AssemblyName>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFrameworks>net462</TargetFrameworks>
     <!-- Important: This project is exclusively NetFramework. This will not be upgraded to NetStandard nor NetCore. -->
     <Prefer32Bit>false</Prefer32Bit>
     <DefineConstants>$(DefineConstants);ALLOW_AGGRESSIVE_INLIGNING_ATTRIBUTE</DefineConstants>
diff --git a/WEB/Src/WindowsServer/WindowsServer.Tests/Mock/NetPlatformHttpResponseTypesExtension.cs b/WEB/Src/WindowsServer/WindowsServer.Tests/Mock/NetPlatformHttpResponseTypesExtension.cs
index 8ce0047410..2149af3edd 100644
--- a/WEB/Src/WindowsServer/WindowsServer.Tests/Mock/NetPlatformHttpResponseTypesExtension.cs
+++ b/WEB/Src/WindowsServer/WindowsServer.Tests/Mock/NetPlatformHttpResponseTypesExtension.cs
@@ -28,7 +28,7 @@ public static void SetContentEncoding(this HttpResponse resp, Encoding enc)
         {
         }
 
-#elif NET452
+#elif NETFRAMEWORK
 
         public static void SetContentLength(this HttpListenerResponse resp, long len)
         {
diff --git a/WEB/Src/WindowsServer/WindowsServer.Tests/WindowsServer.Tests.csproj b/WEB/Src/WindowsServer/WindowsServer.Tests/WindowsServer.Tests.csproj
index 3166c8ff9b..ee546911a4 100644
--- a/WEB/Src/WindowsServer/WindowsServer.Tests/WindowsServer.Tests.csproj
+++ b/WEB/Src/WindowsServer/WindowsServer.Tests/WindowsServer.Tests.csproj
@@ -3,8 +3,6 @@
 
   <PropertyGroup>
     <!-- TargetFrameworks are defined in Test.props, but can be overridden here if needed. -->
-    <TargetFrameworks>$(TargetFrameworks_WithLegacy)</TargetFrameworks>
-    
     <AssemblyName>Microsoft.AI.WindowsServer.Tests</AssemblyName>
     <RootNamespace>Microsoft.ApplicationInsights.Tests</RootNamespace>
   </PropertyGroup>
diff --git a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj
index aab6dd0694..34353da7cd 100644
--- a/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj
+++ b/WEB/Src/WindowsServer/WindowsServer/WindowsServer.csproj
@@ -4,7 +4,7 @@
   <PropertyGroup>
     <RootNamespace>Microsoft.ApplicationInsights.WindowsServer</RootNamespace>
     <AssemblyName>Microsoft.AI.WindowsServer</AssemblyName>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net462;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="$(OS) != 'Windows_NT'">netstandard2.0</TargetFrameworks>
   </PropertyGroup>
 
@@ -35,7 +35,7 @@
     <Content Include="Microsoft.ApplicationInsights.WindowsServer.targets" PackagePath="build" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net452'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <!--Framework References-->
     <Reference Include="System.Management" />
     <Reference Include="System.Net.Http" />