g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加　admin　子模块

Browse Source
This commit is contained in:
Diego
2024-12-19 11:54:14 +08:00
parent f4a7e96943
commit 1b26ecbbf5
12 changed files with 73 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Directory.Build.props
View File

@@ -1,9 +1,8 @@
<Project>
<PropertyGroup>
<AdminVersion>7.2.0.51</AdminVersion>
<PluginVersion>9.0.2.51</PluginVersion>
<ProPluginVersion>9.0.2.74</ProPluginVersion>
<PluginVersion>9.0.2.52</PluginVersion>
<ProPluginVersion>9.0.2.75</ProPluginVersion>
</PropertyGroup>
<PropertyGroup>

3
src/Foundation/ThingsGateway.CSScript/ThingsGateway.CSScript.csproj
View File

@@ -20,6 +20,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ThingsGateway.NewLife.X" Version="$(AdminVersion)" />
<ProjectReference Include="..\..\..\Admin\src\ThingsGateway.NewLife.X\ThingsGateway.NewLife.X.csproj" />
</ItemGroup>
</Project>

2
src/Foundation/ThingsGateway.Foundation.Razor/ThingsGateway.Foundation.Razor.csproj
View File

@@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="ThingsGateway.Razor" Version="$(AdminVersion)" />
<ProjectReference Include="..\..\..\Admin\src\ThingsGateway.Razor\ThingsGateway.Razor.csproj" />
</ItemGroup>

2
src/Foundation/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
View File

@@ -10,7 +10,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.0" />
<PackageReference Include="ThingsGateway.NewLife.X" Version="$(AdminVersion)" />
<ProjectReference Include="..\..\..\Admin\src\ThingsGateway.NewLife.X\ThingsGateway.NewLife.X.csproj" />
<PackageReference Include="TouchSocket" Version="3.0.8" />
<PackageReference Include="TouchSocket.SerialPorts" Version="3.0.8" />
</ItemGroup>

2
src/FoundationVersion.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>9.0.2.37</Version>
<Version>9.0.2.38</Version>
</PropertyGroup>
<ItemGroup>

2
src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj
View File

@@ -12,7 +12,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="ThingsGateway.Admin.Application" Version="$(AdminVersion)" />
<ProjectReference Include="..\..\..\Admin\src\ThingsGateway.Admin.Application\ThingsGateway.Admin.Application.csproj" />
</ItemGroup>
<ItemGroup>

2
src/Gateway/ThingsGateway.Gateway.Razor/ThingsGateway.Gateway.Razor.csproj
View File

@@ -6,7 +6,7 @@
<ProjectReference Include="..\ThingsGateway.Gateway.Application\ThingsGateway.Gateway.Application.csproj" />
<PackageReference Include="BootstrapBlazor.WinBox" Version="9.0.7" />
<PackageReference Include="BootstrapBlazor.CodeEditor" Version="9.0.1" />
<PackageReference Include="ThingsGateway.Admin.Razor" Version="$(AdminVersion)" />
<ProjectReference Include="..\..\..\Admin\src\ThingsGateway.Admin.Razor\ThingsGateway.Admin.Razor.csproj" />
<ProjectReference Include="..\..\Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj" />
</ItemGroup>

2
src/ThingsGateway.Photino/ThingsGateway.Photino.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="$(SolutionDir)Version.props" />
<Import Project="..\ThingsGateway.Server\targets\Admin.targets" />
<!--<Import Project="..\ThingsGateway.Server\targets\Admin.targets" />-->
<Import Project="..\ThingsGateway.Server\targets\Plugin.targets" />
<Import Project="..\ThingsGateway.Server\targets\CustomPlugin.targets" />
<Import Project="..\ThingsGateway.Server\targets\Custom.targets" />

2
src/ThingsGateway.Server/ThingsGateway.Server.csproj
View File

