Skip to content

Commit 583154a

Browse files
ariel-levyariel-levy
authored
Merge pull request #4 from apiiro/ohad/net-core-6
net core 6
2 parents 41149cd + 7b025fc commit 583154a

12 files changed

+57
-24
lines changed

‎make-nuget.sh

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
#!/bin/bash
2+
3+
# NOTE:
4+
# 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.
5+
6+
WORK_DIR=`pwd`
7+
8+
pushd ./src/LanguageServer/Impl
9+
dotnet pack --configuration Release
10+
dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.LanguageServer.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
11+
popd
12+
13+
pushd ./src/Analysis/Ast/Impl
14+
dotnet pack --configuration Release
15+
dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.Analysis.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
16+
popd
17+
18+
pushd ./src/Analysis/Core/Impl
19+
dotnet pack --configuration Release
20+
dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.Analysis.Core.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
21+
popd
22+
23+
pushd ./src/Parsing/Impl
24+
dotnet pack --configuration Release
25+
dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.Parsing.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
26+
popd
27+
28+
pushd ./src/Core/Impl
29+
dotnet pack --configuration Release
30+
dotnet nuget push $WORK_DIR/output/bin/Release/Microsoft.Python.Core.1.0.2.nupkg --source "github" --skip-duplicate --no-symbols true
31+
popd
32+

‎src/Analysis/Ast/Impl/Microsoft.Python.Analysis.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.Analysis</RootNamespace>
55
<AssemblyName>Microsoft.Python.Analysis</AssemblyName>
66
<PackageId>Microsoft.Python.Analysis</PackageId>
7-
<Version>1.0.1</Version>
7+
<Version>1.0.2</Version>
88
<Authors>Apiiro</Authors>
99
<Company>Apiiro</Company>
1010
<RepositoryUrl>https://github.com/apiiro/python-language-server</RepositoryUrl>

‎src/Analysis/Ast/Test/Microsoft.Python.Analysis.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.Analysis.Tests</RootNamespace>
55
<AssemblyName>Microsoft.Python.Analysis.Tests</AssemblyName>
66
</PropertyGroup>

‎src/Analysis/Core/Impl/Microsoft.Python.Analysis.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.Analysis</RootNamespace>
55
<AssemblyName>Microsoft.Python.Analysis.Core</AssemblyName>
66
<PackageId>Microsoft.Python.Analysis.Core</PackageId>
7-
<Version>1.0.1</Version>
7+
<Version>1.0.2</Version>
88
<Authors>Apiiro</Authors>
99
<Company>Apiiro</Company>
1010
<RepositoryUrl>https://github.com/apiiro/python-language-server</RepositoryUrl>

‎src/Core/Impl/Extensions/EnumerableExtensions.cs

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -167,14 +167,15 @@ public static IEnumerable<T> TraverseDepthFirst<T>(this T root, Func<T, IEnumera
167167
}
168168
}
169169

170-
public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> selector) {
171-
var seen = new HashSet<TKey>();
172-
173-
foreach (var item in source) {
174-
if (seen.Add(selector(item))) {
175-
yield return item;
176-
}
177-
}
178-
}
170+
// this method is implemented is System.Linq in .net core 6
171+
// public static IEnumerable<TSource> DistinctBy<TSource, TKey>(this IEnumerable<TSource> source, Func<TSource, TKey> selector) {
172+
// var seen = new HashSet<TKey>();
173+
//
174+
// foreach (var item in source) {
175+
// if (seen.Add(selector(item))) {
176+
// yield return item;
177+
// }
178+
// }
179+
// }
179180
}
180181
}

‎src/Core/Impl/Microsoft.Python.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.Core</RootNamespace>
55
<AssemblyName>Microsoft.Python.Core</AssemblyName>
66
<PackageId>Microsoft.Python.Core</PackageId>
7-
<Version>1.0.1</Version>
7+
<Version>1.0.2</Version>
88
<Authors>Apiiro</Authors>
99
<Company>Apiiro</Company>
1010
<RepositoryUrl>https://github.com/apiiro/python-language-server</RepositoryUrl>

‎src/Core/Test/Microsoft.Python.Core.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.Core.Tests</RootNamespace>
55
<AssemblyName>Microsoft.Python.Core.Tests</AssemblyName>
66
</PropertyGroup>

‎src/LanguageServer/Impl/Microsoft.Python.LanguageServer.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.LanguageServer</RootNamespace>
55
<AssemblyName>Microsoft.Python.LanguageServer</AssemblyName>
66
<PackageId>Microsoft.Python.LanguageServer</PackageId>
7-
<Version>1.0.1</Version>
7+
<Version>1.0.2</Version>
88
<Authors>Apiiro</Authors>
99
<Company>Apiiro</Company>
1010
<PackageDescription>Apiiro Python Language Server</PackageDescription>

‎src/LanguageServer/Test/Microsoft.Python.LanguageServer.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.LanguageServer.Tests</RootNamespace>
55
<AssemblyName>Microsoft.Python.LanguageServer.Tests</AssemblyName>
66
</PropertyGroup>

‎src/Parsing/Impl/Microsoft.Python.Parsing.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.Parsing</RootNamespace>
55
<AssemblyName>Microsoft.Python.Parsing</AssemblyName>
66
<PackageId>Microsoft.Python.Parsing</PackageId>
7-
<Version>1.0.1</Version>
7+
<Version>1.0.2</Version>
88
<Authors>Apiiro</Authors>
99
<Company>Apiiro</Company>
1010
<RepositoryUrl>https://github.com/apiiro/python-language-server</RepositoryUrl>

‎src/Parsing/Test/Microsoft.Python.Parsing.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.Parsing.Tests</RootNamespace>
55
<AssemblyName>Microsoft.Python.Parsing.Tests</AssemblyName>
66
</PropertyGroup>

‎src/UnitTests/Core/Impl/UnitTests.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<RootNamespace>Microsoft.Python.UnitTests.Core</RootNamespace>
55
<AssemblyName>Microsoft.Python.UnitTests.Core</AssemblyName>
66
</PropertyGroup>

0 commit comments

Comments
 (0)