root
/
ldj
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: root:8931e08b30766d3f4cafd944ad3b44e538680fc5
Branches Tags
root:main
root:ldjO
root:ldjadv
root:medicine
root:ldj
..
compare: root:8305a6bb7450278f95f4b7e6ebaa2f68568eb36e
Branches Tags
root:ldjO
root:ldjadv
root:medicine
root:ldj
root:main

No commits in common. "8931e08b30766d3f4cafd944ad3b44e538680fc5" and "8305a6bb7450278f95f4b7e6ebaa2f68568eb36e" have entirely different histories.
8931e08b30 ... 8305a6bb74

63 changed files with 139 additions and 250 deletions
Show Stats Expand all files Collapse all files

5
DNExamples/DNExamples.csproj
View File

@ -34,11 +34,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40-client\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
@ -69,7 +65,6 @@
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>

4
DNExamples/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40-client" />
</packages>

8
DNLight/DNLight.csproj
View File

@ -31,13 +31,8 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -59,9 +54,6 @@
<Compile Include="uartinfo.cs" /> <Compile Include="uartinfo.cs" />
<Compile Include="unart_manage.cs" /> <Compile Include="unart_manage.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

4
DNLight/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

6
DNLightSvr/DNLightSvr.csproj
View File

@ -38,8 +38,8 @@
<StartupObject /> <StartupObject />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath> <HintPath>..\winform\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.configuration" /> <Reference Include="System.configuration" />
@ -47,7 +47,6 @@
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" /> <Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -88,7 +87,6 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>

4
DNLightSvr/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

6
Data/BaseObject/DataAccess.csproj
View File

@ -61,9 +61,6 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.configuration" /> <Reference Include="System.configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
@ -107,9 +104,6 @@
<Install>true</Install> <Install>true</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

4
Data/BaseObject/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

7
DeinuPageControl/DeinuPageControl.csproj
View File

@ -32,11 +32,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40-client\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
@ -61,9 +57,6 @@
<DependentUpon>Pager.cs</DependentUpon> <DependentUpon>Pager.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

4
DeinuPageControl/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40-client" />
</packages>

5
LightService/LightService.csproj
View File

@ -33,12 +33,8 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40-client\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
@ -53,7 +49,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
<None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>

4
LightService/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40-client" />
</packages>

5
Logical/Logical.csproj
View File

@ -64,9 +64,6 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\Data\BaseObject\bin\Debug\BaseObject.dll</HintPath> <HintPath>..\Data\BaseObject\bin\Debug\BaseObject.dll</HintPath>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ReportViewer.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="Microsoft.ReportViewer.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.ReportViewer.WebForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="Microsoft.ReportViewer.WebForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@ -77,7 +74,6 @@
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
@ -144,7 +140,6 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" />
<None Include="reportStockRecord.xsc"> <None Include="reportStockRecord.xsc">
<DependentUpon>reportStockRecord.xsd</DependentUpon> <DependentUpon>reportStockRecord.xsd</DependentUpon>
</None> </None>

4
Logical/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

5
Model/Model.csproj
View File

@ -61,15 +61,11 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.configuration" /> <Reference Include="System.configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" /> <Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
@ -476,7 +472,6 @@
<Link>.editorconfig</Link> <Link>.editorconfig</Link>
</None> </None>
<None Include="App.config" /> <None Include="App.config" />
<None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<BootstrapperPackage Include="Microsoft.Net.Client.3.5"> <BootstrapperPackage Include="Microsoft.Net.Client.3.5">

4
Model/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

5
Utils/Utils.csproj
View File

@ -60,8 +60,8 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath> <HintPath>..\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.ReportViewer.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="Microsoft.ReportViewer.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.ReportViewer.WebForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="Microsoft.ReportViewer.WebForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
@ -71,7 +71,6 @@
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" /> <Reference Include="System.Drawing" />

1
Utils/packages.config
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
<package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net40" /> <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net40" />
</packages> </packages>

7
WcfAuthentication/WcfClientAuthentication.csproj
View File

