From 756e6c531d49a4565e47949120cb33bae431566e Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 24 四月 2025 09:45:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.115.28.255:8110/r/TigerClouds-Tech/Server/TigerApi6_2024
---
Tiger.Api/Tiger.Api.csproj | 73 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 28 deletions(-)
diff --git a/Tiger.Api/Tiger.Api.csproj b/Tiger.Api/Tiger.Api.csproj
index 715d944..276738f 100644
--- a/Tiger.Api/Tiger.Api.csproj
+++ b/Tiger.Api/Tiger.Api.csproj
@@ -1,29 +1,29 @@
锘�<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup Label="Globals">
- <SccProjectName>SAK</SccProjectName>
- <SccProvider>SAK</SccProvider>
- <SccAuxPath>SAK</SccAuxPath>
- <SccLocalPath>SAK</SccLocalPath>
+ <SccProjectName></SccProjectName>
+ <SccProvider></SccProvider>
+ <SccAuxPath></SccAuxPath>
+ <SccLocalPath></SccLocalPath>
<Platforms>AnyCPU;x86</Platforms>
</PropertyGroup>
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
- <ApplicationIcon>TigerApi6Text64.ico</ApplicationIcon>
+ <ApplicationIcon>Icons\HonghuApi64.ico</ApplicationIcon>
<OutputType>Exe</OutputType>
<AssemblyName>TigerApiHost</AssemblyName>
<UserSecretsId>63e1c730-ccbc-4208-a72d-3e6460877d4d</UserSecretsId>
- <FileVersion>6.0.1</FileVersion>
- <AssemblyVersion>6.0.1</AssemblyVersion>
+ <FileVersion>6.0.2</FileVersion>
+ <AssemblyVersion>6.0.2</AssemblyVersion>
<PackageReleaseNotes></PackageReleaseNotes>
<Description>Api Host Program Base on .Net 6
Hash : 673cd3b3fa311e691e8dd8136b580ed0bcc64cf0</Description>
- <Version>6.0.1</Version>
+ <Version>6.0.2</Version>
<Product>Tiger Api Host</Product>
- <Company>SZ TigerClouds Co.,Ltd.</Company>
+ <Company>娣卞湷甯傞挍鏍间簯绉戞妧鏈夐檺鍏徃 (SZ TigerClouds Technology Co.,Ltd.)</Company>
<Authors>TigerClouds Team</Authors>
- <Copyright>Copyright 漏 2020-2023 TigerClouds. All rights reserved.</Copyright>
+ <Copyright>Copyright 漏 2020-2025 SZ TigerClouds Technology Co.,Ltd.. All rights reserved.</Copyright>
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
<GenerateDocumentationFile>True</GenerateDocumentationFile>
<StartupObject></StartupObject>
@@ -53,32 +53,47 @@
<ItemGroup>
+ <Compile Remove="Controllers\EMS\**" />
+ <Compile Remove="Controllers\QMS\**" />
+ <Compile Remove="wwwroot\**" />
+ <Content Remove="Controllers\EMS\**" />
+ <Content Remove="Controllers\QMS\**" />
+ <Content Remove="wwwroot\**" />
+ <EmbeddedResource Remove="Controllers\EMS\**" />
+ <EmbeddedResource Remove="Controllers\QMS\**" />
+ <EmbeddedResource Remove="wwwroot\**" />
+ <None Remove="Controllers\EMS\**" />
+ <None Remove="Controllers\QMS\**" />
+ <None Remove="wwwroot\**" />
+ </ItemGroup>
+
+
+ <ItemGroup>
<Compile Remove="iBiz\Logger.cs" />
</ItemGroup>
<ItemGroup>
- <Content Include="TigerApi6Text64.ico" />
+ <Content Include="Icons\HonghuApi64.ico" />
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Autofac" Version="8.0.0" />
- <PackageReference Include="Autofac.Configuration" Version="6.0.0" />
- <PackageReference Include="Autofac.Extensions.DependencyInjection" Version="9.0.0" />
- <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
- <PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.14" />
- <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
- <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.14" />
- <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
+ <PackageReference Include="Microsoft.AspNetCore.Hosting.WindowsServices" Version="6.0.33" />
+ <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.33" />
<PackageReference Include="Microsoft.Extensions.Hosting.WindowsServices" Version="7.0.1" />
- <PackageReference Include="SharpZipLib" Version="1.4.2" />
- <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\Tiger.IBusiness.MES\Tiger.IBusiness.MES.csproj" />
+ <ProjectReference Include="..\Tiger.IBusiness.WMS\Tiger.IBusiness.WMS.csproj" />
<ProjectReference Include="..\Tiger.IBusiness\Tiger.IBusiness.csproj" />
</ItemGroup>
<ItemGroup>
- <Folder Include="Controllers\EMS\" />
- <Folder Include="Controllers\QMS\" />
+ <None Include="Views\Home\Index.cshtml" />
+ <None Include="Views\Home\Privacy.cshtml" />
+ <None Include="Views\Shared\Error.cshtml" />
+ <None Include="Views\Shared\_Layout.cshtml" />
+ <None Include="Views\Shared\_ValidationScriptsPartial.cshtml" />
+ <None Include="Views\_ViewImports.cshtml" />
+ <None Include="Views\_ViewStart.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Update="appsettings.json">
@@ -96,12 +111,14 @@
<Content Update="Autofac\Template.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
- <Content Update="Autofac\Transaction.json">
- <CopyToOutputDirectory>Always</CopyToOutputDirectory>
- </Content>
- <Content Update="Autofac\Default.json">
+ <Content Update="BizSettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
- <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" autofac_4template_1json__JsonSchema="https://json.schemastore.org/appsettings.json" autofac_4transaction_1json__JsonSchema="https://json.schemastore.org/appsettings.json" /></VisualStudio></ProjectExtensions>
+ <ItemGroup>
+ <None Update="Language.db">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </None>
+ </ItemGroup>
+ <ProjectExtensions><VisualStudio><UserProperties appsettings_1json__JsonSchema="" autofac_4template_1json__JsonSchema="https://json.schemastore.org/appsettings.json" /></VisualStudio></ProjectExtensions>
</Project>
--
Gitblit v1.9.3