Merge branch 'main' into chore/#3792_DependencyAdjustement

reactiveui · May 4, 2024 · 6324536 · 6324536
2 parents 6fa1136 + e1c210f
commit 6324536
Show file tree

Hide file tree

Showing 540 changed files with 626 additions and 2,179 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -20,6 +20,7 @@ jobs:
     with:
       configuration: Release
       productNamespacePrefix: "ReactiveUI"
+      dotNetBuild: true
       useVisualStudioPreview: false
       useMauiCheckDotNetTool: false
       solutionFile: "reactiveui.sln"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,8 @@ jobs:
     with:
       configuration: Release
       productNamespacePrefix: "ReactiveUI"
-      useVisualStudioPreview: true
+      dotNetBuild: true
+      useVisualStudioPreview: false
       useMauiCheckDotNetTool: false
       solutionFile: "reactiveui.sln"
     secrets:

diff --git a/README.md b/README.md
@@ -157,26 +157,20 @@ See [Contribution Guidelines](https://www.reactiveui.net/contribute/) for furthe
         <a href="https://github.com/chrispulman">Chris Pulman</a>
         <p>United Kingdom</p>
       </td>
+    </tr>
+    <tr>
       <td align="center" valign="top" width="105">
         <img width="100" height="100" src="https://github.com/rlittlesii.png?s=150">
         <br>
         <a href="https://github.com/rlittlesii">Rodney Littles II</a>
         <p>Texas, USA</p>
       </td>
-    </tr>
-    <tr>
       <td align="center" valign="top" width="105">
         <img width="100" height="100" src="https://github.com/cabauman.png?s=150">
         <br>
         <a href="https://github.com/cabauman">Colt Bauman</a>
         <p>South Korea</p>
       </td>
-      <td align="center" valign="top" width="105">
-        <img width="100" height="100" src="https://github.com/worldbeater.png?s=150">
-        <br>
-        <a href="https://github.com/worldbeater">Artyom Gorchakov</a>
-        <p>Moscow, Russia</p>
-      </td>
     </tr>
   </tbody>
 </table>
@@ -189,44 +183,52 @@ The following have been core team members in the past.
 <table>
   <tbody>
     <tr>
-      <td align="center" valign="top">
+      <td align="center" valign="top" width="105">
         <img width="100" height="100" src="https://github.com/ghuntley.png?s=150">
         <br>
         <a href="https://github.com/ghuntley">Geoffrey Huntley</a>
         <p>Sydney, Australia</p>
       </td>
-      <td align="center" valign="top">
+      <td align="center" valign="top" width="105">
         <img width="100" height="100" src="https://github.com/kentcb.png?s=150">
         <br>
         <a href="https://github.com/kentcb">Kent Boogaart</a>
         <p>Brisbane, Australia</p>
       </td>
-      <td align="center" valign="top">
+      <td align="center" valign="top" width="105">
         <img width="100" height="100" src="https://github.com/olevett.png?s=150">
         <br>
         <a href="https://github.com/olevett">Olly Levett</a>
         <p>London, United Kingdom</p>
       </td>
     </tr>
     <tr>
-      <td align="center" valign="top">
+      <td align="center" valign="top" width="105">
         <img width="100" height="100" src="https://github.com/anaisbetts.png?s=150">
         <br>
         <a href="https://github.com/anaisbetts">Anaïs Betts</a>
         <p>San Francisco, USA</p>
       </td>
-      <td align="center" valign="top">
+      <td align="center" valign="top" width="105">
         <img width="100" height="100" src="https://github.com/shiftkey.png?s=150">
         <br>
         <a href="https://github.com/shiftkey">Brendan Forster</a>
         <p>Melbourne, Australia</p>
       </td>
-      <td align="center" valign="top">
-        <img width="120" height="100" src="https://github.com/clairernovotny.png?s=150">
+      <td align="center" valign="top" width="105">
+        <img width="100" height="100" src="https://github.com/clairernovotny.png?s=150">
         <br>
         <a href="https://github.com/clairernovotny">Claire Novotny</a>
         <p>New York, USA</p>
       </td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="105">
+        <img width="100" height="100" src="https://github.com/worldbeater.png?s=150">
+        <br>
+        <a href="https://github.com/worldbeater">Artyom Gorchakov</a>
+        <p>Moscow, Russia</p>
+      </td>
      </tr>
   </tbody>
 </table>

diff --git a/integrationtests/Directory.Build.props b/integrationtests/Directory.Build.props
@@ -27,7 +27,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
-    <PackageReference Include="Roslynator.Analyzers" Version="4.12.1" PrivateAssets="All" />
+    <PackageReference Include="Roslynator.Analyzers" Version="4.12.2" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)..\src\stylecop.json" Link="stylecop.json" />

diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -5,9 +5,10 @@
   </PropertyGroup>
   <PropertyGroup>
     <FodyVersion>6.8.0</FodyVersion>
-    <SplatVersion>14.8.12</SplatVersion>
+    <SplatVersion>15.0.1</SplatVersion>
     <XamarinAndroidSupportVersion>28.0.0.3</XamarinAndroidSupportVersion>
     <XUnitVersion>2.6.6</XUnitVersion>
+    <VerifyXUnitVersion>23.2.0</VerifyXUnitVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
@@ -28,7 +29,7 @@
     <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
     <PackageVersion Include="PublicApiGenerator" Version="11.1.0" />
     <PackageVersion Include="Reactive.Wasm" Version="2.1.2" />
-    <PackageVersion Include="Roslynator.Analyzers" Version="4.12.1" />
+    <PackageVersion Include="Roslynator.Analyzers" Version="4.12.2" />
     <PackageVersion Include="Splat" Version="$(SplatVersion)" />
     <PackageVersion Include="Splat.Autofac" Version="$(SplatVersion)" />
     <PackageVersion Include="Splat.Drawing" Version="$(SplatVersion)" />
@@ -39,7 +40,7 @@
     <PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
     <PackageVersion Include="System.Text.Json" Version="8.0.3" />
-    <PackageVersion Include="Verify.Xunit" Version="23.2.0" />
+    <PackageVersion Include="Verify.Xunit" Version="$(VerifyXUnitVersion)" />
     <PackageVersion Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="$(XamarinAndroidSupportVersion)" />
     <PackageVersion Include="Xamarin.Android.Support.v4" Version="$(XamarinAndroidSupportVersion)" />
     <PackageVersion Include="Xamarin.Android.Support.v7.AppCompat" Version="$(XamarinAndroidSupportVersion)" />
@@ -96,4 +97,4 @@
     <PackageVersion Include="System.Text.Encoding.Extensions" Version="4.3.0" />
     <PackageVersion Include="System.Threading" Version="4.3.0" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/src/ReactiveUI.Blazor/GlobalUsings.cs b/src/ReactiveUI.Blazor/GlobalUsings.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Blazor/PlatformOperations.cs b/src/ReactiveUI.Blazor/PlatformOperations.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Blazor/ReactiveComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveComponentBase.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveInjectableComponentBase.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs b/src/ReactiveUI.Blazor/ReactiveLayoutComponentBase.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Blazor/Registrations.cs b/src/ReactiveUI.Blazor/Registrations.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Blend/FollowObservableStateBehavior.cs b/src/ReactiveUI.Blend/FollowObservableStateBehavior.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Blend/GlobalUsings.cs b/src/ReactiveUI.Blend/GlobalUsings.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Blend/Platforms/net4/ObservableTrigger.cs b/src/ReactiveUI.Blend/Platforms/net4/ObservableTrigger.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Drawing/GlobalUsings.cs b/src/ReactiveUI.Drawing/GlobalUsings.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Drawing/Registrations.cs b/src/ReactiveUI.Drawing/Registrations.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2023 .NET Foundation and Contributors. All rights reserved.
+// Copyright (c) 2024 .NET Foundation and Contributors. All rights reserved.
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation 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/ReactiveUI.Maui.Tests/Activation/ActivatingReactivePagesTests.cs b/src/ReactiveUI.Maui.Tests/Activation/ActivatingReactivePagesTests.cs