fix conflic

Author: agile.zhou

.github/workflows/arm32.yml

@@ -41,7 +41,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 8.0.*
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/arm64.yml

@@ -40,7 +40,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 8.0.*
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/master-ci.yml

@@ -8,6 +8,7 @@ on:
       - '**/*.yml'
   pull_request:
     branches: [ master ]
+  workflow_dispatch:
 
 jobs:
   build-reactapp:
@@ -41,7 +42,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 8.0.*
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/mysqlconnector.yml

@@ -41,7 +41,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 8.0.*
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/preview-dotnet.yml

@@ -23,7 +23,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 8.0.*
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/publish.yml

@@ -6,7 +6,8 @@ on:
     paths-ignore: 
       - '**/*.md'
       - '**/*.yml'
-    
+  workflow_dispatch:
+
 jobs:
   build-reactapp:
     runs-on: ubuntu-latest
@@ -39,7 +40,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 8.0.*
     - name: Install dependencies
       run: dotnet restore
     - name: Build

.github/workflows/release-xxx.yml

@@ -7,7 +7,7 @@ on:
       - '**/*.yml'
     tags:        
       - 'v-*'
-    
+  workflow_dispatch:  
 jobs:
   build-reactapp:
     runs-on: ubuntu-latest
@@ -40,7 +40,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 8.0.*
     - name: Install dependencies
       run: dotnet restore
     - name: Build
@@ -50,10 +50,10 @@ jobs:
         name: agileconfig-ui
         path: src/AgileConfig.Server.Apisite/wwwroot/ui
     - name: build server release xxx
-      run: dotnet publish AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release
+      run: dotnet publish src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj -c Release
     - uses: vimtor/action-zip@v1
       with:
-        files: AgileConfig.Server.Apisite/bin/Release/net6.0/publish/
+        files: src/AgileConfig.Server.Apisite/bin/Release/net8.0/publish/
         dest: agileconfig_server_deploy.zip
     - name: create release
       uses: ncipollo/release-action@v1

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change log
 ------------------------------
+[1.8.0]
+* 升级到 .NET8
+
+[1.7.2]
+* 修复 appid 为中文时无法获取配置的问题
+
+[1.7.1]
+* 修复在严格区分大小写的 SQLServer 上建表失败的问题
+
 [1.7.0]
 * 支持 SSO 登录   
 

Dockerfile

@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal-arm64v8 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-arm64v8 AS base
 WORKDIR /app
 EXPOSE 5000
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /src
 COPY ["src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj", "AgileConfig.Server.Apisite/"]
 COPY ["src/AgileConfig.Server.Data.Entity/AgileConfig.Server.Data.Entity.csproj", "AgileConfig.Server.Data.Entity/"]

docker-compose.yml

@@ -6,6 +6,8 @@ services:
       - "15000:5000"
     networks:
       - net0
+    security_opt:
+      - seccomp=unconfined
     volumes:
       - /etc/localtime:/etc/localtime
     environment:
@@ -20,6 +22,8 @@ services:
       - "15001:5000"
     networks:
       - net0
+    security_opt:
+      - seccomp=unconfined
     volumes:
       - /etc/localtime:/etc/localtime
     environment:
@@ -35,6 +39,8 @@ services:
       - "15002:5000"
     networks:
       - net0
+    security_opt:
+      - seccomp=unconfined
     volumes:
       - /etc/localtime:/etc/localtime
     environment: