e8ebab2c · joebigelow/wix · siGit Code & Deploy

src/WixToolset.Core.Burn/Bind/BindBundleCommand.cs

+1 -1

@@ -45,7 +45,7 @@ namespace WixToolset.Core.Burn

45 this.BackendExtensions = backedExtensions;

46 }

47

48 - private IWixToolsetServiceProvider ServiceProvider { get; }

48 + private IServiceProvider ServiceProvider { get; }

49

50 private IMessaging Messaging { get; }

51

src/WixToolset.Core.Burn/Bundles/ProcessMsiPackageCommand.cs

+1 -1

@@ -23,7 +23,7 @@ namespace WixToolset.Core.Burn.Bundles

23 {

24 private const string PropertySqlFormat = "SELECT `Value` FROM `Property` WHERE `Property` = '{0}'";

25

26 - public ProcessMsiPackageCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable<IBurnBackendBinderExtension> backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols)

26 + public ProcessMsiPackageCommand(IServiceProvider serviceProvider, IEnumerable<IBurnBackendBinderExtension> backendExtensions, IntermediateSection section, PackageFacade facade, Dictionary<string, WixBundlePayloadSymbol> payloadSymbols)

27 {

28 this.Messaging = serviceProvider.GetService<IMessaging>();

29 this.BackendHelper = serviceProvider.GetService<IBackendHelper>();

src/WixToolset.Core.Burn/Bundles/ProcessPayloadsCommand.cs

+1 -1

@@ -15,7 +15,7 @@ namespace WixToolset.Core.Burn.Bundles

15

16 internal class ProcessPayloadsCommand

17 {

18 - public ProcessPayloadsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, IPayloadHarvester payloadHarvester, IEnumerable<WixBundlePayloadSymbol> payloads, PackagingType defaultPackaging, string layoutDirectory)

18 + public ProcessPayloadsCommand(IServiceProvider serviceProvider, IBackendHelper backendHelper, IPayloadHarvester payloadHarvester, IEnumerable<WixBundlePayloadSymbol> payloads, PackagingType defaultPackaging, string layoutDirectory)

19 {

20 this.Messaging = serviceProvider.GetService<IMessaging>();

21

src/WixToolset.Core.Burn/ExtensibilityServices/BurnBackendHelper.cs

+1 -1

@@ -25,7 +25,7 @@ namespace WixToolset.Core.Burn.ExtensibilityServices

25

26 private Dictionary<string, ManifestData> BundleExtensionDataById { get; } = new Dictionary<string, ManifestData>();

27

28 - public BurnBackendHelper(IWixToolsetServiceProvider serviceProvider)

28 + public BurnBackendHelper(IServiceProvider serviceProvider)

29 {

30 this.backendHelper = serviceProvider.GetService<IBackendHelper>();

31 }

src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerCommand.cs

+1 -1

@@ -22,7 +22,7 @@ namespace WixToolset.Core.ExtensionCache

22 List

23 }

24

25 - public ExtensionCacheManagerCommand(IWixToolsetServiceProvider serviceProvider)

25 + public ExtensionCacheManagerCommand(IServiceProvider serviceProvider)

26 {

27 this.Messaging = serviceProvider.GetService<IMessaging>();

28 this.ExtensionReferences = new List<string>();

src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionCommandLine.cs

+2 -2

@@ -14,12 +14,12 @@ namespace WixToolset.Core.ExtensionCache

14 /// </summary>

15 internal class ExtensionCacheManagerExtensionCommandLine : BaseExtensionCommandLine

16 {

17 - public ExtensionCacheManagerExtensionCommandLine(IWixToolsetServiceProvider serviceProvider)

17 + public ExtensionCacheManagerExtensionCommandLine(IServiceProvider serviceProvider)

18 {

19 this.ServiceProvider = serviceProvider;

20 }

21

22 - private IWixToolsetServiceProvider ServiceProvider { get; }

22 + private IServiceProvider ServiceProvider { get; }

23

24 public override IEnumerable<ExtensionCommandLineSwitch> CommandLineSwitches => new ExtensionCommandLineSwitch[]

25 {

src/WixToolset.Core.ExtensionCache/ExtensionCacheManagerExtensionFactory.cs

+2 -2

@@ -8,12 +8,12 @@ namespace WixToolset.Core.ExtensionCache

8

9 internal class ExtensionCacheManagerExtensionFactory : IExtensionFactory

10 {

11 - public ExtensionCacheManagerExtensionFactory(IWixToolsetServiceProvider serviceProvider)

11 + public ExtensionCacheManagerExtensionFactory(IServiceProvider serviceProvider)

12 {

13 this.ServiceProvider = serviceProvider;

14 }

15

16 - private IWixToolsetServiceProvider ServiceProvider { get; }

16 + private IServiceProvider ServiceProvider { get; }

17

18 public bool TryCreateExtension(Type extensionType, out object extension)

19 {

src/WixToolset.Core.WindowsInstaller/Bind/BindDatabaseCommand.cs

+1 -1

@@ -55,7 +55,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

55 this.BackendExtensions = backendExtension;

56 }

57

58 - public IWixToolsetServiceProvider ServiceProvider { get; }

58 + public IServiceProvider ServiceProvider { get; }

59

60 private IMessaging Messaging { get; }

61

src/WixToolset.Core.WindowsInstaller/Bind/CabinetResolver.cs

+2 -2

@@ -14,7 +14,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

14

15 internal class CabinetResolver

16 {

17 - public CabinetResolver(IWixToolsetServiceProvider serviceProvider, string cabCachePath, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)

17 + public CabinetResolver(IServiceProvider serviceProvider, string cabCachePath, IEnumerable<IWindowsInstallerBackendBinderExtension> backendExtensions)

18 {

19 this.ServiceProvider = serviceProvider;

20

@@ -23,7 +23,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

23 this.BackendExtensions = backendExtensions;

24 }

25

26 - private IWixToolsetServiceProvider ServiceProvider { get; }

26 + private IServiceProvider ServiceProvider { get; }

27

28 private string CabCachePath { get; }

29

src/WixToolset.Core.WindowsInstaller/Bind/CreateCabinetsCommand.cs

+2 -2

@@ -31,7 +31,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

31

32 private Dictionary<string, string> lastCabinetAddedToMediaTable; // Key is First Cabinet Name, Value is Last Cabinet Added in the Split Sequence

33

34 - public CreateCabinetsCommand(IWixToolsetServiceProvider serviceProvider, IBackendHelper backendHelper, WixMediaTemplateSymbol mediaTemplate)

34 + public CreateCabinetsCommand(IServiceProvider serviceProvider, IBackendHelper backendHelper, WixMediaTemplateSymbol mediaTemplate)

35 {

36 this.fileTransfers = new List<IFileTransfer>();

37

@@ -46,7 +46,7 @@ namespace WixToolset.Core.WindowsInstaller.Bind

46 this.MediaTemplate = mediaTemplate;

47 }

48

49 - private IWixToolsetServiceProvider ServiceProvider { get; }

49 + private IServiceProvider ServiceProvider { get; }

50

51 private IBackendHelper BackendHelper { get; }

52

src/WixToolset.Core.WindowsInstaller/ExtensibilityServices/WindowsInstallerBackendHelper.cs

+1 -1

@@ -16,7 +16,7 @@ namespace WixToolset.Core.WindowsInstaller.ExtensibilityServices

16 {

17 private readonly IBackendHelper backendHelper;

18

19 - public WindowsInstallerBackendHelper(IWixToolsetServiceProvider serviceProvider)

19 + public WindowsInstallerBackendHelper(IServiceProvider serviceProvider)

20 {

21 this.backendHelper = serviceProvider.GetService<IBackendHelper>();

22 }

src/WixToolset.Core/BindContext.cs

+3 -3

@@ -2,21 +2,21 @@

2

3 namespace WixToolset.Core

4 {

5 + using System;

6 using System.Collections.Generic;

7 using System.Threading;

8 using WixToolset.Data;

9 using WixToolset.Extensibility;

10 using WixToolset.Extensibility.Data;

10 - using WixToolset.Extensibility.Services;

11

12 internal class BindContext : IBindContext

13 {

14 - internal BindContext(IWixToolsetServiceProvider serviceProvider)

14 + internal BindContext(IServiceProvider serviceProvider)

15 {

16 this.ServiceProvider = serviceProvider;

17 }

18

19 - public IWixToolsetServiceProvider ServiceProvider { get; }

19 + public IServiceProvider ServiceProvider { get; }

20

21 public IEnumerable<BindPath> BindPaths { get; set; }

22

src/WixToolset.Core/Binder.cs

+2 -2

@@ -17,12 +17,12 @@ namespace WixToolset.Core

17 /// </summary>

18 internal class Binder : IBinder

19 {

20 - internal Binder(IWixToolsetServiceProvider serviceProvider)

20 + internal Binder(IServiceProvider serviceProvider)

21 {

22 this.ServiceProvider = serviceProvider;

23 }

24

25 - public IWixToolsetServiceProvider ServiceProvider { get; }

25 + public IServiceProvider ServiceProvider { get; }

26

27 public IBindResult Bind(IBindContext context)

28 {

src/WixToolset.Core/CommandLine/BuildCommand.cs

+4 -4

@@ -18,7 +18,7 @@ namespace WixToolset.Core.CommandLine

18 {

19 private readonly CommandLine commandLine;

20

21 - public BuildCommand(IWixToolsetServiceProvider serviceProvider)

21 + public BuildCommand(IServiceProvider serviceProvider)

22 {

23 this.ServiceProvider = serviceProvider;

24 this.Messaging = serviceProvider.GetService<IMessaging>();

@@ -30,7 +30,7 @@ namespace WixToolset.Core.CommandLine

30

31 public bool StopParsing => this.commandLine.ShowHelp;

32

33 - private IWixToolsetServiceProvider ServiceProvider { get; }

33 + private IServiceProvider ServiceProvider { get; }

34

35 private IMessaging Messaging { get; }

36

@@ -541,13 +541,13 @@ namespace WixToolset.Core.CommandLine

541

542 public string BuiltOutputsFile { get; private set; }

543

544 - public CommandLine(IWixToolsetServiceProvider serviceProvider, IMessaging messaging)

544 + public CommandLine(IServiceProvider serviceProvider, IMessaging messaging)

545 {

546 this.ServiceProvider = serviceProvider;

547 this.Messaging = messaging;

548 }

549

550 - private IWixToolsetServiceProvider ServiceProvider { get; }

550 + private IServiceProvider ServiceProvider { get; }

551

552 private IMessaging Messaging { get; }

553

src/WixToolset.Core/CommandLine/CommandLine.cs

+2 -2

@@ -21,9 +21,9 @@ namespace WixToolset.Core.CommandLine

21

22 internal class CommandLine : ICommandLine

23 {

24 - public CommandLine(IWixToolsetServiceProvider serviceProvider) => this.ServiceProvider = serviceProvider;

24 + public CommandLine(IServiceProvider serviceProvider) => this.ServiceProvider = serviceProvider;

25

26 - private IWixToolsetServiceProvider ServiceProvider { get; }

26 + private IServiceProvider ServiceProvider { get; }

27

28 public ICommandLineCommand CreateCommand(string[] args)

29 {

src/WixToolset.Core/CommandLine/CommandLineArguments.cs

+1 -1

@@ -12,7 +12,7 @@ namespace WixToolset.Core.CommandLine

12

13 internal class CommandLineArguments : ICommandLineArguments

14 {

15 - public CommandLineArguments(IWixToolsetServiceProvider serviceProvider)

15 + public CommandLineArguments(IServiceProvider serviceProvider)

16 {

17 this.Messaging = serviceProvider.GetService<IMessaging>();

18 }

src/WixToolset.Core/CommandLine/CommandLineContext.cs

+2 -2

@@ -8,12 +8,12 @@ namespace WixToolset.Core.CommandLine

8

9 internal class CommandLineContext : ICommandLineContext

10 {

11 - public CommandLineContext(IWixToolsetServiceProvider serviceProvider)

11 + public CommandLineContext(IServiceProvider serviceProvider)

12 {

13 this.ServiceProvider = serviceProvider;

14 }

15

16 - public IWixToolsetServiceProvider ServiceProvider { get; }

16 + public IServiceProvider ServiceProvider { get; }

17

18 public IExtensionManager ExtensionManager { get; set; }

19

src/WixToolset.Core/CommandLine/CompileCommand.cs

+3 -3

@@ -13,14 +13,14 @@ namespace WixToolset.Core.CommandLine

13

14 internal class CompileCommand : ICommandLineCommand

15 {

16 - public CompileCommand(IWixToolsetServiceProvider serviceProvider)

16 + public CompileCommand(IServiceProvider serviceProvider)

17 {

18 this.ServiceProvider = serviceProvider;

19 this.Messaging = serviceProvider.GetService<IMessaging>();

20 this.ExtensionManager = serviceProvider.GetService<IExtensionManager>();

21 }

22

23 - public CompileCommand(IWixToolsetServiceProvider serviceProvider, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, Platform platform)

23 + public CompileCommand(IServiceProvider serviceProvider, IEnumerable<SourceFile> sources, IDictionary<string, string> preprocessorVariables, Platform platform)

24 {

25 this.ServiceProvider = serviceProvider;

26 this.Messaging = serviceProvider.GetService<IMessaging>();

@@ -30,7 +30,7 @@ namespace WixToolset.Core.CommandLine

30 this.Platform = platform;

31 }

32

33 - private IWixToolsetServiceProvider ServiceProvider { get; }

33 + private IServiceProvider ServiceProvider { get; }

34

35 public IMessaging Messaging { get; }

36

src/WixToolset.Core/CommandLine/DecompileCommand.cs

+2 -2

@@ -16,7 +16,7 @@ namespace WixToolset.Core.CommandLine

16 {

17 private readonly CommandLine commandLine;

18

19 - public DecompileCommand(IWixToolsetServiceProvider serviceProvider)

19 + public DecompileCommand(IServiceProvider serviceProvider)

20 {

21 this.ServiceProvider = serviceProvider;

22 this.Messaging = serviceProvider.GetService<IMessaging>();

@@ -27,7 +27,7 @@ namespace WixToolset.Core.CommandLine

27

28 public bool StopParsing => this.commandLine.ShowHelp;

29

30 - private IWixToolsetServiceProvider ServiceProvider { get; }

30 + private IServiceProvider ServiceProvider { get; }

31

32 public IMessaging Messaging { get; }

33

src/WixToolset.Core/CompileContext.cs

+3 -3

@@ -2,22 +2,22 @@

2

3 namespace WixToolset.Core

4 {

5 + using System;

6 using System.Collections.Generic;

7 using System.Threading;

8 using System.Xml.Linq;

9 using WixToolset.Data;

10 using WixToolset.Extensibility;

11 using WixToolset.Extensibility.Data;

11 - using WixToolset.Extensibility.Services;

12

13 internal class CompileContext : ICompileContext

14 {

15 - internal CompileContext(IWixToolsetServiceProvider serviceProvider)

15 + internal CompileContext(IServiceProvider serviceProvider)

16 {

17 this.ServiceProvider = serviceProvider;

18 }

19

20 - public IWixToolsetServiceProvider ServiceProvider { get; }

20 + public IServiceProvider ServiceProvider { get; }

21

22 public string CompilationId { get; set; }

23

src/WixToolset.Core/Compiler.cs

+4 -4

@@ -57,7 +57,7 @@ namespace WixToolset.Core

57 Icon,

58 }

59

60 - internal Compiler(IWixToolsetServiceProvider serviceProvider)

60 + internal Compiler(IServiceProvider serviceProvider)

61 {

62 this.Messaging = serviceProvider.GetService<IMessaging>();

63 }

@@ -4298,9 +4298,9 @@ namespace WixToolset.Core

4298 }

4299 }

4300 else if ("TARGETDIR".Equals(id.Id, StringComparison.Ordinal) && !("SourceDir".Equals(name, StringComparison.Ordinal) && shortName == null && shortSourceName == null && sourceName == null))

4301 - {

4302 - this.Core.Write(ErrorMessages.IllegalTargetDirDefaultDir(sourceLineNumbers, name));

4303 - }

4301 + {

4302 + this.Core.Write(ErrorMessages.IllegalTargetDirDefaultDir(sourceLineNumbers, name));

4303 + }

4304

4305 // Update the file source path appropriately.

4306 if (fileSourceAttribSet)

src/WixToolset.Core/DecompileContext.cs

+2 -2

@@ -11,12 +11,12 @@ namespace WixToolset.Core

11

12 internal class DecompileContext : IDecompileContext

13 {

14 - internal DecompileContext(IWixToolsetServiceProvider serviceProvider)

14 + internal DecompileContext(IServiceProvider serviceProvider)

15 {

16 this.ServiceProvider = serviceProvider;

17 }

18

19 - public IWixToolsetServiceProvider ServiceProvider { get; }

19 + public IServiceProvider ServiceProvider { get; }

20

21 public string DecompilePath { get; set; }

22

src/WixToolset.Core/Decompiler.cs

+2 -2

@@ -12,12 +12,12 @@ namespace WixToolset.Core

12 /// </summary>

13 internal class Decompiler : IDecompiler

14 {

15 - internal Decompiler(IWixToolsetServiceProvider serviceProvider)

15 + internal Decompiler(IServiceProvider serviceProvider)

16 {

17 this.ServiceProvider = serviceProvider;

18 }

19

20 - public IWixToolsetServiceProvider ServiceProvider { get; }

20 + public IServiceProvider ServiceProvider { get; }

21

22 public IDecompileResult Decompile(IDecompileContext context)

23 {

src/WixToolset.Core/ExtensibilityServices/BackendHelper.cs

+1 -1

@@ -16,7 +16,7 @@ namespace WixToolset.Core.ExtensibilityServices

16 {

17 private static readonly string[] ReservedFileNames = { "CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9" };

18

19 - public BackendHelper(IWixToolsetServiceProvider serviceProvider)

19 + public BackendHelper(IServiceProvider serviceProvider)

20 {

21 this.Messaging = serviceProvider.GetService<IMessaging>();

22 }

src/WixToolset.Core/ExtensibilityServices/ParseHelper.cs

+2 -2

@@ -18,14 +18,14 @@ namespace WixToolset.Core.ExtensibilityServices

18 {

19 private static readonly char[] InlineDirectorySeparators = new char[] { ':', '\\', '/' };

20

21 - public ParseHelper(IWixToolsetServiceProvider serviceProvider)

21 + public ParseHelper(IServiceProvider serviceProvider)

22 {

23 this.ServiceProvider = serviceProvider;

24

25 this.Messaging = serviceProvider.GetService<IMessaging>();

26 }

27

28 - private IWixToolsetServiceProvider ServiceProvider { get; }

28 + private IServiceProvider ServiceProvider { get; }

29

30 private IMessaging Messaging { get; }

31

src/WixToolset.Core/ExtensibilityServices/PreprocessHelper.cs

+6 -6

@@ -17,14 +17,14 @@ namespace WixToolset.Core.ExtensibilityServices

17 private static readonly char[] VariableSplitter = new char[] { '.' };

18 private static readonly char[] ArgumentSplitter = new char[] { ',' };

19

20 - public PreprocessHelper(IWixToolsetServiceProvider serviceProvider)

20 + public PreprocessHelper(IServiceProvider serviceProvider)

21 {

22 this.ServiceProvider = serviceProvider;

23

24 this.Messaging = this.ServiceProvider.GetService<IMessaging>();

25 }

26

27 - private IWixToolsetServiceProvider ServiceProvider { get; }

27 + private IServiceProvider ServiceProvider { get; }

28

29 private IMessaging Messaging { get; }

30

@@ -133,7 +133,7 @@ namespace WixToolset.Core.ExtensibilityServices

133 }

134

135 default:

136 - var extensionsByPrefix = this.GetExtensionsByPrefix(context);

136 + var extensionsByPrefix = this.GetExtensionsByPrefix();

137 if (extensionsByPrefix.TryGetValue(prefix, out var extension))

138 {

139 try

@@ -259,7 +259,7 @@ namespace WixToolset.Core.ExtensibilityServices

259 return context.Variables.TryGetValue(name, out var result) ? result : null;

260

261 default:

262 - var extensionsByPrefix = this.GetExtensionsByPrefix(context);

262 + var extensionsByPrefix = this.GetExtensionsByPrefix();

263 if (extensionsByPrefix.TryGetValue(prefix, out var extension))

264 {

265 try

@@ -309,7 +309,7 @@ namespace WixToolset.Core.ExtensibilityServices

309 break;

310

311 default:

312 - var extensionsByPrefix = this.GetExtensionsByPrefix(context);

312 + var extensionsByPrefix = this.GetExtensionsByPrefix();

313 if (extensionsByPrefix.TryGetValue(prefix, out var extension))

314 {

315 if (!extension.ProcessPragma(prefix, pragma, args, parent))

@@ -468,7 +468,7 @@ namespace WixToolset.Core.ExtensibilityServices

468 }

469 }

470

471 - private Dictionary<string, IPreprocessorExtension> GetExtensionsByPrefix(IPreprocessContext context)

471 + private Dictionary<string, IPreprocessorExtension> GetExtensionsByPrefix()

472 {

473 if (this.ExtensionsByPrefix == null)

474 {

src/WixToolset.Core/ExtensibilityServices/SymbolDefinitionCreator.cs

+2 -2

@@ -10,12 +10,12 @@ namespace WixToolset.Core.ExtensibilityServices

10

11 internal class SymbolDefinitionCreator : ISymbolDefinitionCreator

12 {

13 - public SymbolDefinitionCreator(IWixToolsetServiceProvider serviceProvider)

13 + public SymbolDefinitionCreator(IServiceProvider serviceProvider)

14 {

15 this.ServiceProvider = serviceProvider;

16 }

17

18 - private IWixToolsetServiceProvider ServiceProvider { get; }

18 + private IServiceProvider ServiceProvider { get; }

19

20 private IEnumerable<IExtensionData> ExtensionData { get; set; }

21

src/WixToolset.Core/IncribeContext.cs

+2 -2

@@ -8,12 +8,12 @@ namespace WixToolset.Core

8

9 internal class InscribeContext : IInscribeContext

10 {

11 - public InscribeContext(IWixToolsetServiceProvider serviceProvider)

11 + public InscribeContext(IServiceProvider serviceProvider)

12 {

13 this.ServiceProvider = serviceProvider;

14 }

15

16 - public IWixToolsetServiceProvider ServiceProvider { get; }

16 + public IServiceProvider ServiceProvider { get; }

17

18 public string IntermediateFolder { get; set; }

19

src/WixToolset.Core/LayoutContext.cs

+3 -3

@@ -2,20 +2,20 @@

2

3 namespace WixToolset.Core

4 {

5 + using System;

6 using System.Collections.Generic;

7 using System.Threading;

8 using WixToolset.Extensibility;

9 using WixToolset.Extensibility.Data;

9 - using WixToolset.Extensibility.Services;

10

11 internal class LayoutContext : ILayoutContext

12 {

13 - internal LayoutContext(IWixToolsetServiceProvider serviceProvider)

13 + internal LayoutContext(IServiceProvider serviceProvider)

14 {

15 this.ServiceProvider = serviceProvider;

16 }

17

18 - public IWixToolsetServiceProvider ServiceProvider { get; }

18 + public IServiceProvider ServiceProvider { get; }

19

20 public IEnumerable<ILayoutExtension> Extensions { get; set; }

21

src/WixToolset.Core/LayoutCreator.cs

+2 -2

@@ -16,14 +16,14 @@ namespace WixToolset.Core

16 /// </summary>

17 internal class LayoutCreator : ILayoutCreator

18 {

19 - internal LayoutCreator(IWixToolsetServiceProvider serviceProvider)

19 + internal LayoutCreator(IServiceProvider serviceProvider)

20 {

21 this.ServiceProvider = serviceProvider;

22

23 this.Messaging = serviceProvider.GetService<IMessaging>();

24 }

25

26 - private IWixToolsetServiceProvider ServiceProvider { get; }

26 + private IServiceProvider ServiceProvider { get; }

27

28 private IMessaging Messaging { get; }

29

src/WixToolset.Core/Librarian.cs

+2 -2

@@ -16,14 +16,14 @@ namespace WixToolset.Core

16 /// </summary>

17 internal class Librarian : ILibrarian

18 {

19 - internal Librarian(IWixToolsetServiceProvider serviceProvider)

19 + internal Librarian(IServiceProvider serviceProvider)

20 {

21 this.ServiceProvider = serviceProvider;

22

23 this.Messaging = this.ServiceProvider.GetService<IMessaging>();

24 }

25

26 - private IWixToolsetServiceProvider ServiceProvider { get; }

26 + private IServiceProvider ServiceProvider { get; }

27

28 private IMessaging Messaging { get; }

29

src/WixToolset.Core/LibraryContext.cs

+3 -2

@@ -2,6 +2,7 @@

2

3 namespace WixToolset.Core

4 {

5 + using System;

6 using System.Collections.Generic;

7 using System.Threading;

8 using WixToolset.Data;

@@ -11,12 +12,12 @@ namespace WixToolset.Core

12

13 internal class LibraryContext : ILibraryContext

14 {

14 - internal LibraryContext(IWixToolsetServiceProvider serviceProvider)

15 + internal LibraryContext(IServiceProvider serviceProvider)

16 {

17 this.ServiceProvider = serviceProvider;

18 }

19

19 - public IWixToolsetServiceProvider ServiceProvider { get; }

20 + public IServiceProvider ServiceProvider { get; }

21

22 public IMessaging Messaging { get; set; }

23

src/WixToolset.Core/LinkContext.cs

+3 -2

@@ -2,6 +2,7 @@

2

3 namespace WixToolset.Core

4 {

5 + using System;

6 using System.Collections.Generic;

7 using System.Threading;

8 using WixToolset.Data;

@@ -11,12 +12,12 @@ namespace WixToolset.Core

12

13 internal class LinkContext : ILinkContext

14 {

14 - internal LinkContext(IWixToolsetServiceProvider serviceProvider)

15 + internal LinkContext(IServiceProvider serviceProvider)

16 {

17 this.ServiceProvider = serviceProvider;

18 }

19

19 - public IWixToolsetServiceProvider ServiceProvider { get; }

20 + public IServiceProvider ServiceProvider { get; }

21

22 public IEnumerable<ILinkerExtension> Extensions { get; set; }

23

src/WixToolset.Core/Linker.cs

+2 -2

@@ -27,14 +27,14 @@ namespace WixToolset.Core

27 /// <summary>

28 /// Creates a linker.

29 /// </summary>

30 - internal Linker(IWixToolsetServiceProvider serviceProvider)

30 + internal Linker(IServiceProvider serviceProvider)

31 {

32 this.ServiceProvider = serviceProvider;

33 this.Messaging = this.ServiceProvider.GetService<IMessaging>();

34 this.sectionIdOnRows = true; // TODO: what is the correct value for this?

35 }

36

37 - private IWixToolsetServiceProvider ServiceProvider { get; }

37 + private IServiceProvider ServiceProvider { get; }

38

39 private IMessaging Messaging { get; }

40

src/WixToolset.Core/LocalizationParser.cs

+1 -1

@@ -15,7 +15,7 @@ namespace WixToolset.Core

15 public static readonly XNamespace WxlNamespace = "http://wixtoolset.org/schemas/v4/wxl";

16 private const string XmlElementName = "WixLocalization";

17

18 - internal LocalizationParser(IWixToolsetServiceProvider serviceProvider)

18 + internal LocalizationParser(IServiceProvider serviceProvider)

19 {

20 this.Messaging = serviceProvider.GetService<IMessaging>();

21 }

src/WixToolset.Core/PreprocessContext.cs

+3 -3

@@ -2,21 +2,21 @@

2

3 namespace WixToolset.Core

4 {

5 + using System;

6 using System.Collections.Generic;

7 using System.Threading;

8 using WixToolset.Data;

9 using WixToolset.Extensibility;

10 using WixToolset.Extensibility.Data;

10 - using WixToolset.Extensibility.Services;

11

12 internal class PreprocessContext : IPreprocessContext

13 {

14 - internal PreprocessContext(IWixToolsetServiceProvider serviceProvider)

14 + internal PreprocessContext(IServiceProvider serviceProvider)

15 {

16 this.ServiceProvider = serviceProvider;

17 }

18

19 - public IWixToolsetServiceProvider ServiceProvider { get; }

19 + public IServiceProvider ServiceProvider { get; }

20

21 public IEnumerable<IPreprocessorExtension> Extensions { get; set; }

22

src/WixToolset.Core/Preprocessor.cs

+3 -3

@@ -37,14 +37,14 @@ namespace WixToolset.Core

37 XmlResolver = null,

38 };

39

40 - internal Preprocessor(IWixToolsetServiceProvider serviceProvider)

40 + internal Preprocessor(IServiceProvider serviceProvider)

41 {

42 this.ServiceProvider = serviceProvider;

43

44 this.Messaging = this.ServiceProvider.GetService<IMessaging>();

45 }

46

47 - private IWixToolsetServiceProvider ServiceProvider { get; }

47 + private IServiceProvider ServiceProvider { get; }

48

49 private IMessaging Messaging { get; }

50

@@ -1489,7 +1489,7 @@ namespace WixToolset.Core

1489

1490 private class ProcessingState

1491 {

1492 - public ProcessingState(IWixToolsetServiceProvider serviceProvider, IPreprocessContext context)

1492 + public ProcessingState(IServiceProvider serviceProvider, IPreprocessContext context)

1493 {

1494 var path = Path.GetFullPath(context.SourcePath);

1495

src/WixToolset.Core/ResolveContext.cs

+3 -2

@@ -2,6 +2,7 @@

2

3 namespace WixToolset.Core

4 {

5 + using System;

6 using System.Collections.Generic;

7 using System.Threading;

8 using WixToolset.Data;

@@ -11,12 +12,12 @@ namespace WixToolset.Core

12

13 internal class ResolveContext : IResolveContext

14 {

14 - internal ResolveContext(IWixToolsetServiceProvider serviceProvider)

15 + internal ResolveContext(IServiceProvider serviceProvider)

16 {

17 this.ServiceProvider = serviceProvider;

18 }

19

19 - public IWixToolsetServiceProvider ServiceProvider { get; }

20 + public IServiceProvider ServiceProvider { get; }

21

22 public IEnumerable<IBindPath> BindPaths { get; set; }

23

src/WixToolset.Core/Resolver.cs

+2 -2

@@ -17,7 +17,7 @@ namespace WixToolset.Core

17 /// </summary>

18 internal class Resolver : IResolver

19 {

20 - internal Resolver(IWixToolsetServiceProvider serviceProvider)

20 + internal Resolver(IServiceProvider serviceProvider)

21 {

22 this.ServiceProvider = serviceProvider;

23

@@ -26,7 +26,7 @@ namespace WixToolset.Core

26 this.VariableResolver = serviceProvider.GetService<IVariableResolver>();

27 }

28

29 - private IWixToolsetServiceProvider ServiceProvider { get; }

29 + private IServiceProvider ServiceProvider { get; }

30

31 private IMessaging Messaging { get; }

32

src/WixToolset.Core/UnbindContext.cs

+3 -3

@@ -2,17 +2,17 @@

2

3 namespace WixToolset.Core

4 {

5 + using System;

6 using WixToolset.Extensibility.Data;

6 - using WixToolset.Extensibility.Services;

7

8 internal class UnbindContext : IUnbindContext

9 {

10 - internal UnbindContext(IWixToolsetServiceProvider serviceProvider)

10 + internal UnbindContext(IServiceProvider serviceProvider)

11 {

12 this.ServiceProvider = serviceProvider;

13 }

14

15 - public IWixToolsetServiceProvider ServiceProvider { get; }

15 + public IServiceProvider ServiceProvider { get; }

16

17 public string ExportBasePath { get; set; }

18

src/WixToolset.Core/Unbinder.cs

+3 -2

@@ -2,6 +2,7 @@

2

3 namespace WixToolset.Core

4 {

5 + using System;

6 using System.Collections.Generic;

7 using System.IO;

8 using WixToolset.Data;

@@ -13,7 +14,7 @@ namespace WixToolset.Core

14 /// </summary>

15 internal sealed class Unbinder : IUnbinder

16 {

16 - public Unbinder(IWixToolsetServiceProvider serviceProvider)

17 + public Unbinder(IServiceProvider serviceProvider)

18 {

19 this.ServiceProvider = serviceProvider;

20

@@ -21,7 +22,7 @@ namespace WixToolset.Core

22 this.BackendFactories = extensionManager.GetServices<IBackendFactory>();

23 }

24

24 - public IWixToolsetServiceProvider ServiceProvider { get; }

25 + public IServiceProvider ServiceProvider { get; }

26

27 public IEnumerable<IBackendFactory> BackendFactories { get; }

28

src/WixToolset.Core/VariableResolver.cs

+2 -2

@@ -21,7 +21,7 @@ namespace WixToolset.Core

21 /// <summary>

22 /// Instantiate a new VariableResolver.

23 /// </summary>

24 - internal VariableResolver(IWixToolsetServiceProvider serviceProvider)

24 + internal VariableResolver(IServiceProvider serviceProvider)

25 {

26 this.ServiceProvider = serviceProvider;

27 this.Messaging = serviceProvider.GetService<IMessaging>();

@@ -31,7 +31,7 @@ namespace WixToolset.Core

31 this.localizedControls = new Dictionary<string, LocalizedControl>();

32 }

33

34 - private IWixToolsetServiceProvider ServiceProvider { get; }

34 + private IServiceProvider ServiceProvider { get; }

35

36 private IMessaging Messaging { get; }

37

src/WixToolset.Core/WixToolsetServiceProvider.cs

+3 -20

@@ -73,14 +73,14 @@ namespace WixToolset.Core

73

74 private Dictionary<Type, object> Singletons { get; }

75

76 - public bool TryGetService(Type serviceType, out object service)

76 + public object GetService(Type serviceType)

77 {

78 if (serviceType == null)

79 {

80 throw new ArgumentNullException(nameof(serviceType));

81 }

82

83 - if (!this.Singletons.TryGetValue(serviceType, out service))

83 + if (!this.Singletons.TryGetValue(serviceType, out var service))

84 {

85 if (this.CreationFunctions.TryGetValue(serviceType, out var creationFunction))

86 {

@@ -95,24 +95,7 @@ namespace WixToolset.Core

95 }

96 }

97

98 - return service != null;

99 - }

100 -

101 - public bool TryGetService<T>(out T service) where T : class

102 - {

103 - var success = this.TryGetService(typeof(T), out var untypedService);

104 - service = (T)untypedService;

105 - return success;

106 - }

107 -

108 - public object GetService(Type serviceType)

109 - {

110 - return this.TryGetService(serviceType, out var service) ? service : throw new ArgumentException($"Unknown service type: {serviceType.Name}", nameof(serviceType));

111 - }

112 -

113 - public T GetService<T>() where T : class

114 - {

115 - return (T)this.GetService(typeof(T));

98 + return service;

99 }

100

101 public void AddService(Type serviceType, Func<IWixToolsetCoreServiceProvider, Dictionary<Type, object>, object> creationFunction)

src/test/WixToolsetTest.CoreIntegration/BundleExtractionFixture.cs

+1

@@ -8,6 +8,7 @@ namespace WixToolsetTest.CoreIntegration

8 using WixToolset.Core;

9 using WixToolset.Core.TestPackage;

10 using WixToolset.Data;

11 + using WixToolset.Extensibility.Services;

12 using Xunit;

13

14 public class BundleExtractionFixture

src/test/WixToolsetTest.CoreIntegration/PreprocessorFixture.cs

+1

@@ -10,6 +10,7 @@ namespace WixToolsetTest.CoreIntegration

10 using WixToolset.Data;

11 using WixToolset.Data.Symbols;

12 using WixToolset.Extensibility.Data;

13 + using WixToolset.Extensibility.Services;

14 using Xunit;

15

16 public class PreprocessorFixture

Remove use of removed IWixToolsetServiceProvider