housekeeping: update to use modern language (#978)

* housekeeping: Fix tests and formatting * housekeeping: Update to modern c# 10 style
reactiveui · Dec 7, 2022 · e8cba17 · e8cba17
1 parent 941fc00
commit e8cba17
Show file tree

Hide file tree

Showing 113 changed files with 1,164 additions and 3,179 deletions.
diff --git a/src/ReactiveUI.DI.Tests/Mocks/ActivatingView.cs b/src/ReactiveUI.DI.Tests/Mocks/ActivatingView.cs
@@ -17,28 +17,25 @@ namespace ReactiveUI.DI.Tests.Mocks;
 /// <seealso cref="ReactiveUI.IActivatableView" />
 public sealed class ActivatingView : ReactiveObject, IViewFor<ActivatingViewModel>, IDisposable
 {
-    private int _count;
     private ActivatingViewModel? _viewModel;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ActivatingView"/> class.
     /// </summary>
-    public ActivatingView()
-    {
+    public ActivatingView() =>
         this.WhenActivated(d =>
         {
-            _count++;
-            d(Disposable.Create(() => _count--));
+            IsActiveCount++;
+            d(Disposable.Create(() => IsActiveCount--));
         });
-    }
 
     /// <summary>
     /// Gets the count.
     /// </summary>
     /// <value>
     /// The count.
     /// </value>
-    public int IsActiveCount => _count;
+    public int IsActiveCount { get; private set; }
 
     /// <summary>
     /// Gets the loaded.

diff --git a/src/ReactiveUI.DI.Tests/Mocks/ActivatingViewModel.cs b/src/ReactiveUI.DI.Tests/Mocks/ActivatingViewModel.cs
@@ -18,7 +18,7 @@ public class ActivatingViewModel : ReactiveObject, IActivatableViewModel
     /// </summary>
     public ActivatingViewModel()
     {
-        Activator = new ViewModelActivator();
+        Activator = new();
 
         this.WhenActivated(d =>
         {
@@ -28,9 +28,9 @@ public ActivatingViewModel()
     }
 
     /// <summary>
-    /// Gets or sets the Activator which will be used by the View when Activation/Deactivation occurs.
+    /// Gets the Activator which will be used by the View when Activation/Deactivation occurs.
     /// </summary>
-    public ViewModelActivator Activator { get; protected set; }
+    public ViewModelActivator Activator { get; }
 
     /// <summary>
     /// Gets or sets the active count.

diff --git a/src/ReactiveUI.DI.Tests/ViewWithViewContractThatShouldNotLoad.cs b/src/ReactiveUI.DI.Tests/ViewWithViewContractThatShouldNotLoad.cs
@@ -14,10 +14,7 @@ public sealed class ViewWithViewContractThatShouldNotLoad : IViewFor<ViewModelOn
     /// <summary>
     /// Initializes a new instance of the <see cref="ViewWithViewContractThatShouldNotLoad"/> class.
     /// </summary>
-    public ViewWithViewContractThatShouldNotLoad()
-    {
-        throw new InvalidOperationException("This view should not be created.");
-    }
+    public ViewWithViewContractThatShouldNotLoad() => throw new InvalidOperationException("This view should not be created.");
 
     /// <inheritdoc />
     object? IViewFor.ViewModel

diff --git a/src/Splat.AppCenter/AppCenterFeatureUsageTrackingSession.cs b/src/Splat.AppCenter/AppCenterFeatureUsageTrackingSession.cs
@@ -42,16 +42,10 @@ internal AppCenterFeatureUsageTrackingSession(string featureName, Guid parentRef
     public Guid ParentReference { get; }
 
     /// <inheritdoc />
-    public void Dispose()
-    {
-        TrackEvent("Feature Usage End");
-    }
+    public void Dispose() => TrackEvent("Feature Usage End");
 
     /// <inheritdoc />
-    public IFeatureUsageTrackingSession SubFeature(string description)
-    {
-        return new AppCenterFeatureUsageTrackingSession(description, FeatureReference);
-    }
+    public IFeatureUsageTrackingSession SubFeature(string description) => new AppCenterFeatureUsageTrackingSession(description, FeatureReference);
 
     /// <inheritdoc />
     public void OnException(Exception exception)

diff --git a/src/Splat.AppCenter/AppCenterViewTracking.cs b/src/Splat.AppCenter/AppCenterViewTracking.cs
@@ -25,11 +25,9 @@ public void OnViewNavigation(string name)
         Microsoft.AppCenter.Analytics.Analytics.TrackEvent("PageView", properties);
     }
 
-    private static IDictionary<string, string> GetProperties(string name)
-    {
-        return new Dictionary<string, string>
+    private static IDictionary<string, string> GetProperties(string name) =>
+        new Dictionary<string, string>
         {
             { "Name", name },
         };
-    }
 }
diff --git a/src/Splat.ApplicationInsights/ApplicationInsightsFeatureUsageTrackingSession.cs b/src/Splat.ApplicationInsights/ApplicationInsightsFeatureUsageTrackingSession.cs
@@ -52,19 +52,14 @@ internal ApplicationInsightsFeatureUsageTrackingSession(
     public string FeatureName { get; }
 
     /// <inheritdoc />
-    public void Dispose()
-    {
-        TrackEvent("Feature Usage End");
-    }
+    public void Dispose() => TrackEvent("Feature Usage End");
 
     /// <inheritdoc />
-    public IFeatureUsageTrackingSession SubFeature(string description)
-    {
-        return new ApplicationInsightsFeatureUsageTrackingSession(
+    public IFeatureUsageTrackingSession SubFeature(string description) =>
+        new ApplicationInsightsFeatureUsageTrackingSession(
             description,
             FeatureReference,
             _telemetryClient);
-    }
 
     /// <inheritdoc />
     public void OnException(Exception exception)

diff --git a/src/Splat.ApplicationInsights/ApplicationInsightsViewTracking.cs b/src/Splat.ApplicationInsights/ApplicationInsightsViewTracking.cs
@@ -20,19 +20,13 @@ public sealed class ApplicationInsightsViewTracking : IViewTracking
     /// Initializes a new instance of the <see cref="ApplicationInsightsViewTracking"/> class.
     /// </summary>
     /// <param name="telemetryClient">The Application Insights telemetry client instance to use.</param>
-    public ApplicationInsightsViewTracking(TelemetryClient telemetryClient)
-    {
-        _telemetryClient = telemetryClient;
-    }
+    public ApplicationInsightsViewTracking(TelemetryClient telemetryClient) => _telemetryClient = telemetryClient;
 
     /// <summary>
     /// Track a view navigation using just a name.
     /// </summary>
     /// <param name="name">Name of the view.</param>
-    public void OnViewNavigation(string name)
-    {
-        _telemetryClient.TrackPageView(name);
-    }
+    public void OnViewNavigation(string name) => _telemetryClient.TrackPageView(name);
 
     /// <summary>
     /// Track a View Navigation with Extended Data.

diff --git a/src/Splat.Autofac/AutofacDependencyResolver.cs b/src/Splat.Autofac/AutofacDependencyResolver.cs
@@ -53,10 +53,7 @@ public AutofacDependencyResolver(ContainerBuilder builder)
     public virtual object? GetService(Type? serviceType, string? contract = null)
     {
         var isNull = serviceType is null;
-        if (serviceType is null)
-        {
-            serviceType = typeof(NullServiceType);
-        }
+        serviceType ??= typeof(NullServiceType);
 
         lock (_lockObject)
         {
@@ -93,10 +90,7 @@ public void SetLifetimeScope(ILifetimeScope lifetimeScope)
     public virtual IEnumerable<object> GetServices(Type? serviceType, string? contract = null)
     {
         var isNull = serviceType is null;
-        if (serviceType is null)
-        {
-            serviceType = typeof(NullServiceType);
-        }
+        serviceType ??= typeof(NullServiceType);
 
         lock (_lockObject)
         {
@@ -105,13 +99,12 @@ public virtual IEnumerable<object> GetServices(Type? serviceType, string? contra
                 var enumerableType = typeof(IEnumerable<>).MakeGenericType(serviceType);
                 var instance = Resolve(enumerableType, contract);
 
-                if (isNull && instance is IEnumerable<NullServiceType> nullService)
-                {
-                    return nullService.Select(item => item.Factory()!);
-                }
-                else if (!isNull && instance is not null)
+                switch (isNull)
                 {
-                    return ((IEnumerable)instance).Cast<object>();
+                    case true when instance is IEnumerable<NullServiceType> nullService:
+                        return nullService.Select(item => item.Factory()!);
+                    case false when instance is not null:
+                        return ((IEnumerable)instance).Cast<object>();
                 }
             }
             finally
@@ -126,10 +119,7 @@ public virtual IEnumerable<object> GetServices(Type? serviceType, string? contra
     /// <inheritdoc />
     public bool HasRegistration(Type? serviceType, string? contract = null)
     {
-        if (serviceType is null)
-        {
-            serviceType = typeof(NullServiceType);
-        }
+        serviceType ??= typeof(NullServiceType);
 
         lock (_lockObject)
         {
@@ -158,10 +148,7 @@ public bool HasRegistration(Type? serviceType, string? contract = null)
     public virtual void Register(Func<object?> factory, Type? serviceType, string? contract = null)
     {
         var isNull = serviceType is null;
-        if (serviceType is null)
-        {
-            serviceType = typeof(NullServiceType);
-        }
+        serviceType ??= typeof(NullServiceType);
 
         lock (_lockObject)
         {

diff --git a/src/Splat.Common.Test/ViewThatShouldNotLoad.cs b/src/Splat.Common.Test/ViewThatShouldNotLoad.cs
@@ -17,10 +17,7 @@ public sealed class ViewThatShouldNotLoad : IViewFor<ViewModelOne>
     /// <summary>
     /// Initializes a new instance of the <see cref="ViewThatShouldNotLoad"/> class.
     /// </summary>
-    public ViewThatShouldNotLoad()
-    {
-        throw new InvalidOperationException("This view should not be created.");
-    }
+    public ViewThatShouldNotLoad() => throw new InvalidOperationException("This view should not be created.");
 
     /// <inheritdoc />
     object? IViewFor.ViewModel

diff --git a/src/Splat.Drawing.Tests/BitmapLoaderTests.cs b/src/Splat.Drawing.Tests/BitmapLoaderTests.cs
@@ -79,20 +79,11 @@ public void Load_Succeeds(Func<Stream> getStream)
         }
     }
 
-    private static Stream GetBitmapStream()
-    {
-        return GetStream("splatlogo.bmp");
-    }
+    private static Stream GetBitmapStream() => GetStream("splatlogo.bmp");
 
-    private static Stream GetJpegStream()
-    {
-        return GetStream("splatlogo.jpg");
-    }
+    private static Stream GetJpegStream() => GetStream("splatlogo.jpg");
 
-    private static Stream GetPngStream()
-    {
-        return GetStream("splatlogo.png");
-    }
+    private static Stream GetPngStream() => GetStream("splatlogo.png");
 
     private static Stream GetStream(string imageName)
     {

diff --git a/src/Splat.Drawing.Tests/Colors/CoverageColorTests.cs b/src/Splat.Drawing.Tests/Colors/CoverageColorTests.cs
@@ -190,35 +190,23 @@ public void ARGBColorToStringGivesValue()
     /// Invalids the ARGB color A throws.
     /// </summary>
     [Fact]
-    public void InvalidARGBColorAThrows()
-    {
-        Assert.Throws<ArgumentException>(() => SplatColor.FromArgb(256, 0, 0, 0));
-    }
+    public void InvalidARGBColorAThrows() => Assert.Throws<ArgumentException>(() => SplatColor.FromArgb(256, 0, 0, 0));
 
     /// <summary>
     /// Invalids the ARGB color r throws.
     /// </summary>
     [Fact]
-    public void InvalidARGBColorRThrows()
-    {
-        Assert.Throws<ArgumentException>(() => SplatColor.FromArgb(0, 256, 0, 0));
-    }
+    public void InvalidARGBColorRThrows() => Assert.Throws<ArgumentException>(() => SplatColor.FromArgb(0, 256, 0, 0));
 
     /// <summary>
     /// Invalids the ARGB color g throws.
     /// </summary>
     [Fact]
-    public void InvalidARGBColorGThrows()
-    {
-        Assert.Throws<ArgumentException>(() => SplatColor.FromArgb(0, 0, 256, 0));
-    }
+    public void InvalidARGBColorGThrows() => Assert.Throws<ArgumentException>(() => SplatColor.FromArgb(0, 0, 256, 0));
 
     /// <summary>
     /// Invalids the ARGB color b throws.
     /// </summary>
     [Fact]
-    public void InvalidARGBColorBThrows()
-    {
-        Assert.Throws<ArgumentException>(() => SplatColor.FromArgb(0, 0, 0, 256));
-    }
+    public void InvalidARGBColorBThrows() => Assert.Throws<ArgumentException>(() => SplatColor.FromArgb(0, 0, 0, 256));
 }
diff --git a/src/Splat.Drawing.Tests/Colors/SplatColorTests.cs b/src/Splat.Drawing.Tests/Colors/SplatColorTests.cs
@@ -52,10 +52,7 @@ private static IEnumerable<object[]> GetEnumAsTestTheory()
     {
         var values = Enum.GetValues(typeof(KnownColor));
         var results = new List<object[]>(values.Length);
-        foreach (var value in values)
-        {
-            results.Add(new[] { value! });
-        }
+        results.AddRange(values.Cast<object?>().Select(value => new[] { value! }));
 
         return results;
     }