Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -150,3 +150,7 @@ $RECYCLE.BIN/
lib/Packages/
src/packages/
/src/.vs/Shaolinq/v15/sqlite3/storage.ide

# Rider IDE

.idea
32 changes: 32 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
version: "3.8"

networks:
test-stand:

services:
postgress:
image: stellirin/postgres-windows:latest
environment:
- POSTGRES_PASSWORD=postgres
ports:
- "5432:5432"
networks:
- test-stand
mysql:
image: pomelofoundation/mysql-windows:8-ltsc2019
ports:
- "3306:3306"
environment:
- MYSQL_ROOT_HOST=%
- MYSQL_ROOT_PASSWORD=root
networks:
- test-stand
mssql:
image: kkbruce/mssql-server-windows-express:windowsservercore-1809
ports:
- "1433:1433"
environment:
- ACCEPT_EULA=Y
- sa_password=r00t_p@$$w0rd1
networks:
- test-stand
Empty file removed lib/.gitignore
Empty file.
Binary file removed lib/Mono.Data.Sqlite.dll
Binary file not shown.
Empty file removed nuspec/GeneratedAsync.cs.pp
Empty file.
26 changes: 0 additions & 26 deletions nuspec/RewriteAsyncAttribute.cs.pp

This file was deleted.

22 changes: 0 additions & 22 deletions nuspec/Shaolinq.AsyncRewriter.nuspec

This file was deleted.

4 changes: 0 additions & 4 deletions nuspec/Shaolinq.AsyncRewriter.props

This file was deleted.

25 changes: 0 additions & 25 deletions nuspec/Shaolinq.AsyncRewriter.targets

This file was deleted.

36 changes: 0 additions & 36 deletions nuspec/Shaolinq.MySql.nuspec

This file was deleted.

2 changes: 1 addition & 1 deletion nuspec/Shaolinq.Postgres.DotConnect.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Designed to perform super fast and be easy to use, Shaolinq's features also incl
<tags>shaolinq linq provider orm postgres sql database</tags>
<dependencies>
<dependency id="Shaolinq" version="$version$"/>
<dependency id="dotConnect.Express.for.PostgreSQL" version="7.10.1061"/>
<dependency id="dotConnect.Express.for.PostgreSQL" version="7.24.2066"/>
</dependencies>
</metadata>
</package>
36 changes: 0 additions & 36 deletions nuspec/Shaolinq.Postgres.nuspec

This file was deleted.

35 changes: 0 additions & 35 deletions nuspec/Shaolinq.SqlServer.nuspec

This file was deleted.

36 changes: 0 additions & 36 deletions nuspec/Shaolinq.Sqlite.nuspec

This file was deleted.

34 changes: 0 additions & 34 deletions nuspec/Shaolinq.nuspec

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net5.0</TargetFramework>
<TargetFramework>net6.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Shaolinq.AsyncRewriter/CompilationLookup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ private bool MethodIsPublicOrAccessibleFromCompilation(IMethodSymbol method)

if ((method.DeclaredAccessibility == Accessibility.Internal
|| method.DeclaredAccessibility == Accessibility.ProtectedOrInternal)
&& Equals(method.ContainingAssembly, this.compilation.Assembly))
&& SymbolEqualityComparer.Default.Equals(method.ContainingAssembly, this.compilation.Assembly))
{
return true;
}
Expand Down Expand Up @@ -61,7 +61,7 @@ public List<IMethodSymbol> GetExtensionMethods(string name, ITypeSymbol type)
}
}

return retval.OrderBy(c => c.Key.ContainingAssembly.Equals(this.compilation.Assembly) ? 0 : c.Value + 1).Select(c => c.Key).ToList();
return retval.OrderBy(c => SymbolEqualityComparer.Default.Equals(c.Key.ContainingAssembly,this.compilation.Assembly) ? 0 : c.Value + 1).Select(c => c.Key).ToList();
}

private void Visit(Compilation compilationNode)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public override SyntaxNode VisitInvocationExpression(InvocationExpressionSyntax
if (result.Symbol == null)
{
var newNode = node.WithArgumentList(SyntaxFactory.ArgumentList(SyntaxFactory.SeparatedList(node.ArgumentList.Arguments
.Where(c => GetArgumentType(c) != this.cancellationTokenSymbol))));
.Where(c => !SymbolEqualityComparer.Default.Equals(GetArgumentType(c),this.cancellationTokenSymbol)))));

var visited = Visit(node.Expression);

Expand Down
Loading