diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-03-14 11:20:54 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-03-14 11:32:08 -0700 |
| commit | e8ebab2ce3991c3abb9942ce48a026a2169df01e (patch) | |
| tree | 7a43209081067ee5b8379f2b1ca9bdbc4f7ee51f /src/WixToolset.Core.ExtensionCache | |
| parent | dad79129d26cfb12f0d8894d9189334fa982b823 (diff) | |
| download | wix-e8ebab2ce3991c3abb9942ce48a026a2169df01e.tar.gz wix-e8ebab2ce3991c3abb9942ce48a026a2169df01e.tar.bz2 wix-e8ebab2ce3991c3abb9942ce48a026a2169df01e.zip | |
Remove use of removed IWixToolsetServiceProvider
Diffstat (limited to 'src/WixToolset.Core.ExtensionCache')
3 files changed, 5 insertions, 5 deletions
diff --git a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerCommand.cs b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerCommand.cs index 67c1504b..94ee4f22 100644 --- a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerCommand.cs +++ b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerCommand.cs | |||
| @@ -22,7 +22,7 @@ namespace WixToolset.Core.ExtensionCache | |||
| 22 | List | 22 | List |
| 23 | } | 23 | } |
| 24 | 24 | ||
| 25 | public ExtensionCacheManagerCommand(IWixToolsetServiceProvider serviceProvider) | 25 | public ExtensionCacheManagerCommand(IServiceProvider serviceProvider) |
| 26 | { | 26 | { |
| 27 | this.Messaging = serviceProvider.GetService<IMessaging>(); | 27 | this.Messaging = serviceProvider.GetService<IMessaging>(); |
| 28 | this.ExtensionReferences = new List<string>(); | 28 | this.ExtensionReferences = new List<string>(); |
diff --git a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionCommandLine.cs b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionCommandLine.cs index a27e2a1f..76587830 100644 --- a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionCommandLine.cs +++ b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionCommandLine.cs | |||
| @@ -14,12 +14,12 @@ namespace WixToolset.Core.ExtensionCache | |||
| 14 | /// </summary> | 14 | /// </summary> |
| 15 | internal class ExtensionCacheManagerExtensionCommandLine : BaseExtensionCommandLine | 15 | internal class ExtensionCacheManagerExtensionCommandLine : BaseExtensionCommandLine |
| 16 | { | 16 | { |
| 17 | public ExtensionCacheManagerExtensionCommandLine(IWixToolsetServiceProvider serviceProvider) | 17 | public ExtensionCacheManagerExtensionCommandLine(IServiceProvider serviceProvider) |
| 18 | { | 18 | { |
| 19 | this.ServiceProvider = serviceProvider; | 19 | this.ServiceProvider = serviceProvider; |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | private IWixToolsetServiceProvider ServiceProvider { get; } | 22 | private IServiceProvider ServiceProvider { get; } |
| 23 | 23 | ||
| 24 | public override IEnumerable<ExtensionCommandLineSwitch> CommandLineSwitches => new ExtensionCommandLineSwitch[] | 24 | public override IEnumerable<ExtensionCommandLineSwitch> CommandLineSwitches => new ExtensionCommandLineSwitch[] |
| 25 | { | 25 | { |
diff --git a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionFactory.cs b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionFactory.cs index 44fc4b86..c38e5c70 100644 --- a/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionFactory.cs +++ b/src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionFactory.cs | |||
| @@ -8,12 +8,12 @@ namespace WixToolset.Core.ExtensionCache | |||
| 8 | 8 | ||
| 9 | internal class ExtensionCacheManagerExtensionFactory : IExtensionFactory | 9 | internal class ExtensionCacheManagerExtensionFactory : IExtensionFactory |
| 10 | { | 10 | { |
| 11 | public ExtensionCacheManagerExtensionFactory(IWixToolsetServiceProvider serviceProvider) | 11 | public ExtensionCacheManagerExtensionFactory(IServiceProvider serviceProvider) |
| 12 | { | 12 | { |
| 13 | this.ServiceProvider = serviceProvider; | 13 | this.ServiceProvider = serviceProvider; |
| 14 | } | 14 | } |
| 15 | 15 | ||
| 16 | private IWixToolsetServiceProvider ServiceProvider { get; } | 16 | private IServiceProvider ServiceProvider { get; } |
| 17 | 17 | ||
| 18 | public bool TryCreateExtension(Type extensionType, out object extension) | 18 | public bool TryCreateExtension(Type extensionType, out object extension) |
| 19 | { | 19 | { |
