Merge pull request #47 from EasyAbp/abp601

Upgrade to ABP 6.0.1
EasyAbp · Nov 20, 2022 · 6255e03 · 6255e03
2 parents 153ef9a + 95036e7
commit 6255e03
Show file tree

Hide file tree

Showing 45 changed files with 18,846 additions and 1,087 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -34,6 +34,9 @@ jobs:
       - name: dotnet build
         run: dotnet build -c Release
 
+      - name: dotnet test
+        run: dotnet test -c Release --no-restore --no-build
+
       - name: dotnet pack
         run: dotnet pack -c Release --no-build -o dest
 
@@ -47,6 +50,7 @@ jobs:
           del *.Host.Shared.*
           del *.HttpApi.Host.*
           del *.IdentityServer.*
+          del *.AuthServer.*
           del *.Web.Host.*
           del *.Web.Unified.*
           del *.HttpApi.Client.ConsoleTestApp.*

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
     <PropertyGroup>
 
-        <AbpVersion>5.3.1</AbpVersion>
-        <EasyAbpAbpTreesModuleVersion>2.7.1</EasyAbpAbpTreesModuleVersion>
+        <AbpVersion>6.0.1</AbpVersion>
+        <EasyAbpAbpTreesModuleVersion>2.8.0</EasyAbpAbpTreesModuleVersion>
         <OrleansVersion>3.6.5</OrleansVersion>
 
     </PropertyGroup>

diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.2.0</Version>
+    <Version>0.3.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <AbpProjectType>module</AbpProjectType>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>

diff --git a/docs/README.md b/docs/README.md
@@ -1,2 +1,9 @@
 # BookingService
+
+[![ABP version](https://img.shields.io/badge/dynamic/xml?style=flat-square&color=yellow&label=abp&query=%2F%2FProject%2FPropertyGroup%2FAbpVersion&url=https%3A%2F%2Fraw.githubusercontent.com%2FEasyAbp%2FBookingService%2Fmain%2FDirectory.Build.props)](https://abp.io)
+[![NuGet](https://img.shields.io/nuget/v/EasyAbp.BookingService.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.BookingService.Domain.Shared)
+[![NuGet Download](https://img.shields.io/nuget/dt/EasyAbp.BookingService.Domain.Shared.svg?style=flat-square)](https://www.nuget.org/packages/EasyAbp.BookingService.Domain.Shared)
+[![Discord online](https://badgen.net/discord/online-members/xyg8TrRa27?label=Discord)](https://discord.gg/xyg8TrRa27)
+[![GitHub stars](https://img.shields.io/github/stars/EasyAbp/BookingService?style=social)](https://www.github.com/EasyAbp/BookingService)
+
 An ABP application module that allows users to book time for people or assets.
diff --git a/modules/BookingService.Orleans/angular/package.json b/modules/BookingService.Orleans/angular/package.json
@@ -15,14 +15,14 @@
   },
   "private": true,
   "dependencies": {
-    "@abp/ng.account": "~5.3.1",
-    "@abp/ng.components": "~5.3.1",
-    "@abp/ng.core": "~5.3.1",
-    "@abp/ng.identity": "~5.3.1",
-    "@abp/ng.setting-management": "~5.3.1",
-    "@abp/ng.tenant-management": "~5.3.1",
-    "@abp/ng.theme.basic": "~5.3.1",
-    "@abp/ng.theme.shared": "~5.3.1",
+    "@abp/ng.account": "~6.0.1",
+    "@abp/ng.components": "~6.0.1",
+    "@abp/ng.core": "~6.0.1",
+    "@abp/ng.identity": "~6.0.1",
+    "@abp/ng.setting-management": "~6.0.1",
+    "@abp/ng.tenant-management": "~6.0.1",
+    "@abp/ng.theme.basic": "~6.0.1",
+    "@abp/ng.theme.shared": "~6.0.1",
     "@angular/animations": "~13.1.1",
     "@angular/common": "~13.1.1",
     "@angular/compiler": "~13.1.1",
@@ -37,7 +37,7 @@
     "zone.js": "~0.11.4"
   },
   "devDependencies": {
-    "@abp/ng.schematics": "~5.3.1",
+    "@abp/ng.schematics": "~6.0.1",
     "@angular-devkit/build-angular": "~13.1.2",
     "@angular-eslint/builder": "~13.0.1",
     "@angular-eslint/eslint-plugin": "~13.0.1",