Skip to content

Commit

Permalink
EntitFrameworkCore project updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@bberka
bberka committed Feb 20, 2023
1 parent 97ecbf8 commit 95fe3cb
Show file tree
Hide file tree
Showing 75 changed files with 43 additions and 13 deletions.
Binary file modified .vs/EasMe/DesignTimeBuild/.dtbcache.v2
View file
Binary file not shown.
Binary file removed .vs/EasMe/FileContentIndex/066e7d79-a41b-4506-b4a2-4417654427ea.vsidx
View file
Binary file not shown.
Binary file removed .vs/EasMe/FileContentIndex/1b3754e9-066d-4e60-96da-d496fe1c57b7.vsidx
View file
Binary file not shown.
Binary file added .vs/EasMe/FileContentIndex/767c030c-f4c9-4905-be28-0c8fcadb386d.vsidx
View file
Binary file not shown.
Binary file added .vs/EasMe/FileContentIndex/af7ebc93-aafb-49d0-9a44-175711a9a90b.vsidx
View file
Binary file not shown.
Binary file modified .vs/EasMe/v17/.futdcache.v2
View file
Binary file not shown.
Binary file modified .vs/EasMe/v17/.suo
View file
Binary file not shown.
Binary file modified .vs/ProjectEvaluation/easme.metadata.v5.2
View file
Binary file not shown.
Binary file modified .vs/ProjectEvaluation/easme.projects.v5.2
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/EasMe.Authorization/EasMe.Authorization.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>E:\Repos\easme-lib\bin</BaseOutputPath>
<BaseOutputPath>C:\Users\kkass\source\build\easme</BaseOutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/EasMe.Authorization/obj/Release/net6.0/EasMe.Authorization.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ C:\Users\kkass\source\repos\easme-lib\src\EasMe.Authorization\obj\Release\net6.0
C:\Users\kkass\source\repos\easme-lib\src\EasMe.Authorization\obj\Release\net6.0\refint\EasMe.Authorization.dll
C:\Users\kkass\source\repos\easme-lib\src\EasMe.Authorization\obj\Release\net6.0\EasMe.Authorization.pdb
C:\Users\kkass\source\repos\easme-lib\src\EasMe.Authorization\obj\Release\net6.0\ref\EasMe.Authorization.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.Authorization.deps.json
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.Authorization.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.Authorization.pdb
2 changes: 1 addition & 1 deletion src/EasMe.EntityFrameworkCore/EasMe.EntityFrameworkCore.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>E:\Repos\easme-lib\bin</BaseOutputPath>
<BaseOutputPath>C:\Users\kkass\source\build\easme</BaseOutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 6 additions & 1 deletion src/EasMe.EntityFrameworkCore/V2/GenericRepository.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected GenericRepository(TContext context)
return query.FirstOrDefault();
}

