Skip to content

Commit f9d43eb

Browse files
ThatRendleThatRendle
committed
Fixing up MEF code to only check Simple.Data.* assemblies
1 parent f752a2e commit f9d43eb

9 files changed

Lines changed: 23 additions & 18 deletions

File tree

‎CommonAssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
// COM, set the ComVisible attribute to true on that type.
2020
[assembly: ComVisible(false)]
2121

22-
[assembly: AssemblyVersion("0.17.0.1")]
23-
[assembly: AssemblyFileVersion("0.17.0.1")]
22+
[assembly: AssemblyVersion("0.17.1.1")]
23+
[assembly: AssemblyFileVersion("0.17.1.1")]
2424

‎Simple.Data.Ado/ProviderHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,13 +208,13 @@ private static bool LoadUsingAssemblyAttribute(string connectionString, ICollect
208208
private static List<ProviderAssemblyAttributeBase> LoadAssemblyAttributes()
209209
{
210210
var attributes = AppDomain.CurrentDomain.GetAssemblies()
211-
.Where(a => !a.GlobalAssemblyCache)
211+
.Where(a => a.GetName().Name.StartsWith("Simple.Data.", StringComparison.OrdinalIgnoreCase))
212212
.SelectMany(ProviderAssemblyAttributeBase.Get)
213213
.ToList();
214214

215215
if (attributes.Count == 0)
216216
{
217-
foreach (var file in Directory.EnumerateFiles(Composer.GetSimpleDataAssemblyPath(), "*.dll"))
217+
foreach (var file in Directory.EnumerateFiles(Composer.GetSimpleDataAssemblyPath(), "Simple.Data.*.dll"))
218218
{
219219
Assembly assembly;
220220
if (Composer.TryLoadAssembly(file, out assembly))

‎Simple.Data.Ado/Simple.Data.Ado.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Simple.Data.Ado</id>
5-
<version>0.17.0.1</version>
5+
<version>0.17.1.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>ADO Adapter for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Core" version="0.17.0.1" />
15+
<dependency id="Simple.Data.Core" version="0.17.1.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.Mocking/Simple.Data.Mocking.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.Mocking</id>
5-
<version>0.17.0.1</version>
5+
<version>0.17.1.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>XML-based Mocking adapter for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>database data .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.17.0.1" />
15+
<dependency id="Simple.Data.Ado" version="0.17.1.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data.SqlCe40/NugetPack.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nuget pack -sym Simple.Data.SqlCe40.csproj -Properties Configuration=Release;Platform=AnyCPU -Build
1+
nuget pack -sym Simple.Data.SqlCe40.nuspec

‎Simple.Data.SqlCe40/Simple.Data.SqlCe40.nuspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Simple.Data.SqlCompact40</id>
5-
<version>0.17.0.1</version>
5+
<version>0.17.1.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
@@ -12,10 +12,10 @@
1212
<description>SQL Server Compact 4.0 ADO provider for the Simple.Data data access library.</description>
1313
<tags>sqlserver compact sqlce database data ado .net40</tags>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.17.0.1" />
15+
<dependency id="Simple.Data.Ado" version="0.17.1.1" />
1616
</dependencies>
1717
</metadata>
18-
<files>
18+
<!--<files>
1919
<file src="bin\Release\Simple.Data.SqlCe40.dll" target="lib\net40" />
20-
</files>
21-
</package>
20+
</files>-->
21+
</package>

‎Simple.Data.SqlServer/Simple.Data.SqlServer.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
33
<metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
44
<id>Simple.Data.SqlServer</id>
5-
<version>0.17.0.1</version>
5+
<version>0.17.1.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<description>SQL Server ADO provider for the Simple.Data data access library.</description>
@@ -12,7 +12,7 @@
1212
<tags>sqlserver database data ado .net40</tags>
1313
<language>en-us</language>
1414
<dependencies>
15-
<dependency id="Simple.Data.Ado" version="0.17.0.1" />
15+
<dependency id="Simple.Data.Ado" version="0.17.1.1" />
1616
</dependencies>
1717
</metadata>
1818
</package>

‎Simple.Data/MefHelper.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,16 @@ private static CompositionContainer CreateFolderContainer()
8686
private static CompositionContainer CreateAppDomainContainer()
8787
{
8888
var aggregateCatalog = new AggregateCatalog();
89-
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().Where(a => !a.GlobalAssemblyCache))
89+
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies().Where(IsSimpleDataAssembly))
9090
{
9191
aggregateCatalog.Catalogs.Add(new AssemblyCatalog(assembly));
9292
}
9393
return new CompositionContainer(aggregateCatalog);
9494
}
95+
96+
private static bool IsSimpleDataAssembly(Assembly assembly)
97+
{
98+
return assembly.GetName().Name.StartsWith("Simple.Data.", StringComparison.OrdinalIgnoreCase);
99+
}
95100
}
96101
}

‎Simple.Data/Simple.Data.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>Simple.Data.Core</id>
5-
<version>0.17.0.1</version>
5+
<version>0.17.1.1</version>
66
<authors>Mark Rendle</authors>
77
<owners>Mark Rendle</owners>
88
<licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>

0 commit comments

Comments
 (0)