Merge branch 'master' into dev/4.0.0

Caliburn-Micro · Oct 25, 2017 · 75ed8e6 · 75ed8e6
2 parents 66eb0f2 + 526a6c8
commit 75ed8e6
Show file tree

Hide file tree

Showing 30 changed files with 124 additions and 122 deletions.
diff --git a/nuget/Caliburn.Micro.Core.nuspec b/nuget/Caliburn.Micro.Core.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Caliburn.Micro.Core</id>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <authors>Rob Eisenberg, Marco Amendola, Chin Bae, Ryan Cromwell, Nigel Sampson, Thomas Ibel, Matt Hidinger</authors>
     <description>A small, yet powerful framework designed for Xaml platforms, Caliburn.Micro implements a variety of UI patterns for solving real-world problems. Patterns that are highlighted include MVVM (Presentation Model), MVP and MVC.</description>
     <language>en-US</language>

diff --git a/nuget/Caliburn.Micro.Start.nuspec b/nuget/Caliburn.Micro.Start.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Caliburn.Micro.Start</id>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <authors>Rob Eisenberg, Marco Amendola, Chin Bae, Ryan Cromwell, Nigel Sampson, Thomas Ibel, Matt Hidinger</authors>
     <description>A startup sample for Caliburn.Micro.</description>
     <language>en-US</language>
@@ -20,7 +20,7 @@
 
     <dependencies>
       <group>
-        <dependency id="Caliburn.Micro" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro" version="[3.2.0]" />
       </group>
     </dependencies>
   </metadata>

diff --git a/nuget/Caliburn.Micro.Xamarin.Forms.nuspec b/nuget/Caliburn.Micro.Xamarin.Forms.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Caliburn.Micro.Xamarin.Forms</id>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <authors>Rob Eisenberg, Marco Amendola, Chin Bae, Ryan Cromwell, Nigel Sampson, Thomas Ibel, Matt Hidinger</authors>
     <description>A small, yet powerful framework designed for Xaml platforms, Caliburn.Micro implements a variety of UI patterns for solving real-world problems. Patterns that are highlighted include MVVM (Presentation Model), MVP and MVC.</description>
     <language>en-US</language>
@@ -16,35 +16,35 @@
 
     <dependencies>
       <group>
-        <dependency id="Caliburn.Micro.Core" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro.Core" version="[3.2.0]" />
         <dependency id="Xamarin.Forms" version="2.0.1.6505" />
       </group>
       <group targetFramework="net45">
-        <dependency id="Caliburn.Micro" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro" version="[3.2.0]" />
         <dependency id="Xamarin.Forms" version="2.0.1.6505" />
       </group>
       <group targetFramework="win8">
-        <dependency id="Caliburn.Micro" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro" version="[3.2.0]" />
         <dependency id="Xamarin.Forms" version="2.0.1.6505" />
       </group>
       <group targetFramework="wp8">
-        <dependency id="Caliburn.Micro" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro" version="[3.2.0]" />
         <dependency id="Xamarin.Forms" version="2.0.1.6505" />
       </group>
       <group targetFramework="wpa81">
-        <dependency id="Caliburn.Micro" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro" version="[3.2.0]" />
         <dependency id="Xamarin.Forms" version="2.0.1.6505" />
       </group>
       <group targetFramework="MonoAndroid10">
-        <dependency id="Caliburn.Micro" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro" version="[3.2.0]" />
         <dependency id="Xamarin.Forms" version="2.0.1.6505" />
       </group>
       <group targetFramework="Xamarin.iOS10">
-        <dependency id="Caliburn.Micro" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro" version="[3.2.0]" />
         <dependency id="Xamarin.Forms" version="2.0.1.6505" />
       </group>
       <group targetFramework="MonoTouch10">
-        <dependency id="Caliburn.Micro" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro" version="[3.2.0]" />
         <dependency id="Xamarin.Forms" version="2.0.1.6505" />
       </group>
     </dependencies>

diff --git a/nuget/Caliburn.Micro.nuspec b/nuget/Caliburn.Micro.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>Caliburn.Micro</id>
-    <version>3.1.0</version>
+    <version>3.2.0</version>
     <authors>Rob Eisenberg, Marco Amendola, Chin Bae, Ryan Cromwell, Nigel Sampson, Thomas Ibel, Matt Hidinger</authors>
     <description>A small, yet powerful framework designed for Xaml platforms, Caliburn.Micro implements a variety of UI patterns for solving real-world problems. Patterns that are highlighted include MVVM (Presentation Model), MVP and MVC.</description>
     <language>en-US</language>