@ -32,14 +32,10 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.configuration" /> <Reference Include="System.configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -58,9 +54,6 @@
<Name>Utils</Name> <Name>Utils</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

4
WcfAuthentication/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

8
WcfService1/WmsWcfService.csproj
View File

@ -57,13 +57,13 @@
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>.\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net40\Newtonsoft.Json.dll</HintPath>
<Private>True</Private>
</Reference> </Reference>
<Reference Include="System.Data.Entity" /> <Reference Include="System.Data.Entity" />
<Reference Include="System.Data.Services" /> <Reference Include="System.Data.Services" />

3
WcfService1/packages.config
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="log4net" version="2.0.16" targetFramework="net40" /> <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net40" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
</packages> </packages>

6
WcfService2/WcfService2.csproj
View File

@ -39,9 +39,6 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Web.DynamicData" /> <Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" /> <Reference Include="System.Web.Entity" />
@ -88,9 +85,6 @@
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions> <ProjectExtensions>

2
WcfService2/WcfService2.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress> <UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

4
WcfService2/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

7
WcfServiceAuthentication/WcfServiceAuthentication.csproj
View File

@ -32,16 +32,12 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.configuration" /> <Reference Include="System.configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" /> <Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -64,9 +60,6 @@
<Name>Utils</Name> <Name>Utils</Name>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

4
WcfServiceAuthentication/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

6
WcfServiceErp/WcfServiceErp.csproj
View File

@ -41,8 +41,9 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />
@ -170,7 +171,6 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<None Include="packages.config" />
<None Include="Properties\PublishProfiles\IISProfile.pubxml" /> <None Include="Properties\PublishProfiles\IISProfile.pubxml" />
<None Include="Web.Debug.config"> <None Include="Web.Debug.config">
<DependentUpon>Web.config</DependentUpon> <DependentUpon>Web.config</DependentUpon>

2
WcfServiceErp/WcfServiceErp.csproj.user
View File

@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication /> <IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode /> <IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile /> <UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>E:\win10e\wms\vsprojectOwen3\vsprojectOwen\WcfServiceErp\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\win10e\wms\vsprojectOwen3\vsprojectOwen\WcfServiceErp\Properties\PublishProfiles\IISProfile.pubxml</NameOfLastUsedPublishProfile>
</PropertyGroup> </PropertyGroup>
<ProjectExtensions> <ProjectExtensions>

4
WcfServiceErp/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

5
WcfServiceLibrary1/WcfServiceLibrary1.csproj
View File

@ -33,12 +33,8 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40-client\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
@ -53,7 +49,6 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
<None Include="packages.config" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<ProjectExtensions> <ProjectExtensions>

4
WcfServiceLibrary1/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40-client" />
</packages>

3
WcfServicePortal/WcfServicePortal.csproj
View File

@ -42,9 +42,6 @@
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Web.DynamicData" /> <Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" /> <Reference Include="System.Web.Entity" />

2
WcfServicePortal/WcfServicePortal.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress> <UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

1
WcfServicePortal/packages.config
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
<package id="Microsoft.ApplicationInsights.Web" version="2.22.0" targetFramework="net40" /> <package id="Microsoft.ApplicationInsights.Web" version="2.22.0" targetFramework="net40" />
</packages> </packages>

1
WebRest/WebRest.csproj
View File

@ -8,7 +8,6 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="log4net" Version="2.0.16" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" /> <PackageReference Include="System.ServiceModel.Duplex" Version="4.8.*" />
<PackageReference Include="System.ServiceModel.Federation" Version="4.8.*" /> <PackageReference Include="System.ServiceModel.Federation" Version="4.8.*" />

7
WindowsServiceOut/WindowsServiceOut.csproj
View File

@ -71,17 +71,15 @@
<NoWin32Manifest>true</NoWin32Manifest> <NoWin32Manifest>true</NoWin32Manifest>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath> <HintPath>..\libs\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Configuration.Install" /> <Reference Include="System.Configuration.Install" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -124,7 +122,6 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None> </None>
<None Include="packages.config" />
<None Include="Properties\DataSources\System.Data.DataSet.datasource" /> <None Include="Properties\DataSources\System.Data.DataSet.datasource" />
<None Include="Properties\DataSources\System.Data.DataTable.datasource" /> <None Include="Properties\DataSources\System.Data.DataTable.datasource" />
<None Include="Service References\ServiceReferenceScheduledService\ScheduledService1.wsdl" /> <None Include="Service References\ServiceReferenceScheduledService\ScheduledService1.wsdl" />

4
WindowsServiceOut/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

5
conn/conn.csproj
View File

@ -52,14 +52,10 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.configuration" /> <Reference Include="System.configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web" />
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -71,7 +67,6 @@
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>

4
conn/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

79
deiniuWMS.sln
View File

@ -50,8 +50,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfServiceAuthentication",
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfClientAuthentication", "WcfAuthentication\WcfClientAuthentication.csproj", "{A8815A01-047B-4BFA-AFB3-4786A8F62991}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfClientAuthentication", "WcfAuthentication\WcfClientAuthentication.csproj", "{A8815A01-047B-4BFA-AFB3-4786A8F62991}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wcfApp", "wcfApp\wcfApp.csproj", "{886F6068-56D2-43A8-8443-A58832DF1EB2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfServiceLibrary1", "WcfServiceLibrary1\WcfServiceLibrary1.csproj", "{445C4298-9BC7-4CD2-8532-6F3C531E96E2}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfService2", "WcfService2\WcfService2.csproj", "{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DBDF9109-310B-468F-AC6E-0C87D3517573}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DBDF9109-310B-468F-AC6E-0C87D3517573}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wcfClient", "wcfClient\wcfClient.csproj", "{43541AC3-9C29-4F8A-979A-FF907C231115}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "labelTestAdv", "labelTestAdv\labelTestAdv.csproj", "{1B6A31B6-743F-468F-88B6-BDE8888B4EF5}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "labelTestAdv", "labelTestAdv\labelTestAdv.csproj", "{1B6A31B6-743F-468F-88B6-BDE8888B4EF5}"
EndProject EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "epick", "epick", "{58F9A277-90C0-4673-9341-02D5A666669B}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "epick", "epick", "{58F9A277-90C0-4673-9341-02D5A666669B}"
@ -88,6 +96,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WcfServiceErp", "WcfService
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebRest", "WebRest\WebRest.csproj", "{3F42360F-7468-48A1-9535-2DB50E0BFA4B}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebRest", "WebRest\WebRest.csproj", "{3F42360F-7468-48A1-9535-2DB50E0BFA4B}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "wavePick", "wavePick\wavePick.csproj", "{77C46102-3FA7-47BE-9873-E69827FC1AED}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|.NET = Debug|.NET Debug|.NET = Debug|.NET
@ -238,6 +248,54 @@ Global
{A8815A01-047B-4BFA-AFB3-4786A8F62991}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {A8815A01-047B-4BFA-AFB3-4786A8F62991}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{A8815A01-047B-4BFA-AFB3-4786A8F62991}.Release|Mixed Platforms.Build.0 = Release|Any CPU {A8815A01-047B-4BFA-AFB3-4786A8F62991}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A8815A01-047B-4BFA-AFB3-4786A8F62991}.Release|x86.ActiveCfg = Release|Any CPU {A8815A01-047B-4BFA-AFB3-4786A8F62991}.Release|x86.ActiveCfg = Release|Any CPU
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Debug|.NET.ActiveCfg = Debug|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Debug|Any CPU.ActiveCfg = Debug|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Debug|Mixed Platforms.Build.0 = Debug|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Debug|x86.ActiveCfg = Debug|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Debug|x86.Build.0 = Debug|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Release|.NET.ActiveCfg = Release|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Release|Any CPU.ActiveCfg = Release|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Release|Mixed Platforms.ActiveCfg = Release|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Release|Mixed Platforms.Build.0 = Release|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Release|x86.ActiveCfg = Release|x86
{886F6068-56D2-43A8-8443-A58832DF1EB2}.Release|x86.Build.0 = Release|x86
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Debug|.NET.ActiveCfg = Debug|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Debug|x86.ActiveCfg = Debug|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Release|.NET.ActiveCfg = Release|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Release|Any CPU.ActiveCfg = Release|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Release|Any CPU.Build.0 = Release|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{445C4298-9BC7-4CD2-8532-6F3C531E96E2}.Release|x86.ActiveCfg = Release|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Debug|.NET.ActiveCfg = Debug|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Debug|x86.ActiveCfg = Debug|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Release|.NET.ActiveCfg = Release|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Release|Any CPU.Build.0 = Release|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58}.Release|x86.ActiveCfg = Release|Any CPU
{43541AC3-9C29-4F8A-979A-FF907C231115}.Debug|.NET.ActiveCfg = Debug|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Debug|Any CPU.ActiveCfg = Debug|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Debug|Mixed Platforms.Build.0 = Debug|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Debug|x86.ActiveCfg = Debug|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Debug|x86.Build.0 = Debug|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Release|.NET.ActiveCfg = Release|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Release|Any CPU.ActiveCfg = Release|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Release|Mixed Platforms.ActiveCfg = Release|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Release|Mixed Platforms.Build.0 = Release|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Release|x86.ActiveCfg = Release|x86
{43541AC3-9C29-4F8A-979A-FF907C231115}.Release|x86.Build.0 = Release|x86
{1B6A31B6-743F-468F-88B6-BDE8888B4EF5}.Debug|.NET.ActiveCfg = Debug|Any CPU {1B6A31B6-743F-468F-88B6-BDE8888B4EF5}.Debug|.NET.ActiveCfg = Debug|Any CPU
{1B6A31B6-743F-468F-88B6-BDE8888B4EF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B6A31B6-743F-468F-88B6-BDE8888B4EF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B6A31B6-743F-468F-88B6-BDE8888B4EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B6A31B6-743F-468F-88B6-BDE8888B4EF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
@ -402,6 +460,22 @@ Global
{3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU {3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.ActiveCfg = Release|Any CPU {3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.ActiveCfg = Release|Any CPU
{3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.Build.0 = Release|Any CPU {3F42360F-7468-48A1-9535-2DB50E0BFA4B}.Release|x86.Build.0 = Release|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Debug|.NET.ActiveCfg = Debug|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Debug|.NET.Build.0 = Debug|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Debug|Any CPU.Build.0 = Debug|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Debug|x86.ActiveCfg = Debug|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Debug|x86.Build.0 = Debug|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Release|.NET.ActiveCfg = Release|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Release|.NET.Build.0 = Release|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Release|Any CPU.ActiveCfg = Release|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Release|Any CPU.Build.0 = Release|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Release|x86.ActiveCfg = Release|Any CPU
{77C46102-3FA7-47BE-9873-E69827FC1AED}.Release|x86.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -418,7 +492,11 @@ Global
{D756EE47-E7E0-4DBC-8BAD-6AC744F00D4F} = {6EDAC9AA-20FB-4F4A-BEFE-109003A71C25} {D756EE47-E7E0-4DBC-8BAD-6AC744F00D4F} = {6EDAC9AA-20FB-4F4A-BEFE-109003A71C25}
{CA44F42F-4376-4BC6-9EA4-821DB704C75D} = {1A958873-21C7-49B8-89B4-4B59CF99334C} {CA44F42F-4376-4BC6-9EA4-821DB704C75D} = {1A958873-21C7-49B8-89B4-4B59CF99334C}
{A8815A01-047B-4BFA-AFB3-4786A8F62991} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A} {A8815A01-047B-4BFA-AFB3-4786A8F62991} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
{886F6068-56D2-43A8-8443-A58832DF1EB2} = {DBDF9109-310B-468F-AC6E-0C87D3517573}
{445C4298-9BC7-4CD2-8532-6F3C531E96E2} = {DBDF9109-310B-468F-AC6E-0C87D3517573}
{3C829B19-06FA-4B08-AAEE-3B77C6DB3B58} = {DBDF9109-310B-468F-AC6E-0C87D3517573}
{DBDF9109-310B-468F-AC6E-0C87D3517573} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A} {DBDF9109-310B-468F-AC6E-0C87D3517573} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
{43541AC3-9C29-4F8A-979A-FF907C231115} = {DBDF9109-310B-468F-AC6E-0C87D3517573}
{1B6A31B6-743F-468F-88B6-BDE8888B4EF5} = {58F9A277-90C0-4673-9341-02D5A666669B} {1B6A31B6-743F-468F-88B6-BDE8888B4EF5} = {58F9A277-90C0-4673-9341-02D5A666669B}
{58F9A277-90C0-4673-9341-02D5A666669B} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A} {58F9A277-90C0-4673-9341-02D5A666669B} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
{5771EA59-2E9F-4193-988C-DCF0A4B4C653} = {58F9A277-90C0-4673-9341-02D5A666669B} {5771EA59-2E9F-4193-988C-DCF0A4B4C653} = {58F9A277-90C0-4673-9341-02D5A666669B}
@ -434,6 +512,7 @@ Global
{7D96FE49-C422-44B4-A182-547066320802} = {5415AFB3-A170-4765-AD4F-2B1FD3F47D5F} {7D96FE49-C422-44B4-A182-547066320802} = {5415AFB3-A170-4765-AD4F-2B1FD3F47D5F}
{A1A890CA-74D8-4D5A-9E76-90185A21343D} = {1A958873-21C7-49B8-89B4-4B59CF99334C} {A1A890CA-74D8-4D5A-9E76-90185A21343D} = {1A958873-21C7-49B8-89B4-4B59CF99334C}
{3F42360F-7468-48A1-9535-2DB50E0BFA4B} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A} {3F42360F-7468-48A1-9535-2DB50E0BFA4B} = {9346F04D-0F8D-4FEE-817C-E14098A34E2A}
{77C46102-3FA7-47BE-9873-E69827FC1AED} = {58F9A277-90C0-4673-9341-02D5A666669B}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6D1DB09A-84E0-4189-BA3A-FA368DA5363A} SolutionGuid = {6D1DB09A-84E0-4189-BA3A-FA368DA5363A}

8
dnwcs/dnwcs.csproj
View File

@ -31,13 +31,8 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -52,9 +47,6 @@
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

4
dnwcs/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

2
epick/SeedsDeskOut.designer.cs generated
View File

@ -310,7 +310,7 @@
// pager1 // pager1
// //
this.pager1.Location = new System.Drawing.Point(18, 858); this.pager1.Location = new System.Drawing.Point(18, 858);
this.pager1.Margin = new System.Windows.Forms.Padding(6); this.pager1.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
this.pager1.MaximumSize = new System.Drawing.Size(0, 31); this.pager1.MaximumSize = new System.Drawing.Size(0, 31);
this.pager1.Name = "pager1"; this.pager1.Name = "pager1";
this.pager1.NMax = 0; this.pager1.NMax = 0;

2
epick/SeedsDeskOut.resx
View File

@ -303,7 +303,7 @@
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABM
CQAAAk1TRnQBSQFMAgEBAgEAAYABBwGAAQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CQAAAk1TRnQBSQFMAgEBAgEAAXgBBwF4AQcBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

10
epick/epick.csproj
View File

@ -123,8 +123,9 @@
<Reference Include="DevExpress.XtraNavBar.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraNavBar.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\winform\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.Data.ConnectionUI.Dialog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.Data.ConnectionUI.Dialog, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
@ -136,7 +137,7 @@
<Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" /> <Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL"> <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net40\Newtonsoft.Json.dll</HintPath> <HintPath>..\packages\Newtonsoft.Json.13.0.2\lib\net40\Newtonsoft.Json.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" /> <Reference Include="System.ComponentModel.DataAnnotations" />
@ -147,6 +148,9 @@
<Reference Include="System.Data.Linq"> <Reference Include="System.Data.Linq">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System.Data.SQLite">
<HintPath>..\..\database\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Formatters.Soap" /> <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Security" /> <Reference Include="System.Security" />

