Housekeeping Update Packages (#112)

ChrisPulman · web-flow · commit 13ee1a947e9e · 2024-03-20T06:55:08.000Z
Update Copyright Headers
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -22,11 +22,13 @@ jobs:
         fetch-depth: 0
         lfs: true
 
-    - name: Install .NET 6
+    - name: Install .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 6.0.x
-        include-prerelease: true
+        dotnet-version: |
+            6.0.x
+            7.0.x
+            8.0.x
 
     - name: NBGV
       id: nbgv
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -22,11 +22,13 @@ jobs:
         fetch-depth: 0
         lfs: true
 
-    - name: Install .NET 6
+    - name: Install .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 6.0.x
-        include-prerelease: true
+        dotnet-version: |
+            6.0.x
+            7.0.x
+            8.0.x
         
     - name: NBGV
       id: nbgv
diff --git a/src/ReactiveMarbles.Mvvm.Benchmarks/Memory/DummyReactiveObject.cs b/src/ReactiveMarbles.Mvvm.Benchmarks/Memory/DummyReactiveObject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Benchmarks/Memory/DummyRxObject.cs b/src/ReactiveMarbles.Mvvm.Benchmarks/Memory/DummyRxObject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Benchmarks/Memory/ReactiveObjectMemoryBenchmark.cs b/src/ReactiveMarbles.Mvvm.Benchmarks/Memory/ReactiveObjectMemoryBenchmark.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Benchmarks/Memory/RxObjectMemoryBenchmark.cs b/src/ReactiveMarbles.Mvvm.Benchmarks/Memory/RxObjectMemoryBenchmark.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Benchmarks/Performance/AsValuePerformanceBenchmark.cs b/src/ReactiveMarbles.Mvvm.Benchmarks/Performance/AsValuePerformanceBenchmark.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Benchmarks/Performance/ToPropertyPerformanceBenchmark.cs b/src/ReactiveMarbles.Mvvm.Benchmarks/Performance/ToPropertyPerformanceBenchmark.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Benchmarks/Program.cs b/src/ReactiveMarbles.Mvvm.Benchmarks/Program.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/AsLazyValueExtensionsTests.cs b/src/ReactiveMarbles.Mvvm.Tests/AsLazyValueExtensionsTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/AsLazyValueTestObject.cs b/src/ReactiveMarbles.Mvvm.Tests/AsLazyValueTestObject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/AsValueExtensionsTests.cs b/src/ReactiveMarbles.Mvvm.Tests/AsValueExtensionsTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/AsValueTestData.cs b/src/ReactiveMarbles.Mvvm.Tests/AsValueTestData.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/AsValueTestObject.cs b/src/ReactiveMarbles.Mvvm.Tests/AsValueTestObject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/ReactiveObjectFixture.cs b/src/ReactiveMarbles.Mvvm.Tests/ReactiveObjectFixture.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/RxObjectTestFixture.cs b/src/ReactiveMarbles.Mvvm.Tests/RxObjectTestFixture.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/RxObjectTests.cs b/src/ReactiveMarbles.Mvvm.Tests/RxObjectTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/RxRecordTestFixture.cs b/src/ReactiveMarbles.Mvvm.Tests/RxRecordTestFixture.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/RxRecordTests.cs b/src/ReactiveMarbles.Mvvm.Tests/RxRecordTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/ScheduledSubjectTests.cs b/src/ReactiveMarbles.Mvvm.Tests/ScheduledSubjectTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm.Tests/TestObject.cs b/src/ReactiveMarbles.Mvvm.Tests/TestObject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/AsValueExtensions.cs b/src/ReactiveMarbles.Mvvm/AsValueExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/CoreRegistration.cs b/src/ReactiveMarbles.Mvvm/CoreRegistration.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
@@ -7,21 +7,14 @@
 
 namespace ReactiveMarbles.Mvvm;
 
-internal class CoreRegistration : ICoreRegistration
+internal class CoreRegistration(IScheduler mainThreadScheduler, IScheduler taskPoolScheduler, IObserver<Exception> exceptionHandler) : ICoreRegistration
 {
-    public CoreRegistration(IScheduler mainThreadScheduler, IScheduler taskPoolScheduler, IObserver<Exception> exceptionHandler)
-    {
-        MainThreadScheduler = mainThreadScheduler;
-        TaskPoolScheduler = taskPoolScheduler;
-        ExceptionHandler = exceptionHandler;
-    }
-
     /// <inheritdoc />
-    public IScheduler MainThreadScheduler { get; }
+    public IScheduler MainThreadScheduler { get; } = mainThreadScheduler;
 
     /// <inheritdoc />
-    public IScheduler TaskPoolScheduler { get; }
+    public IScheduler TaskPoolScheduler { get; } = taskPoolScheduler;
 
     /// <inheritdoc />
-    public IObserver<Exception> ExceptionHandler { get; }
+    public IObserver<Exception> ExceptionHandler { get; } = exceptionHandler;
 }
diff --git a/src/ReactiveMarbles.Mvvm/CoreRegistrationBuilder.cs b/src/ReactiveMarbles.Mvvm/CoreRegistrationBuilder.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/DebugExceptionHandler.cs b/src/ReactiveMarbles.Mvvm/DebugExceptionHandler.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/ICoreRegistration.cs b/src/ReactiveMarbles.Mvvm/ICoreRegistration.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/ILoggable.cs b/src/ReactiveMarbles.Mvvm/ILoggable.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
@@ -7,7 +7,6 @@ namespace ReactiveMarbles.Mvvm;
 /// <summary>
 /// Marker interface for classes that want access to the underlying framework logger.
 /// </summary>
-public interface ILoggable
-{
-    // TODO: [rlittlesii: October 11, 2021] US MS Logging to log MVVM internals.
-}
+public interface ILoggable;
+
+// TODO: [rlittlesii: October 11, 2021] US MS Logging to log MVVM internals.
diff --git a/src/ReactiveMarbles.Mvvm/IRxObject.cs b/src/ReactiveMarbles.Mvvm/IRxObject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/IRxPropertyEventArgs.cs b/src/ReactiveMarbles.Mvvm/IRxPropertyEventArgs.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/IRxPropertyEventArgsExtensions.cs b/src/ReactiveMarbles.Mvvm/IRxPropertyEventArgsExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/IStateHandler.cs b/src/ReactiveMarbles.Mvvm/IStateHandler.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/IStateHost.cs b/src/ReactiveMarbles.Mvvm/IStateHost.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/IThrownExceptions.cs b/src/ReactiveMarbles.Mvvm/IThrownExceptions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/IValueBinder.cs b/src/ReactiveMarbles.Mvvm/IValueBinder.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/IsExternalInit.cs b/src/ReactiveMarbles.Mvvm/IsExternalInit.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
@@ -12,6 +12,4 @@ namespace System.Runtime.CompilerServices;
 /// This class should not be used by developers in source code.
 /// </summary>
 [EditorBrowsable(EditorBrowsableState.Never)]
-internal static class IsExternalInit
-{
-}
+internal static class IsExternalInit;
diff --git a/src/ReactiveMarbles.Mvvm/LazyValueBinder.cs b/src/ReactiveMarbles.Mvvm/LazyValueBinder.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
@@ -19,7 +19,7 @@ namespace ReactiveMarbles.Mvvm;
 /// <typeparam name="T">The value type.</typeparam>
 internal sealed class LazyValueBinder<T> : IValueBinder<T>
 {
-    private readonly CompositeDisposable _disposable = new();
+    private readonly CompositeDisposable _disposable = [];
     private readonly Func<T> _initialValue;
     private Action? _lazy;
     private T? _value;
diff --git a/src/ReactiveMarbles.Mvvm/LocatorExtensions.cs b/src/ReactiveMarbles.Mvvm/LocatorExtensions.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/Notifications.cs b/src/ReactiveMarbles.Mvvm/Notifications.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/ProxyScheduledSubject.cs b/src/ReactiveMarbles.Mvvm/ProxyScheduledSubject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
@@ -18,7 +18,7 @@ namespace ReactiveMarbles.Mvvm;
 /// <typeparam name="T">The type of item being dispatched by the Subject.</typeparam>
 public class ProxyScheduledSubject<T> : ISubject<T>, IDisposable
 {
-    private readonly CompositeDisposable _disposables = new();
+    private readonly CompositeDisposable _disposables = [];
     private readonly IObserver<T> _defaultObserver;
     private readonly IScheduler _scheduler;
     private readonly ISubject<T> _subject;
diff --git a/src/ReactiveMarbles.Mvvm/ReactiveMarbles.Mvvm.csproj b/src/ReactiveMarbles.Mvvm/ReactiveMarbles.Mvvm.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-      <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
+      <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
       <LangVersion>latest</LangVersion>
       <PackageDescription>A MVVM framework that integrates with the Reactive Extensions for .NET to create elegant, testable MVVM components that run on any mobile or desktop platform. This is the base package with the base platform implementations</PackageDescription>
       <Nullable>enable</Nullable>
diff --git a/src/ReactiveMarbles.Mvvm/RxDisposableObject.cs b/src/ReactiveMarbles.Mvvm/RxDisposableObject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/RxObject.cs b/src/ReactiveMarbles.Mvvm/RxObject.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
@@ -129,13 +129,8 @@ protected void RaisePropertyChanging(PropertyChangingEventArgs args)
         {
             PropertyChanging?.Invoke(this, args);
         }
-        catch (Exception e)
+        catch (Exception e) when (_thrownExceptions.IsValueCreated)
         {
-            if (!_thrownExceptions.IsValueCreated)
-            {
-                throw;
-            }
-
             _thrownExceptions.Value.OnNext(e);
         }
     }
@@ -161,13 +156,8 @@ protected void RaisePropertyChanged(PropertyChangedEventArgs args)
         {
             PropertyChanged?.Invoke(this, args);
         }
-        catch (Exception e)
+        catch (Exception e) when (_thrownExceptions.IsValueCreated)
         {
-            if (!_thrownExceptions.IsValueCreated)
-            {
-                throw;
-            }
-
             _thrownExceptions.Value.OnNext(e);
         }
     }
diff --git a/src/ReactiveMarbles.Mvvm/RxPropertyChangedEventArgs.cs b/src/ReactiveMarbles.Mvvm/RxPropertyChangedEventArgs.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/RxPropertyChangingEventArgs.cs b/src/ReactiveMarbles.Mvvm/RxPropertyChangingEventArgs.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.
+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.
 // ReactiveUI Association Incorporated licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for full license information.
 
diff --git a/src/ReactiveMarbles.Mvvm/RxRecord.cs b/src/ReactiveMarbles.Mvvm/RxRecord.cs
diff --git a/src/ReactiveMarbles.Mvvm/UnhandledErrorException.cs b/src/ReactiveMarbles.Mvvm/UnhandledErrorException.cs
diff --git a/src/ReactiveMarbles.Mvvm/ValueBinder.cs b/src/ReactiveMarbles.Mvvm/ValueBinder.cs
diff --git a/src/directory.build.props b/src/directory.build.props
diff --git a/src/directory.packages.props b/src/directory.packages.props
diff --git a/src/stylecop.json b/src/stylecop.json

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright (c) 2019-2022 ReactiveUI Association Incorporated. All rights reserved.`
	`1`	`+// Copyright (c) 2019-2024 ReactiveUI Association Incorporated. All rights reserved.`
`2`	`2`	`// ReactiveUI Association Incorporated licenses this file to you under the MIT license.`
`3`	`3`	`// See the LICENSE file in the project root for full license information.`
`4`	`4`