From 7117d4a16bd38edd77395ff5c87856ee8cfcb65b Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 13:53:16 +0800 Subject: [PATCH 01/33] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2e2b8d51..2a0fbd82 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -6,7 +6,7 @@ on: - '**/*.md' - '**/*.yml' tags: - - 'release-*' + - 'v*' jobs: build-reactapp: From 3d55a565bb460ae57cd890df6b11654d38781f5f Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 13:59:00 +0800 Subject: [PATCH 02/33] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 2a0fbd82..82e862fe 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -6,7 +6,7 @@ on: - '**/*.md' - '**/*.yml' tags: - - 'v*' + - 'v-*' jobs: build-reactapp: From b912452a9cef04aa59a7e07a9201cf5100eb213d Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 15:02:24 +0800 Subject: [PATCH 03/33] Update dotnet.yml --- .github/workflows/dotnet.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 82e862fe..210a74e6 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -56,3 +56,9 @@ jobs: password: ${{ secrets.DOCKER_HUB_PASSWORD }} repository: kklldog/agile_config tag_with_ref: true + - name: create release + - uses: ncipollo/release-action@v1 + with: + artifacts: "" + bodyFile: "" + token: ${{ secrets.GITHUB_TOKEN }} From dcfd8feb6eae286b020dbbec57e5126d4e6194ac Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 15:04:22 +0800 Subject: [PATCH 04/33] Update dotnet.yml --- .github/workflows/dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 210a74e6..d217f68f 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -57,7 +57,7 @@ jobs: repository: kklldog/agile_config tag_with_ref: true - name: create release - - uses: ncipollo/release-action@v1 + uses: ncipollo/release-action@v1 with: artifacts: "" bodyFile: "" From afc622523d4afe3a75710a69dd993125a6dec9b5 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 15:22:28 +0800 Subject: [PATCH 05/33] Create release-dotnet.yml --- .github/workflows/release-dotnet.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/release-dotnet.yml diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml new file mode 100644 index 00000000..6890cdcb --- /dev/null +++ b/.github/workflows/release-dotnet.yml @@ -0,0 +1,17 @@ +name: Releases + +on: + push: + tags: + - 'rel-*' + +jobs: + + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: ncipollo/release-action@v1 + with: + artifacts: "appsettings.json" + token: ${{ secrets.GITHUB_TOKEN }} From 96d831b87da33a4b1dff93aa07d7d9beb07b7f6a Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 15:27:42 +0800 Subject: [PATCH 06/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index 6890cdcb..3348bb45 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -1,12 +1,12 @@ -name: Releases - -on: +name: release +on: push: - tags: - - 'rel-*' - + paths-ignore: + - '**/*.md' + - '**/*.yml' + tags: + - 'v-*' jobs: - build: runs-on: ubuntu-latest steps: From 017cbee582b5b52115ffaa25d5ad51917791ddf4 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 15:46:38 +0800 Subject: [PATCH 07/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index 3348bb45..73a55764 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -1,4 +1,5 @@ -name: release +name: add-release + on: push: paths-ignore: @@ -6,12 +7,22 @@ on: - '**/*.yml' tags: - 'v-*' + jobs: - build: + build-dotnet: runs-on: ubuntu-latest + steps: - uses: actions/checkout@v2 - - uses: ncipollo/release-action@v1 + - name: Setup .NET Core + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 3.1.301 + - name: Install dependencies + run: dotnet restore + - name: Build + run: dotnet build --configuration Release --no-restore + - name: create release + uses: ncipollo/release-action@v1 with: - artifacts: "appsettings.json" token: ${{ secrets.GITHUB_TOKEN }} From 21d4eb0466e7e2defc14361959ab5752930817bf Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 15:59:53 +0800 Subject: [PATCH 08/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index 73a55764..bb68e501 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -21,8 +21,9 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet build --configuration Release --no-restore + run: dotnet publish "AgileConfig.Server.Apisite.csproj" -c Release -o /app/publish - name: create release uses: ncipollo/release-action@v1 with: + artifacts: /app/publish token: ${{ secrets.GITHUB_TOKEN }} From 09336811e7499557a749010e39b2befa3c2a8072 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 16:05:16 +0800 Subject: [PATCH 09/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index bb68e501..f8d91c0b 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet publish "AgileConfig.Server.Apisite.csproj" -c Release -o /app/publish + run: dotnet publish "/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj" -c Release -o /app/publish - name: create release uses: ncipollo/release-action@v1 with: From eb04de274b77512cb437eecda594f5d55d0258d2 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 16:10:30 +0800 Subject: [PATCH 10/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index f8d91c0b..98c56768 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet publish "/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj" -c Release -o /app/publish + run: dotnet publish "/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj" -c Release -o /app/publish - name: create release uses: ncipollo/release-action@v1 with: From 9194d0e0d3acd2f2ec1818efb94a5cd6137410f7 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 16:15:17 +0800 Subject: [PATCH 11/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index 98c56768..147fd723 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet publish "/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj" -c Release -o /app/publish + run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release -o /app/publish - name: create release uses: ncipollo/release-action@v1 with: From 25b9470b4e3a94c34f7fbe9f470be5179e60ba34 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 16:22:50 +0800 Subject: [PATCH 12/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index 147fd723..3be253aa 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -21,7 +21,7 @@ jobs: - name: Install dependencies run: dotnet restore - name: Build - run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release -o /app/publish + run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release - name: create release uses: ncipollo/release-action@v1 with: From 543154fe55fb46bbf023b026f4eded6ab103ded0 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 16:27:40 +0800 Subject: [PATCH 13/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index 3be253aa..33790a6c 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -25,5 +25,5 @@ jobs: - name: create release uses: ncipollo/release-action@v1 with: - artifacts: /app/publish + artifacts: AgileConfig/AgileConfig/AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ token: ${{ secrets.GITHUB_TOKEN }} From 1d56362427dbdb9940f432d2b1a501c7b240c66b Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 16:37:41 +0800 Subject: [PATCH 14/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index 33790a6c..f0a8c9cb 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -22,6 +22,10 @@ jobs: run: dotnet restore - name: Build run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release + - uses: actions/upload-artifact@v2 + with: + name: agileconfig-server + path: AgileConfig/AgileConfig/AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ - name: create release uses: ncipollo/release-action@v1 with: From b725482e181326dd60c6db8ca6a5df6d002a2342 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 16:45:42 +0800 Subject: [PATCH 15/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index f0a8c9cb..eae4f16a 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -25,9 +25,9 @@ jobs: - uses: actions/upload-artifact@v2 with: name: agileconfig-server - path: AgileConfig/AgileConfig/AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ + path: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ - name: create release uses: ncipollo/release-action@v1 with: - artifacts: AgileConfig/AgileConfig/AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ + artifacts: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ token: ${{ secrets.GITHUB_TOKEN }} From f0a0875b854212f78f172d9d5eb950c23fcb3198 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 16:59:01 +0800 Subject: [PATCH 16/33] Update release-dotnet.yml --- .github/workflows/release-dotnet.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml index eae4f16a..9f936f88 100644 --- a/.github/workflows/release-dotnet.yml +++ b/.github/workflows/release-dotnet.yml @@ -26,8 +26,12 @@ jobs: with: name: agileconfig-server path: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ + - uses: papeloto/action-zip@v1 + with: + files: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ + dest: agileconfig_server.zip - name: create release uses: ncipollo/release-action@v1 with: - artifacts: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ + artifacts: agileconfig_server.zip token: ${{ secrets.GITHUB_TOKEN }} From 4a0865532f50b1ec564c8ab0137f696cb43fdeeb Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 17:09:14 +0800 Subject: [PATCH 17/33] Update dotnet.yml --- .github/workflows/dotnet.yml | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index d217f68f..28ef5db4 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -49,6 +49,17 @@ jobs: with: name: agileconfig-ui path: AgileConfig.Server.Apisite/wwwroot/ui + - name: build server release xxx + run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release + - uses: papeloto/action-zip@v1 + with: + files: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ + dest: agileconfig_server.zip + - name: create release + uses: ncipollo/release-action@v1 + with: + artifacts: agileconfig_server.zip + token: ${{ secrets.GITHUB_TOKEN }} - name: Push to Docker hub release -xxx uses: docker/build-push-action@v1 with: @@ -56,9 +67,3 @@ jobs: password: ${{ secrets.DOCKER_HUB_PASSWORD }} repository: kklldog/agile_config tag_with_ref: true - - name: create release - uses: ncipollo/release-action@v1 - with: - artifacts: "" - bodyFile: "" - token: ${{ secrets.GITHUB_TOKEN }} From 7f8da02e7ee2ad025b185c0ecb3b3e4ff745077b Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 17:20:34 +0800 Subject: [PATCH 18/33] Update dotnet.yml --- .github/workflows/dotnet.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml index 28ef5db4..818a9f21 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/dotnet.yml @@ -1,4 +1,4 @@ -name: release-xxx ci workflow +name: v-xxx ci workflow , it will build dockerimage-v.xxx and create a release package on: push: @@ -54,11 +54,11 @@ jobs: - uses: papeloto/action-zip@v1 with: files: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ - dest: agileconfig_server.zip + dest: agileconfig_server_deploy.zip - name: create release uses: ncipollo/release-action@v1 with: - artifacts: agileconfig_server.zip + artifacts: agileconfig_server_deploy.zip token: ${{ secrets.GITHUB_TOKEN }} - name: Push to Docker hub release -xxx uses: docker/build-push-action@v1 From 94beb29df178b18935095d0a99bed41eac340c72 Mon Sep 17 00:00:00 2001 From: mjzhou Date: Mon, 8 Nov 2021 17:36:16 +0800 Subject: [PATCH 19/33] remove an unuse ci file --- .github/workflows/release-dotnet.yml | 37 ---------------- dsd | 66 ++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 37 deletions(-) delete mode 100644 .github/workflows/release-dotnet.yml create mode 100644 dsd diff --git a/.github/workflows/release-dotnet.yml b/.github/workflows/release-dotnet.yml deleted file mode 100644 index 9f936f88..00000000 --- a/.github/workflows/release-dotnet.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: add-release - -on: - push: - paths-ignore: - - '**/*.md' - - '**/*.yml' - tags: - - 'v-*' - -jobs: - build-dotnet: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - - name: Setup .NET Core - uses: actions/setup-dotnet@v1 - with: - dotnet-version: 3.1.301 - - name: Install dependencies - run: dotnet restore - - name: Build - run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release - - uses: actions/upload-artifact@v2 - with: - name: agileconfig-server - path: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ - - uses: papeloto/action-zip@v1 - with: - files: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ - dest: agileconfig_server.zip - - name: create release - uses: ncipollo/release-action@v1 - with: - artifacts: agileconfig_server.zip - token: ${{ secrets.GITHUB_TOKEN }} diff --git a/dsd b/dsd new file mode 100644 index 00000000..8df18922 --- /dev/null +++ b/dsd @@ -0,0 +1,66 @@ +0.0.1 +1.0.0 +1.0.1 +1.0.2 +1.0.3 +1.0.4 +1.0.5 +1.0.6 +1.0.7 +1.0.8 +1.1.0 +1.1.1 +1.1.2 +1.1.3 +1.1.4 +1.1.5 +1.1.6 +1.1.7 +1.1.7.1 +1.1.7.2 +p1.2.0 +preview-1.2.0 +preview-1.2.0.1 +preview-1.2.0.2 +preview-1.2.0.3 +preview-1.3.0 +preview-1.3.1 +realease-1.3.8.1 +release-1.1.9 +release-1.2.0.3 +release-1.2.0.4 +release-1.2.1 +release-1.2.1.1 +release-1.2.1.2 +release-1.2.3 +release-1.2.3.1 +release-1.2.3.2 +release-1.2.3.3 +release-1.2.4 +release-1.3.1 +release-1.3.2 +release-1.3.3 +release-1.3.4 +release-1.3.5 +release-1.3.6 +release-1.3.7 +release-1.3.8 +release-1.3.8.2 +release-1.3.8.3 +release-1.3.8.4 +release-1.4.0 +release-1.4.1 +release-1.4.2 +release-1.4.3 +release-1.5.0 +release-1.5.1 +release-1.5.1.1 +release-1.5.1.2 +release-1.5.1.3 +release-1.5.1.4 +release-1.5.1.5 +release-1.5.2 +release-1.8.3.4 +v-1.5.2 +v1.5.2 +v1.5.3 From 87b9d0c2b5e434a544e59f26d4aae402c6173658 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 17:41:49 +0800 Subject: [PATCH 20/33] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4554279f..affcee6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change log ------------------------------ +[1.5.2] - 2021.11.08 +* 支持环境间复制配置 + [1.5.1.3] - 2021.11.03 * 应用列表支持排序 From e695de9aaab3033b2f0ecfc25037b85a7bc45f34 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 17:48:05 +0800 Subject: [PATCH 21/33] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2de6fb36..74b16221 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ sudo docker run \ 2. db:provider 配置程序的数据库类型。目前程序支持：sqlserver，mysql，sqlite, PostgreSql，Oracle 五种数据库。 3. db:conn 配置数据库连接串 -> 注意：如果通过IIS部署，请自行下载publish分支源码进行编译。请先编译react-ui-antd项目把dist内的产物复制到apisite项目的wwwroot/ui目录下。 +> 注意：如果通过IIS或者别的方式部署，请自行下载github主页上的[releases](https://github.com/dotnetcore/AgileConfig/releases)下面下载最新的部署包。如果自己使用源码编译，请先编译react-ui-antd项目把dist内的产物复制到apisite项目的wwwroot/ui目录下。 ### 初始化管理员密码 第一次运行程序需要初始化超级管理员密码，超管用户名固定为 admin ![](https://ftp.bmp.ovh/imgs/2021/04/44242b327230c5e6.png) From 0f2e1e89d4e03394754e573fdb1864357d751f21 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Mon, 8 Nov 2021 17:49:30 +0800 Subject: [PATCH 22/33] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 74b16221..c4d24b63 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ sudo docker run \ 2. db:provider 配置程序的数据库类型。目前程序支持：sqlserver，mysql，sqlite, PostgreSql，Oracle 五种数据库。 3. db:conn 配置数据库连接串 -> 注意：如果通过IIS或者别的方式部署，请自行下载github主页上的[releases](https://github.com/dotnetcore/AgileConfig/releases)下面下载最新的部署包。如果自己使用源码编译，请先编译react-ui-antd项目把dist内的产物复制到apisite项目的wwwroot/ui目录下。 +> 注意：如果通过IIS或者别的方式部署，请自行从主页上的[releases](https://github.com/dotnetcore/AgileConfig/releases)页面下载最新的部署包。如果自己使用源码编译，请先编译react-ui-antd项目把dist内的产物复制到apisite项目的wwwroot/ui目录下。 ### 初始化管理员密码 第一次运行程序需要初始化超级管理员密码，超管用户名固定为 admin ![](https://ftp.bmp.ovh/imgs/2021/04/44242b327230c5e6.png) @@ -146,7 +146,7 @@ Install-Package AgileConfig.Client "nodes": "http://localhost:5000,http://localhost:5001"//多个节点使用逗号分隔, "name": "client_name", "tag": "tag1", - "env": "dev" + "env": "DEV" } } From 63d6fd790022b16c4e43421dee409e9ff31cd73c Mon Sep 17 00:00:00 2001 From: mjzhou Date: Tue, 9 Nov 2021 14:41:48 +0800 Subject: [PATCH 23/33] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=B0=20.NET=206?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Agile.Config.Protocol.csproj | 2 +- .../AgileConfig.Server.Apisite.csproj | 14 +++++++------- AgileConfig.Server.Apisite/JWT.cs | 2 +- AgileConfig.Server.Apisite/Startup.cs | 6 +----- .../AgileConfig.Server.Common.csproj | 6 +++--- AgileConfig.Server.Common/FunctionUtil.cs | 12 ++++++------ AgileConfig.Server.Common/HttpExt.cs | 2 +- .../AgileConfig.Server.CommonTests.csproj | 13 ++++++++----- .../AgileConfig.Server.Data.Entity.csproj | 4 ++-- .../AgileConfig.Server.Data.Freesql.csproj | 2 +- .../AgileConfig.Server.IService.csproj | 2 +- .../AgileConfig.Server.Service.csproj | 2 +- .../AgileConfig.Server.ServiceTests.csproj | 15 +++++++++------ ApiSiteTests/ApiSiteTests.csproj | 15 +++++++++------ 14 files changed, 51 insertions(+), 46 deletions(-) diff --git a/Agile.Config.Protocol/Agile.Config.Protocol.csproj b/Agile.Config.Protocol/Agile.Config.Protocol.csproj index 9f5c4f4a..dbc15171 100644 --- a/Agile.Config.Protocol/Agile.Config.Protocol.csproj +++ b/Agile.Config.Protocol/Agile.Config.Protocol.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net6.0 diff --git a/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj index 2362c765..31f6e88f 100644 --- a/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj +++ b/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 InProcess 1.5.2 1.5.2 @@ -23,12 +23,12 @@ - - - - - - + + + + + + diff --git a/AgileConfig.Server.Apisite/JWT.cs b/AgileConfig.Server.Apisite/JWT.cs index c18e1ecf..6b0a93e4 100644 --- a/AgileConfig.Server.Apisite/JWT.cs +++ b/AgileConfig.Server.Apisite/JWT.cs @@ -43,7 +43,7 @@ public static string GetToken(string userId, string userName, bool isAdmin) { new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()), new Claim("id", userId, ClaimValueTypes.String), // 用户id - new Claim("name", userName), // 用户名 + new Claim("username", userName, ClaimValueTypes.String), // 用户名 new Claim("admin", isAdmin.ToString() ,ClaimValueTypes.Boolean) // 是否是管理员 }; var key = Encoding.UTF8.GetBytes(JwtSetting.Instance.SecurityKey); diff --git a/AgileConfig.Server.Apisite/Startup.cs b/AgileConfig.Server.Apisite/Startup.cs index 2b078ac2..170174c2 100644 --- a/AgileConfig.Server.Apisite/Startup.cs +++ b/AgileConfig.Server.Apisite/Startup.cs @@ -5,13 +5,10 @@ using AgileConfig.Server.Apisite.Websocket; using AgileConfig.Server.Common; using AgileConfig.Server.Data.Freesql; -using AgileConfig.Server.IService; using AgileConfig.Server.Service; -using Microsoft.AspNetCore.Authentication.Cookies; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; @@ -49,7 +46,7 @@ public void ConfigureServices(IServiceCollection services) }; }); services.AddCors(); - services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_3_0).AddRazorRuntimeCompilation(); + services.AddMvc().AddRazorRuntimeCompilation(); if (Appsettings.IsPreviewMode) { @@ -88,7 +85,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env, IService app.UseWebSockets(new WebSocketOptions() { KeepAliveInterval = TimeSpan.FromSeconds(60), - ReceiveBufferSize = 2 * 1024 }); app.UseMiddleware(); app.UseStaticFiles(); diff --git a/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj b/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj index 7c8e0317..fac82794 100644 --- a/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj +++ b/AgileConfig.Server.Common/AgileConfig.Server.Common.csproj @@ -1,13 +1,13 @@  - netcoreapp3.1 + net6.0 - - + + diff --git a/AgileConfig.Server.Common/FunctionUtil.cs b/AgileConfig.Server.Common/FunctionUtil.cs index 4807e386..0e6510a8 100644 --- a/AgileConfig.Server.Common/FunctionUtil.cs +++ b/AgileConfig.Server.Common/FunctionUtil.cs @@ -29,11 +29,11 @@ public static T TRY(Func func, int tryCount) result = func(); break; } - catch (Exception ex) + catch { if (i == (tryCount - 1)) { - throw ex; + throw; } } } @@ -63,11 +63,11 @@ public static async Task TRYAsync(Func> func, int tryCount) result = await func(); break; } - catch (Exception ex) + catch { if (i == (tryCount - 1)) { - throw ex; + throw; } } } @@ -126,11 +126,11 @@ public static void TRY(Action act, int tryCount) act(); break; } - catch (Exception ex) + catch { if (i == (tryCount - 1)) { - throw ex; + throw; } } } diff --git a/AgileConfig.Server.Common/HttpExt.cs b/AgileConfig.Server.Common/HttpExt.cs index 1501b182..b836377f 100644 --- a/AgileConfig.Server.Common/HttpExt.cs +++ b/AgileConfig.Server.Common/HttpExt.cs @@ -61,7 +61,7 @@ public static (string, string) GetUserNamePasswordFromBasicAuthorization(this Ht public static string GetUserNameFromClaim(this HttpContext httpContext) { - var name = httpContext.User?.FindFirst("name")?.Value; + var name = httpContext.User?.FindFirst("username")?.Value; return name; } diff --git a/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj b/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj index ac36e8a9..0b4c13d4 100644 --- a/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj +++ b/AgileConfig.Server.CommonTests/AgileConfig.Server.CommonTests.csproj @@ -1,16 +1,19 @@ - netcoreapp3.1 + net6.0 false - - - - + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj b/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj index cd0c6879..114a83d7 100644 --- a/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj +++ b/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj @@ -1,12 +1,12 @@  - netcoreapp3.1 + net6.0 - + diff --git a/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj b/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj index f43fdbbd..47d6833b 100644 --- a/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj +++ b/AgileConfig.Server.Data.Freesql/AgileConfig.Server.Data.Freesql.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 diff --git a/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj b/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj index d229a442..6485ad29 100644 --- a/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj +++ b/AgileConfig.Server.IService/AgileConfig.Server.IService.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 diff --git a/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj b/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj index 7c328728..cd7d6a1c 100644 --- a/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj +++ b/AgileConfig.Server.Service/AgileConfig.Server.Service.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 diff --git a/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj b/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj index 83bc87bc..4e915e98 100644 --- a/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj +++ b/AgileConfig.Server.ServiceTests/AgileConfig.Server.ServiceTests.csproj @@ -1,17 +1,20 @@ - netcoreapp3.1 + net6.0 false - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/ApiSiteTests/ApiSiteTests.csproj b/ApiSiteTests/ApiSiteTests.csproj index 019ccfa1..e14b28b4 100644 --- a/ApiSiteTests/ApiSiteTests.csproj +++ b/ApiSiteTests/ApiSiteTests.csproj @@ -1,17 +1,20 @@ - netcoreapp3.1 + net6.0 false - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + From b6be1d02616d4afc76a2aed7486b1e40d66389ae Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Tue, 9 Nov 2021 14:44:48 +0800 Subject: [PATCH 24/33] Update dotnet-core.yml --- .github/workflows/dotnet-core.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet-core.yml index e7fab1b0..c8ce2ef4 100644 --- a/.github/workflows/dotnet-core.yml +++ b/.github/workflows/dotnet-core.yml @@ -41,7 +41,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.301 + dotnet-version: 6.0 - name: Install dependencies run: dotnet restore - name: Build From 488103788cab924a306444d7ad3b2dbdf4d9ba9b Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Tue, 9 Nov 2021 14:45:44 +0800 Subject: [PATCH 25/33] Rename dotnet-core.yml to master-ci.yml --- .github/workflows/{dotnet-core.yml => master-ci.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{dotnet-core.yml => master-ci.yml} (100%) diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/master-ci.yml similarity index 100% rename from .github/workflows/dotnet-core.yml rename to .github/workflows/master-ci.yml From 7346fc0d9da28a36de268bbb059bfb27c91e3364 Mon Sep 17 00:00:00 2001 From: mjzhou Date: Tue, 9 Nov 2021 15:16:34 +0800 Subject: [PATCH 26/33] update Dockerfile --- .dockerignore | 25 +++++++++++++++++++ .../AgileConfig.Server.Apisite.csproj | 2 ++ .../Properties/launchSettings.json | 16 ++++++++---- Dockerfile | 4 +-- 4 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 .dockerignore diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..3729ff0c --- /dev/null +++ b/.dockerignore @@ -0,0 +1,25 @@ +**/.classpath +**/.dockerignore +**/.env +**/.git +**/.gitignore +**/.project +**/.settings +**/.toolstarget +**/.vs +**/.vscode +**/*.*proj.user +**/*.dbmdl +**/*.jfm +**/azds.yaml +**/bin +**/charts +**/docker-compose* +**/Dockerfile* +**/node_modules +**/npm-debug.log +**/obj +**/secrets.dev.yaml +**/values.dev.yaml +LICENSE +README.md \ No newline at end of file diff --git a/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj index 31f6e88f..83134b8f 100644 --- a/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj +++ b/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj @@ -6,6 +6,7 @@ 1.5.2 1.5.2 1.5.2 + Linux @@ -26,6 +27,7 @@ + diff --git a/AgileConfig.Server.Apisite/Properties/launchSettings.json b/AgileConfig.Server.Apisite/Properties/launchSettings.json index dbfef018..386c4fe1 100644 --- a/AgileConfig.Server.Apisite/Properties/launchSettings.json +++ b/AgileConfig.Server.Apisite/Properties/launchSettings.json @@ -1,8 +1,8 @@ -{ +{ "$schema": "http://json.schemastore.org/launchsettings.json", "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, + "windowsAuthentication": false, + "anonymousAuthentication": true, "iisExpress": { "applicationUrl": "http://localhost:54550", "sslPort": 0 @@ -21,10 +21,16 @@ "commandName": "Project", "launchBrowser": true, "launchUrl": "home/index", - "applicationUrl": "http://localhost:5000", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "applicationUrl": "http://localhost:5000" + }, + "Docker": { + "commandName": "Docker", + "launchBrowser": true, + "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}/api/values", + "publishAllPorts": true } } } \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index f72894c1..e9a32290 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base WORKDIR /app EXPOSE 5000 -FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build WORKDIR /src COPY ["AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj", "AgileConfig.Server.Apisite/"] COPY ["AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj", "AgileConfig.Server.Data.Entity/"] From 0734d56a7a56f7f7d715f4d1111617b49e03c2c2 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Tue, 9 Nov 2021 15:21:39 +0800 Subject: [PATCH 27/33] Update master-ci.yml --- .github/workflows/master-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-ci.yml b/.github/workflows/master-ci.yml index c8ce2ef4..575552a0 100644 --- a/.github/workflows/master-ci.yml +++ b/.github/workflows/master-ci.yml @@ -41,7 +41,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0 + dotnet-version: 6.0.0 - name: Install dependencies run: dotnet restore - name: Build From ae898f6e07dec36dc7c09831a6d71c746b4d3cd7 Mon Sep 17 00:00:00 2001 From: mjzhou Date: Tue, 9 Nov 2021 15:26:12 +0800 Subject: [PATCH 28/33] test net6 dockefiler --- AgileConfig.Server.Apisite/Startup.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/AgileConfig.Server.Apisite/Startup.cs b/AgileConfig.Server.Apisite/Startup.cs index 170174c2..3424c3c7 100644 --- a/AgileConfig.Server.Apisite/Startup.cs +++ b/AgileConfig.Server.Apisite/Startup.cs @@ -20,6 +20,7 @@ namespace AgileConfig.Server.Apisite { public class Startup { + //test docker file public Startup(IConfiguration configuration, ILoggerFactory loggerFactory) { Configuration = configuration; From 35658a3a906b7f866525b6bf06634dbf8ce1e329 Mon Sep 17 00:00:00 2001 From: mjzhou Date: Tue, 9 Nov 2021 15:39:17 +0800 Subject: [PATCH 29/33] update master-ci --- .github/workflows/master-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/master-ci.yml b/.github/workflows/master-ci.yml index 575552a0..70ec7a5f 100644 --- a/.github/workflows/master-ci.yml +++ b/.github/workflows/master-ci.yml @@ -41,7 +41,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.0 + dotnet-version: 6.0.100 - name: Install dependencies run: dotnet restore - name: Build From 2467b8e67baea3eba319a599e876a55bc5f7a3c1 Mon Sep 17 00:00:00 2001 From: mjzhou Date: Tue, 9 Nov 2021 15:41:44 +0800 Subject: [PATCH 30/33] test master ci --- AgileConfig.Server.Apisite/Startup.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/AgileConfig.Server.Apisite/Startup.cs b/AgileConfig.Server.Apisite/Startup.cs index 3424c3c7..170174c2 100644 --- a/AgileConfig.Server.Apisite/Startup.cs +++ b/AgileConfig.Server.Apisite/Startup.cs @@ -20,7 +20,6 @@ namespace AgileConfig.Server.Apisite { public class Startup { - //test docker file public Startup(IConfiguration configuration, ILoggerFactory loggerFactory) { Configuration = configuration; From d547bc2fbe1b4ec30ae649139d7d2c8bd1baf38f Mon Sep 17 00:00:00 2001 From: mjzhou Date: Tue, 9 Nov 2021 15:58:36 +0800 Subject: [PATCH 31/33] update version to 1.5.3 --- AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj | 2 +- .../react-ui-antd/src/layouts/compos/LayoutFooter.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj index 83134b8f..71810f54 100644 --- a/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj +++ b/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj @@ -3,7 +3,7 @@ net6.0 InProcess - 1.5.2 + 1.5.3 1.5.2 1.5.2 Linux diff --git a/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx b/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx index 05489735..6ef401c8 100644 --- a/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx +++ b/AgileConfig.Server.UI/react-ui-antd/src/layouts/compos/LayoutFooter.tsx @@ -14,7 +14,7 @@ const LayoutFooter : React.FC =()=>{ { getAppVer()}    -   Powered by .netcore3.1 ant-design-pro4 +   Powered by .netcore6.0 ant-design-pro4 ) } From 04c497c7540946f0863b7f9ed3e449067175b816 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Tue, 9 Nov 2021 15:59:45 +0800 Subject: [PATCH 32/33] Update and rename publish-dotnet.yml to publish.yml --- .github/workflows/{publish-dotnet.yml => publish.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{publish-dotnet.yml => publish.yml} (97%) diff --git a/.github/workflows/publish-dotnet.yml b/.github/workflows/publish.yml similarity index 97% rename from .github/workflows/publish-dotnet.yml rename to .github/workflows/publish.yml index 156a4240..a994f470 100644 --- a/.github/workflows/publish-dotnet.yml +++ b/.github/workflows/publish.yml @@ -39,7 +39,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.301 + dotnet-version: 6.0.100 - name: Install dependencies run: dotnet restore - name: Build From cf81ea028a9d3c1812cdcc39e7a77591f6e8ad10 Mon Sep 17 00:00:00 2001 From: "minjie.zhou" Date: Tue, 9 Nov 2021 16:03:01 +0800 Subject: [PATCH 33/33] Update and rename dotnet.yml to release-xxx.yml --- .github/workflows/{dotnet.yml => release-xxx.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{dotnet.yml => release-xxx.yml} (94%) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/release-xxx.yml similarity index 94% rename from .github/workflows/dotnet.yml rename to .github/workflows/release-xxx.yml index 818a9f21..4626ead4 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/release-xxx.yml @@ -40,7 +40,7 @@ jobs: - name: Setup .NET Core uses: actions/setup-dotnet@v1 with: - dotnet-version: 3.1.301 + dotnet-version: 6.0.100 - name: Install dependencies run: dotnet restore - name: Build @@ -53,7 +53,7 @@ jobs: run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release - uses: papeloto/action-zip@v1 with: - files: AgileConfig.Server.Apisite/bin/Release/netcoreapp3.1/publish/ + files: AgileConfig.Server.Apisite/bin/Release/net6.0/publish/ dest: agileconfig_server_deploy.zip - name: create release uses: ncipollo/release-action@v1