public IEnumerable<TEntity> Get(
public IEnumerable<TEntity> GetOrdered(
Expression<Func<TEntity, bool>>? filter = null,
Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>>? orderBy = null,
params Expression<Func<TEntity, object>>[] includeExpressions)
Expand All @@ -57,6 +57,11 @@ public IEnumerable<TEntity> Get(
return query.ToList();
}

public IEnumerable<TEntity> Get(Expression<Func<TEntity, bool>>? filter = null, params Expression<Func<TEntity, object>>[] includeExpressions)
{
return GetOrdered(filter, null, includeExpressions);
}

public IEnumerable<TEntity> GetPaging(int page, int pageSize = 15, Expression<Func<TEntity, bool>>? filter = null, Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>>? orderBy = null,
params Expression<Func<TEntity, object>>[] includeExpressions)
{
Expand Down
5 changes: 4 additions & 1 deletion src/EasMe.EntityFrameworkCore/V2/IGenericRepository.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ public interface IGenericRepository<TEntity>

TEntity? GetFirstOrDefault(Expression<Func<TEntity, bool>>? filter = null,params string[] includeProperties);

IEnumerable<TEntity> Get(
IEnumerable<TEntity> GetOrdered(
Expression<Func<TEntity, bool>>? filter = null,
Func<IQueryable<TEntity>, IOrderedQueryable<TEntity>>? orderBy = null,
params Expression<Func<TEntity, object>>[] includeExpressions);

IEnumerable<TEntity> Get(
Expression<Func<TEntity, bool>>? filter = null,
params Expression<Func<TEntity, object>>[] includeExpressions);
IEnumerable<TEntity> GetPaging(
int page,
int pageSize = 15,
Expand Down
Binary file modified ...tyFrameworkCore/obj/Debug/net6.0/EasMe.EntityFrameworkCore.csproj.AssemblyReference.cache
View file
Binary file not shown.
Binary file modified src/EasMe.EntityFrameworkCore/obj/Debug/net6.0/EasMe.EntityFrameworkCore.dll
View file
Binary file not shown.
Binary file modified src/EasMe.EntityFrameworkCore/obj/Debug/net6.0/EasMe.EntityFrameworkCore.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.EntityFrameworkCore/obj/Debug/net6.0/ref/EasMe.EntityFrameworkCore.dll
View file
Binary file not shown.
Binary file modified src/EasMe.EntityFrameworkCore/obj/Debug/net6.0/refint/EasMe.EntityFrameworkCore.dll
View file
Binary file not shown.
Binary file modified ...FrameworkCore/obj/Release/net6.0/EasMe.EntityFrameworkCore.csproj.AssemblyReference.cache
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion ...FrameworkCore/obj/Release/net6.0/EasMe.EntityFrameworkCore.csproj.CoreCompileInputs.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4fbaddf516866f3104b9d7a3d8da7630fbd2f36c
007fe6ae99a1eeb0482db102946cfa261cc0a83e
3 changes: 3 additions & 0 deletions ...ityFrameworkCore/obj/Release/net6.0/EasMe.EntityFrameworkCore.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,6 @@ C:\Users\kkass\source\repos\easme-lib\src\EasMe.EntityFrameworkCore\obj\Release\
C:\Users\kkass\source\repos\easme-lib\src\EasMe.EntityFrameworkCore\obj\Release\net6.0\refint\EasMe.EntityFrameworkCore.dll
C:\Users\kkass\source\repos\easme-lib\src\EasMe.EntityFrameworkCore\obj\Release\net6.0\EasMe.EntityFrameworkCore.pdb
C:\Users\kkass\source\repos\easme-lib\src\EasMe.EntityFrameworkCore\obj\Release\net6.0\ref\EasMe.EntityFrameworkCore.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.EntityFrameworkCore.deps.json
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.EntityFrameworkCore.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.EntityFrameworkCore.pdb
Binary file modified src/EasMe.EntityFrameworkCore/obj/Release/net6.0/EasMe.EntityFrameworkCore.dll
View file
Binary file not shown.
Binary file modified src/EasMe.EntityFrameworkCore/obj/Release/net6.0/EasMe.EntityFrameworkCore.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.EntityFrameworkCore/obj/Release/net6.0/ref/EasMe.EntityFrameworkCore.dll
View file
Binary file not shown.
Binary file modified src/EasMe.EntityFrameworkCore/obj/Release/net6.0/refint/EasMe.EntityFrameworkCore.dll
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/EasMe.Logging/EasMe.Logging.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>E:\Repos\easme-lib\bin</BaseOutputPath>
<BaseOutputPath>C:\Users\kkass\source\build\easme</BaseOutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
Binary file modified src/EasMe.Logging/obj/Debug/net6.0/EasMe.Logging.csproj.AssemblyReference.cache
View file
Binary file not shown.
Binary file modified src/EasMe.Logging/obj/Debug/net6.0/EasMe.Logging.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Logging/obj/Debug/net6.0/EasMe.Logging.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.Logging/obj/Debug/net6.0/ref/EasMe.Logging.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Logging/obj/Debug/net6.0/refint/EasMe.Logging.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Logging/obj/Release/net6.0/EasMe.Logging.csproj.AssemblyReference.cache
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/EasMe.Logging/obj/Release/net6.0/EasMe.Logging.csproj.CoreCompileInputs.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3fe5d1851511512d8a641bcd4cc06fc992616935
4deb16b6d161176afe28dea038996679840eb3e0
3 changes: 3 additions & 0 deletions src/EasMe.Logging/obj/Release/net6.0/EasMe.Logging.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ C:\Users\kkass\source\repos\easme-lib\src\EasMe.Logging\obj\Release\net6.0\EasMe
C:\Users\kkass\source\repos\easme-lib\src\EasMe.Logging\obj\Release\net6.0\refint\EasMe.Logging.dll
C:\Users\kkass\source\repos\easme-lib\src\EasMe.Logging\obj\Release\net6.0\EasMe.Logging.pdb
C:\Users\kkass\source\repos\easme-lib\src\EasMe.Logging\obj\Release\net6.0\ref\EasMe.Logging.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.Logging.deps.json
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.Logging.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.Logging.pdb
Binary file modified src/EasMe.Logging/obj/Release/net6.0/EasMe.Logging.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Logging/obj/Release/net6.0/EasMe.Logging.pdb
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/EasMe.Result/EasMe.Result.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>E:\Repos\easme-lib\bin</BaseOutputPath>
<BaseOutputPath>C:\Users\kkass\source\build\easme</BaseOutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
3 changes: 3 additions & 0 deletions src/EasMe.Result/obj/Release/net6.0/EasMe.Result.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ C:\Users\kkass\source\repos\easme-lib\src\EasMe.Result\obj\Release\net6.0\EasMe.
C:\Users\kkass\source\repos\easme-lib\src\EasMe.Result\obj\Release\net6.0\refint\EasMe.Result.dll
C:\Users\kkass\source\repos\easme-lib\src\EasMe.Result\obj\Release\net6.0\EasMe.Result.pdb
C:\Users\kkass\source\repos\easme-lib\src\EasMe.Result\obj\Release\net6.0\ref\EasMe.Result.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.Result.deps.json
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.Result.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.Result.pdb
2 changes: 1 addition & 1 deletion src/EasMe.System/EasMe.System.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<BaseOutputPath>E:\Repos\easme-lib\bin</BaseOutputPath>
<BaseOutputPath>C:\Users\kkass\source\build\easme</BaseOutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
Binary file modified src/EasMe.System/obj/Debug/net6.0/EasMe.System.csproj.AssemblyReference.cache
View file
Binary file not shown.
Binary file modified src/EasMe.System/obj/Debug/net6.0/EasMe.System.dll
View file
Binary file not shown.
Binary file modified src/EasMe.System/obj/Debug/net6.0/EasMe.System.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.System/obj/Release/net6.0/EasMe.System.csproj.AssemblyReference.cache
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/EasMe.System/obj/Release/net6.0/EasMe.System.csproj.CoreCompileInputs.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4f57c65c8221924b7d08869770181520f4411221
8e905c4576fda693f060a31a58ed37a1a7cf8949
3 changes: 3 additions & 0 deletions src/EasMe.System/obj/Release/net6.0/EasMe.System.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@ C:\Users\kkass\source\repos\easme-lib\src\EasMe.System\obj\Release\net6.0\EasMe.
C:\Users\kkass\source\repos\easme-lib\src\EasMe.System\obj\Release\net6.0\refint\EasMe.System.dll
C:\Users\kkass\source\repos\easme-lib\src\EasMe.System\obj\Release\net6.0\EasMe.System.pdb
C:\Users\kkass\source\repos\easme-lib\src\EasMe.System\obj\Release\net6.0\ref\EasMe.System.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.System.deps.json
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.System.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.System.pdb
Binary file modified src/EasMe.System/obj/Release/net6.0/EasMe.System.dll
View file
Binary file not shown.
Binary file modified src/EasMe.System/obj/Release/net6.0/EasMe.System.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.Test/bin/Debug/net6.0/EasMe.Test.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Test/bin/Debug/net6.0/EasMe.Test.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.Test/bin/Debug/net6.0/EasMe.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Test/bin/Debug/net6.0/EasMe.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.Test/bin/Release/net6.0/EasMe.Test.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Test/bin/Release/net6.0/EasMe.Test.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.Test/bin/Release/net6.0/EasMe.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Test/bin/Release/net6.0/EasMe.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.Test/obj/Debug/net6.0/EasMe.Test.csproj.AssemblyReference.cache
View file
Binary file not shown.
Binary file modified src/EasMe.Test/obj/Debug/net6.0/EasMe.Test.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Test/obj/Debug/net6.0/EasMe.Test.pdb
View file
Binary file not shown.
Binary file modified src/EasMe.Test/obj/Release/net6.0/EasMe.Test.csproj.AssemblyReference.cache
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/EasMe.Test/obj/Release/net6.0/EasMe.Test.csproj.CoreCompileInputs.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8d2ea205706e6760677d7181089b0a8280750876
335f1b3f63a596d9a24be34587385f5279b18b9d
Binary file modified src/EasMe.Test/obj/Release/net6.0/EasMe.Test.dll
View file
Binary file not shown.
Binary file modified src/EasMe.Test/obj/Release/net6.0/EasMe.Test.pdb
View file
Binary file not shown.
4 changes: 4 additions & 0 deletions src/EasMe/EasConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,10 @@ namespace EasMe;

public static class EasConfig
{
public static string? GetConnectionString(string key)
{
return ConfigurationManager.ConnectionStrings[key]?.ConnectionString?.ToString();
}
public static string? GetString(string key)
{
return ConfigurationManager.AppSettings[key]?.ToString();
Expand Down
2 changes: 1 addition & 1 deletion src/EasMe/EasMe.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<Configurations>Debug;Release;TESTSERVER;REAL_RLS;TEST_RLS</Configurations>
<BaseOutputPath>E:\Repos\easme-lib\bin</BaseOutputPath>
<BaseOutputPath>C:\Users\kkass\source\build\easme</BaseOutputPath>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/EasMe/obj/Debug/net6.0/EasMe.csproj.CoreCompileInputs.cache
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c7903f7e52ba13e9e285edef2720d1ac5b71e03b
c7016d7df7b3499697a9be79c4ce454d0df5accd
Binary file modified src/EasMe/obj/Debug/net6.0/EasMe.dll
View file
Binary file not shown.
Binary file modified src/EasMe/obj/Debug/net6.0/EasMe.pdb
View file
Binary file not shown.
Binary file modified src/EasMe/obj/Debug/net6.0/ref/EasMe.dll
View file
Binary file not shown.
Binary file modified src/EasMe/obj/Debug/net6.0/refint/EasMe.dll
View file
Binary file not shown.
3 changes: 3 additions & 0 deletions src/EasMe/obj/Release/net6.0/EasMe.csproj.FileListAbsolute.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,6 @@ C:\Users\kkass\source\repos\easme-lib\src\EasMe\obj\Release\net6.0\EasMe.dll
C:\Users\kkass\source\repos\easme-lib\src\EasMe\obj\Release\net6.0\refint\EasMe.dll
C:\Users\kkass\source\repos\easme-lib\src\EasMe\obj\Release\net6.0\EasMe.pdb
C:\Users\kkass\source\repos\easme-lib\src\EasMe\obj\Release\net6.0\ref\EasMe.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.deps.json
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.dll
C:\Users\kkass\source\build\easme\Release\net6.0\EasMe.pdb
Binary file modified src/EasMe/obj/Release/net6.0/EasMe.dll
View file
Binary file not shown.
Binary file modified src/EasMe/obj/Release/net6.0/EasMe.pdb
View file
Binary file not shown.
Binary file modified src/EasMe/obj/Release/net6.0/ref/EasMe.dll
View file
Binary file not shown.
Binary file modified src/EasMe/obj/Release/net6.0/refint/EasMe.dll
View file
Binary file not shown.

0 comments on commit 95fe3cb

Please sign in to comment.