Merge pull request #4 from apiiro/ohad/net-core-6

net core 6
apiiro · Dec 2, 2021 · 583154a · 583154a
2 parents 41149cd + 7b025fc
commit 583154a
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 24 deletions.
diff --git a/make-nuget.sh b/make-nuget.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# NOTE:
+# Until we'll set the version as an argument make sure to change the version in the 'nuget push' lines to matach the version in binaries.
+
+WORK_DIR=`pwd`
+
+pushd ./src/LanguageServer/Impl
+dotnet pack --configuration Release
+dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.LanguageServer.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
+popd
+
+pushd ./src/Analysis/Ast/Impl
+dotnet pack --configuration Release
+dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.Analysis.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
+popd
+
+pushd ./src/Analysis/Core/Impl
+dotnet pack --configuration Release
+dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.Analysis.Core.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
+popd
+
+pushd ./src/Parsing/Impl
+dotnet pack --configuration Release
+dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.Parsing.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
+popd
+
+pushd ./src/Core/Impl
+dotnet pack --configuration Release
+dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.Core.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
+popd
+
diff --git a/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj b/src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Python.Analysis</RootNamespace>
     <AssemblyName>Microsoft.Python.Analysis</AssemblyName>
     <PackageId>Microsoft.Python.Analysis</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <Authors>Apiiro</Authors>
     <Company>Apiiro</Company>
     <RepositoryUrl>https://github.com/apiiro/python-language-server</RepositoryUrl>

diff --git 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>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Python.Analysis.Tests</RootNamespace>
     <AssemblyName>Microsoft.Python.Analysis.Tests</AssemblyName>
   </PropertyGroup>

diff --git a/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj b/src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Python.Analysis</RootNamespace>
     <AssemblyName>Microsoft.Python.Analysis.Core</AssemblyName>
     <PackageId>Microsoft.Python.Analysis.Core</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <Authors>Apiiro</Authors>
     <Company>Apiiro</Company>
     <RepositoryUrl>https://github.com/apiiro/python-language-server</RepositoryUrl>

diff --git a/src/Core/Impl/Extensions/EnumerableExtensions.cs b/src/Core/Impl/Extensions/EnumerableExtensions.cs
@@ -167,14 +167,15 @@ public static IEnumerable<T> TraverseDepthFirst<T>(this T root, Func<T, IEnumera
             }
         }
 
-        public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> selector) {
-            var seen = new HashSet<TKey>();
-
-            foreach (var item in source) {
-                if (seen.Add(selector(item))) {
-                    yield return item;
-                }
-            }
-        }
+        // this method is implemented is System.Linq in .net core 6
+        // public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> selector) {
+        //     var seen = new HashSet<TKey>();
+        //
+        //     foreach (var item in source) {
+        //         if (seen.Add(selector(item))) {
+        //             yield return item;
+        //         }
+        //     }
+        // }
     }
 }
diff --git a/src/Core/Impl/Microsoft.Python.Core.csproj b/src/Core/Impl/Microsoft.Python.Core.csproj
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Python.Core</RootNamespace>
     <AssemblyName>Microsoft.Python.Core</AssemblyName>
     <PackageId>Microsoft.Python.Core</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <Authors>Apiiro</Authors>
     <Company>Apiiro</Company>
     <RepositoryUrl>https://github.com/apiiro/python-language-server</RepositoryUrl>

diff --git 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>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Python.Core.Tests</RootNamespace>
     <AssemblyName>Microsoft.Python.Core.Tests</AssemblyName>
   </PropertyGroup>

diff --git a/src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj b/src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj
@@ -1,10 +1,10 @@
 <Project>
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <RootNamespace>Microsoft.Python.LanguageServer</RootNamespace>
         <AssemblyName>Microsoft.Python.LanguageServer</AssemblyName>
         <PackageId>Microsoft.Python.LanguageServer</PackageId>
-        <Version>1.0.1</Version>
+        <Version>1.0.2</Version>
         <Authors>Apiiro</Authors>
         <Company>Apiiro</Company>
         <PackageDescription>Apiiro Python Language Server</PackageDescription>

diff --git 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>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Python.LanguageServer.Tests</RootNamespace>
     <AssemblyName>Microsoft.Python.LanguageServer.Tests</AssemblyName>
   </PropertyGroup>

diff --git a/src/Parsing/Impl/Microsoft.Python.Parsing.csproj b/src/Parsing/Impl/Microsoft.Python.Parsing.csproj
@@ -1,10 +1,10 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Python.Parsing</RootNamespace>
     <AssemblyName>Microsoft.Python.Parsing</AssemblyName>
     <PackageId>Microsoft.Python.Parsing</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <Authors>Apiiro</Authors>
     <Company>Apiiro</Company>
     <RepositoryUrl>https://github.com/apiiro/python-language-server</RepositoryUrl>

diff --git 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>net5.0</TargetFramework>
+    <TargetFramework>net6.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
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>Microsoft.Python.UnitTests.Core</RootNamespace>
     <AssemblyName>Microsoft.Python.UnitTests.Core</AssemblyName>
   </PropertyGroup>