From 74f4742f2478f1b71b57f3731d13eae44ddbd053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com>
Date: Fri, 13 Jan 2023 23:05:14 +0800
Subject: [PATCH] =?UTF-8?q?workflow:=20=E4=BF=AE=E6=94=B9dotnet=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=BA7.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/deploy-docs.yml              | 18 ------------------
 .../{deploy-demo.yml => docker-image.yml}      |  6 +++---
 .github/workflows/docs.yml                     | 18 ++++++++++++++++++
 .../{dotnet-publish_nuget.yml => nuget.yml}    |  6 +++---
 4 files changed, 24 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/deploy-docs.yml
 rename .github/workflows/{deploy-demo.yml => docker-image.yml} (97%)
 create mode 100644 .github/workflows/docs.yml
 rename .github/workflows/{dotnet-publish_nuget.yml => nuget.yml} (89%)

diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml
deleted file mode 100644
index c8af6f23..00000000
--- a/.github/workflows/deploy-docs.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-name: deploy-docs
-on:
-  push:
-    branches:
-      - main
-jobs:
-  build-docs-and-deploy:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout 🛎️
-      uses: actions/checkout@v2
-      with:
-        persist-credentials: false 
-    - name: Deploy docs 🚀
-      uses: mhausenblas/mkdocs-deploy-gh-pages@master
-      env:
-        GITHUB_TOKEN: ${{ secrets.TOKEN }}
-        CONFIG_FILE: docs/mkdocs.yml
diff --git a/.github/workflows/deploy-demo.yml b/.github/workflows/docker-image.yml
similarity index 97%
rename from .github/workflows/deploy-demo.yml
rename to .github/workflows/docker-image.yml
index e1a627b4..8fd04019 100644
--- a/.github/workflows/deploy-demo.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,4 +1,4 @@
-name: 部署
+name: Docker-Images
 on:
   push:
     tags:
@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Install Dotnet 6.x
+      - name: Install Dotnet 7.x
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0"
+          dotnet-version: 7.0.x
           include-prerelease: True
       - name: Build
         run: dotnet build aspnet-core/Lion.AbpPro.sln
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 00000000..5dd70b6f
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,18 @@
+name: Docs
+on:
+  push:
+    branches:
+      - main
+jobs:
+  build-docs-and-deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout 🛎️
+        uses: actions/checkout@v2
+        with:
+          persist-credentials: false
+      - name: Deploy docs 🚀
+        uses: mhausenblas/mkdocs-deploy-gh-pages@master
+        env:
+          GITHUB_TOKEN: ${{ secrets.TOKEN }}
+          CONFIG_FILE: docs/mkdocs.yml
diff --git a/.github/workflows/dotnet-publish_nuget.yml b/.github/workflows/nuget.yml
similarity index 89%
rename from .github/workflows/dotnet-publish_nuget.yml
rename to .github/workflows/nuget.yml
index 9232202a..bd7606ad 100644
--- a/.github/workflows/dotnet-publish_nuget.yml
+++ b/.github/workflows/nuget.yml
@@ -1,4 +1,4 @@
-name: Dotnet-Push
+name: Nuget
 on:
   push:
     tags:
@@ -9,10 +9,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Install Dotnet 6.x
+      - name: Install Dotnet 7.x
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0"
+          dotnet-version: 7.0.x
           include-prerelease: True
       - name: Setting Version
         id: vars