diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs index 22b8bc99d..9548583bb 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/ViewModels/Base/ViewModelLocator.cs @@ -42,11 +42,11 @@ namespace eShopOnContainers.Core.ViewModels.Base { _container = new TinyIoCContainer(); - // View models + // View models - by default, TinyIoC will register concrete classes as multi-instance. _container.Register(); _container.Register(); _container.Register(); - _container.Register(); + _container.Register().AsSingleton(); _container.Register(); _container.Register(); _container.Register(); @@ -54,21 +54,21 @@ namespace eShopOnContainers.Core.ViewModels.Base _container.Register(); _container.Register(); - // Services - _container.Register().AsSingleton(); + // Services - by default, TinyIoC will register interface registrations as singletons. + _container.Register(); _container.Register(); _container.Register(); _container.Register(); - _container.Register(); + _container.Register().AsMultiInstance(); _container.Register(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); + _container.Register(); + _container.Register(); + _container.Register(); + _container.Register(); + _container.Register(); + _container.Register(); + _container.Register(); + _container.Register(); } public static void UpdateDependencies(bool useMockServices) @@ -76,21 +76,21 @@ namespace eShopOnContainers.Core.ViewModels.Base // Change injected dependencies if (useMockServices) { - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); + _container.Register(); + _container.Register(); + _container.Register(); + _container.Register(); + _container.Register(); UseMockService = true; } else { - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); - _container.Register().AsSingleton(); + _container.Register(); + _container.Register(); + _container.Register(); + _container.Register(); + _container.Register(); UseMockService = false; }