Skip to content

Commit 392c98d

Browse files
devgisdevgis
committed
添加wpf和core版支持
1 parent 3772edd commit 392c98d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+581
-2685
lines changed

‎.gitignore‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
packages
22
CsharpLibs/bin
33
CsharpLibs/obj
4+
CsharpLibs.Core/bin
5+
CsharpLibs.Core/obj
6+
CsharpLibs.WPF/bin
7+
CsharpLibs.WPF/obj
8+
.vs
49
.vs/CsharpLibs/v16/.suo

‎.vs/CsharpLibs/v16/.suo‎

9 KB
Binary file not shown.

‎CsharpLibs.Core/CsharpLibs.Core.csproj‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
</PropertyGroup>
6+
7+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
8+
<DefineConstants>TRACE;DOTNETCORE</DefineConstants>
9+
</PropertyGroup>
10+
11+
<ItemGroup>
12+
<Compile Include="..\Share\BllClass.cs" Link="BllClass.cs" />
13+
<Compile Include="..\Share\Comparer.cs" Link="Comparer.cs" />
14+
<Compile Include="..\Share\CSVHelper.cs" Link="CSVHelper.cs" />
15+
<Compile Include="..\Share\DalClass.cs" Link="DalClass.cs" />
16+
<Compile Include="..\Share\DESEncrptor.cs" Link="DESEncrptor.cs" />
17+
<Compile Include="..\Share\HttpHelper.cs" Link="HttpHelper.cs" />
18+
<Compile Include="..\Share\ListToCsv.cs" Link="ListToCsv.cs" />
19+
<Compile Include="..\Share\Loger.cs" Link="Loger.cs" />
20+
<Compile Include="..\Share\Loger2.cs" Link="Loger2.cs" />
21+
<Compile Include="..\Share\OledbHelper.cs" Link="OledbHelper.cs" />
22+
<Compile Include="..\Share\OracleHelper.cs" Link="OracleHelper.cs" />
23+
<Compile Include="..\Share\OraHelper_OracleManagedDataAccess.cs" Link="OraHelper_OracleManagedDataAccess.cs" />
24+
<Compile Include="..\Share\SerializeObj.cs" Link="SerializeObj.cs" />
25+
<Compile Include="..\Share\SQLHelper.cs" Link="SQLHelper.cs" />
26+
<Compile Include="..\Share\SQLServerHelper.cs" Link="SQLServerHelper.cs" />
27+
<Compile Include="..\Share\TestSendEmail.cs" Link="TestSendEmail.cs" />
28+
</ItemGroup>
29+
30+
<ItemGroup>
31+
<PackageReference Include="Oracle.ManagedDataAccess" Version="21.6.1" />
32+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
33+
<PackageReference Include="System.Data.OleDb" Version="4.6.0" />
34+
<PackageReference Include="System.Data.OracleClient" Version="1.0.8" />
35+
<PackageReference Include="System.Data.SqlClient" Version="4.6.1" />
36+
</ItemGroup>
37+
38+
</Project>

‎CsharpLibs.WPF/App.config‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<configSections>
4+
<section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.18.3, Culture=neutral, PublicKeyToken=89b483f429c47342" />
5+
</configSections>
6+
<system.data>
7+
<DbProviderFactories>
8+
<remove invariant="Oracle.ManagedDataAccess.Client" />
9+
<add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.18.3, Culture=neutral, PublicKeyToken=89b483f429c47342" />
10+
</DbProviderFactories>
11+
</system.data>
12+
<runtime>
13+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
14+
<dependentAssembly>
15+
<publisherPolicy apply="no" />
16+
<assemblyIdentity name="Oracle.ManagedDataAccess" publicKeyToken="89b483f429c47342" culture="neutral" />
17+
<bindingRedirect oldVersion="4.122.0.0 - 4.65535.65535.65535" newVersion="4.122.18.3" />
18+
</dependentAssembly>
19+
</assemblyBinding>
20+
</runtime>
21+
<oracle.manageddataaccess.client>
22+
<version number="*">
23+
<dataSources>
24+
<dataSource alias="SampleDataSource" descriptor="(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL))) " />
25+
</dataSources>
26+
</version>
27+
</oracle.manageddataaccess.client>
28+
</configuration>

