Merge pull request #108 from KirillOsenkov/Fix105

Fix https://github.com/mono/mono-addins/issues/105

2 files changed, 14 insertions, 2 deletions

diff --git a/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs b/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs
index 4fd808c..42b836a 100644
--- a/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs
+++ b/Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs
@@ -79,13 +79,17 @@ namespace Mono.Addins.Database
 			return finfo;
 		}
 		
-		static string GetDomain (string path)
+		internal static string GetDomain (string path)
 		{
 			path = Path.GetFullPath (path);
 			string s = path.Replace (Path.DirectorySeparatorChar, '_');
 			s = s.Replace (Path.AltDirectorySeparatorChar, '_');
 			s = s.Replace (Path.VolumeSeparatorChar, '_');
 			s = s.Trim ('_');
+			if (Util.IsWindows) {
+				s = s.ToLowerInvariant();
+			}
+
 			return s;
 		}
 		
diff --git a/Mono.Addins/Mono.Addins.Database/FileDatabase.cs b/Mono.Addins/Mono.Addins.Database/FileDatabase.cs
index c2ce12c..ad2deca 100644
--- a/Mono.Addins/Mono.Addins.Database/FileDatabase.cs
+++ b/Mono.Addins/Mono.Addins.Database/FileDatabase.cs
@@ -360,6 +360,10 @@ namespace Mono.Addins.Database
 		
 		object ReadSharedObject (string directory, string sharedFileName, string extension, string objectId, BinaryXmlTypeMap typeMap, bool checkOnly, out string fileName)
 		{
+			if (Util.IsWindows) {
+				objectId = objectId.ToLowerInvariant();
+			}
+
 			string name = GetFileKey (directory, sharedFileName, objectId);
 			string file = Path.Combine (directory, name + extension);
 
@@ -431,7 +435,11 @@ namespace Mono.Addins.Database
 		public string WriteSharedObject (string directory, string sharedFileName, string extension, string objectId, string readFileName, BinaryXmlTypeMap typeMap, IBinaryXmlElement obj)
 		{
 			string file = readFileName;
-			
+
+			if (Util.IsWindows) {
+				objectId = objectId.ToLowerInvariant();
+			}
+
 			if (file == null) {
 				int count = 1;
 				string name = GetFileKey (directory, sharedFileName, objectId);