Solved 2 bugs

1. Context Delegate Subscribe failed when running from thread pool thread. Created a static exec method that returns the current TaskScheuler becuase the SynchronizationContext was null 2. RegisterService TFrom, TTO caused a bug in the init routine, it caused the service to be created twice.
kobi2294 · May 30, 2019 · 0334906 · 0334906
1 parent 6e9da74
commit 0334906
Show file tree

Hide file tree

Showing 23 changed files with 190 additions and 37 deletions.
diff --git a/Extensions/MvvmKitAppSample/Bootstrapper.cs b/Extensions/MvvmKitAppSample/Bootstrapper.cs
@@ -6,6 +6,9 @@
 using System.Text;
 using System.Threading.Tasks;
 using MvvmKitAppSample.Services;
+using Unity;
+using System.Diagnostics;
+using System.Threading;
 
 namespace MvvmKitAppSample
 {
@@ -16,11 +19,18 @@ protected override async Task ConfigureContainerOverride()
             await base.ConfigureContainerOverride();
             await Navigation.RegisterStaticRegions(typeof(GlobalNav));
             RegisterService<IUiService, UiService>();
+            RegisterService<BackgroundService>();
+            RegisterService<IBgService2, BgService2>();
+            RegisterService<IBgService1, BgService1>();
         }
 
         protected override async Task InitializeShellOverride()
         {
             await base.InitializeShellOverride();
+
+            var bgs = Container.Resolve<BackgroundService>();
+            var uis = Container.Resolve<IUiService>();
+
             await Navigation.RouteTo(GlobalNav.ShellRoutes.Shell);
             await Navigation.RouteTo(GlobalNav.Main, GlobalNav.MainRoutes.One);
             await Navigation.RouteTo(GlobalNav.Gain, GlobalNav.MainRoutes.Two);

diff --git a/Extensions/MvvmKitAppSample/Components/Shell/ShellVm.cs b/Extensions/MvvmKitAppSample/Components/Shell/ShellVm.cs
@@ -68,23 +68,23 @@ protected override async Task OnInitialized(object param)
             var i = await _service.MyNumber.Get();
             await _service.MyNumber.Set(43);
 
-            await _service.PropName.Changed.Subscribe(this, val =>
-            {
-                Debug.WriteLine("PropName was changed to " + val);
-                return Tasks.Empty;
-            });
-
-            await _service.A.Changed.Subscribe(this, val =>
-            {
-                Debug.WriteLine("service.A = " + val);
-                return Tasks.Empty;
-            });
-
-            await _service.OnMyBrithday.Subscribe(this, val =>
-            {
-                Debug.WriteLine("All is well" + val);
-                return Task.CompletedTask;
-            });
+            //await _service.PropName.Changed.Subscribe(this, val =>
+            //{
+            //    Debug.WriteLine("PropName was changed to " + val);
+            //    return Tasks.Empty;
+            //});
+
+            //await _service.A.Changed.Subscribe(this, val =>
+            //{
+            //    Debug.WriteLine("service.A = " + val);
+            //    return Tasks.Empty;
+            //});
+
+            //await _service.OnMyBrithday.Subscribe(this, val =>
+            //{
+            //    Debug.WriteLine("All is well" + val);
+            //    return Task.CompletedTask;
+            //});
 
             await Navigation.RegisterRegion(MyRegion);
             await Navigation.NavigateTo<PageOneVm>(MyRegion);

diff --git a/Extensions/MvvmKitAppSample/MvvmKitAppSample.csproj b/Extensions/MvvmKitAppSample/MvvmKitAppSample.csproj
@@ -68,6 +68,10 @@
     </Compile>
     <Compile Include="Components\PageTwo\PageTwoVm.cs" />
     <Compile Include="Services\BackgroundService.cs" />
+    <Compile Include="Services\BgService1.cs" />
+    <Compile Include="Services\BgService2.cs" />
+    <Compile Include="Services\IBgService1.cs" />
+    <Compile Include="Services\IBgService2.cs" />
     <Compile Include="Services\IUiService.cs" />
     <Compile Include="Services\UiService.cs" />
   </ItemGroup>

diff --git a/Extensions/MvvmKitAppSample/Services/BackgroundService.cs b/Extensions/MvvmKitAppSample/Services/BackgroundService.cs
@@ -1,8 +1,10 @@
 using MvvmKit;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Unity;
 
@@ -20,10 +22,13 @@ public class BackgroundService: BackgroundServiceBase
 
 
         private readonly ServiceField<bool> _PropName = true;
+
         public ServiceProperty<bool> PropName { get => (_PropName, this); }
 
         public AsyncEvent<DateTime> OnMyBrithday { get; } = new AsyncEvent<DateTime>(DateTime.Now);
 
+        private IUiService _uiService;
+
         public BackgroundService()
         {
         }
@@ -34,16 +39,21 @@ protected override async Task OnInit()
         }
 
         [InjectionMethod]
-        public void Inject()
+        public void Inject(IUiService uiService)
         {
             // store dependencies here
+            _uiService = uiService;
         }
 
         public Task Method()
         {
             return Run(async () =>
             {
+                Debug.WriteLine("I am in a ba service, thread = " + Thread.CurrentThread.ManagedThreadId);
+
                 await _A.Set(_A.Value + 1);
+
+                await _uiService.Method();
             }, true);
         }
     }

diff --git a/Extensions/MvvmKitAppSample/Services/BgService1.cs b/Extensions/MvvmKitAppSample/Services/BgService1.cs
@@ -0,0 +1,45 @@
+using MvvmKit;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Unity;
+
+namespace MvvmKitAppSample.Services
+{
+    public class BgService1 : BackgroundServiceBase, IBgService1
+    {
+        private IBgService2 _svc;
+
+        protected override async Task OnInit()
+        {
+            await base.OnInit();
+
+            // init logic here
+            await _svc.OnString.Subscribe(this, OnString);
+        }
+
+        private async Task OnString(string arg)
+        {
+            await Task.Delay(1000);
+            Debug.WriteLine("Hey Baby! " + arg);
+        }
+
+        [InjectionMethod]
+        public void Inject(IBgService2 svc)
+        {
+            // store dependencies here
+            _svc = svc;
+        }
+
+        public Task Method()
+        {
+            return Run(() =>
+            {
+                // your logic here
+            });
+        }
+    }
+}
diff --git a/Extensions/MvvmKitAppSample/Services/BgService2.cs b/Extensions/MvvmKitAppSample/Services/BgService2.cs
@@ -0,0 +1,44 @@
+using MvvmKit;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Unity;
+
+namespace MvvmKitAppSample.Services
+{
+    public class BgService2 : BackgroundServiceBase, IBgService2
+    {
+        public AsyncEvent<string> OnString { get; } = new AsyncEvent<string>("First Value");
+
+        protected override async Task OnInit()
+        {
+            await base.OnInit();
+
+            // init logic here
+        }
+
+        public static int counter = 0;
+        public int id;
+
+        public BgService2()
+        {
+            id = ++counter;
+        }
+
+        [InjectionMethod]
+        public void Inject()
+        {
+            // store dependencies here
+        }
+
+        public Task Method()
+        {
+            return Run(() =>
+            {
+                // your logic here
+            });
+        }
+    }
+}
diff --git a/Extensions/MvvmKitAppSample/Services/IBgService1.cs b/Extensions/MvvmKitAppSample/Services/IBgService1.cs
@@ -0,0 +1,9 @@
+using System.Threading.Tasks;
+
+namespace MvvmKitAppSample.Services
+{
+    public interface IBgService1
+    {
+        Task Method();
+    }
+}
diff --git a/Extensions/MvvmKitAppSample/Services/IBgService2.cs b/Extensions/MvvmKitAppSample/Services/IBgService2.cs
@@ -0,0 +1,12 @@
+using System.Threading.Tasks;
+using MvvmKit;
+
+namespace MvvmKitAppSample.Services
+{
+    public interface IBgService2
+    {
+        AsyncEvent<string> OnString { get; }
+
+        Task Method();
+    }
+}
diff --git a/Extensions/MvvmKitAppSample/Services/UiService.cs b/Extensions/MvvmKitAppSample/Services/UiService.cs
@@ -1,8 +1,10 @@
 using MvvmKit;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Unity;
 