‎CsharpLibs.WPF/CsharpLibs.WPF.csproj‎

Lines changed: 155 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,155 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{D3341A37-24A2-4FDF-9906-2DDD7C0E85A6}</ProjectGuid>
8+
<OutputType>library</OutputType>
9+
<RootNamespace>CsharpLibs.WPF</RootNamespace>
10+
<AssemblyName>CsharpLibs.WPF</AssemblyName>
11+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12+
<FileAlignment>512</FileAlignment>
13+
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14+
<WarningLevel>4</WarningLevel>
15+
<Deterministic>true</Deterministic>
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
18+
</PropertyGroup>
19+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20+
<DebugSymbols>true</DebugSymbols>
21+
<DebugType>full</DebugType>
22+
<Optimize>false</Optimize>
23+
<OutputPath>bin\Debug\</OutputPath>
24+
<DefineConstants>TRACE;DEBUG;WPF</DefineConstants>
25+
<ErrorReport>prompt</ErrorReport>
26+
<WarningLevel>4</WarningLevel>
27+
</PropertyGroup>
28+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<DebugType>pdbonly</DebugType>
30+
<Optimize>true</Optimize>
31+
<OutputPath>bin\Release\</OutputPath>
32+
<DefineConstants>TRACE</DefineConstants>
33+
<ErrorReport>prompt</ErrorReport>
34+
<WarningLevel>4</WarningLevel>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<Reference Include="ICSharpCode.SharpZipLib, Version=0.86.0.518, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
38+
<HintPath>..\packages\NPOI.2.0.6\lib\net40\ICSharpCode.SharpZipLib.dll</HintPath>
39+
</Reference>
40+
<Reference Include="NPOI, Version=2.0.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
41+
<HintPath>..\packages\NPOI.2.0.6\lib\net40\NPOI.dll</HintPath>
42+
</Reference>
43+
<Reference Include="NPOI.OOXML, Version=2.0.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
44+
<HintPath>..\packages\NPOI.2.0.6\lib\net40\NPOI.OOXML.dll</HintPath>
45+
</Reference>
46+
<Reference Include="NPOI.OpenXml4Net, Version=2.0.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
47+
<HintPath>..\packages\NPOI.2.0.6\lib\net40\NPOI.OpenXml4Net.dll</HintPath>
48+
</Reference>
49+
<Reference Include="NPOI.OpenXmlFormats, Version=2.0.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
50+
<HintPath>..\packages\NPOI.2.0.6\lib\net40\NPOI.OpenXmlFormats.dll</HintPath>
51+
</Reference>
52+
<Reference Include="Oracle.ManagedDataAccess, Version=4.122.18.3, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
53+
<HintPath>..\packages\Oracle.ManagedDataAccess.18.3.0\lib\net40\Oracle.ManagedDataAccess.dll</HintPath>
54+
</Reference>
55+
<Reference Include="System" />
56+
<Reference Include="System.Configuration" />
57+
<Reference Include="System.Data" />
58+
<Reference Include="System.Data.OracleClient" />
59+
<Reference Include="System.Xml" />
60+
<Reference Include="Microsoft.CSharp" />
61+
<Reference Include="System.Core" />
62+
<Reference Include="System.Xml.Linq" />
63+
<Reference Include="System.Data.DataSetExtensions" />
64+
<Reference Include="System.Net.Http" />
65+
<Reference Include="System.Xaml">
66+
<RequiredTargetFramework>4.0</RequiredTargetFramework>
67+
</Reference>
68+
<Reference Include="WindowsBase" />
69+
<Reference Include="PresentationCore" />
70+
<Reference Include="PresentationFramework" />
71+
</ItemGroup>
72+
<ItemGroup>
73+
<Page Include="Themes\Generic.xaml">
74+
<Generator>MSBuild:Compile</Generator>
75+
<SubType>Designer</SubType>
76+
</Page>
77+
</ItemGroup>
78+
<ItemGroup>
79+
<Compile Include="..\Share\AssemblyInfo.cs">
80+
<Link>Properties\AssemblyInfo.cs</Link>
81+
</Compile>
82+
<Compile Include="..\Share\BllClass.cs">
83+
<Link>BllClass.cs</Link>
84+
</Compile>
85+
<Compile Include="..\Share\Comparer.cs">
86+
<Link>Comparer.cs</Link>
87+
</Compile>
88+
<Compile Include="..\Share\CSVHelper.cs">
89+
<Link>CSVHelper.cs</Link>
90+
</Compile>
91+
<Compile Include="..\Share\DalClass.cs">
92+
<Link>DalClass.cs</Link>
93+
</Compile>
94+
<Compile Include="..\Share\DESEncrptor.cs">
95+
<Link>DESEncrptor.cs</Link>
96+
</Compile>
97+
<Compile Include="..\Share\HttpHelper.cs">
98+
<Link>HttpHelper.cs</Link>
99+
</Compile>
100+
<Compile Include="..\Share\ListToCsv.cs">
101+
<Link>ListToCsv.cs</Link>
102+
</Compile>
103+
<Compile Include="..\Share\Loger.cs">
104+
<Link>Loger.cs</Link>
105+
</Compile>
106+
<Compile Include="..\Share\Loger2.cs">
107+
<Link>Loger2.cs</Link>
108+
</Compile>
109+
<Compile Include="..\Share\MessageHelperWPFSilverlight.cs">
110+
<Link>MessageHelperWPFSilverlight.cs</Link>
111+
</Compile>
112+
<Compile Include="..\Share\OledbHelper.cs">
113+
<Link>OledbHelper.cs</Link>
114+
</Compile>
115+
<Compile Include="..\Share\OracleHelper.cs">
116+
<Link>OracleHelper.cs</Link>
117+
</Compile>
118+
<Compile Include="..\Share\OraHelper_OracleManagedDataAccess.cs">
119+
<Link>OraHelper_OracleManagedDataAccess.cs</Link>
120+
</Compile>
121+
<Compile Include="..\Share\SerializeObj.cs">
122+
<Link>SerializeObj.cs</Link>
123+
</Compile>
124+
<Compile Include="..\Share\SQLHelper.cs">
125+
<Link>SQLHelper.cs</Link>
126+
</Compile>
127+
<Compile Include="..\Share\SQLServerHelper.cs">
128+
<Link>SQLServerHelper.cs</Link>
129+
</Compile>
130+
<Compile Include="..\Share\TestSendEmail.cs">
131+
<Link>TestSendEmail.cs</Link>
132+
</Compile>
133+
<Compile Include="Properties\Resources.Designer.cs">
134+
<AutoGen>True</AutoGen>
135+
<DesignTime>True</DesignTime>
136+
<DependentUpon>Resources.resx</DependentUpon>
137+
</Compile>
138+
<Compile Include="Properties\Settings.Designer.cs">
139+
<AutoGen>True</AutoGen>
140+
<DependentUpon>Settings.settings</DependentUpon>
141+
<DesignTimeSharedInput>True</DesignTimeSharedInput>
142+
</Compile>
143+
<EmbeddedResource Include="Properties\Resources.resx">
144+
<Generator>ResXFileCodeGenerator</Generator>
145+
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
146+
</EmbeddedResource>
147+
<None Include="App.config" />
148+
<None Include="packages.config" />
149+
<None Include="Properties\Settings.settings">
150+
<Generator>SettingsSingleFileGenerator</Generator>
151+
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
152+
</None>
153+
</ItemGroup>
154+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
155+
</Project>

‎CsharpLibs.WPF/Properties/Resources.Designer.cs‎

Lines changed: 62 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)