Merge branch 'master' of https://310.jisheyun.com/daizan/JiShe.IOT.Admin

2025-06-12 17:56:36 +08:00 · 2025-06-12 17:56:36 +08:00 · de443b5fa8
commit de443b5fa8
parent 58afa8cfd2 7f5c578d78
16 changed files with 20 additions and 17 deletions
--- a/Directory.Build.props
+++ b/Directory.Build.props
@ -6,7 +6,10 @@
 		<!--Volo Abp 版本-->
 		<VoloAbpVersion>9.1.1</VoloAbpVersion>

-		<!--Dotnet Info 版本-->
+		<!--Dotnet 组件 版本-->
 		<DotnetInfoVersion>9.0.0</DotnetInfoVersion>
+
+		<!--Dotnet 框架 版本-->
+		<DotnetTargetFrameworkVersion>net9.0</DotnetTargetFrameworkVersion>
 	</PropertyGroup>
 </Project>
--- a/gateways/JiShe.IoT.WebGateway/JiShe.IoT.WebGateway.csproj
+++ b/gateways/JiShe.IoT.WebGateway/JiShe.IoT.WebGateway.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">

    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
    </PropertyGroup>

    <ItemGroup>
--- a/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj
+++ b/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj
@ -2,7 +2,7 @@


    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
        <PreserveCompilationReferences>true</PreserveCompilationReferences>
        <UserSecretsId>JiShe.IoT-4681b4fd-151f-4221-84a4-929d86723e4c</UserSecretsId>
--- a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj
+++ b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
    </PropertyGroup>

--- a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
+++ b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj
@ -2,7 +2,7 @@


    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
    </PropertyGroup>

--- a/src/JiShe.IoT.DbMigrator/JiShe.IoT.DbMigrator.csproj
+++ b/src/JiShe.IoT.DbMigrator/JiShe.IoT.DbMigrator.csproj
@ -2,7 +2,7 @@

    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
    </PropertyGroup>

    <ItemGroup>
--- a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj
+++ b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
        <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
    </PropertyGroup>
--- a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
+++ b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
    </PropertyGroup>

--- a/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
+++ b/src/JiShe.IoT.EntityFrameworkCore/JiShe.IoT.EntityFrameworkCore.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
    </PropertyGroup>

--- a/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
+++ b/src/JiShe.IoT.HttpApi.Client/JiShe.IoT.HttpApi.Client.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
    </PropertyGroup>

--- a/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj
+++ b/src/JiShe.IoT.HttpApi/JiShe.IoT.HttpApi.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">

 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
 		<RootNamespace>JiShe.IoT</RootNamespace>
 	</PropertyGroup>

--- a/test/JiShe.IoT.Application.Tests/JiShe.IoT.Application.Tests.csproj
+++ b/test/JiShe.IoT.Application.Tests/JiShe.IoT.Application.Tests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
        <IsPackable>false</IsPackable>
    </PropertyGroup>
--- a/test/JiShe.IoT.Domain.Tests/JiShe.IoT.Domain.Tests.csproj
+++ b/test/JiShe.IoT.Domain.Tests/JiShe.IoT.Domain.Tests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
        <IsPackable>false</IsPackable>
    </PropertyGroup>
--- a/test/JiShe.IoT.EntityFrameworkCore.Tests/JiShe.IoT.EntityFrameworkCore.Tests.csproj
+++ b/test/JiShe.IoT.EntityFrameworkCore.Tests/JiShe.IoT.EntityFrameworkCore.Tests.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
        <IsPackable>false</IsPackable>
    </PropertyGroup>
--- a/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/JiShe.IoT.HttpApi.Client.ConsoleTestApp.csproj
+++ b/test/JiShe.IoT.HttpApi.Client.ConsoleTestApp/JiShe.IoT.HttpApi.Client.ConsoleTestApp.csproj
@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
        <OutputType>Exe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <IsPackable>false</IsPackable>
    </PropertyGroup>

--- a/test/JiShe.IoT.TestBase/JiShe.IoT.TestBase.csproj
+++ b/test/JiShe.IoT.TestBase/JiShe.IoT.TestBase.csproj
@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>$(DotnetTargetFrameworkVersion)</TargetFramework>
        <RootNamespace>JiShe.IoT</RootNamespace>
        <IsPackable>false</IsPackable>
    </PropertyGroup>