@@ -27,6 +29,7 @@ public Task Method()
         {
             return Run(() =>
             {
+                Debug.WriteLine("I am in UI Service, Thread = " + Thread.CurrentThread.ManagedThreadId);
                 // your logic here
             });
         }

diff --git a/Extensions/MvvmKitExtension/ProjectTemplates/Mvvm/An MvvmKit Application.zip b/Extensions/MvvmKitExtension/ProjectTemplates/Mvvm/An MvvmKit Application.zip
diff --git a/...ons/MvvmKitExtension/ProjectTemplates/Mvvm/An MvvmKit Application/MvvmKitAppSample.csproj b/...ons/MvvmKitExtension/ProjectTemplates/Mvvm/An MvvmKit Application/MvvmKitAppSample.csproj
@@ -108,7 +108,7 @@
 
   <ItemGroup>
     <PackageReference Include="MvvmKit">
-      <Version>1.0.0.18</Version>
+      <Version>1.0.0.20</Version>
     </PackageReference>
     <PackageReference Include="Unity">
       <Version>5.10.3</Version>

diff --git a/Extensions/MvvmKitExtension/source.extension.vsixmanifest b/Extensions/MvvmKitExtension/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
     <Metadata>
-        <Identity Id="MvvmKit Extension.fca60f99-6a29-4936-a072-ba741fee533f" Version="2.18" Language="en-US" Publisher="Kobi Hari" />
+        <Identity Id="MvvmKit Extension.fca60f99-6a29-4936-a072-ba741fee533f" Version="2.20" Language="en-US" Publisher="Kobi Hari" />
         <DisplayName>MvvmKit Extension</DisplayName>
         <Description xml:space="preserve">An Extension for visual studio that contains templates and snippets that will help you develop an application using the MVVM Kit</Description>
         <MoreInfo>https://github.com/kobi2294/MvvmKit/wiki</MoreInfo>

diff --git a/Source/MvvmKit/Mvvm/Core/BootstrapperBase.cs b/Source/MvvmKit/Mvvm/Core/BootstrapperBase.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows;
 using Unity;
@@ -96,13 +97,17 @@ public async void Run()
 
             // init services
             var services = _servicesToInit.Select(type => Container.Resolve(type) as ServiceBase)
-                                          .Select(service => service.Init());
+                                          .Select(service => service.Init())
+                                          .ToList();
+
+            var ctxt = SynchronizationContext.Current;
 
             await OnServicesInitializing();
 
             await InitializeShellOverride();
 
             await Task.WhenAll(services);
+
             await OnServicesInitialized();
         }
 
@@ -129,7 +134,7 @@ protected void RegisterService<InterfaceType, ServiceType>(bool initService = tr
             Container.RegisterType<InterfaceType, ServiceType>(new ContainerControlledLifetimeManager());
             if (initService)
             {
-                _servicesToInit.Add(typeof(ServiceType));
+                _servicesToInit.Add(typeof(InterfaceType));
             }
         }
 

diff --git a/Source/MvvmKit/Mvvm/Core/DelegateCommand.cs b/Source/MvvmKit/Mvvm/Core/DelegateCommand.cs
@@ -24,7 +24,7 @@ public DelegateCommand(Action execute)
         /// </summary>
         /// <param name="execute">The <see cref="Action"/> to invoke when <see cref="ICommand.Execute"/> is called.</param>
         /// <param name="canExecute">The <see cref="Func{TResult}"/> to invoke when <see cref="ICommand.CanExecute"/> is called</param>
