diff --git a/README.md b/README.md index 90b7e03..87e4ae0 100644 --- a/README.md +++ b/README.md @@ -29,16 +29,8 @@ luban相较于常规的excel导表工具有以下核心优势: - 通用型生成工具。也可以用于生成协议、数据库之类的代码,甚至可以用作对象缓存服务。 ## 文档 - -- [主页](https://focus-creative-games.github.io/luban/index.html) -- [特性](docs/traits.md) - [快速上手](docs/start_up.md) -- [wiki](https://github.com/focus-creative-games/luban/wiki)。 有使用疑问,请先查看此wiki。 -- [Excel 配置数据简介](docs/data_excel.md) -- [client&server安装与使用说明](docs/luban_install_manual.md) -- [本地化](docs/l10n.md) -- [文档目录](docs/catalog.md) -- [完整手册](docs/manual.md) +- [wiki](https://github.com/focus-creative-games/luban/wiki) 有使用疑问,请先查看此wiki。 - **示例项目** ([github](https://github.com/focus-creative-games/luban_examples)) ([gitee](https://gitee.com/focus-creative-games/luban_examples)) - [版本变更记录](https://github.com/focus-creative-games/luban/wiki/%E7%89%88%E6%9C%AC%E5%8F%98%E6%9B%B4%E8%AE%B0%E5%BD%95) @@ -898,7 +890,7 @@ println(tables.TbItem.Get(12).Name) ## 开发环境架设 - 安装 [VS2019 社区版](https://visualstudio.microsoft.com/zh-hans/vs/) -- 安装 [.dotnet core sdk 5.0](https://dotnet.microsoft.com/download/dotnet/5.0) +- 安装 [.dotnet core sdk 6.0](https://dotnet.microsoft.com/download/dotnet/6.0) ## 安装与使用 diff --git a/docs/luban_comman_tools.md b/docs/luban_command_tools.md similarity index 100% rename from docs/luban_comman_tools.md rename to docs/luban_command_tools.md diff --git a/docs/start_up.md b/docs/start_up.md index 5918350..0e17a3f 100644 --- a/docs/start_up.md +++ b/docs/start_up.md @@ -2,7 +2,7 @@ ## 安装 -1. dotnet sdk 5.0 +1. [dotnet sdk 6.0](https://dotnet.microsoft.com/download/dotnet/6.0) 1. 下载luban_examples项目 下载项目 [luban_examples](https://github.com/focus-creative-games/luban_examples)。 diff --git a/src/Luban.Client/Luban.Client.csproj b/src/Luban.Client/Luban.Client.csproj index 68ab704..448e6b3 100644 --- a/src/Luban.Client/Luban.Client.csproj +++ b/src/Luban.Client/Luban.Client.csproj @@ -2,7 +2,11 @@ Exe - net5.0 + net6.0 + Luban.Client.Program + https://github.com/focus-creative-games/luban + True + README.md @@ -11,6 +15,13 @@ + + + True + \ + + + diff --git a/src/Luban.Client/Scripts/Dockerfile b/src/Luban.Client/Scripts/Dockerfile index 3516f7f..c5a5131 100644 --- a/src/Luban.Client/Scripts/Dockerfile +++ b/src/Luban.Client/Scripts/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0 as build +FROM mcr.microsoft.com/dotnet/sdk:6.0 as build WORKDIR /app/Luban.Common COPY Luban.Common/*.csproj ./ @@ -14,7 +14,7 @@ COPY nuget.config ./nuget.config RUN dotnet publish -c Release -o out -FROM mcr.microsoft.com/dotnet/runtime:5.0 AS runtime +FROM mcr.microsoft.com/dotnet/runtime:6.0 AS runtime WORKDIR /app COPY --from=build /app/Luban.Client/out ./ diff --git a/src/Luban.ClientServer/Luban.ClientServer.csproj b/src/Luban.ClientServer/Luban.ClientServer.csproj index fa5d3cc..ecb4088 100644 --- a/src/Luban.ClientServer/Luban.ClientServer.csproj +++ b/src/Luban.ClientServer/Luban.ClientServer.csproj @@ -2,9 +2,20 @@ Exe - net5.0 + net6.0 + Luban.ClientServer.Program + https://github.com/focus-creative-games/luban + True + README.md + + + True + \ + + + diff --git a/src/Luban.Common/Luban.Common.csproj b/src/Luban.Common/Luban.Common.csproj index 04d9d3f..9c34014 100644 --- a/src/Luban.Common/Luban.Common.csproj +++ b/src/Luban.Common/Luban.Common.csproj @@ -1,7 +1,9 @@ - net5.0 + net6.0 + https://github.com/focus-creative-games/luban + True diff --git a/src/Luban.Job.Cfg/Luban.Job.Cfg.csproj b/src/Luban.Job.Cfg/Luban.Job.Cfg.csproj index c0e8cdd..c5938b0 100644 --- a/src/Luban.Job.Cfg/Luban.Job.Cfg.csproj +++ b/src/Luban.Job.Cfg/Luban.Job.Cfg.csproj @@ -2,7 +2,9 @@ Library - net5.0 + net6.0 + https://github.com/focus-creative-games/luban + True diff --git a/src/Luban.Job.Common/Luban.Job.Common.csproj b/src/Luban.Job.Common/Luban.Job.Common.csproj index 1dbcf1a..12bddaa 100644 --- a/src/Luban.Job.Common/Luban.Job.Common.csproj +++ b/src/Luban.Job.Common/Luban.Job.Common.csproj @@ -1,7 +1,10 @@ - net5.0 + net6.0 + https://github.com/focus-creative-games/luban + README.md + True @@ -10,6 +13,13 @@ + + + True + \ + + + diff --git a/src/Luban.Job.Db/Luban.Job.Db.csproj b/src/Luban.Job.Db/Luban.Job.Db.csproj index aa0bab2..5e41a89 100644 --- a/src/Luban.Job.Db/Luban.Job.Db.csproj +++ b/src/Luban.Job.Db/Luban.Job.Db.csproj @@ -2,7 +2,10 @@ Library - net5.0 + net6.0 + https://github.com/focus-creative-games/luban + README.md + True @@ -11,6 +14,13 @@ + + + True + \ + + + diff --git a/src/Luban.Job.Proto/Luban.Job.Proto.csproj b/src/Luban.Job.Proto/Luban.Job.Proto.csproj index c23729e..52ded76 100644 --- a/src/Luban.Job.Proto/Luban.Job.Proto.csproj +++ b/src/Luban.Job.Proto/Luban.Job.Proto.csproj @@ -2,7 +2,10 @@ Library - net5.0 + net6.0 + https://github.com/focus-creative-games/luban + README.md + True @@ -11,6 +14,13 @@ + + + True + \ + + + diff --git a/src/Luban.Server.Common/Luban.Server.Common.csproj b/src/Luban.Server.Common/Luban.Server.Common.csproj index 1e9af7a..15d132c 100644 --- a/src/Luban.Server.Common/Luban.Server.Common.csproj +++ b/src/Luban.Server.Common/Luban.Server.Common.csproj @@ -1,7 +1,9 @@ - net5.0 + net6.0 + https://github.com/focus-creative-games/luban + True diff --git a/src/Luban.Server/Luban.Server.csproj b/src/Luban.Server/Luban.Server.csproj index 0a3c7b9..f0541ef 100644 --- a/src/Luban.Server/Luban.Server.csproj +++ b/src/Luban.Server/Luban.Server.csproj @@ -2,7 +2,10 @@ Exe - net5.0 + net6.0 + https://github.com/focus-creative-games/luban + README.md + True @@ -24,6 +27,13 @@ + + + True + \ + + + diff --git a/src/Luban.Server/Scripts/Dockerfile b/src/Luban.Server/Scripts/Dockerfile index d18afa9..e0ad82f 100644 --- a/src/Luban.Server/Scripts/Dockerfile +++ b/src/Luban.Server/Scripts/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:5.0 as build +FROM mcr.microsoft.com/dotnet/sdk:6.0 as build WORKDIR /app/Luban.Common COPY Luban.Common/*.csproj ./ @@ -40,7 +40,7 @@ COPY nuget.config ./nuget.config RUN dotnet publish -c Release -o out -FROM mcr.microsoft.com/dotnet/runtime:5.0 AS runtime +FROM mcr.microsoft.com/dotnet/runtime:6.0 AS runtime RUN cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo "Asia/Shanghai" > /etc/timezone WORKDIR /app COPY --from=build /app/Luban.Server/out ./ diff --git a/src/LubanAssistant/LubanAssistant.csproj b/src/LubanAssistant/LubanAssistant.csproj index 6a21588..f00812c 100644 --- a/src/LubanAssistant/LubanAssistant.csproj +++ b/src/LubanAssistant/LubanAssistant.csproj @@ -97,7 +97,7 @@ bin\Debug\ false TRACE;DEBUG;VSTO40,LUBAN_LITE - 4 + 3 true