diff options
author | David Karlaš <david.karlas@microsoft.com> | 2018-02-28 18:40:01 +0300 |
---|---|---|
committer | David Karlaš <david.karlas@microsoft.com> | 2018-02-28 18:40:01 +0300 |
commit | e5396e3846c138eb0e235ab1a01966569568eb7e (patch) | |
tree | e3dfc2961b426305128410a7ba983e094c7a93e5 /Mono.Addins.Setup | |
parent | 85f0977bfe2580e29cc6d6e8edc4db557657f90f (diff) |
Updated with PR comments
Diffstat (limited to 'Mono.Addins.Setup')
4 files changed, 5 insertions, 10 deletions
diff --git a/Mono.Addins.Setup/Mono.Addins.Setup.csproj b/Mono.Addins.Setup/Mono.Addins.Setup.csproj index c1a5b78..1265e30 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup.csproj +++ b/Mono.Addins.Setup/Mono.Addins.Setup.csproj @@ -53,9 +53,6 @@ <Private>False</Private> </ProjectReference> <PackageReference Include="NuGet.Build.Packaging" Version="0.2.0" /> - <PackageReference Include="Newtonsoft.Json"> - <Version>10.0.3</Version> - </PackageReference> </ItemGroup> <ItemGroup> <Compile Include="Mono.Addins.Setup\AddinInfo.cs" /> diff --git a/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs b/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs index 2081f2b..6929928 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs +++ b/Mono.Addins.Setup/Mono.Addins.Setup/AddinPackage.cs @@ -132,7 +132,7 @@ namespace Mono.Addins.Setup throw new InstallException ("The addin " + info.Name + " v" + info.Version + " is already installed."); if (url != null) - packFile = AddinStore.DownloadFile (monitor, url); + packFile = service.DownloadFile (monitor, url); tempFolder = CreateTempFolder (); diff --git a/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs b/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs index fab26f4..eef58f2 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs +++ b/Mono.Addins.Setup/Mono.Addins.Setup/AddinStore.cs @@ -49,7 +49,7 @@ using System.Threading; namespace Mono.Addins.Setup { - public class AddinStore + internal class AddinStore { SetupService service; @@ -625,7 +625,7 @@ namespace Mono.Addins.Setup } } - public static string DownloadFile (IProgressMonitor monitor, string url) + internal string DownloadFile (IProgressMonitor monitor, string url) { if (url.StartsWith ("file://", StringComparison.Ordinal)) { string tmpfile = Path.GetTempFileName (); diff --git a/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs b/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs index 3af3cfa..dcb4246 100644 --- a/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs +++ b/Mono.Addins.Setup/Mono.Addins.Setup/RepositoryRegistry.cs @@ -53,7 +53,7 @@ namespace Mono.Addins.Setup } /// <summary> - /// Subscribes to an on-line repository + /// Subscribes to an on-line repository, notice that default registry provider is "MonoAddins" /// </summary> /// <param name="monitor"> /// Progress monitor where to show progress status and log @@ -68,14 +68,13 @@ namespace Mono.Addins.Setup /// The repository index is not downloaded by default. It can be downloaded /// by calling UpdateRepository. /// </remarks> - [Obsolete ("Use different overload")] public AddinRepository RegisterRepository (IProgressStatus monitor, string url) { return RegisterRepository (monitor, url, false, "MonoAddins"); } /// <summary> - /// Subscribes to an on-line repository + /// Subscribes to an on-line repository, notice that default registry provider is "MonoAddins" /// </summary> /// <param name="monitor"> /// Progress monitor where to show progress status and log @@ -89,7 +88,6 @@ namespace Mono.Addins.Setup /// <returns> /// A repository reference /// </returns> - [Obsolete("Use different overload")] public AddinRepository RegisterRepository (IProgressStatus monitor, string url, bool updateNow) { return RegisterRepository (monitor, url, updateNow, "MonoAddins"); |