diff --git a/src/Analysis/Ast/Test/FluentAssertions/AssertionsUtilities.cs b/src/Analysis/Ast/Test/FluentAssertions/AssertionsUtilities.cs
index 9be29ed15..70ad06871 100644
--- a/src/Analysis/Ast/Test/FluentAssertions/AssertionsUtilities.cs
+++ b/src/Analysis/Ast/Test/FluentAssertions/AssertionsUtilities.cs
@@ -24,6 +24,7 @@
 using Microsoft.Python.Core;
 using Microsoft.Python.Core.Text;
 using Microsoft.Python.Parsing;
+using Range = Microsoft.Python.Core.Text.Range;
 
 namespace Microsoft.Python.Analysis.Tests.FluentAssertions {
     public static class AssertionsUtilities {
diff --git a/src/Analysis/Ast/Test/Microsoft.Python.Analysis.Tests.csproj b/src/Analysis/Ast/Test/Microsoft.Python.Analysis.Tests.csproj
index 4a7a9f7a7..2e5dfb031 100644
--- a/src/Analysis/Ast/Test/Microsoft.Python.Analysis.Tests.csproj
+++ b/src/Analysis/Ast/Test/Microsoft.Python.Analysis.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <RootNamespace>Microsoft.Python.Analysis.Tests</RootNamespace>
     <AssemblyName>Microsoft.Python.Analysis.Tests</AssemblyName>
   </PropertyGroup>
diff --git a/src/Core/Test/Microsoft.Python.Core.Tests.csproj b/src/Core/Test/Microsoft.Python.Core.Tests.csproj
index 1ca8be126..131762ab6 100644
--- a/src/Core/Test/Microsoft.Python.Core.Tests.csproj
+++ b/src/Core/Test/Microsoft.Python.Core.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <RootNamespace>Microsoft.Python.Core.Tests</RootNamespace>
     <AssemblyName>Microsoft.Python.Core.Tests</AssemblyName>
   </PropertyGroup>
diff --git a/src/LanguageServer/Impl/Formatting/BlockFormatter.cs b/src/LanguageServer/Impl/Formatting/BlockFormatter.cs
index 30e820c8a..adbd7cd52 100644
--- a/src/LanguageServer/Impl/Formatting/BlockFormatter.cs
+++ b/src/LanguageServer/Impl/Formatting/BlockFormatter.cs
@@ -24,6 +24,7 @@
 using Microsoft.Python.Core.Diagnostics;
 using Microsoft.Python.Core.Text;
 using Microsoft.Python.LanguageServer.Protocol;
+using Range = Microsoft.Python.Core.Text.Range;
 
 namespace Microsoft.Python.LanguageServer.Formatting {
     /// <summary>
diff --git a/src/LanguageServer/Impl/Formatting/LineFormatter.cs b/src/LanguageServer/Impl/Formatting/LineFormatter.cs
index 22720232b..88afbe1b7 100644
--- a/src/LanguageServer/Impl/Formatting/LineFormatter.cs
+++ b/src/LanguageServer/Impl/Formatting/LineFormatter.cs
@@ -24,6 +24,7 @@
 using Microsoft.Python.Core.Text;
 using Microsoft.Python.LanguageServer.Protocol;
 using Microsoft.Python.Parsing;
+using Range = Microsoft.Python.Core.Text.Range;
 
 namespace Microsoft.Python.LanguageServer.Formatting {
     /// <summary>
diff --git a/src/LanguageServer/Impl/LanguageServer.cs b/src/LanguageServer/Impl/LanguageServer.cs
index e522897de..5831b91fa 100644
--- a/src/LanguageServer/Impl/LanguageServer.cs
+++ b/src/LanguageServer/Impl/LanguageServer.cs
@@ -25,7 +25,6 @@
 using Microsoft.Python.Core.Idle;
 using Microsoft.Python.Core.Logging;
 using Microsoft.Python.Core.Services;
-using Microsoft.Python.Core.Text;
 using Microsoft.Python.Core.Threading;
 using Microsoft.Python.LanguageServer.Extensibility;
 using Microsoft.Python.LanguageServer.Protocol;
@@ -33,6 +32,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using StreamJsonRpc;
+using Range = Microsoft.Python.Core.Text.Range;
 
 namespace Microsoft.Python.LanguageServer.Implementation {
     /// <summary>
diff --git a/src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj b/src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj
index 58b65f302..c14e1229b 100644
--- a/src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj
+++ b/src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj
@@ -1,6 +1,6 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>netcoreapp2.2</TargetFramework>
+        <TargetFramework>netcoreapp3.0</TargetFramework>
         <RootNamespace>Microsoft.Python.LanguageServer</RootNamespace>
         <AssemblyName>Microsoft.Python.LanguageServer</AssemblyName>
     </PropertyGroup>
diff --git a/src/LanguageServer/Impl/Protocol/Classes.cs b/src/LanguageServer/Impl/Protocol/Classes.cs
index 7f93794d9..a22bccf42 100644
--- a/src/LanguageServer/Impl/Protocol/Classes.cs
+++ b/src/LanguageServer/Impl/Protocol/Classes.cs
@@ -16,8 +16,8 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using Microsoft.Python.Core.Text;
 using Newtonsoft.Json;
+using Range = Microsoft.Python.Core.Text.Range;
 
 namespace Microsoft.Python.LanguageServer.Protocol {
     [Serializable]
diff --git a/src/LanguageServer/Impl/Protocol/Messages.cs b/src/LanguageServer/Impl/Protocol/Messages.cs
index 7c70d3686..2fb1305bb 100644
--- a/src/LanguageServer/Impl/Protocol/Messages.cs
+++ b/src/LanguageServer/Impl/Protocol/Messages.cs
@@ -17,6 +17,7 @@
 using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.Python.Core.Text;
+using Range = Microsoft.Python.Core.Text.Range;
 
 namespace Microsoft.Python.LanguageServer.Protocol {
     [Serializable]
diff --git a/src/LanguageServer/Impl/Sources/HoverSource.cs b/src/LanguageServer/Impl/Sources/HoverSource.cs
index 83cdf51fa..22ed0aeb5 100644
--- a/src/LanguageServer/Impl/Sources/HoverSource.cs
+++ b/src/LanguageServer/Impl/Sources/HoverSource.cs
@@ -13,7 +13,6 @@
 // See the Apache Version 2.0 License for specific language governing
 // permissions and limitations under the License.
 
-using System;
 using Microsoft.Python.Analysis;
 using Microsoft.Python.Analysis.Analyzer;
 using Microsoft.Python.Analysis.Analyzer.Expressions;
@@ -25,6 +24,7 @@
 using Microsoft.Python.LanguageServer.Completion;
 using Microsoft.Python.LanguageServer.Protocol;
 using Microsoft.Python.Parsing.Ast;
+using Range = Microsoft.Python.Core.Text.Range;
 
 namespace Microsoft.Python.LanguageServer.Sources {
     internal sealed class HoverSource {
diff --git a/src/LanguageServer/Test/FluentAssertions/TextEditCollectionAssertions.cs b/src/LanguageServer/Test/FluentAssertions/TextEditCollectionAssertions.cs
index d3e8534ad..cd4a556db 100644
--- a/src/LanguageServer/Test/FluentAssertions/TextEditCollectionAssertions.cs
+++ b/src/LanguageServer/Test/FluentAssertions/TextEditCollectionAssertions.cs
@@ -23,6 +23,7 @@
 using Microsoft.Python.Core.Text;
 using Microsoft.Python.LanguageServer.Protocol;
 using static Microsoft.Python.Analysis.Tests.FluentAssertions.AssertionsUtilities;
+using Range = Microsoft.Python.Core.Text.Range;
 
 namespace Microsoft.Python.LanguageServer.Tests.FluentAssertions {
     [ExcludeFromCodeCoverage]
diff --git a/src/LanguageServer/Test/Microsoft.Python.LanguageServer.Tests.csproj b/src/LanguageServer/Test/Microsoft.Python.LanguageServer.Tests.csproj
index 3bf4d084d..85c33691c 100644
--- a/src/LanguageServer/Test/Microsoft.Python.LanguageServer.Tests.csproj
+++ b/src/LanguageServer/Test/Microsoft.Python.LanguageServer.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <RootNamespace>Microsoft.Python.LanguageServer.Tests</RootNamespace>
     <AssemblyName>Microsoft.Python.LanguageServer.Tests</AssemblyName>
   </PropertyGroup>
diff --git a/src/Parsing/Test/Microsoft.Python.Parsing.Tests.csproj b/src/Parsing/Test/Microsoft.Python.Parsing.Tests.csproj
index 8eeb7a1ed..23ff93b1d 100644
--- a/src/Parsing/Test/Microsoft.Python.Parsing.Tests.csproj
+++ b/src/Parsing/Test/Microsoft.Python.Parsing.Tests.csproj
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <RootNamespace>Microsoft.Python.Parsing.Tests</RootNamespace>
     <AssemblyName>Microsoft.Python.Parsing.Tests</AssemblyName>
   </PropertyGroup>
diff --git a/src/UnitTests/Core/Impl/UnitTests.Core.csproj b/src/UnitTests/Core/Impl/UnitTests.Core.csproj
index 3a1e90721..165ef15c4 100644
--- a/src/UnitTests/Core/Impl/UnitTests.Core.csproj
+++ b/src/UnitTests/Core/Impl/UnitTests.Core.csproj
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>Microsoft.Python.UnitTests.Core</RootNamespace>
     <AssemblyName>Microsoft.Python.UnitTests.Core</AssemblyName>
   </PropertyGroup>