3
epick/packages.config
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="log4net" version="2.0.16" targetFramework="net40" /> <package id="Newtonsoft.Json" version="13.0.2" targetFramework="net40" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net40" />
</packages> </packages>

6
epickHost/epickHost.csproj
View File

@ -71,8 +71,8 @@
<ApplicationIcon>logox.ico</ApplicationIcon> <ApplicationIcon>logox.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL"> <Reference Include="log4net">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath> <HintPath>..\winform\bin\Debug\log4net.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.configuration" /> <Reference Include="System.configuration" />
@ -80,7 +80,6 @@
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
<Reference Include="System.ServiceModel.Web" /> <Reference Include="System.ServiceModel.Web" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -144,7 +143,6 @@
<SubType>Designer</SubType> <SubType>Designer</SubType>
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>

4
epickHost/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

6
epickService/epickService.csproj
View File

@ -39,9 +39,6 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
<Reference Include="System.Web.DynamicData" /> <Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" /> <Reference Include="System.Web.Entity" />
@ -81,9 +78,6 @@
<ItemGroup> <ItemGroup>
<Folder Include="App_Data\" /> <Folder Include="App_Data\" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />
<ProjectExtensions> <ProjectExtensions>

2
epickService/epickService.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig> <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>false</UseIISExpress> <UseIISExpress>false</UseIISExpress>
<Use64BitIISExpress /> <Use64BitIISExpress />
<IISExpressSSLPort /> <IISExpressSSLPort />

