refactor: 统一版本号

9 months ago · f67d054aae
parent ba04878b29
commit f67d054aae
25 changed files with 646 additions and 608 deletions
--- a/NPin.sln
+++ b/NPin.sln
@ -30,6 +30,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		end.sh = end.sh
 		start.sh = start.sh
 		usings.props = usings.props
+		version.props = version.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "module", "module", "{EEAD0AD4-0F90-46D9-A775-D88AE07E2869}"
@ -76,6 +77,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NPin.Framework.Upms.Applica
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NPin.Framework.Upms.Application", "module\upms\NPin.Framework.Upms.Application\NPin.Framework.Upms.Application.csproj", "{A48B3BDD-5996-438B-951A-09C52E595FCB}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "setting-management", "setting-management", "{B5122F6D-D6A7-4B7E-A08A-E4690633D616}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NPin.Framework.SettingManagement.Domain", "module\setting-management\NPin.Framework.SettingManagement.Domain\NPin.Framework.SettingManagement.Domain.csproj", "{CA8A2428-D292-4936-AA23-D3F904AA2C94}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NPin.Framework.SettingManagement.SqlSugarCore", "module\setting-management\NPin.Framework.SettingManagement.SqlSugarCore\NPin.Framework.SettingManagement.SqlSugarCore.csproj", "{5FD24D2B-FC1D-47DA-8FBE-48C8C5F1A1CC}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{F8719D08-B45E-48BD-8154-AADB627E8478}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NPin.Test", "test\NPin.Test\NPin.Test.csproj", "{B85E92D1-39A0-4004-A0C0-1883C8A8FBE4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -190,6 +201,18 @@ Global
 		{A48B3BDD-5996-438B-951A-09C52E595FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A48B3BDD-5996-438B-951A-09C52E595FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A48B3BDD-5996-438B-951A-09C52E595FCB}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA8A2428-D292-4936-AA23-D3F904AA2C94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA8A2428-D292-4936-AA23-D3F904AA2C94}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA8A2428-D292-4936-AA23-D3F904AA2C94}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA8A2428-D292-4936-AA23-D3F904AA2C94}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5FD24D2B-FC1D-47DA-8FBE-48C8C5F1A1CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5FD24D2B-FC1D-47DA-8FBE-48C8C5F1A1CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5FD24D2B-FC1D-47DA-8FBE-48C8C5F1A1CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5FD24D2B-FC1D-47DA-8FBE-48C8C5F1A1CC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B85E92D1-39A0-4004-A0C0-1883C8A8FBE4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B85E92D1-39A0-4004-A0C0-1883C8A8FBE4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B85E92D1-39A0-4004-A0C0-1883C8A8FBE4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B85E92D1-39A0-4004-A0C0-1883C8A8FBE4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{088B4948-AE5B-45B3-A9FA-B853671CFA05} = {F2A0A89E-A2F9-48CF-AD38-0318B5ACD11C}
@ -223,5 +246,9 @@ Global
 		{786A1422-C4BD-4742-B33D-EBB82762CC63} = {39C0CC7B-2185-48C6-8D22-F54212CA36D4}
 		{028A9FD0-3C94-45D6-9A4D-68BD4985B176} = {39C0CC7B-2185-48C6-8D22-F54212CA36D4}
 		{A48B3BDD-5996-438B-951A-09C52E595FCB} = {39C0CC7B-2185-48C6-8D22-F54212CA36D4}
+		{B5122F6D-D6A7-4B7E-A08A-E4690633D616} = {EEAD0AD4-0F90-46D9-A775-D88AE07E2869}
+		{CA8A2428-D292-4936-AA23-D3F904AA2C94} = {B5122F6D-D6A7-4B7E-A08A-E4690633D616}
+		{5FD24D2B-FC1D-47DA-8FBE-48C8C5F1A1CC} = {B5122F6D-D6A7-4B7E-A08A-E4690633D616}
+		{B85E92D1-39A0-4004-A0C0-1883C8A8FBE4} = {F8719D08-B45E-48BD-8154-AADB627E8478}
 	EndGlobalSection
 EndGlobal