-        DelegateCommand(Action execute, Func<bool> canExecute)
+        public DelegateCommand(Action execute, Func<bool> canExecute)
             : base(execute, canExecute)
         {
         }

diff --git a/Source/MvvmKit/Properties/AssemblyInfo.cs b/Source/MvvmKit/Properties/AssemblyInfo.cs
@@ -51,7 +51,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.18")]
-[assembly: AssemblyFileVersion("1.0.0.18")]
+[assembly: AssemblyVersion("1.0.0.20")]
+[assembly: AssemblyFileVersion("1.0.0.20")]
 [assembly: NeutralResourcesLanguage("en")]
 
diff --git a/Source/MvvmKit/Tools/Async/ContextDelegates/AsyncEventT.cs b/Source/MvvmKit/Tools/Async/ContextDelegates/AsyncEventT.cs
@@ -18,6 +18,11 @@ public Task Subscribe(object owner, Func<T, Task> callback)
             return callback(LatestValue);
         }
 
+        public Task Subscribe(object onString)
+        {
+            throw new NotImplementedException();
+        }
+
         public Task Unsubscribe(object owner, Func<T, Task> callback = null)
         {
             if (callback == null)

diff --git a/Source/MvvmKit/Tools/Async/ContextDelegates/ContextAction.cs b/Source/MvvmKit/Tools/Async/ContextDelegates/ContextAction.cs
@@ -38,10 +38,10 @@ public ContextAction(TaskScheduler scheduler, object owner, Action action)
             : this(scheduler.ToContextRunner(), action.ToWeak(owner)) { }
 
         public ContextAction(WeakAction wa)
-            : this(TaskScheduler.FromCurrentSynchronizationContext(), wa) { }
+            : this(Exec.RunningTaskScheduler, wa) { }
 
         public ContextAction(object owner, Action a)
-            : this(TaskScheduler.FromCurrentSynchronizationContext(), a.ToWeak(owner)) { }
+            : this(Exec.RunningTaskScheduler, a.ToWeak(owner)) { }
 
         public Task Invoke()
         {

diff --git a/Source/MvvmKit/Tools/Async/ContextDelegates/ContextActionT.cs b/Source/MvvmKit/Tools/Async/ContextDelegates/ContextActionT.cs
@@ -38,10 +38,10 @@ public ContextAction(TaskScheduler scheduler, object owner, Action<T> action)
             : this(scheduler.ToContextRunner(), action.ToWeak(owner)) { }
 
         public ContextAction(WeakAction<T> wa)
-            : this(TaskScheduler.FromCurrentSynchronizationContext(), wa) { }
+            : this(Exec.RunningTaskScheduler, wa) { }
 
         public ContextAction(object owner, Action<T> a)
-            : this(TaskScheduler.FromCurrentSynchronizationContext(), a.ToWeak(owner)) { }
+            : this(Exec.RunningTaskScheduler, a.ToWeak(owner)) { }
 
 
         public Task Invoke(T arg)

diff --git a/Source/MvvmKit/Tools/Async/ContextDelegates/ContextActionT1T2.cs b/Source/MvvmKit/Tools/Async/ContextDelegates/ContextActionT1T2.cs
@@ -36,10 +36,10 @@ public ContextAction(TaskScheduler scheduler, object owner, Action<T1, T2> actio
             : this(scheduler.ToContextRunner(), action.ToWeak(owner)) { }
 
         public ContextAction(WeakAction<T1, T2> wa)
-            : this(TaskScheduler.FromCurrentSynchronizationContext(), wa) { }
+            : this(Exec.RunningTaskScheduler, wa) { }
 
         public ContextAction(object owner, Action<T1, T2> a)
-            : this(TaskScheduler.FromCurrentSynchronizationContext(), a.ToWeak(owner)) { }
+            : this(Exec.RunningTaskScheduler, a.ToWeak(owner)) { }
 
         public Task Invoke(T1 arg1, T2 arg2)
         {