4
epickService/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

6
labelTestAdv/labelTestAdv.csproj
View File

@ -72,14 +72,9 @@
<Reference Include="DevExpress.Printing.v16.2.Core"> <Reference Include="DevExpress.Printing.v16.2.Core">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.VisualBasic" /> <Reference Include="Microsoft.VisualBasic" />
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Web" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" /> <Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />
@ -120,7 +115,6 @@
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>

4
labelTestAdv/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

6
myLog/myLog.csproj
View File

@ -52,9 +52,6 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.configuration" /> <Reference Include="System.configuration" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
@ -96,9 +93,6 @@
<Install>true</Install> <Install>true</Install>
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.

4
myLog/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
</packages>

4
wcfApp/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40-client" />
</packages>

5
wcfApp/wcfApp.csproj
View File

@ -34,11 +34,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40-client\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
@ -84,7 +80,6 @@
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
</Compile> </Compile>
<None Include="App.config" /> <None Include="App.config" />
<None Include="packages.config" />
<None Include="Properties\DataSources\WcfService2.CompositeType.datasource" /> <None Include="Properties\DataSources\WcfService2.CompositeType.datasource" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>

4
wcfClient/packages.config
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="log4net" version="2.0.16" targetFramework="net40-client" />
</packages>

5
wcfClient/wcfClient.csproj
View File

@ -34,11 +34,7 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40-client\log4net.dll</HintPath>
</Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" /> <Reference Include="System.Core" />
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel" />
@ -78,7 +74,6 @@
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<None Include="app.config" /> <None Include="app.config" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings"> <None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator> <Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput> <LastGenOutput>Settings.Designer.cs</LastGenOutput>

4
winform/epick/DeskCustomer.cs
View File

@ -226,9 +226,7 @@ namespace DeiNiu.wms.win
int end = (pager1.PageSize * pager1.PageCurrent); int end = (pager1.PageSize * pager1.PageCurrent);
lastQuery = query; lastQuery = query;
DataSet ds = custClient.queryDesks(query, start, end); DataSet ds = custClient.queryDesks(query, start, end);
closeClient(); custClient.Close();
dt = ds.Tables[0]; dt = ds.Tables[0];
int cnt = Convert.ToInt32(ds.Tables[1].Rows[0][0].ToString()); int cnt = Convert.ToInt32(ds.Tables[1].Rows[0][0].ToString());