--- a/common.props
+++ b/common.props
@ -1,5 +1,6 @@
 <Project>
    <Import Project="usings.props" />
+    <Import Project="version.props" />

    <PropertyGroup>
        <TargetFramework>net8.0</TargetFramework>
@ -27,5 +28,8 @@
    <ItemGroup>
        <Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
    </ItemGroup>
+    <ItemGroup>
+        <FrameworkReference Include="Microsoft.AspNetCore.App" />
+    </ItemGroup>
    
 </Project>
--- a/end.sh
+++ b/end.sh
@ -1,3 +1,3 @@
 #!/bin/bash
 kill -9 $(lsof -t -i:19001)
-echo "Yi-进程已关闭"
+echo "NPin-进程已关闭"
--- a/framework/NPin.Framework.AspNetCore/NPin.Framework.AspNetCore.csproj
+++ b/framework/NPin.Framework.AspNetCore/NPin.Framework.AspNetCore.csproj
@ -8,8 +8,8 @@
    </ItemGroup>

    <ItemGroup>
-        <PackageReference Include="Volo.Abp.Json" Version="8.0.5" />
-        <PackageReference Include="Volo.Abp.Swashbuckle" Version="8.0.5" />
+        <PackageReference Include="Volo.Abp.Json" Version="$(AbpVersion)" />
+        <PackageReference Include="Volo.Abp.Swashbuckle" Version="$(AbpVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/framework/NPin.Framework.Caching.FreeRedis/NPin.Framework.Caching.FreeRedis.csproj
+++ b/framework/NPin.Framework.Caching.FreeRedis/NPin.Framework.Caching.FreeRedis.csproj
@ -4,7 +4,7 @@
    <ItemGroup>
      <PackageReference Include="FreeRedis" Version="1.2.14" />
      <PackageReference Include="FreeRedis.DistributedCache" Version="1.2.5" />
-      <PackageReference Include="Volo.Abp.Caching" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />
    </ItemGroup>

 </Project>
--- a/framework/NPin.Framework.Core/NPin.Framework.Core.csproj
+++ b/framework/NPin.Framework.Core/NPin.Framework.Core.csproj
@ -5,6 +5,6 @@
        <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.0" />
        <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0"/>
        <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
-        <PackageReference Include="Volo.Abp.Core" Version="8.0.5"/>
+        <PackageReference Include="Volo.Abp.Core" Version="$(AbpVersion)"/>
    </ItemGroup>
 </Project>
--- a/framework/NPin.Framework.Ddd.Application.Contracts/NPin.Framework.Ddd.Application.Contracts.csproj
+++ b/framework/NPin.Framework.Ddd.Application.Contracts/NPin.Framework.Ddd.Application.Contracts.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <Import Project="..\..\common.props" />
    <ItemGroup>
-      <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.Ddd.Application.Contracts" Version="$(AbpVersion)" />
    </ItemGroup>
    <ItemGroup>
      <ProjectReference Include="..\NPin.Framework.Core\NPin.Framework.Core.csproj" />
--- a/framework/NPin.Framework.Ddd.Application/NPin.Framework.Ddd.Application.csproj
+++ b/framework/NPin.Framework.Ddd.Application/NPin.Framework.Ddd.Application.csproj
@ -9,7 +9,7 @@
      <PackageReference Include="Microsoft.AspNetCore.Mvc.Abstractions" Version="2.2.0" />
      <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
      <PackageReference Include="MiniExcel" Version="1.31.3" />
-      <PackageReference Include="Volo.Abp.Ddd.Application" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.Ddd.Application" Version="$(AbpVersion)" />
    </ItemGroup>

 </Project>
