Skip to content

Commit 8232215

Browse files
HadiFadlHadiFadl
committed
Fixed some bugs within the Test project
1 parent ea40a6d commit 8232215

15 files changed

+334
-84
lines changed

‎SchemaMapperDLL.sln

+25-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 14
4-
VisualStudioVersion = 14.0.25420.1
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.30002.166
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SchemaMapperDLL", "SchemaMapperDLL\SchemaMapperDLL.csproj", "{687E3733-B82E-4CC7-9E83-9573407D01B7}"
77
EndProject
@@ -10,19 +10,42 @@ EndProject
1010
Global
1111
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1212
Debug|Any CPU = Debug|Any CPU
13+
Debug|x64 = Debug|x64
14+
Debug|x86 = Debug|x86
1315
Release|Any CPU = Release|Any CPU
16+
Release|x64 = Release|x64
17+
Release|x86 = Release|x86
1418
EndGlobalSection
1519
GlobalSection(ProjectConfigurationPlatforms) = postSolution
1620
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1721
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
22+
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Debug|x64.ActiveCfg = Debug|x64
23+
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Debug|x64.Build.0 = Debug|x64
24+
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Debug|x86.ActiveCfg = Debug|x86
25+
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Debug|x86.Build.0 = Debug|x86
1826
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
1927
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Release|Any CPU.Build.0 = Release|Any CPU
28+
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Release|x64.ActiveCfg = Release|x64
29+
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Release|x64.Build.0 = Release|x64
30+
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Release|x86.ActiveCfg = Release|x86
31+
{687E3733-B82E-4CC7-9E83-9573407D01B7}.Release|x86.Build.0 = Release|x86
2032
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
2133
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Debug|x64.ActiveCfg = Debug|x64
35+
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Debug|x64.Build.0 = Debug|x64
36+
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Debug|x86.ActiveCfg = Debug|x86
37+
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Debug|x86.Build.0 = Debug|x86
2238
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Release|Any CPU.ActiveCfg = Release|Any CPU
2339
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Release|x64.ActiveCfg = Release|x64
41+
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Release|x64.Build.0 = Release|x64
42+
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Release|x86.ActiveCfg = Release|x86
43+
{04EEEF3C-55EE-47E7-92C7-3B5770E3B4A7}.Release|x86.Build.0 = Release|x86
2444
EndGlobalSection
2545
GlobalSection(SolutionProperties) = preSolution
2646
HideSolutionNode = FALSE
2747
EndGlobalSection
48+
GlobalSection(ExtensibilityGlobals) = postSolution
49+
SolutionGuid = {75E0FD91-065E-4F1C-8064-753605749C36}
50+
EndGlobalSection
2851
EndGlobal

‎SchemaMapperDLL/Classes/Exporters/OracleExport.cs

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Data;
88
using Oracle.DataAccess.Client;
99
using Oracle.DataAccess.Types;
10+
using SchemaMapper.SchemaMapping;
1011

