Update Abp to 5.0, support for net core 3.0!

maliming · Nov 9, 2019 · 8561642 · 8561642
1 parent e662a8d
commit 8561642
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 26 deletions.
diff --git a/Abp.GeneralTree/Abp.GeneralTree.csproj b/Abp.GeneralTree/Abp.GeneralTree.csproj
@@ -4,14 +4,14 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <Version>2.4.3</Version>
+    <Version>3.0.0</Version>
     <PackageProjectUrl>https://github.com/maliming/Abp.GeneralTree</PackageProjectUrl>
     <Authors>maliming</Authors>
     <Company>maliming</Company>
-    <PackageReleaseNotes>Update Abp to 4.4.0</PackageReleaseNotes>
+    <PackageReleaseNotes>Update Abp to 5.0, support for net core 3.0!</PackageReleaseNotes>
     <Description>Abp.GeneralTree Based on the idea of Organizations in Abp, we did a general management of the entity tree structure.</Description>
-    <AssemblyVersion>2.4.3.0</AssemblyVersion>
-    <FileVersion>2.4.3.0</FileVersion>
+    <AssemblyVersion>3.0.0.0</AssemblyVersion>
+    <FileVersion>3.0.0.0</FileVersion>
     <PackageTags>abp,generaltree</PackageTags>
     <RepositoryUrl>https://github.com/maliming/Abp.GeneralTree</RepositoryUrl>
     <RepositoryType />
@@ -21,7 +21,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp" Version="4.4.0" />
+    <PackageReference Include="Abp" Version="5.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Abp.GeneralTree/GeneralTree/GeneralTreeManager.cs b/Abp.GeneralTree/GeneralTree/GeneralTreeManager.cs
@@ -262,14 +262,27 @@ private async Task<List<TTree>> GetChildrenAsync(TPrimaryKey? parentId, bool rec
         /// <returns></returns>
         private void CheckSameName(TTree tree)
         {
-            if (_generalTreeRepository.GetAll().Where(EqualParentId(tree.ParentId))
-                .WhereIf(_generalTreeConfiguration.CheckSameNameExpression != null,
-                    x => _generalTreeConfiguration.CheckSameNameExpression(x, tree))
-                .Where(NotEqualId(tree.Id))
-                .Any(x => x.Name == tree.Name))
+            if (_generalTreeConfiguration.CheckSameNameExpression == null)
             {
-                throw new UserFriendlyException(_generalTreeConfiguration.ExceptionMessageFactory.Invoke(tree));
+                if (!_generalTreeRepository.GetAll().Where(EqualParentId(tree.ParentId))
+                    .Where(NotEqualId(tree.Id))
+                    .Any(x => x.Name == tree.Name))
+                {
+                    return;
+                }
+            }
+            else
+            {
+                var trees = _generalTreeRepository.GetAll().Where(EqualParentId(tree.ParentId))
+                    .Where(NotEqualId(tree.Id))
+                    .Where(x => x.Name == tree.Name).ToList();
+                if (!trees.Any() || !trees.Any(x => _generalTreeConfiguration.CheckSameNameExpression(x, tree)))
+                {
+                    return;
+                }
             }
+
+            throw new UserFriendlyException(_generalTreeConfiguration.ExceptionMessageFactory.Invoke(tree));
         }
 
         /// <summary>

diff --git a/Abp.GeneralTree/GeneralTree/GeneralTreeManagerWithReferenceType.cs b/Abp.GeneralTree/GeneralTree/GeneralTreeManagerWithReferenceType.cs
@@ -263,13 +263,25 @@ private async Task<List<TTree>> GetChildrenAsync(TPrimaryKey parentId, bool recu
         /// <returns></returns>
         private void CheckSameName(TTree tree)
         {
-            if (_generalTreeRepository.GetAll().Where(x => x.ParentId == tree.ParentId && x.Id != tree.Id).WhereIf(
-                    _generalTreeConfiguration.CheckSameNameExpression != null,
-                    x => _generalTreeConfiguration.CheckSameNameExpression(x, tree))
-                .Any(x => x.Name == tree.Name))
+            if (_generalTreeConfiguration.CheckSameNameExpression == null)
             {
-                throw new UserFriendlyException(_generalTreeConfiguration.ExceptionMessageFactory.Invoke(tree));
+                if (!_generalTreeRepository.GetAll().Where(x => x.ParentId == tree.ParentId && x.Id != tree.Id)
+                    .Any(x => x.Name == tree.Name))
+                {
+                    return;
+                }
+            }
+            else
+            {
+                var trees = _generalTreeRepository.GetAll().Where(x => x.ParentId == tree.ParentId && x.Id != tree.Id)
+                    .Where(x => x.Name == tree.Name).ToList();
+                if (!trees.Any() || !trees.Any(x => _generalTreeConfiguration.CheckSameNameExpression(x, tree)))
+                {
+                    return;
+                }
             }
+
+            throw new UserFriendlyException(_generalTreeConfiguration.ExceptionMessageFactory.Invoke(tree));
         }
 
         /// <summary>

diff --git a/TreeApplication/TreeAppDbContext.cs b/TreeApplication/TreeAppDbContext.cs
@@ -13,5 +13,14 @@ public TreeAppDbContext(DbContextOptions<TreeAppDbContext> options)
         public virtual DbSet<Region> Region { get; set; }
 
         public virtual DbSet<Region2> Region2 { get; set; }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+
+            modelBuilder.Entity<Region2>()
+                .Property(b => b.Id)
+                .ValueGeneratedOnAdd();
+        }
     }
 }
diff --git a/TreeApplication/TreeApplication.csproj b/TreeApplication/TreeApplication.csproj
@@ -1,12 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp" Version="4.4.0" />
-    <PackageReference Include="Abp.EntityFrameworkCore" Version="4.4.0" />
+    <PackageReference Include="Abp" Version="5.0.0" />
+    <PackageReference Include="Abp.EntityFrameworkCore" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TreeTests/TreeTests.csproj b/TreeTests/TreeTests.csproj
@@ -1,17 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.EntityFrameworkCore" Version="4.4.0" />
-    <PackageReference Include="Abp.TestBase" Version="4.4.0" />
+    <PackageReference Include="Abp.EntityFrameworkCore" Version="5.0.0" />
+    <PackageReference Include="Abp.TestBase" Version="5.0.0" />
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.3.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.3" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="Shouldly" Version="3.0.2" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">