diff options
| author | David Karlaš <david.karlas@microsoft.com> | 2018-02-27 19:38:05 +0300 |
|---|---|---|
| committer | David Karlaš <david.karlas@microsoft.com> | 2018-02-27 19:38:05 +0300 |
| commit | 85f0977bfe2580e29cc6d6e8edc4db557657f90f (patch) | |
| tree | 7d8b865c98ff33a88b792a1e5013a219a3fa8768 /Mono.Addins.Setup | |
| parent | 3894104a77a20529bbaa7fa451bf0ca96c6393e5 (diff) | |
Made SetupService settable via constructor for AddinManagerDialog so app can set service with custom Providers
Diffstat (limited to 'Mono.Addins.Setup')
| -rw-r--r-- | Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs | 4 | ||||
| -rw-r--r-- | Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs b/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs index c6e69dd..130f059 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs +++ b/Mono.Addins.Setup/Mono.Addins.Setup/AddinSystemConfigurationReaderWriter.cs @@ -251,8 +251,6 @@ namespace Mono.Addins.Setup } else if (Reader.LocalName == "ProviderId" && Reader.NamespaceURI == "" && !b16) { b16 = true; ob.ProviderId = Reader.ReadElementString (); - if (string.IsNullOrEmpty (ob.ProviderId)) - ob.ProviderId = "MonoAddins"; } else if (Reader.LocalName == "LastModified" && Reader.NamespaceURI == "" && !b14) { b14 = true; string s21 = Reader.ReadElementString (); @@ -373,7 +371,7 @@ namespace Mono.Addins.Setup WriteElementString ("IsReference", "", (ob.@IsReference?"true":"false")); WriteElementString ("File", "", ob.@File); WriteElementString ("Url", "", ob.@Url); - WriteElementString ("ProviderId", "", ob.ProviderId.ToString ()); + WriteElementString ("ProviderId", "", ob.ProviderId); WriteElementString ("Name", "", ob.@Name); WriteElementString ("LastModified", "", XmlConvert.ToString (ob.@LastModified, XmlDateTimeSerializationMode.RoundtripKind)); if (ob.@Enabled != true) { diff --git a/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs b/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs index f739324..d29bed1 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs +++ b/Mono.Addins.Setup/Mono.Addins.Setup/SetupService.cs @@ -91,6 +91,7 @@ namespace Mono.Addins.Setup this.registry = registry; repositories = new RepositoryRegistry (this); store = new AddinStore (this); + AddAddinRepositoryProvider ("MonoAddins", new MonoAddinsRepositoryProvider (this)); } /// <summary> @@ -310,6 +311,9 @@ namespace Mono.Addins.Setup public AddinRepositoryProvider GetAddinRepositoryProvider (string providerId) { + + if (string.IsNullOrEmpty (providerId)) + providerId = "MonoAddins"; if (providersList.TryGetValue (providerId, out var addinRepositoryProvider)) return addinRepositoryProvider; throw new KeyNotFoundException (providerId); |