@@ -20,10 +20,10 @@
 
     <dependencies>
       <group>
-        <dependency id="Caliburn.Micro.Core" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro.Core" version="[3.2.0]" />
       </group>
       <group targetFramework="uap10.0">
-        <dependency id="Caliburn.Micro.Core" version="[3.1.0]" />
+        <dependency id="Caliburn.Micro.Core" version="[3.2.0]" />
         <dependency id="Microsoft.Xaml.Behaviors.Uwp.Managed" version="1.1.0" />
       </group>
     </dependencies>

diff --git a/samples/features/Features.CrossPlatform.Shared/Features.CrossPlatform.Shared.projitems b/samples/features/Features.CrossPlatform.Shared/Features.CrossPlatform.Shared.projitems
@@ -34,6 +34,5 @@
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\NavigationSourceViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\NavigationTargetViewModel.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)ViewModels\TabViewModel.cs" />
-    <Compile Include="$(MSBuildThisFileDirectory)ViewModels\ViewModelExtensions.cs" />
   </ItemGroup>
 </Project>
diff --git a/samples/features/Features.CrossPlatform.Shared/ViewModels/ActionsViewModel.cs b/samples/features/Features.CrossPlatform.Shared/ViewModels/ActionsViewModel.cs
@@ -28,7 +28,7 @@ public Task SayGoodbyeAsync(string name)
         public string Output
         {
             get { return output; }
-            set { this.Set(ref output, value); }
+            set { Set(ref output, value); }
         }
     }
 }
diff --git a/samples/features/Features.CrossPlatform.Shared/ViewModels/BindingsViewModel.cs b/samples/features/Features.CrossPlatform.Shared/ViewModels/BindingsViewModel.cs
@@ -24,7 +24,7 @@ public BindingsViewModel()
         public ActivityBaseViewModel SelectedActivity
         {
             get { return selectedActivity; }
-            set { this.Set(ref selectedActivity, value); }
+            set { Set(ref selectedActivity, value); }
         }
     }
 }
diff --git a/samples/features/Features.CrossPlatform.Shared/ViewModels/Events/EventSourceViewModel.cs b/samples/features/Features.CrossPlatform.Shared/ViewModels/Events/EventSourceViewModel.cs
@@ -17,7 +17,7 @@ public EventSourceViewModel(IEventAggregator eventAggregator)
         public string Text
         {
             get { return text; }
-            set { this.Set(ref text, value); }
+            set { Set(ref text, value); }
         }
 
         public void Publish()

diff --git a/samples/features/Features.CrossPlatform.Shared/ViewModels/ExecuteViewModel.cs b/samples/features/Features.CrossPlatform.Shared/ViewModels/ExecuteViewModel.cs
@@ -12,7 +12,7 @@ public class ExecuteViewModel : Screen
         public bool Safe
         {
             get { return safe; }
-            set { this.Set(ref safe, value); }
+            set { Set(ref safe, value); }
         }
 
         public void StartBackgroundWork()

diff --git a/samples/features/Features.CrossPlatform.Shared/ViewModels/MenuViewModel.cs b/samples/features/Features.CrossPlatform.Shared/ViewModels/MenuViewModel.cs
@@ -22,7 +22,7 @@ public MenuViewModel(INavigationService navigationService)
                 new FeatureViewModel("Execute", "Using Execute to execute code on the UI thread.", typeof(ExecuteViewModel)),
                 new FeatureViewModel("Event Aggregator", "Send events between uncoupled view models.", typeof(EventAggregationViewModel)),
 #if !XAMARINFORMS
-                new FeatureViewModel("Design Time", "Conventions in the xaml desginer and design mode detection.", typeof(DesignTimeViewModel)),
+                new FeatureViewModel("Design Time", "Conventions in the xaml designer and design mode detection.", typeof(DesignTimeViewModel)),
 #endif
                 new FeatureViewModel("Conductors", "Composing view models together with lifecycle events", typeof(ConductorViewModel)),
                 new FeatureViewModel("Bubbling Actions", "How to bubble actions from a child view model to a parent", typeof(BubblingViewModel)),

