diff options
author | Kirill Osenkov <KirillOsenkov@users.noreply.github.com> | 2018-04-10 18:40:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-04-10 18:40:25 +0300 |
commit | 000c075e6ee11666f81096b83de962c18cac320f (patch) | |
tree | 25d394cac2c4bc6f84183969961bd6aedc98ff2b /Mono.Addins/Mono.Addins.Database | |
parent | d9291426df01bd1c3b4e63c04b5bac735d172518 (diff) | |
parent | cb6923f5b2a344adbabb0a497abfde9f97e1a66b (diff) |
Merge pull request #108 from KirillOsenkov/Fix105
Fix https://github.com/mono/mono-addins/issues/105
Diffstat (limited to 'Mono.Addins/Mono.Addins.Database')
-rw-r--r-- | Mono.Addins/Mono.Addins.Database/AddinScanFolderInfo.cs | 6 | ||||
-rw-r--r-- | Mono.Addins/Mono.Addins.Database/FileDatabase.cs | 10 |
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); |