--- a/framework/NPin.Framework.Mapster/NPin.Framework.Mapster.csproj
+++ b/framework/NPin.Framework.Mapster/NPin.Framework.Mapster.csproj
@ -3,9 +3,7 @@

    <ItemGroup>
      <PackageReference Include="Mapster" Version="7.4.0" />
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-      <PackageReference Include="NUnit" Version="4.1.0" />
-      <PackageReference Include="Volo.Abp.ObjectMapping" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.ObjectMapping" Version="$(AbpVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/framework/NPin.Framework.SqlSugarCore.Abstractions/NPin.Framework.SqlSugarCore.Abstractions.csproj
+++ b/framework/NPin.Framework.SqlSugarCore.Abstractions/NPin.Framework.SqlSugarCore.Abstractions.csproj
@ -2,8 +2,8 @@
    <Import Project="..\..\common.props" />

    <ItemGroup>
-      <PackageReference Include="SqlSugarCoreNoDrive" Version="5.1.4.146" />
-      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.0.5" />
+      <PackageReference Include="SqlSugarCoreNoDrive" Version="$(SqlSugarVersion)" />
+      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/framework/NPin.Framework.SqlSugarCore/NPin.Framework.SqlSugarCore.csproj
+++ b/framework/NPin.Framework.SqlSugarCore/NPin.Framework.SqlSugarCore.csproj
@ -3,7 +3,7 @@

    <ItemGroup>
      <PackageReference Include="MySqlBackup.NET.MySqlConnector" Version="2.3.8" />
-      <PackageReference Include="SqlSugarCore" Version="5.1.4.146" />
+      <PackageReference Include="SqlSugarCore" Version="$(SqlSugarVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/module/audit-logging/NPin.Framework.AuditLogging.Domain.Shared/NPin.Framework.AuditLogging.Domain.Shared.csproj
+++ b/module/audit-logging/NPin.Framework.AuditLogging.Domain.Shared/NPin.Framework.AuditLogging.Domain.Shared.csproj
@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\..\..\common.props" />
    
    <PropertyGroup>
        <TargetFramework>net8.0</TargetFramework>
@ -7,7 +8,7 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="$(AbpVersion)" />
    </ItemGroup>

 </Project>
--- a/module/audit-logging/NPin.Framework.AuditLogging.Domain/NPin.Framework.AuditLogging.Domain.csproj
+++ b/module/audit-logging/NPin.Framework.AuditLogging.Domain/NPin.Framework.AuditLogging.Domain.csproj
@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\..\..\common.props" />
    
    <PropertyGroup>
        <TargetFramework>net8.0</TargetFramework>
@ -7,8 +8,8 @@
    </PropertyGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.Auditing" Version="8.0.5" />
-      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.Auditing" Version="$(AbpVersion)" />
+      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/module/audit-logging/NPin.Framework.AuditLogging.SqlSugarCore/NPin.Framework.AuditLogging.SqlSugarCore.csproj
+++ b/module/audit-logging/NPin.Framework.AuditLogging.SqlSugarCore/NPin.Framework.AuditLogging.SqlSugarCore.csproj
@ -1,4 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="..\..\..\common.props" />
    
    <PropertyGroup>
        <TargetFramework>net8.0</TargetFramework>
--- a/module/tenant-management/NPin.Framework.TenantManagement.Application.Contracts/NPin.Framework.TenantManagement.Application.Contracts.csproj
+++ b/module/tenant-management/NPin.Framework.TenantManagement.Application.Contracts/NPin.Framework.TenantManagement.Application.Contracts.csproj
@ -8,7 +8,7 @@
    </PropertyGroup>
    
    <ItemGroup>
-      <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="$(AbpVersion)" />
    </ItemGroup>
    
    <ItemGroup>
--- a/module/tenant-management/NPin.Framework.TenantManagement.Domain/NPin.Framework.TenantManagement.Domain.csproj
+++ b/module/tenant-management/NPin.Framework.TenantManagement.Domain/NPin.Framework.TenantManagement.Domain.csproj
@ -12,8 +12,8 @@
    </ItemGroup>
    
    <ItemGroup>
-      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.0.5" />
-      <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
+      <PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="$(AbpVersion)" />
    </ItemGroup>

 </Project>
--- a/module/upms/NPin.Framework.Upms.Application/NPin.Framework.Upms.Application.csproj
+++ b/module/upms/NPin.Framework.Upms.Application/NPin.Framework.Upms.Application.csproj
@ -9,7 +9,7 @@
      <PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" />
      <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
      <PackageReference Include="SkiaSharp.NativeAssets.Linux.NoDependencies" Version="2.88.7" />
-      <PackageReference Include="Volo.Abp.BackgroundWorkers.Quartz" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.BackgroundWorkers.Quartz" Version="$(AbpVersion)" />
    </ItemGroup>

 </Project>
--- a/module/upms/NPin.Framework.Upms.Domain.Shared/NPin.Framework.Upms.Domain.Shared.csproj
+++ b/module/upms/NPin.Framework.Upms.Domain.Shared/NPin.Framework.Upms.Domain.Shared.csproj
@ -5,7 +5,7 @@
      <ProjectReference Include="..\..\..\framework\NPin.Framework.SqlSugarCore.Abstractions\NPin.Framework.SqlSugarCore.Abstractions.csproj" />
    </ItemGroup>
    <ItemGroup>
-      <PackageReference Include="Volo.Abp.Users.Domain.Shared" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.Users.Domain.Shared" Version="$(AbpVersion)" />
    </ItemGroup>

 </Project>
--- a/module/upms/NPin.Framework.Upms.Domain/NPin.Framework.Upms.Domain.csproj
+++ b/module/upms/NPin.Framework.Upms.Domain/NPin.Framework.Upms.Domain.csproj
@ -10,9 +10,9 @@
      <PackageReference Include="IPTools.International" Version="1.6.0" />
      <PackageReference Include="TencentCloudSDK" Version="3.0.966" />
      <PackageReference Include="UAParser" Version="3.1.47" />
-      <PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="8.0.5" />
-      <PackageReference Include="Volo.Abp.Caching" Version="8.0.5" />
-      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.AspNetCore.SignalR" Version="$(AbpVersion)" />
+      <PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />
+      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
    </ItemGroup>

 </Project>
--- a/src/NPin.Domain.Shared/NPin.Domain.Shared.csproj
+++ b/src/NPin.Domain.Shared/NPin.Domain.Shared.csproj
@ -9,7 +9,7 @@
    </ItemGroup>

    <ItemGroup>
-      <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.Ddd.Domain.Shared" Version="$(AbpVersion)" />
    </ItemGroup>

    <ItemGroup>
--- a/src/NPin.Domain/NPin.Domain.csproj
+++ b/src/NPin.Domain/NPin.Domain.csproj
@ -18,7 +18,7 @@
    </ItemGroup>
    
    <ItemGroup>
-      <PackageReference Include="Volo.Abp.Caching" Version="8.0.5" />
-      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="8.0.5" />
+      <PackageReference Include="Volo.Abp.Caching" Version="$(AbpVersion)" />
+      <PackageReference Include="Volo.Abp.Ddd.Domain" Version="$(AbpVersion)" />
    </ItemGroup>
 </Project>
--- a/src/NPin.Web/NPin.Web.csproj
+++ b/src/NPin.Web/NPin.Web.csproj
@ -12,11 +12,11 @@
        <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
        <PackageReference Include="Serilog.AspNetCore" Version="8.0.1"/>
        <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0"/>
-        <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="8.0.5"/>
-        <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="8.0.5"/>
-        <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="8.0.5"/>
-        <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.0.5"/>
-        <PackageReference Include="Volo.Abp.Autofac" Version="8.0.5"/>
+        <PackageReference Include="Volo.Abp.AspNetCore.Authentication.JwtBearer" Version="$(AbpVersion)"/>
+        <PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="$(AbpVersion)"/>
+        <PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="$(AbpVersion)"/>
+        <PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)"/>
+        <PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)"/>
    </ItemGroup>

    <ItemGroup>
--- a/start.sh
+++ b/start.sh
@ -1,4 +1,4 @@
 #!/bin/bash
 ./end.sh
 nohup dotnet Yi.Abp.Web.dll > /dev/null 2>&1 &
-echo "Yi-启动成功!"
+echo "NPin-启动成功!"
--- a/version.props
+++ b/version.props
@ -0,0 +1,6 @@
+<Project>
+    <PropertyGroup>
+        <AbpVersion>8.0.5</AbpVersion>
+        <SqlSugarVersion>5.1.4.149</SqlSugarVersion>
+    </PropertyGroup>
+</Project>