@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="$(SolutionDir)Version.props" />
<Import Project="targets\Admin.targets" />
<Import Project="targets\Plugin.targets" />
<Import Project="targets\CustomPlugin.targets" />
<Import Project="targets\Custom.targets" />
<!--<Import Project="targets\Admin.targets" />-->
<!--<Import Project="targets\OtherPlugin.targets" />-->
<!--<Import Project="targets\OtherPlugin1.targets" />-->
<PropertyGroup>

2
src/ThingsGateway.Winform/ThingsGateway.Winform.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Import Project="$(SolutionDir)Version.props" />
<Import Project="..\ThingsGateway.Server\targets\Admin.targets" />
<!--<Import Project="..\ThingsGateway.Server\targets\Admin.targets" />-->
<Import Project="..\ThingsGateway.Server\targets\Plugin.targets" />
<Import Project="..\ThingsGateway.Server\targets\CustomPlugin.targets" />
<Import Project="..\ThingsGateway.Server\targets\Custom.targets" />

61
src/ThingsGateway.sln
View File

@@ -34,6 +34,29 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ThingsGateway.Gateway.Razor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Foundation.Razor", "Foundation\ThingsGateway.Foundation.Razor\ThingsGateway.Foundation.Razor.csproj", "{569F229F-FB10-4789-B00B-D9D12383177A}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Admin", "Admin", "{72C65578-92A5-4E99-9779-27835B12B32F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Admin.Application", "..\Admin\src\ThingsGateway.Admin.Application\ThingsGateway.Admin.Application.csproj", "{C4C01993-DB12-49D9-BDDB-C312042A6C29}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Admin.Razor", "..\Admin\src\ThingsGateway.Admin.Razor\ThingsGateway.Admin.Razor.csproj", "{BC3AE9E7-7B56-4894-9514-52A493A0D724}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Core", "..\Admin\src\ThingsGateway.Core\ThingsGateway.Core.csproj", "{D473E69E-FDBE-4A8E-A835-7F380C8E6D86}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Furion", "..\Admin\src\ThingsGateway.Furion\ThingsGateway.Furion.csproj", "{3759E861-BA1E-498A-85CF-48A0BE6B00BB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.NewLife.X", "..\Admin\src\ThingsGateway.NewLife.X\ThingsGateway.NewLife.X.csproj", "{42928B73-237A-4483-935E-E7FAAC52F288}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.Razor", "..\Admin\src\ThingsGateway.Razor\ThingsGateway.Razor.csproj", "{015DD6B7-325F-45B5-B69E-CBD62DC6235A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ThingsGateway.AdminServer", "..\Admin\src\ThingsGateway.AdminServer\ThingsGateway.AdminServer.csproj", "{BE13F278-C153-4CB8-A4EF-59BEFAE54CF8}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "other", "other", "{568A28E1-6CAE-461C-8578-C28BEAC81945}"
ProjectSection(SolutionItems) = preProject
..\Admin\src\Admin.props = ..\Admin\src\Admin.props
..\Admin\src\PackNuget.props = ..\Admin\src\PackNuget.props
..\Admin\src\Version.props = ..\Admin\src\Version.props
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -80,6 +103,34 @@ Global
{569F229F-FB10-4789-B00B-D9D12383177A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{569F229F-FB10-4789-B00B-D9D12383177A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{569F229F-FB10-4789-B00B-D9D12383177A}.Release|Any CPU.Build.0 = Release|Any CPU
{C4C01993-DB12-49D9-BDDB-C312042A6C29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4C01993-DB12-49D9-BDDB-C312042A6C29}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4C01993-DB12-49D9-BDDB-C312042A6C29}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C4C01993-DB12-49D9-BDDB-C312042A6C29}.Release|Any CPU.Build.0 = Release|Any CPU
{BC3AE9E7-7B56-4894-9514-52A493A0D724}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BC3AE9E7-7B56-4894-9514-52A493A0D724}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC3AE9E7-7B56-4894-9514-52A493A0D724}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC3AE9E7-7B56-4894-9514-52A493A0D724}.Release|Any CPU.Build.0 = Release|Any CPU
{D473E69E-FDBE-4A8E-A835-7F380C8E6D86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D473E69E-FDBE-4A8E-A835-7F380C8E6D86}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D473E69E-FDBE-4A8E-A835-7F380C8E6D86}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D473E69E-FDBE-4A8E-A835-7F380C8E6D86}.Release|Any CPU.Build.0 = Release|Any CPU
{3759E861-BA1E-498A-85CF-48A0BE6B00BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3759E861-BA1E-498A-85CF-48A0BE6B00BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3759E861-BA1E-498A-85CF-48A0BE6B00BB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3759E861-BA1E-498A-85CF-48A0BE6B00BB}.Release|Any CPU.Build.0 = Release|Any CPU
{42928B73-237A-4483-935E-E7FAAC52F288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{42928B73-237A-4483-935E-E7FAAC52F288}.Debug|Any CPU.Build.0 = Debug|Any CPU
{42928B73-237A-4483-935E-E7FAAC52F288}.Release|Any CPU.ActiveCfg = Release|Any CPU
{42928B73-237A-4483-935E-E7FAAC52F288}.Release|Any CPU.Build.0 = Release|Any CPU
{015DD6B7-325F-45B5-B69E-CBD62DC6235A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{015DD6B7-325F-45B5-B69E-CBD62DC6235A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{015DD6B7-325F-45B5-B69E-CBD62DC6235A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{015DD6B7-325F-45B5-B69E-CBD62DC6235A}.Release|Any CPU.Build.0 = Release|Any CPU
{BE13F278-C153-4CB8-A4EF-59BEFAE54CF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BE13F278-C153-4CB8-A4EF-59BEFAE54CF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BE13F278-C153-4CB8-A4EF-59BEFAE54CF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BE13F278-C153-4CB8-A4EF-59BEFAE54CF8}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -92,10 +143,18 @@ Global
{A1163B55-31D8-4F58-872F-1DD5E0F14490} = {5948EA23-4B42-4C22-A266-2E0AE5FA575F}
{6B92AF2D-0997-4887-B1C5-31861F298238} = {5948EA23-4B42-4C22-A266-2E0AE5FA575F}
{569F229F-FB10-4789-B00B-D9D12383177A} = {2AC600BB-4325-4E0A-93A7-B1F53C8E2CA7}
{C4C01993-DB12-49D9-BDDB-C312042A6C29} = {72C65578-92A5-4E99-9779-27835B12B32F}
{BC3AE9E7-7B56-4894-9514-52A493A0D724} = {72C65578-92A5-4E99-9779-27835B12B32F}
{D473E69E-FDBE-4A8E-A835-7F380C8E6D86} = {72C65578-92A5-4E99-9779-27835B12B32F}
{3759E861-BA1E-498A-85CF-48A0BE6B00BB} = {72C65578-92A5-4E99-9779-27835B12B32F}
{42928B73-237A-4483-935E-E7FAAC52F288} = {72C65578-92A5-4E99-9779-27835B12B32F}
{015DD6B7-325F-45B5-B69E-CBD62DC6235A} = {72C65578-92A5-4E99-9779-27835B12B32F}
{BE13F278-C153-4CB8-A4EF-59BEFAE54CF8} = {72C65578-92A5-4E99-9779-27835B12B32F}
{568A28E1-6CAE-461C-8578-C28BEAC81945} = {72C65578-92A5-4E99-9779-27835B12B32F}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
RESX_Rules = {"EnabledRules":[]}
RESX_NeutralResourcesLanguage = zh-Hans
SolutionGuid = {199B1B96-4F56-4828-9531-813BA02DB282}
EndGlobalSection
EndGlobal

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>7.2.0.75</Version>
<Version>7.2.0.76</Version>
</PropertyGroup>
<ItemGroup>