1
winform/packages.config
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="log4net" version="2.0.16" targetFramework="net40" />
<package id="Microsoft.ReportingServices.ReportViewerControl.Winforms" version="150.1537.0" targetFramework="net40" /> <package id="Microsoft.ReportingServices.ReportViewerControl.Winforms" version="150.1537.0" targetFramework="net40" />
<package id="Microsoft.SqlServer.Types" version="14.0.314.76" targetFramework="net40" /> <package id="Microsoft.SqlServer.Types" version="14.0.314.76" targetFramework="net40" />
<package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net40" /> <package id="ThoughtWorks.QRCode" version="1.1.0" targetFramework="net40" />

38
winform/wms.csproj
View File

@ -119,9 +119,6 @@
<Reference Include="DevExpress.XtraTreeList.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL"> <Reference Include="DevExpress.XtraTreeList.v16.2, Version=16.2.6.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="log4net, Version=2.0.16.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.16\lib\net40\log4net.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Data.ConnectionUI.Dialog"> <Reference Include="Microsoft.Data.ConnectionUI.Dialog">
<HintPath>D:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\Microsoft.Data.ConnectionUI.Dialog.dll</HintPath> <HintPath>D:\Program Files (x86)\Microsoft Visual Studio 10.0\Common7\IDE\Microsoft.Data.ConnectionUI.Dialog.dll</HintPath>
</Reference> </Reference>
@ -140,10 +137,10 @@
<Reference Include="Microsoft.ReportViewer.ProcessingObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> <Reference Include="Microsoft.ReportViewer.ProcessingObjectModel, Version=15.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1537.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll</HintPath> <HintPath>..\packages\Microsoft.ReportingServices.ReportViewerControl.Winforms.150.1537.0\lib\net40\Microsoft.ReportViewer.ProcessingObjectModel.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"> <Reference Include="Microsoft.ReportViewer.WebForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <Private>True</Private>
<HintPath>C:\Program Files (x86)\Microsoft Visual Studio 10.0\ReportViewer\Microsoft.ReportViewer.WinForms.dll</HintPath>
</Reference> </Reference>
<Reference Include="Microsoft.ReportViewer.WinForms, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="Microsoft.SqlServer.Types, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL"> <Reference Include="Microsoft.SqlServer.Types, Version=14.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll</HintPath> <HintPath>..\packages\Microsoft.SqlServer.Types.14.0.314.76\lib\net40\Microsoft.SqlServer.Types.dll</HintPath>
</Reference> </Reference>
@ -155,13 +152,16 @@
<Reference Include="System.Runtime.Serialization" /> <Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Formatters.Soap" /> <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.ServiceModel" /> <Reference Include="System.ServiceModel">
<Reference Include="System.ServiceModel.Web" /> <Private>True</Private>
</Reference>
<Reference Include="System.ServiceModel.Web">
<Private>True</Private>
</Reference>
<Reference Include="System.Speech"> <Reference Include="System.Speech">
<Private>True</Private> <Private>True</Private>
</Reference> </Reference>
<Reference Include="System.Transactions" /> <Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" /> <Reference Include="System.Web.Extensions" />
<Reference Include="System.Windows.Forms.DataVisualization" /> <Reference Include="System.Windows.Forms.DataVisualization" />
<Reference Include="System.Xml.Linq" /> <Reference Include="System.Xml.Linq" />
@ -2122,6 +2122,26 @@
<IncludeHash>True</IncludeHash> <IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType> <FileType>Assembly</FileType>
</PublishFile> </PublishFile>
<PublishFile Include="Microsoft.ReportViewer.DataVisualization">
<Visible>False</Visible>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="Microsoft.ReportViewer.ProcessingObjectModel">
<Visible>False</Visible>
<Group>
</Group>
<TargetPath>
</TargetPath>
<PublishState>Include</PublishState>
<IncludeHash>True</IncludeHash>
<FileType>Assembly</FileType>
</PublishFile>
<PublishFile Include="stdole"> <PublishFile Include="stdole">
<Visible>False</Visible> <Visible>False</Visible>
<Group> <Group>