From 6686b4418f13be34d98d89e96b2a91e11cf30f49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A7=E7=9F=B3=E5=A4=B4?= <nnhy@vip.qq.com>
Date: Thu, 20 Jun 2024 19:14:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BC=96=E8=AF=91=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/publish-beta.yml | 15 +++++++--------
 .github/workflows/publish.yml      | 17 +++++++++--------
 .github/workflows/test.yml         |  7 +++++--
 XCode/XCode.csproj                 |  2 +-
 4 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/publish-beta.yml b/.github/workflows/publish-beta.yml
index d127cfb68..a5ac9b66e 100644
--- a/.github/workflows/publish-beta.yml
+++ b/.github/workflows/publish-beta.yml
@@ -16,21 +16,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup dotNET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: |
+          6.0.x
+          7.0.x
+          8.x
     - name: Get Version
       run: echo "VERSION=$(date '+%Y.%m%d-beta%H%M')" >> $GITHUB_ENV
     - name: Build
       run: |
-        dotnet build -c Release --version-suffix ${{ env.VERSION }}
-    - name: Pack
-      run: |
-        dotnet pack --no-build --version-suffix ${{ env.VERSION }} -c Release -o out XCode/XCode.csproj
-        dotnet pack --no-build --version-suffix ${{ env.VERSION }} -c Release -o out XCodeTool/XCodeTool.csproj
-
+        dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out XCode/XCode.csproj
+        dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out XCodeTool/XCodeTool.csproj
     - name: Publish
       run: |
         dotnet nuget push ./out/*.nupkg --skip-duplicate --source https://nuget.pkg.github.com/NewLifeX/index.json --api-key ${{ github.token }}
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e583d069b..e1de6e40c 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -10,19 +10,20 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup dotNET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: |
+          6.0.x
+          7.0.x
+          8.x
+    - name: Get Version
+      run: echo "VERSION=$(date '+%Y.%m%d')" >> $GITHUB_ENV
     - name: Build
       run: |
-        dotnet build -c Release
-    - name: Pack
-      run: |
-        dotnet pack --no-build -c Release -o out XCode/XCode.csproj
-        dotnet pack --no-build -c Release -o out XCodeTool/XCodeTool.csproj
-
+        dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out XCode/XCode.csproj
+        dotnet pack --version-suffix ${{ env.VERSION }} -c Release -o out XCodeTool/XCodeTool.csproj
     - name: Publish
       run: |
         dotnet nuget push ./out/*.nupkg --skip-duplicate --source https://nuget.pkg.github.com/NewLifeX/index.json --api-key ${{ github.token }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e87f28fb5..76eaf1bce 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -12,11 +12,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Setup dotNET
       uses: actions/setup-dotnet@v3
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: |
+          6.0.x
+          7.0.x
+          8.x
     - name: Build
       run: |
         dotnet build -c Release
diff --git a/XCode/XCode.csproj b/XCode/XCode.csproj
index e86c95b93..82c7c5754 100644
--- a/XCode/XCode.csproj
+++ b/XCode/XCode.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
   <PropertyGroup>
-    <TargetFrameworks>net45;net461;netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net45;net461;netstandard2.0;netstandard2.1</TargetFrameworks>
     <AssemblyName>XCode</AssemblyName>
     <RootNamespace>XCode</RootNamespace>
     <AssemblyTitle>NewLife数据中间件</AssemblyTitle>