diff --git a/samples/features/Features.CrossPlatform.Shared/ViewModels/NavigationSourceViewModel.cs b/samples/features/Features.CrossPlatform.Shared/ViewModels/NavigationSourceViewModel.cs
@@ -21,13 +21,13 @@ public NavigationSourceViewModel(INavigationService navigationService)
         public string Text
         {
             get { return text; }
-            set { this.Set(ref text, value); }
+            set { Set(ref text, value); }
         }
 
         public bool IsEnabled
         {
             get { return isEnabled; }
-            set { this.Set(ref isEnabled, value); }
+            set { Set(ref isEnabled, value); }
         }
 
         public void Navigate()

diff --git a/samples/features/Features.CrossPlatform.Shared/ViewModels/NavigationTargetViewModel.cs b/samples/features/Features.CrossPlatform.Shared/ViewModels/NavigationTargetViewModel.cs
@@ -11,13 +11,13 @@ public class NavigationTargetViewModel : Screen
         public string Text
         {
             get { return text; }
-            set { this.Set(ref text, value); }
+            set { Set(ref text, value); }
         }
 
         public bool IsEnabled
         {
             get { return isEnabled; }
-            set { this.Set(ref isEnabled, value); }
+            set { Set(ref isEnabled, value); }
         }
     }
 }
diff --git a/samples/features/Features.CrossPlatform.Shared/ViewModels/TabViewModel.cs b/samples/features/Features.CrossPlatform.Shared/ViewModels/TabViewModel.cs
@@ -22,7 +22,7 @@ protected override void OnActivate()
 
         protected override void OnDeactivate(bool close)
         {
-            Messages.Add($"Deactivted, close: {close}");
+            Messages.Add($"Deactivated, close: {close}");
         }
 
         public BindableCollection<string> Messages { get; }

diff --git a/samples/features/Features.CrossPlatform.Shared/ViewModels/ViewModelExtensions.cs b/samples/features/Features.CrossPlatform.Shared/ViewModels/ViewModelExtensions.cs
diff --git a/samples/setup/Setup.Android/readme.md b/samples/setup/Setup.Android/readme.md
@@ -2,10 +2,7 @@
 
 1. File > New Project > `New Blank App (Android)`.
 2. Add nuget package `Caliburn.Micro`.
-3. Delete `MainActivity`.
-4. Create `ViewModels` folder.
-5. Create new class `MainViewModel`.
-6. Add new empty storyboard `Views.storyboard` to the root folder.
-7. Add a new view controller to the storyboard.
-8. Set property `Class` on the view controller to `MainViewController`.
-9. In Project properties > iOS Application > set Main Interface to `Views.storyboard`.
+3. Create `ViewModels` and `Activities` folders.
+4. Create new class `MainViewModel` in the `ViewModels` folder.
+5. Move the Activity `MainActivity` to the `Activities` folder.
+6. Add a new class `Application` to the root folder.
diff --git a/samples/setup/Setup.iOS/readme.md b/samples/setup/Setup.iOS/readme.md
@@ -2,7 +2,9 @@
 
 1. File > New Project > `New Blank App (iOS)`.
 2. Add nuget package `Caliburn.Micro`.
-3. Create `ViewModels` and `Activities` folders.
-4. Create new class `MainViewModel` in the `ViewModels` folder.
-5. Move the Activity `MainActivity` to the `Activities` folder.
-6. Add a new class `Application` to the root folder.
+3. Create `ViewModels` folder.
+4. Create new class `MainViewModel`.
+5. Add new empty storyboard `Views.storyboard` to the root folder.
+6. Add a new view controller to the storyboard.
+7. Set property `Class` on the view controller to `MainViewController`.
+8. In Project properties > iOS Application > set Main Interface to `Views.storyboard`.
diff --git a/src/Caliburn.Micro.Core/Conductor.cs b/src/Caliburn.Micro.Core/Conductor.cs
@@ -60,7 +60,7 @@ public partial class Conductor<T> : ConductorBaseWithActiveItem<T> where T: clas
         /// <summary>
         /// Called when deactivating.
         /// </summary>
-        /// <param name="close">Inidicates whether this instance will be closed.</param>
+        /// <param name="close">Indicates whether this instance will be closed.</param>
         protected override void OnDeactivate(bool close) {
             ScreenExtensions.TryDeactivate(ActiveItem, close);
         }

