Refactor and mark obsolete methods, improve formatting

- Added `[Obsolete]` attribute to `OnActivateAsync` in `ConductorWithCollectionOneActiveTests.cs` to indicate it should be replaced by `OnActivatedAsync`.
- Introduced new `OnActivatedAsync` method in `ConductorWithCollectionOneActiveTests.cs`.
- Corrected spacing and formatting issues in `ConductorWithCollectionOneActiveTests.cs` for better readability.
- Added a summary comment to `BootstrapperBase` class in `BootstrapperBase.cs`.
- Made minor formatting adjustments in `BootstrapperBase.cs`.
- Removed unnecessary `#pragma` directives and added `[Obsolete]` attribute in `ScreenExtentionTests.cs`.
- Skipped a test in `ConductorWithCollectionOneActiveTests.cs` with `[Fact(Skip = "...")]` attribute, providing a reason for skipping.

Author: vb2ae

src/Caliburn.Micro.Core.Tests/ConductorWithCollectionOneActiveTests.cs

@@ -39,13 +39,22 @@ private class ActivateScreen : Screen
             public int ActivateCalledCount { get; private set; }
             public bool AutoContinue { get; set; }
 
+            [Obsolete("Please use OnActivatedAsync instead.")]
             protected override async Task OnActivateAsync(CancellationToken cancellationToken)
             {
                 ActivateCalledCount++;
                 await Task.Delay(100, cancellationToken);
                 if (AutoContinue)
                     RequestContinue?.Invoke(this, EventArgs.Empty);
             }
+
+            protected override async Task OnActivatedAsync(CancellationToken cancellationToken)
+            {
+                ActivateCalledCount++;
+                await Task.Delay(100, cancellationToken);
+                if (AutoContinue)
+                    RequestContinue?.Invoke(this, EventArgs.Empty);
+            }
         }
 
         private class ActivatedScreen : Screen
@@ -54,12 +63,12 @@ private class ActivatedScreen : Screen
 
             public int ActivateCalledCount { get; private set; }
             public bool AutoContinue { get; set; }
-            
+
             protected override async Task OnActivatedAsync(CancellationToken cancellationToken)
             {
                 ActivateCalledCount++;
                 await Task.Delay(100, cancellationToken);
-                if(AutoContinue)
+                if (AutoContinue)
                     RequestContinue?.Invoke(this, EventArgs.Empty);
             }
         }
@@ -123,7 +132,7 @@ public async Task CanCloseIsTrueWhenItemsAreClosable()
             conductor.Items.Add(conducted);
 
             await ((IActivate)conductor).ActivateAsync(CancellationToken.None);
-            var canClose =await conductor.CanCloseAsync(CancellationToken.None);
+            var canClose = await conductor.CanCloseAsync(CancellationToken.None);
 
             Assert.True(canClose);
             Assert.False(conducted.IsClosed);
@@ -141,7 +150,7 @@ public async Task CanCloseIsTrueWhenItemsAreNotClosableAndCloseStrategyCloses()
                 IsClosable = true
             };
             conductor.Items.Add(conducted);
-            await((IActivate)conductor).ActivateAsync(CancellationToken.None);
+            await ((IActivate)conductor).ActivateAsync(CancellationToken.None);
             var canClose = await conductor.CanCloseAsync(CancellationToken.None);
 
             Assert.True(canClose);
@@ -166,17 +175,17 @@ public async Task ActivateWhileActivateOneLevel()
             var conductor = new Conductor<IScreen>.Collection.OneActive();
             var viewModel1 = new ActivateScreen()
             {
-                DisplayName = "ViewModel 1", 
+                DisplayName = "ViewModel 1",
                 AutoContinue = true
             };
             conductor.Items.Add(viewModel1);
             var viewModel2 = new ActivateScreen() { DisplayName = "ViewModel 2" };
             conductor.Items.Add(viewModel2);
             viewModel1.RequestContinue += (sender, e) => { conductor.ActivateItemAsync(viewModel2).Wait(); };
-        
+
             await conductor.ActivateAsync();
             await conductor.ActivateItemAsync(viewModel1);
-        
+
             Assert.False(viewModel1.IsActive);
             Assert.Equal(1, viewModel1.ActivateCalledCount);
             Assert.True(viewModel2.IsActive);
