WGQ_WB19011.git

			@@ -14,7 +14,7 @@
			<RootNamespace>FineUIPro.iWareWms</RootNamespace>
			<AssemblyName>iWareWms</AssemblyName>
			<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
			<UseIISExpress>false</UseIISExpress>
			<UseIISExpress>true</UseIISExpress>
			<TargetFrameworkProfile />
			<FileUpgradeFlags>
			</FileUpgradeFlags>
			@@ -74,9 +74,8 @@
			<SpecificVersion>False</SpecificVersion>
			<HintPath>..\..\WebApi\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
			</Reference>
			<Reference Include="FineUIPro, Version=5.5.0.0, Culture=neutral, PublicKeyToken=9cbe753c029f291a, processorArchitecture=MSIL">
			<SpecificVersion>False</SpecificVersion>
			<HintPath>bin\FineUIPro.dll</HintPath>
			<Reference Include="FineUIPro">
			<HintPath>..\dll\FineUIPro.dll</HintPath>
			</Reference>
			<Reference Include="iWareDataRbacWms, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
			<SpecificVersion>False</SpecificVersion>
			@@ -960,6 +959,9 @@
			<Content Include="Code\Common\Entity\_system~.ini" />
			<Content Include="Code\Common\Service\_system~.ini" />
			<Content Include="Code\Common\_system~.ini" />
			<Content Include="Metadata\deploymentTemplates\apiappconfig.azureresource.json" />
			<Content Include="apiapp.json" />
			<None Include="Properties\PublishProfiles\iWareWms.pubxml" />
			<None Include="Service References\PrintWcfService\Arrays.xsd">
			<SubType>Designer</SubType>
			</None>
			@@ -3593,13 +3595,7 @@
			</EmbeddedResource>
			</ItemGroup>
			<ItemGroup>
			<Content Include="res\icon\Thumbs.db" />
			<Content Include="res\images\logo\Thumbs.db" />
			<Content Include="res\images\main\_system~.ini" />
			<Content Include="res\images\themes\border\Thumbs.db" />
			<Content Include="res\images\themes\small\Thumbs.db" />
			<Content Include="res\images\themes\Thumbs.db" />
			<Content Include="res\images\Thumbs.db" />
			</ItemGroup>
			<ItemGroup>
			<Content Include="View\RBAC\Content\_system~.ini" />
			@@ -3727,9 +3723,13 @@
			<WebProjectProperties>
			<UseIIS>True</UseIIS>
			<AutoAssignPort>True</AutoAssignPort>
			<DevelopmentServerPort>0</DevelopmentServerPort>
			<DevelopmentServerPort>65031</DevelopmentServerPort>
			<DevelopmentServerVPath>/</DevelopmentServerVPath>
			<IISUrl>http://localhost/iWareWms</IISUrl>
			<<<<<<< HEAD
			<IISUrl>http://localhost:8099</IISUrl>
			=======
			<IISUrl>http://localhost:55234/</IISUrl>
			>>>>>>> c3984d64e9727d60a2a61682271bd52cc82712b9
			<NTLMAuthentication>False</NTLMAuthentication>
			<UseCustomServer>False</UseCustomServer>
			<CustomServerUrl>