From 8cf831fdff85a6b4e921942c105be0a522bb8115 Mon Sep 17 00:00:00 2001 From: MikhailArkhipov Date: Thu, 5 Sep 2019 11:50:13 -0700 Subject: [PATCH 1/2] Upgrade to 3.0 --- src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj | 2 +- src/Analysis/Ast/Test/FluentAssertions/AssertionsUtilities.cs | 1 + src/Analysis/Ast/Test/Microsoft.Python.Analysis.Tests.csproj | 2 +- src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj | 2 +- src/Core/Impl/Microsoft.Python.Core.csproj | 2 +- src/Core/Test/Microsoft.Python.Core.Tests.csproj | 2 +- src/LanguageServer/Impl/Formatting/BlockFormatter.cs | 1 + src/LanguageServer/Impl/Formatting/LineFormatter.cs | 1 + src/LanguageServer/Impl/LanguageServer.cs | 2 +- src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj | 2 +- src/LanguageServer/Impl/Protocol/Classes.cs | 2 +- src/LanguageServer/Impl/Protocol/Messages.cs | 1 + src/LanguageServer/Impl/Sources/HoverSource.cs | 2 +- .../Test/FluentAssertions/TextEditCollectionAssertions.cs | 1 + .../Test/Microsoft.Python.LanguageServer.Tests.csproj | 2 +- src/Parsing/Impl/Microsoft.Python.Parsing.csproj | 2 +- src/Parsing/Test/Microsoft.Python.Parsing.Tests.csproj | 2 +- src/UnitTests/Core/Impl/UnitTests.Core.csproj | 2 +- 18 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj b/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj index 8f4bbee5a..f4f68aa84 100644 --- a/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj +++ b/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.1 Microsoft.Python.Analysis Microsoft.Python.Analysis 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 @@  - netcoreapp2.2 + netcoreapp3.0 Microsoft.Python.Analysis.Tests Microsoft.Python.Analysis.Tests diff --git a/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj b/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj index 4e97b8e58..ea90bd130 100644 --- a/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj +++ b/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.1 Microsoft.Python.Analysis Microsoft.Python.Analysis.Core diff --git a/src/Core/Impl/Microsoft.Python.Core.csproj b/src/Core/Impl/Microsoft.Python.Core.csproj index f41668645..f7cb41618 100644 --- a/src/Core/Impl/Microsoft.Python.Core.csproj +++ b/src/Core/Impl/Microsoft.Python.Core.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.1 Microsoft.Python.Core Microsoft.Python.Core 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 @@  - netcoreapp2.2 + netcoreapp3.0 Microsoft.Python.Core.Tests Microsoft.Python.Core.Tests 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 { /// 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 { /// 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 { /// 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 @@  - netcoreapp2.2 + netcoreapp3.0 Microsoft.Python.LanguageServer Microsoft.Python.LanguageServer 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 @@  - netcoreapp2.2 + netcoreapp3.0 Microsoft.Python.LanguageServer.Tests Microsoft.Python.LanguageServer.Tests diff --git a/src/Parsing/Impl/Microsoft.Python.Parsing.csproj b/src/Parsing/Impl/Microsoft.Python.Parsing.csproj index 0b21cd07b..2773fbace 100644 --- a/src/Parsing/Impl/Microsoft.Python.Parsing.csproj +++ b/src/Parsing/Impl/Microsoft.Python.Parsing.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netstandard2.1 Microsoft.Python.Parsing Microsoft.Python.Parsing 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 @@  - netcoreapp2.2 + netcoreapp3.0 Microsoft.Python.Parsing.Tests Microsoft.Python.Parsing.Tests 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 @@  - netstandard2.0 + netstandard2.1 Microsoft.Python.UnitTests.Core Microsoft.Python.UnitTests.Core From 26ea552ede5fd72cb85867f5ddd9700ad9e1b5cd Mon Sep 17 00:00:00 2001 From: MikhailArkhipov Date: Thu, 5 Sep 2019 13:00:44 -0700 Subject: [PATCH 2/2] Get back to 2.0 --- src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj | 2 +- src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj | 2 +- src/Core/Impl/Microsoft.Python.Core.csproj | 2 +- src/Parsing/Impl/Microsoft.Python.Parsing.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj b/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj index f4f68aa84..8f4bbee5a 100644 --- a/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj +++ b/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + netstandard2.0 Microsoft.Python.Analysis Microsoft.Python.Analysis diff --git a/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj b/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj index ea90bd130..4e97b8e58 100644 --- a/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj +++ b/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + netstandard2.0 Microsoft.Python.Analysis Microsoft.Python.Analysis.Core diff --git a/src/Core/Impl/Microsoft.Python.Core.csproj b/src/Core/Impl/Microsoft.Python.Core.csproj index f7cb41618..f41668645 100644 --- a/src/Core/Impl/Microsoft.Python.Core.csproj +++ b/src/Core/Impl/Microsoft.Python.Core.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + netstandard2.0 Microsoft.Python.Core Microsoft.Python.Core diff --git a/src/Parsing/Impl/Microsoft.Python.Parsing.csproj b/src/Parsing/Impl/Microsoft.Python.Parsing.csproj index 2773fbace..0b21cd07b 100644 --- a/src/Parsing/Impl/Microsoft.Python.Parsing.csproj +++ b/src/Parsing/Impl/Microsoft.Python.Parsing.csproj @@ -1,6 +1,6 @@  - netstandard2.1 + netstandard2.0 Microsoft.Python.Parsing Microsoft.Python.Parsing