diff --git a/src/Caliburn.Micro.Core/ConductorWithCollectionAllActive.cs b/src/Caliburn.Micro.Core/ConductorWithCollectionAllActive.cs
@@ -67,7 +67,7 @@ public AllActive(bool openPublicItems)
                 /// <summary>
                 /// Called when deactivating.
                 /// </summary>
-                /// <param name="close">Inidicates whether this instance will be closed.</param>
+                /// <param name="close">Indicates whether this instance will be closed.</param>
                 protected override void OnDeactivate(bool close) {
                     items.OfType<IDeactivate>().Apply(x => x.Deactivate(close));
                     if (close) {

diff --git a/src/Caliburn.Micro.Core/ConductorWithCollectionOneActive.cs b/src/Caliburn.Micro.Core/ConductorWithCollectionOneActive.cs
@@ -170,7 +170,7 @@ public class OneActive : ConductorBaseWithActiveItem<T> {
                 /// <summary>
                 /// Called when deactivating.
                 /// </summary>
-                /// <param name="close">Inidicates whether this instance will be closed.</param>
+                /// <param name="close">Indicates whether this instance will be closed.</param>
                 protected override void OnDeactivate(bool close) {
                     if (close) {
                         items.OfType<IDeactivate>().Apply(x => x.Deactivate(true));

diff --git a/src/Caliburn.Micro.Core/DefaultPlatformProvider.cs b/src/Caliburn.Micro.Core/DefaultPlatformProvider.cs
@@ -10,15 +10,15 @@ public class DefaultPlatformProvider : IPlatformProvider {
         /// <summary>
         /// Indicates whether or not the framework is in design-time mode.
         /// </summary>
-        public bool InDesignMode {
+        public virtual bool InDesignMode {
             get { return true; }
         }
 
         /// <summary>
         /// Executes the action on the UI thread asynchronously.
         /// </summary>
         /// <param name="action">The action to execute.</param>
-        public void BeginOnUIThread(Action action) {
+        public virtual void BeginOnUIThread(Action action) {
             action();
         }
 
@@ -27,15 +27,15 @@ public class DefaultPlatformProvider : IPlatformProvider {
         /// </summary>
         /// <param name="action">The action to execute.</param>
         /// <returns></returns>
-        public Task OnUIThreadAsync(Action action) {
+        public virtual Task OnUIThreadAsync(Action action) {
             return Task.Factory.StartNew(action);
         }
 
         /// <summary>
         /// Executes the action on the UI thread.
         /// </summary>
         /// <param name="action">The action to execute.</param>
-        public void OnUIThread(Action action) {
+        public virtual void OnUIThread(Action action) {
             action();
         }
 
@@ -52,7 +52,7 @@ public class DefaultPlatformProvider : IPlatformProvider {
         /// The WindowManager marks that element as a framework-created element so that it can determine what it created vs. what was intended by the developer.
         /// Calling GetFirstNonGeneratedView allows the framework to discover what the original element was.
         /// </remarks>
-        public object GetFirstNonGeneratedView(object view) {
+        public virtual object GetFirstNonGeneratedView(object view) {
             return view;
         }
 
@@ -62,7 +62,7 @@ public class DefaultPlatformProvider : IPlatformProvider {
         /// <param name="view">The view.</param>
         /// <param name="handler">The handler.</param>
         /// <returns>true if the handler was executed immediately; false otherwise</returns>
-        public void ExecuteOnFirstLoad(object view, Action<object> handler) {
+        public virtual void ExecuteOnFirstLoad(object view, Action<object> handler) {
             handler(view);
         }
 
@@ -71,7 +71,7 @@ public class DefaultPlatformProvider : IPlatformProvider {
         /// </summary>
         /// <param name="view">The view.</param>
         /// <param name="handler">The handler.</param>
-        public void ExecuteOnLayoutUpdated(object view, Action<object> handler) {
+        public virtual void ExecuteOnLayoutUpdated(object view, Action<object> handler) {
             handler(view);
         }
 
@@ -84,7 +84,7 @@ public class DefaultPlatformProvider : IPlatformProvider {
         /// <returns>
         /// An <see cref="Action" /> to close the view model.
         /// </returns>
-        public Action GetViewCloseAction(object viewModel, ICollection<object> views, bool? dialogResult) {
+        public virtual Action GetViewCloseAction(object viewModel, ICollection<object> views, bool? dialogResult) {
             return () => { };
         }
     }