Skip to content

Commit e946ba7

Browse files
okifyokify
committed
SQL Server tests passing
1 parent 101318d commit e946ba7

File tree

10 files changed

+103
-41
lines changed

10 files changed

+103
-41
lines changed

‎Simple.Data-Mono.sln‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple.Data.Ado.Test", "Sim
1919
EndProject
2020
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple.Data.BehaviourTest", "Simple.Data.BehaviourTest\Simple.Data.BehaviourTest.csproj", "{70536BA8-AF0D-46F3-B04C-45177F56B320}"
2121
EndProject
22+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple.Data.SqlTest", "Simple.Data.SqlTest\Simple.Data.SqlTest.csproj", "{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}"
23+
EndProject
2224
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple.Data.Ado", "Simple.Data.Ado\Simple.Data.Ado.csproj", "{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}"
2325
EndProject
2426
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple.Data.Mocking", "Simple.Data.Mocking\Simple.Data.Mocking.csproj", "{292611F6-BBBD-492D-891C-0D9FB4BF5433}"
2527
EndProject
28+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple.Data.SqlServer", "Simple.Data.SqlServer\Simple.Data.SqlServer.csproj", "{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}"
29+
EndProject
30+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Simple.Data.TestHelper", "Simple.Data.TestHelper\Simple.Data.TestHelper.csproj", "{7DAB2F13-0392-435E-A934-4567266714BF}"
31+
EndProject
2632
Global
2733
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2834
Debug|Any CPU = Debug|Any CPU
@@ -98,6 +104,20 @@ Global
98104
{70536BA8-AF0D-46F3-B04C-45177F56B320}.Release|Mixed Platforms.Build.0 = Release|Any CPU
99105
{70536BA8-AF0D-46F3-B04C-45177F56B320}.Release|x86.ActiveCfg = Release|Any CPU
100106
{70536BA8-AF0D-46F3-B04C-45177F56B320}.Release|x86.Build.0 = Release|Any CPU
107+
{7DAB2F13-0392-435E-A934-4567266714BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
108+
{7DAB2F13-0392-435E-A934-4567266714BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
109+
{7DAB2F13-0392-435E-A934-4567266714BF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
110+
{7DAB2F13-0392-435E-A934-4567266714BF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
111+
{7DAB2F13-0392-435E-A934-4567266714BF}.Debug|x86.ActiveCfg = Debug|Any CPU
112+
{7DAB2F13-0392-435E-A934-4567266714BF}.Debug|x86.Build.0 = Debug|Any CPU
113+
{7DAB2F13-0392-435E-A934-4567266714BF}.Debug-Mono|Any CPU.ActiveCfg = Debug|Any CPU
114+
{7DAB2F13-0392-435E-A934-4567266714BF}.Debug-Mono|Any CPU.Build.0 = Debug|Any CPU
115+
{7DAB2F13-0392-435E-A934-4567266714BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
116+
{7DAB2F13-0392-435E-A934-4567266714BF}.Release|Any CPU.Build.0 = Release|Any CPU
117+
{7DAB2F13-0392-435E-A934-4567266714BF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
118+
{7DAB2F13-0392-435E-A934-4567266714BF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
119+
{7DAB2F13-0392-435E-A934-4567266714BF}.Release|x86.ActiveCfg = Release|Any CPU
120+
{7DAB2F13-0392-435E-A934-4567266714BF}.Release|x86.Build.0 = Release|Any CPU
101121
{96C623FD-869E-4DCE-98A1-17075EE384F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
102122
{96C623FD-869E-4DCE-98A1-17075EE384F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
103123
{96C623FD-869E-4DCE-98A1-17075EE384F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -112,6 +132,20 @@ Global
112132
{96C623FD-869E-4DCE-98A1-17075EE384F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
113133
{96C623FD-869E-4DCE-98A1-17075EE384F9}.Release|x86.ActiveCfg = Release|Any CPU
114134
{96C623FD-869E-4DCE-98A1-17075EE384F9}.Release|x86.Build.0 = Release|Any CPU
135+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
136+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
137+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
138+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
139+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Debug|x86.ActiveCfg = Debug|Any CPU
140+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Debug|x86.Build.0 = Debug|Any CPU
141+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Debug-Mono|Any CPU.ActiveCfg = Debug|Any CPU
142+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Debug-Mono|Any CPU.Build.0 = Debug|Any CPU
143+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
144+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Release|Any CPU.Build.0 = Release|Any CPU
145+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
146+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Release|Mixed Platforms.Build.0 = Release|Any CPU
147+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Release|x86.ActiveCfg = Release|Any CPU
148+
{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}.Release|x86.Build.0 = Release|Any CPU
115149
{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
116150
{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}.Debug|Any CPU.Build.0 = Debug|Any CPU
117151
{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -126,6 +160,20 @@ Global
126160
{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}.Release|Mixed Platforms.Build.0 = Release|Any CPU
127161
{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}.Release|x86.ActiveCfg = Release|Any CPU
128162
{ECC2D7DB-EC7F-44B6-B09F-5B471C629685}.Release|x86.Build.0 = Release|Any CPU
163+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
164+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Debug|Any CPU.Build.0 = Debug|Any CPU
165+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
166+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
167+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Debug|x86.ActiveCfg = Debug|Any CPU
168+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Debug|x86.Build.0 = Debug|Any CPU
169+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Debug-Mono|Any CPU.ActiveCfg = Debug|Any CPU
170+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Debug-Mono|Any CPU.Build.0 = Debug|Any CPU
171+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Release|Any CPU.ActiveCfg = Release|Any CPU
172+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Release|Any CPU.Build.0 = Release|Any CPU
173+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
174+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Release|Mixed Platforms.Build.0 = Release|Any CPU
175+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Release|x86.ActiveCfg = Release|Any CPU
176+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01}.Release|x86.Build.0 = Release|Any CPU
129177
{292611F6-BBBD-492D-891C-0D9FB4BF5433}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
130178
{292611F6-BBBD-492D-891C-0D9FB4BF5433}.Debug|Any CPU.Build.0 = Debug|Any CPU
131179
{292611F6-BBBD-492D-891C-0D9FB4BF5433}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
@@ -286,6 +334,7 @@ Global
286334
{1B6A87C0-4ACA-4411-8879-844537A52126} = {182AEEFE-9B89-4264-BCED-91A00D1EF896}
287335
{96C623FD-869E-4DCE-98A1-17075EE384F9} = {182AEEFE-9B89-4264-BCED-91A00D1EF896}
288336
{70536BA8-AF0D-46F3-B04C-45177F56B320} = {182AEEFE-9B89-4264-BCED-91A00D1EF896}
337+
{EFA5B19B-D24F-497E-AB48-8588ABFD1D01} = {182AEEFE-9B89-4264-BCED-91A00D1EF896}
289338
EndGlobalSection
290339
GlobalSection(MonoDevelopProperties) = preSolution
291340
StartupItem = Simple.Data\Simple.Data.csproj

‎Simple.Data.SqlServer/DbTypeLookup.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ internal static class DbTypeLookup
1111
{"uniqueidentifier", SqlDbType.UniqueIdentifier},
1212
{"date", SqlDbType.Date},
1313
{"time", SqlDbType.Time},
14-
{"datetime2", SqlDbType.DateTime2},
15-
{
16-
"datetimeoffset",
17-
SqlDbType.DateTimeOffset
18-
},
14+
// {"datetime2", SqlDbType.DateTime2},
15+
// {
16+
// "datetimeoffset",
17+
// SqlDbType.DateTimeOffset
18+
// },
1919
{"tinyint", SqlDbType.TinyInt},
2020
{"smallint", SqlDbType.SmallInt},
2121
{"int", SqlDbType.Int},

‎Simple.Data.SqlServer/Simple.Data.SqlServer.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,7 +10,6 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Simple.Data.SqlServer</RootNamespace>
1212
<AssemblyName>Simple.Data.SqlServer</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1413
<FileAlignment>512</FileAlignment>
1514
</PropertyGroup>
1615
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

‎Simple.Data.SqlTest/DatabaseHelper.cs‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,17 @@ namespace Simple.Data.SqlTest
1010
{
1111
internal static class DatabaseHelper
1212
{
13+
public static readonly string ConnectionString =
14+
"Data Source=10.37.129.4;Initial Catalog=SimpleTest;User ID=SimpleUser;Password=SimplePassword";
15+
1316
public static dynamic Open()
1417
{
15-
return Database.Opener.OpenConnection(Properties.Settings.Default.ConnectionString);
18+
return Database.Opener.OpenConnection(ConnectionString);
1619
}
1720

1821
public static void Reset()
1922
{
20-
using (var cn = new SqlConnection(Properties.Settings.Default.ConnectionString))
23+
using (var cn = new SqlConnection(ConnectionString))
2124
{
2225
cn.Open();
2326
using (var cmd = cn.CreateCommand())

‎Simple.Data.SqlTest/Properties/Resources.resources‎

10.9 KB
Binary file not shown.

‎Simple.Data.SqlTest/SchemaTests/DatabaseSchemaTests.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ namespace Simple.Data.SqlTest.SchemaTests
1313
[TestFixture]
1414
public class DatabaseSchemaTests : DatabaseSchemaTestsBase
1515
{
16+
1617
protected override Database GetDatabase()
1718
{
18-
return Database.OpenConnection(Properties.Settings.Default.ConnectionString);
19+
return Database.OpenConnection(DatabaseHelper.ConnectionString);
1920
}
2021

2122
[Test]
@@ -69,7 +70,7 @@ public void TestNewTableIsAddedToSchemaAfterReset()
6970
dynamic db = GetDatabase();
7071
db.Users.FindById(1); // Forces population of schema...
7172

72-
using (var cn = new SqlConnection(Properties.Settings.Default.ConnectionString))
73+
using (var cn = new SqlConnection(DatabaseHelper.ConnectionString))
7374
using (var cmd = cn.CreateCommand())
7475
{
7576
cn.Open();

‎Simple.Data.SqlTest/Simple.Data.SqlTest.csproj‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -11,7 +11,6 @@
1111
<AppDesignerFolder>Properties</AppDesignerFolder>
1212
<RootNamespace>Simple.Data.SqlTest</RootNamespace>
1313
<AssemblyName>Simple.Data.SqlTest</AssemblyName>
14-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1514
<FileAlignment>512</FileAlignment>
1615
</PropertyGroup>
1716
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -33,24 +32,24 @@
3332
</PropertyGroup>
3433
<ItemGroup>
3534
<Reference Include="Microsoft.CSharp" />
36-
<Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
37-
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
38-
</Reference>
39-
<Reference Include="nunit.mocks, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
40-
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
41-
</Reference>
42-
<Reference Include="pnunit.framework, Version=1.0.4109.34242, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
44-
</Reference>
4535
<Reference Include="System" />
4636
<Reference Include="System.Core">
4737
<RequiredTargetFramework>3.5</RequiredTargetFramework>
4838
</Reference>
4939
<Reference Include="System.Data" />
5040
<Reference Include="System.Xml" />
41+
<Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
42+
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
43+
</Reference>
44+
<Reference Include="nunit.mocks, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
45+
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
46+
</Reference>
47+
<Reference Include="pnunit.framework, Version=1.0.4109.34242, Culture=neutral, PublicKeyToken=null">
48+
<HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
49+
</Reference>
5150
</ItemGroup>
5251
<ItemGroup>
53-
<CodeAnalysisDependentAssemblyPaths Condition=" '$(VS100COMNTOOLS)' != '' " Include="$(VS100COMNTOOLS)..\IDE\PrivateAssemblies">
52+
<CodeAnalysisDependentAssemblyPaths Include="%24%28VS100COMNTOOLS%29..\IDE\PrivateAssemblies" Condition=" '$(VS100COMNTOOLS)' != '' ">
5453
<Visible>False</Visible>
5554
</CodeAnalysisDependentAssemblyPaths>
5655
</ItemGroup>
@@ -97,14 +96,14 @@
9796
<Project>{E24F1C0F-3DCD-4BE5-9A6E-78EF6CB392A1}</Project>
9897
<Name>Simple.Data.SqlServer</Name>
9998
</ProjectReference>
100-
<ProjectReference Include="..\Simple.Data.TestHelper\Simple.Data.TestHelper.csproj">
101-
<Project>{7DAB2F13-0392-435E-A934-4567266714BF}</Project>
102-
<Name>Simple.Data.TestHelper</Name>
103-
</ProjectReference>
10499
<ProjectReference Include="..\Simple.Data\Simple.Data.csproj">
105100
<Project>{148CEE80-2E84-4ABD-B5AB-20415B2BBD21}</Project>
106101
<Name>Simple.Data</Name>
107102
</ProjectReference>
103+
<ProjectReference Include="..\Simple.Data.TestHelper\Simple.Data.TestHelper.csproj">
104+
<Project>{7DAB2F13-0392-435E-A934-4567266714BF}</Project>
105+
<Name>Simple.Data.TestHelper</Name>
106+
</ProjectReference>
108107
</ItemGroup>
109108
<ItemGroup>
110109
<None Include="app.config">

‎Simple.Data.SqlTest/app.config‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,17 @@
33
<configSections>
44
</configSections>
55
<connectionStrings>
6-
<add name="Simple.Data.SqlTest.Properties.Settings.ConnectionString"
6+
<!-- <add name="Simple.Data.SqlTest.Properties.Settings.ConnectionString"
77
connectionString="Data Source=.;Initial Catalog=SimpleTest;Integrated Security=true"
88
providerName="System.Data.SqlClient" />
99
<add name="Test"
1010
connectionString="Data Source=.;Initial Catalog=SimpleTest;Integrated Security=true"
11+
providerName="System.Data.SqlClient" />-->
12+
<add name="Simple.Data.SqlTest.Properties.Settings.ConnectionString"
13+
connectionString="Data Source=10.37.129.4;Initial Catalog=SimpleTest;User ID=SimpleUser;Password=SimplePassword"
14+
providerName="System.Data.SqlClient" />
15+
<add name="Test"
16+
connectionString="Data Source=10.37.129.4;Initial Catalog=SimpleTest;User ID=SimpleUser;Password=SimplePassword"
1117
providerName="System.Data.SqlClient" />
1218
</connectionStrings>
1319
</configuration>

‎Simple.Data.TestHelper/Simple.Data.TestHelper.csproj‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,7 +10,6 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace>Simple.Data.TestHelper</RootNamespace>
1212
<AssemblyName>Simple.Data.TestHelper</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1413
<FileAlignment>512</FileAlignment>
1514
</PropertyGroup>
1615
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -31,22 +30,22 @@
3130
<WarningLevel>4</WarningLevel>
3231
</PropertyGroup>
3332
<ItemGroup>
34-
<Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
35-
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
36-
</Reference>
37-
<Reference Include="nunit.mocks, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
38-
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
39-
</Reference>
40-
<Reference Include="pnunit.framework, Version=1.0.4109.34242, Culture=neutral, processorArchitecture=MSIL">
41-
<HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
42-
</Reference>
4333
<Reference Include="System" />
4434
<Reference Include="System.Core" />
4535
<Reference Include="System.Xml.Linq" />
4636
<Reference Include="System.Data.DataSetExtensions" />
4737
<Reference Include="Microsoft.CSharp" />
4838
<Reference Include="System.Data" />
4939
<Reference Include="System.Xml" />
40+
<Reference Include="nunit.framework, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
41+
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.framework.dll</HintPath>
42+
</Reference>
43+
<Reference Include="nunit.mocks, Version=2.5.10.11092, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
44+
<HintPath>..\packages\NUnit.2.5.10.11092\lib\nunit.mocks.dll</HintPath>
45+
</Reference>
46+
<Reference Include="pnunit.framework, Version=1.0.4109.34242, Culture=neutral, PublicKeyToken=null">
47+
<HintPath>..\packages\NUnit.2.5.10.11092\lib\pnunit.framework.dll</HintPath>
48+
</Reference>
5049
</ItemGroup>
5150
<ItemGroup>
5251
<Compile Include="DatabaseInternalsEx.cs" />

‎Simple.Data/MefHelper.cs‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,14 @@ private static CompositionContainer CreateContainer()
6060
if (path == null) throw new ArgumentException("Unrecognised file.");
6161

6262
var assemblyCatalog = new AssemblyCatalog(Assembly.GetExecutingAssembly());
63-
var folderCatalog = new DirectoryCatalog(path, "Simple.Data.*.dll");
64-
return new CompositionContainer(new AggregateCatalog(assemblyCatalog, folderCatalog));
63+
var aggregateCatalog = new AggregateCatalog(assemblyCatalog);
64+
foreach (string file in System.IO.Directory.GetFiles("/" + path, "Simple.Data.*.dll"))
65+
{
66+
var catalog = new AssemblyCatalog(file);
67+
aggregateCatalog.Catalogs.Add(catalog);
68+
}
69+
// var folderCatalog = new DirectoryCatalog(path, "Simple.Data.*.dll");
70+
return new CompositionContainer(aggregateCatalog);
6571
}
6672
}
6773
}

0 commit comments

Comments
 (0)