1112
namespace SchemaMapper.Exporters
1213
{

‎SchemaMapperDLL/Classes/SchemaMapping/SchemaMapper.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public SchemaMapper(string DestinationSchema, string DestinationTable)
6565
public void ReadFromXml(string path)
6666
{
6767

68-
System.Xml.Serialization.XmlSerializer xs = new System.Xml.Serialization.XmlSerializer(typeof(SchemaMapper.SchemaMapping.SchemaMapper));
68+
System.Xml.Serialization.XmlSerializer xs = new System.Xml.Serialization.XmlSerializer(typeof(SchemaMapper));
6969
string strObject = string.Empty;
7070
SchemaMapper smResult = new SchemaMapper();
7171

@@ -76,7 +76,7 @@ public void ReadFromXml(string path)
7676
sr.Close();
7777
}
7878

79-
smResult = (SchemaMapper.SchemaMapping.SchemaMapper)xs.Deserialize(new StringReader(strObject));
79+
smResult = (SchemaMapper)xs.Deserialize(new StringReader(strObject));
8080

8181
TableName = smResult.TableName.ToString();
8282
SchemaName = smResult.SchemaName.ToString();
@@ -102,7 +102,7 @@ public void WriteToXml(string path, bool overwrite = false)
102102
try
103103
{
104104

105-
System.Xml.Serialization.XmlSerializer xs = new System.Xml.Serialization.XmlSerializer(typeof(SchemaMapper.SchemaMapping.SchemaMapper));
105+
System.Xml.Serialization.XmlSerializer xs = new System.Xml.Serialization.XmlSerializer(typeof(SchemaMapper));
106106
StringWriter sr = new StringWriter();
107107
string strObject = string.Empty;
108108

‎SchemaMapperDLL/Properties/AssemblyInfo.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
[assembly: AssemblyTitle("SchemaMapper")]
99
[assembly: AssemblyDescription("")]
1010
[assembly: AssemblyConfiguration("")]
11-
[assembly: AssemblyCompany("")]
11+
[assembly: AssemblyCompany("Munchy Bytes")]
1212
[assembly: AssemblyProduct("SchemaMapper")]
13-
[assembly: AssemblyCopyright("Copyright © Munchy Bytes 2019")]
13+
[assembly: AssemblyCopyright("Copyright © Munchy Bytes 2020")]
1414
[assembly: AssemblyTrademark("")]
1515
[assembly: AssemblyCulture("")]
1616

@@ -32,5 +32,5 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("1.0.0.0")]
36-
[assembly: AssemblyFileVersion("1.0.0.0")]
35+
[assembly: AssemblyVersion("1.1.0.0")]
36+
[assembly: AssemblyFileVersion("1.1.0.0")]

‎SchemaMapperDLL/Properties/Settings.Designer.cs

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎SchemaMapperDLL/SchemaMapperDLL.csproj

+101-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\EntityFramework.6.4.0\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" />
34
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,9 +10,11 @@
910
<AppDesignerFolder>Properties</AppDesignerFolder>
1011
<RootNamespace>SchemaMapper</RootNamespace>
1112
<AssemblyName>SchemaMapper</AssemblyName>
12-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<TargetFrameworkProfile />
16+
<NuGetPackageImportStamp>
17+
</NuGetPackageImportStamp>
1518
</PropertyGroup>
1619
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1720
<DebugSymbols>true</DebugSymbols>
@@ -32,31 +35,111 @@
3235
<WarningLevel>4</WarningLevel>
3336
<Prefer32Bit>false</Prefer32Bit>
3437
</PropertyGroup>
38+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
39+
<DebugSymbols>true</DebugSymbols>
40+
<OutputPath>bin\x86\Debug\</OutputPath>
41+
<DefineConstants>DEBUG;TRACE</DefineConstants>
42+
<DebugType>full</DebugType>
43+
<PlatformTarget>x86</PlatformTarget>
44+
<LangVersion>7.3</LangVersion>
45+
<ErrorReport>prompt</ErrorReport>
46+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
49+
<OutputPath>bin\x86\Release\</OutputPath>
50+
<DefineConstants>TRACE</DefineConstants>
51+
<Optimize>true</Optimize>
52+
<DebugType>pdbonly</DebugType>
53+
<PlatformTarget>x86</PlatformTarget>
54+
<LangVersion>7.3</LangVersion>
55+
<ErrorReport>prompt</ErrorReport>
56+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
57+
</PropertyGroup>
58+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
59+
<DebugSymbols>true</DebugSymbols>
60+
<OutputPath>bin\x64\Debug\</OutputPath>
61+
<DefineConstants>DEBUG;TRACE</DefineConstants>
62+
<DebugType>full</DebugType>
63+
<PlatformTarget>x64</PlatformTarget>
64+
<LangVersion>7.3</LangVersion>
65+
<ErrorReport>prompt</ErrorReport>
66+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
67+
</PropertyGroup>
68+
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
69+
<OutputPath>bin\x64\Release\</OutputPath>
70+
<DefineConstants>TRACE</DefineConstants>
71+
<Optimize>true</Optimize>
72+
<DebugType>pdbonly</DebugType>
73+
<PlatformTarget>x64</PlatformTarget>
74+
<LangVersion>7.3</LangVersion>
75+
<ErrorReport>prompt</ErrorReport>
76+
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
77+
</PropertyGroup>
3578
<ItemGroup>
36-
<Reference Include="HtmlAgilityPack">
37-
<HintPath>..\..\..\..\..\..\Essentials\ProgAssemblies\HtmlAgilityPack.1.4.6\Net40\HtmlAgilityPack.dll</HintPath>
79+
<Reference Include="BouncyCastle.Crypto, Version=1.8.3.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
80+
<HintPath>..\packages\BouncyCastle.1.8.3.1\lib\BouncyCastle.Crypto.dll</HintPath>
81+
</Reference>
82+
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
83+
<HintPath>..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.dll</HintPath>
84+
</Reference>
85+
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
86+
<HintPath>..\packages\EntityFramework.6.4.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
87+
</Reference>
88+
<Reference Include="Google.Protobuf, Version=3.6.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
89+
<HintPath>..\packages\Google.Protobuf.3.6.1\lib\net45\Google.Protobuf.dll</HintPath>
90+
</Reference>
91+
<Reference Include="HtmlAgilityPack, Version=1.11.23.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
92+
<HintPath>..\packages\HtmlAgilityPack.1.11.23\lib\Net45\HtmlAgilityPack.dll</HintPath>
3893
</Reference>
3994
<Reference Include="LumiSoft.Net">
4095
<HintPath>..\..\..\..\..\..\Essentials\ProgAssemblies\LumiSoft.Net.dll</HintPath>
4196
</Reference>
42-
<Reference Include="Microsoft.VisualBasic" />
43-
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
44-
<SpecificVersion>False</SpecificVersion>
45-
<HintPath>..\..\..\..\..\..\Essentials\ProgAssemblies\Newtonsoft.Json.dll</HintPath>
97+
<Reference Include="Microsoft.VisualBasic, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
98+
<Reference Include="MySql.Data, Version=8.0.19.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
99+
<HintPath>..\packages\MySql.Data.8.0.19\lib\net452\MySql.Data.dll</HintPath>
100+
</Reference>
101+
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
102+
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
103+
</Reference>
104+
<Reference Include="Oracle.DataAccess, Version=4.112.3.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86">
105+
<HintPath>..\packages\Oracle.DataAccess.x86.4.4.112.3\lib\Oracle.DataAccess.dll</HintPath>
106+
</Reference>
107+
<Reference Include="Renci.SshNet, Version=2016.1.0.0, Culture=neutral, PublicKeyToken=1cee9f8bde3db106, processorArchitecture=MSIL">
108+
<HintPath>..\packages\SSH.NET.2016.1.0\lib\net40\Renci.SshNet.dll</HintPath>
46109
</Reference>
47110
<Reference Include="System" />
111+
<Reference Include="System.ComponentModel" />
48112
<Reference Include="System.ComponentModel.DataAnnotations" />
113+
<Reference Include="System.Configuration" />
114+
<Reference Include="System.Configuration.Install" />
49115
<Reference Include="System.Core" />
50116
<Reference Include="System.Data.Entity" />
51117
<Reference Include="System.Data.Linq" />
118+
<Reference Include="System.Data.SQLite, Version=1.0.112.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
119+
<HintPath>..\packages\System.Data.SQLite.Core.1.0.112.0\lib\net451\System.Data.SQLite.dll</HintPath>
120+
</Reference>
121+
<Reference Include="System.Data.SQLite.EF6, Version=1.0.112.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
122+
<HintPath>..\packages\System.Data.SQLite.EF6.1.0.112.0\lib\net451\System.Data.SQLite.EF6.dll</HintPath>
123+
</Reference>
124+
<Reference Include="System.Data.SQLite.Linq, Version=1.0.112.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
125+
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.112.0\lib\net451\System.Data.SQLite.Linq.dll</HintPath>
126+
</Reference>
127+
<Reference Include="System.Data.SqlServerCe, Version=4.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
128+
<HintPath>..\packages\System.Data.SqlServerCe_unofficial.4.0.8482.1\lib\net20\System.Data.SqlServerCe.dll</HintPath>
129+
<Private>True</Private>
130+
</Reference>
52131
<Reference Include="System.Drawing" />
132+
<Reference Include="System.Drawing.Design" />
53133
<Reference Include="System.Management" />
54134
<Reference Include="System.Transactions" />
55135
<Reference Include="System.Xml.Linq" />
56136
<Reference Include="System.Data.DataSetExtensions" />
57137
<Reference Include="Microsoft.CSharp" />
58138
<Reference Include="System.Data" />
59139
<Reference Include="System.Xml" />
140+
<Reference Include="Ubiety.Dns.Core, Version=2.2.1.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
141+
<HintPath>..\packages\MySql.Data.8.0.19\lib\net452\Ubiety.Dns.Core.dll</HintPath>
142+
</Reference>
60143
<Reference Include="VCardLibrary">
61144
<HintPath>..\..\..\..\..\..\Essentials\ProgAssemblies\VCardLibrary.dll</HintPath>
62145
</Reference>
@@ -146,6 +229,7 @@
146229
</ItemGroup>
147230
<ItemGroup>
148231
<None Include="app.config" />
232+
<None Include="packages.config" />
149233
<None Include="Properties\Settings.settings">
150234
<Generator>SettingsSingleFileGenerator</Generator>
151235
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -156,6 +240,16 @@
156240
<Service Include="{508349B6-6B84-4DF5-91F0-309BEEBAD82D}" />
157241
</ItemGroup>
158242
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
243+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
244+
<PropertyGroup>
245+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
246+
</PropertyGroup>
247+
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.112.0\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.112.0\build\net451\System.Data.SQLite.Core.targets'))" />
248+
<Error Condition="!Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.0\build\EntityFramework.props'))" />
249+
<Error Condition="!Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.0\build\EntityFramework.targets'))" />
250+
</Target>
251+
<Import Project="..\packages\System.Data.SQLite.Core.1.0.112.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.112.0\build\net451\System.Data.SQLite.Core.targets')" />
252+
<Import Project="..\packages\EntityFramework.6.4.0\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.0\build\EntityFramework.targets')" />
159253
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
160254
Other similar extension points exist, see Microsoft.Common.targets.
161255
<Target Name="BeforeBuild">

‎SchemaMapperDLL/SchemaMapperDLL.nuspec

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package >
3+
<metadata>
4+
<id>SchemaMapper</id>
5+
<version>1.1.0.0</version>
6+
<title>Schema Mapper</title>
7+
<authors>HadiFadl</authors>
8+
<owners>HadiFadl</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<license type="expression">MIT</license>
11+
<projectUrl>https://github.com/munchy-bytes/SchemaMapper</projectUrl>
12+
<description>A .NET class library to import data from different source into a unified destination</description>
13+
<releaseNotes>https://github.com/munchy-bytes/SchemaMapper</releaseNotes>
14+
<copyright>Copyright © Munchy Bytes 2020</copyright>
15+
<tags>schema-mapping C# SQL</tags>
16+
17+
</metadata>
18+
<dependencies>
19+
<group targetFramework=".NETFramework4.5.2"></group>
20+
<dependency id="Oracle.DataAccess.x86.4" version="4.112.3" />
21+
<dependency id="MySql.Data" version="8.0.19" />
22+
<dependency id="System.Data.SQLite" version="1.0.112" />
23+
<dependency id="HtmlAgilityPack" version="1.11.23" />
24+
<dependency id="System.Data.SqlServerCe_unofficial" version="4.0.8482.1" />
25+
<dependency id="Newtonsoft.Json" version="12.0.3" />
26+
<dependency id="Microsoft.VisualBasic" version="10.3.0" />
27+
<dependency id="EntityFramework" version="6.4.0" />
28+
</dependencies>
29+
<files>
30+
<file src="bin\Debug\VCardLibrary.dll" target="lib" />
31+
<file src="bin\Debug\VBIDE.dll" target="lib" />
32+
<file src="bin\Debug\LumiSoft.Net.dll" target="lib" />
33+
34+
</files>
35+
</package>

0 commit comments

Comments
 (0)