Upgrade to ABP 7.1.0

EasyAbp · Mar 23, 2023 · 282db5f · 282db5f
1 parent 18b79b5
commit 282db5f
Show file tree

Hide file tree

Showing 23 changed files with 6,160 additions and 433 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -6,7 +6,7 @@ on:
       - main
 jobs:
   publish:
-    runs-on: windows-latest
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
       - uses: NuGet/setup-nuget@v1
@@ -33,40 +33,42 @@ 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
+        run: dotnet pack -c Release --no-build --property PackageOutputPath=${{ github.workspace }}/nugetPackages/
 
       - name: remove unused packages
         run: |
-          cd dest
-          del * -Exclude EasyAbp.*
-          del * -Exclude *.${{ steps.getVersion.outputs.first_match }}.nupkg
-          del *.Blazor.Host.*
-          del *.Blazor.Server.Host.*
-          del *.Host.Shared.*
-          del *.HttpApi.Host.*
-          del *.IdentityServer.*
-          del *.AuthServer.*
-          del *.Web.Host.*
-          del *.Web.Unified.*
-          del *.HttpApi.Client.ConsoleTestApp.*
-          del *.Tests.*
-          del *.TestBase.*
-          dir -name
+          cd ${{ github.workspace }}/nugetPackages
+          shopt -s extglob
+          rm -f !(EasyAbp.*)
+          rm -f !(*.${{ steps.getVersion.outputs.first_match }}.nupkg)
+          rm -f *.Blazor.Host.*
+          rm -f *.Blazor.Server.Host.*
+          rm -f *.Host.Shared.*
+          rm -f *.HttpApi.Host.*
+          rm -f *.IdentityServer.*
+          rm -f *.AuthServer.*
+          rm -f *.Web.Host.*
+          rm -f *.Web.Unified.*
+          rm -f *.HttpApi.Client.ConsoleTestApp.*
+          rm -f *.Tests.*
+          rm -f *.TestBase.*
+          ls
+
       - name: dotnet nuget push to GitHub
         uses: tanaka-takayoshi/nuget-publish-to-github-packages-action@v2.1
         with:
-          nupkg-path:  'dest\*.nupkg'
+          nupkg-path:  '${{ github.workspace }}/nugetPackages/*.nupkg'
           repo-owner:  'EasyAbp'
           gh-user:  'EasyAbp'
           token:  ${{ secrets.GITHUB_TOKEN }}
 
       - name: dotnet nuget push to NuGet
-        run: dotnet nuget push dest\*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
+        run: dotnet nuget push ${{ github.workspace }}/nugetPackages/*.nupkg -k ${{secrets.NUGET_API_KEY}} -s https://api.nuget.org/v3/index.json --skip-duplicate
 
       - name: determine if the tag exists
         uses: mukunku/tag-exists-action@v1.0.0
@@ -81,4 +83,4 @@ jobs:
         uses: tvdias/github-tagger@v0.0.1
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ steps.getVersion.outputs.first_match }}
+          tag: ${{ steps.getVersion.outputs.first_match }}
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
 
-    <AbpVersion>7.0.0</AbpVersion>
-    <EasyAbpAbpTagHelperPlusModuleVersion>1.3.0</EasyAbpAbpTagHelperPlusModuleVersion>
+    <AbpVersion>7.1.0</AbpVersion>
+    <EasyAbpAbpTagHelperPlusModuleVersion>1.4.0</EasyAbpAbpTagHelperPlusModuleVersion>
 
   </PropertyGroup>
 </Project>
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>2.2.1</Version>
+    <Version>2.3.0</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/host/EasyAbp.FileManagement.Blazor.Host/EasyAbp.FileManagement.Blazor.Host.csproj b/host/EasyAbp.FileManagement.Blazor.Host/EasyAbp.FileManagement.Blazor.Host.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
+    <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.0" />
+    <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" />
   </ItemGroup>

diff --git a/...asyAbp.FileManagement.Blazor.Server.Host/EasyAbp.FileManagement.Blazor.Server.Host.csproj b/...asyAbp.FileManagement.Blazor.Server.Host/EasyAbp.FileManagement.Blazor.Server.Host.csproj
@@ -12,8 +12,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Blazorise.Bootstrap5" Version="1.1.4.1" />
-        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.1.4.1" />
+        <PackageReference Include="Blazorise.Bootstrap5" Version="1.2.0" />
+        <PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.0" />
         <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
         <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.0" />