From 533c702ee6602a45a7090324e66f4c8e892af6c2 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周一, 25 8月 2025 14:16:57 +0800
Subject: [PATCH] 222
---
DEmon/iWareWms/iWareWms.csproj | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/DEmon/iWareWms/iWareWms.csproj b/DEmon/iWareWms/iWareWms.csproj
index 7aa3f27..f3de51a 100644
--- a/DEmon/iWareWms/iWareWms.csproj
+++ b/DEmon/iWareWms/iWareWms.csproj
@@ -14,7 +14,7 @@
<RootNamespace>FineUIPro.iWareWms</RootNamespace>
<AssemblyName>iWareWms</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
- <UseIISExpress>true</UseIISExpress>
+ <UseIISExpress>false</UseIISExpress>
<TargetFrameworkProfile />
<FileUpgradeFlags>
</FileUpgradeFlags>
@@ -961,6 +961,7 @@
<Content Include="Code\Common\_system~.ini" />
<Content Include="Metadata\deploymentTemplates\apiappconfig.azureresource.json" />
<Content Include="apiapp.json" />
+ <Content Include="FineUIPro.lic.dev.config" />
<None Include="Properties\PublishProfiles\iWareWms.pubxml" />
<None Include="Service References\PrintWcfService\Arrays.xsd">
<SubType>Designer</SubType>
@@ -3725,11 +3726,7 @@
<AutoAssignPort>True</AutoAssignPort>
<DevelopmentServerPort>65031</DevelopmentServerPort>
<DevelopmentServerVPath>/</DevelopmentServerVPath>
-<<<<<<< HEAD
<IISUrl>http://localhost:8099</IISUrl>
-=======
- <IISUrl>http://localhost:55234/</IISUrl>
->>>>>>> c3984d64e9727d60a2a61682271bd52cc82712b9
<NTLMAuthentication>False</NTLMAuthentication>
<UseCustomServer>False</UseCustomServer>
<CustomServerUrl>
--
Gitblit v1.9.3