@@ -189,17 +198,17 @@ public async Task ActivatedWhileActivatedOneLevel()
             var conductor = new Conductor<IScreen>.Collection.OneActive();
             var viewModel1 = new ActivatedScreen()
             {
-                DisplayName = "ViewModel 1", 
+                DisplayName = "ViewModel 1",
                 AutoContinue = true
             };
             conductor.Items.Add(viewModel1);
             var viewModel2 = new ActivatedScreen() { DisplayName = "ViewModel 2" };
             conductor.Items.Add(viewModel2);
             viewModel1.RequestContinue += (sender, e) => { conductor.ActivateItemAsync(viewModel2).Wait(); };
-        
+
             await conductor.ActivateAsync();
             await conductor.ActivateItemAsync(viewModel1);
-        
+
             Assert.False(viewModel1.IsActive);
             Assert.Equal(1, viewModel1.ActivateCalledCount);
             Assert.True(viewModel2.IsActive);
@@ -223,7 +232,7 @@ public async Task ActivateWhileActivateStackedLevels()
             await outerConductor.ActivateAsync();
             await outerConductor.ActivateItemAsync(innerConductor);
             await innerConductor.ActivateItemAsync(viewModel1);
-            
+
             await outerConductor.ChangeActiveItemAsyncPublic(somePage, false);
             Assert.True(somePage.IsActive);
             viewModel1.AutoContinue = true;
@@ -235,7 +244,7 @@ public async Task ActivateWhileActivateStackedLevels()
             Assert.True(viewModel2.IsActive);
             Assert.Equal(1, viewModel2.ActivateCalledCount);
         }
-        
+
         [Fact(Skip = "ActiveItem currently set regardless of IsActive value. See http://caliburnmicro.codeplex.com/discussions/276375")]
         public async Task ChildrenAreNotActivatedIfConductorIsNotActive()
         {
@@ -326,7 +335,7 @@ public async Task ActiveItemSetterShouldSetThePropertySynchronouslyWhenOnDeactiv
             conductor.Items.Add(conducted1);
             var conducted2 = new Screen();
             conductor.Items.Add(conducted2);
-            await((IActivate)conductor).ActivateAsync(CancellationToken.None);
+            await ((IActivate)conductor).ActivateAsync(CancellationToken.None);
             conductor.ActiveItem = conducted1;
             conductor.ActiveItem = conducted2;
             Assert.NotNull(conductor.ActiveItem);

src/Caliburn.Micro.Core.Tests/ScreenExtentionTests.cs

@@ -101,7 +101,7 @@ public override Task<bool> CanCloseAsync(CancellationToken cancellationToken = d
                 return Task.FromResult(IsClosable);
             }
 
-#pragma warning disable CS0618 // Type or member is obsolete
+            [Obsolete("Use OnActivateAsync instead.")]
             protected override async Task OnActivateAsync(CancellationToken cancellationToken)
             {
                 if (deactivationDelay.HasValue)
@@ -110,7 +110,7 @@ protected override async Task OnActivateAsync(CancellationToken cancellationToke
                 }
 
                 await base.OnActivateAsync(cancellationToken);
-#pragma warning restore CS0618 // Type or member is obsolete
+
 
                 WasActivated = true;
                 IsClosable = false;

src/Caliburn.Micro.Platform/Platforms/netcore-avalonia/BootstrapperBase.cs

@@ -9,6 +9,9 @@
 
 namespace Caliburn.Micro
 {
+    /// <summary>
+    /// Base class for bootstrapping the application.
+    /// </summary>
     public class BootstrapperBase
     {
         static readonly ILog Log = LogManager.GetLog(typeof(BootstrapperBase));
@@ -33,7 +36,6 @@ public void Initialize()
 
             PlatformProvider.Current = new XamlPlatformProvider();
 
-
             var baseExtractTypes = AssemblySourceCache.ExtractTypes;
 
             AssemblySourceCache.ExtractTypes = assembly =>
@@ -90,7 +92,7 @@ protected virtual void StartRuntime()
 
             Application = Application.Current;
             PrepareApplication();
-            
+
             Configure();
             IoC.GetInstance = GetInstance;
             IoC.GetAllInstances = GetAllInstances;
@@ -105,7 +107,7 @@ protected virtual void PrepareApplication()
             if (Application.ApplicationLifetime is IControlledApplicationLifetime controlledApplicationLifetime)
             {
                 controlledApplicationLifetime.Startup += OnStartup;
-               
+
                 controlledApplicationLifetime.Exit += OnExit;
             }
         }
@@ -191,7 +193,6 @@ protected async Task DisplayRootViewForAsync(Type viewModelType, IDictionary<str
             window.Show();
         }
 
-
         /// <summary>
         /// Locates the view model, locates the associate view, binds them and shows it as the root view.
         /// </summary>