From 09b85cb079f2093a7806650d6de3f390ebaa4e84 Mon Sep 17 00:00:00 2001
From: Chris Pulman <chris.pulman@yahoo.com>
Date: Tue, 7 May 2024 21:26:50 +0100
Subject: [PATCH] Housekeeping Update Samples (#656)

---
 samples/Directory.build.props                 |   2 +-
 .../LoginApp.WinForms.csproj                  |   2 +-
 samples/LoginApp.Wpf/LoginApp.Wpf.csproj      |   2 +-
 samples/LoginApp.Wpf/Views/SignUpView.xaml    |  88 ++++++------
 samples/LoginApp.sln                          | 133 ++++++++----------
 samples/LoginApp/LoginApp.csproj              |   6 +-
 .../LoginApp/ViewModels/SignUpViewModel.cs    |  40 ++++--
 .../ReactiveUI.Validation.Tests.csproj        |   2 +-
 .../ReactiveUI.Validation.csproj              |   2 +-
 src/global.json                               |   3 -
 10 files changed, 146 insertions(+), 134 deletions(-)

diff --git a/samples/Directory.build.props b/samples/Directory.build.props
index f1691db5..db19600a 100644
--- a/samples/Directory.build.props
+++ b/samples/Directory.build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.5</AvaloniaVersion>
+    <AvaloniaVersion>11.0.10</AvaloniaVersion>
     <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)..\src\analyzers.ruleset</CodeAnalysisRuleSet>
     <WarningsAsErrors>CS8600;CS8602;CS8603;CS8604;CS8605;CS8606;CS8607;CS8608;CS8609;CS8610;CS8611;CS8612;CS8613;CS8614;CS8615;CS8616;CS8617;CS8618;CS8619;CS8620;CS8621;CS8622;CS8623;CS8624;CS8625</WarningsAsErrors>
   </PropertyGroup>
diff --git a/samples/LoginApp.WinForms/LoginApp.WinForms.csproj b/samples/LoginApp.WinForms/LoginApp.WinForms.csproj
index c8684438..7b8d3488 100644
--- a/samples/LoginApp.WinForms/LoginApp.WinForms.csproj
+++ b/samples/LoginApp.WinForms/LoginApp.WinForms.csproj
@@ -6,7 +6,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="ReactiveUI.WinForms" Version="19.*" />
+        <PackageReference Include="ReactiveUI.WinForms" Version="20.*" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/samples/LoginApp.Wpf/LoginApp.Wpf.csproj b/samples/LoginApp.Wpf/LoginApp.Wpf.csproj
index eb84bf13..f8337e4e 100644
--- a/samples/LoginApp.Wpf/LoginApp.Wpf.csproj
+++ b/samples/LoginApp.Wpf/LoginApp.Wpf.csproj
@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="MahApps.Metro" Version="2.4.10" />
-    <PackageReference Include="ReactiveUI.WPF" Version="19.*" />
+    <PackageReference Include="ReactiveUI.WPF" Version="20.*" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/LoginApp.Wpf/Views/SignUpView.xaml b/samples/LoginApp.Wpf/Views/SignUpView.xaml
index 4e1469c8..a6773f35 100644
--- a/samples/LoginApp.Wpf/Views/SignUpView.xaml
+++ b/samples/LoginApp.Wpf/Views/SignUpView.xaml
@@ -1,47 +1,55 @@
-<reactiveUi:ReactiveUserControl 
-    x:TypeArguments="viewModels:SignUpViewModel"
+<reactiveUi:ReactiveUserControl
+    x:Class="LoginApp.Wpf.Views.SignUpView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
     xmlns:reactiveUi="http://reactiveui.net"
     xmlns:viewModels="clr-namespace:LoginApp.ViewModels;assembly=LoginApp"
-    xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls"
-    x:Class="LoginApp.Wpf.Views.SignUpView">
+    x:TypeArguments="viewModels:SignUpViewModel">
     <StackPanel Margin="10">
         <TextBlock Text="Sign Up" />
-        <TextBox Margin="0 10 0 0"
-                 mah:TextBoxHelper.ClearTextButton="True"
-                 mah:TextBoxHelper.UseFloatingWatermark="True"
-                 mah:TextBoxHelper.Watermark="Please, enter user name..."
-                 Text="{Binding UserName, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" />
-        <TextBlock x:Name="UserNameValidation" 
-                   Foreground="Red"
-                   FontSize="12" />
-    
-        <TextBox Margin="0 10 0 0"
-                 mah:TextBoxHelper.ClearTextButton="True"
-                 mah:TextBoxHelper.UseFloatingWatermark="True"
-                 mah:TextBoxHelper.Watermark="Please, enter new password..."
-                 Text="{Binding Password, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" />
-        <TextBlock x:Name="PasswordValidation" 
-                   Foreground="Red"
-                   FontSize="12" />
-    
-        <TextBox Margin="0 10 0 0"
-                 mah:TextBoxHelper.ClearTextButton="True"
-                 mah:TextBoxHelper.UseFloatingWatermark="True"
-                 mah:TextBoxHelper.Watermark="Please, confirm the password..."
-                 Text="{Binding ConfirmPassword, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" />
-        <TextBlock x:Name="ConfirmPasswordValidation"
-                   TextWrapping="Wrap"
-                   Foreground="Red"
-                   FontSize="12" />
-    
-        <Button Margin="0 10 0 5"
-                Content="Sign up" 
-                Command="{Binding SignUp}" />
-        <TextBlock x:Name="CompoundValidation"
-                   TextWrapping="Wrap"
-                   Foreground="Red"
-                   FontSize="12" />
+        <TextBox
+            Margin="0,10,0,0"
+            mah:TextBoxHelper.ClearTextButton="True"
+            mah:TextBoxHelper.UseFloatingWatermark="True"
+            mah:TextBoxHelper.Watermark="Please, enter user name..."
+            Text="{Binding UserName, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBlock
+            x:Name="UserNameValidation"
+            FontSize="12"
+            Foreground="Red" />
+
+        <TextBox
+            Margin="0,10,0,0"
+            mah:TextBoxHelper.ClearTextButton="True"
+            mah:TextBoxHelper.UseFloatingWatermark="True"
+            mah:TextBoxHelper.Watermark="Please, enter new password..."
+            Text="{Binding Password, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBlock
+            x:Name="PasswordValidation"
+            FontSize="12"
+            Foreground="Red" />
+
+        <TextBox
+            Margin="0,10,0,0"
+            mah:TextBoxHelper.ClearTextButton="True"
+            mah:TextBoxHelper.UseFloatingWatermark="True"
+            mah:TextBoxHelper.Watermark="Please, confirm the password..."
+            Text="{Binding ConfirmPassword, ValidatesOnNotifyDataErrors=True, UpdateSourceTrigger=PropertyChanged}" />
+        <TextBlock
+            x:Name="ConfirmPasswordValidation"
+            FontSize="12"
+            Foreground="Red"
+            TextWrapping="Wrap" />
+
+        <Button
+            Margin="0,10,0,5"
+            Command="{Binding SignUp}"
+            Content="Sign up" />
+        <TextBlock
+            x:Name="CompoundValidation"
+            FontSize="12"
+            Foreground="Red"
+            TextWrapping="Wrap" />
     </StackPanel>
-</reactiveUi:ReactiveUserControl>
\ No newline at end of file
+</reactiveUi:ReactiveUserControl>
diff --git a/samples/LoginApp.sln b/samples/LoginApp.sln
index 8f880cf9..625bcc93 100644
--- a/samples/LoginApp.sln
+++ b/samples/LoginApp.sln
@@ -22,10 +22,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoginApp.Wpf", "LoginApp.Wp
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoginApp.WinForms", "LoginApp.WinForms\LoginApp.WinForms.csproj", "{5098BF01-2DC1-44FD-91DE-FF7CD6B5DE6A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoginApp.Uwp", "LoginApp.Uwp\LoginApp.Uwp.csproj", "{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoginApp.Avalonia.Desktop", "LoginApp.Avalonia.Desktop\LoginApp.Avalonia.Desktop.csproj", "{088E02C6-1D2F-4D6A-B140-4291D18910EC}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ReactiveUI.Validation", "..\src\ReactiveUI.Validation\ReactiveUI.Validation.csproj", "{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Ad-Hoc|Any CPU = Ad-Hoc|Any CPU
@@ -282,78 +282,6 @@ Global
 		{5098BF01-2DC1-44FD-91DE-FF7CD6B5DE6A}.Release|x64.Build.0 = Release|Any CPU
 		{5098BF01-2DC1-44FD-91DE-FF7CD6B5DE6A}.Release|x86.ActiveCfg = Release|Any CPU
 		{5098BF01-2DC1-44FD-91DE-FF7CD6B5DE6A}.Release|x86.Build.0 = Release|Any CPU
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|Any CPU.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|Any CPU.Build.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|Any CPU.Deploy.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|ARM.ActiveCfg = Debug|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|ARM.Build.0 = Debug|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|ARM.Deploy.0 = Debug|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|ARM64.ActiveCfg = Debug|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|ARM64.Build.0 = Debug|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|ARM64.Deploy.0 = Debug|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|iPhone.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|iPhone.Build.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|iPhone.Deploy.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|iPhoneSimulator.Deploy.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|x64.ActiveCfg = Debug|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|x64.Build.0 = Debug|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|x64.Deploy.0 = Debug|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|x86.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|x86.Build.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Ad-Hoc|x86.Deploy.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|Any CPU.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|Any CPU.Build.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|Any CPU.Deploy.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|ARM.ActiveCfg = Debug|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|ARM.Build.0 = Debug|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|ARM.Deploy.0 = Debug|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|ARM64.ActiveCfg = Debug|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|ARM64.Build.0 = Debug|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|ARM64.Deploy.0 = Debug|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|iPhone.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|iPhone.Build.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|iPhone.Deploy.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|iPhoneSimulator.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|iPhoneSimulator.Build.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|iPhoneSimulator.Deploy.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|x64.ActiveCfg = Debug|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|x64.Build.0 = Debug|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|x64.Deploy.0 = Debug|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|x86.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|x86.Build.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.AppStore|x86.Deploy.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|ARM.ActiveCfg = Debug|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|ARM.Build.0 = Debug|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|ARM.Deploy.0 = Debug|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|ARM64.ActiveCfg = Debug|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|ARM64.Build.0 = Debug|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|ARM64.Deploy.0 = Debug|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|iPhone.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|iPhoneSimulator.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|x64.ActiveCfg = Debug|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|x64.Build.0 = Debug|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|x64.Deploy.0 = Debug|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|x86.ActiveCfg = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|x86.Build.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Debug|x86.Deploy.0 = Debug|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|Any CPU.ActiveCfg = Release|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|ARM.ActiveCfg = Release|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|ARM.Build.0 = Release|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|ARM.Deploy.0 = Release|ARM
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|ARM64.ActiveCfg = Release|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|ARM64.Build.0 = Release|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|ARM64.Deploy.0 = Release|ARM64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|iPhone.ActiveCfg = Release|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|iPhoneSimulator.ActiveCfg = Release|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|x64.ActiveCfg = Release|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|x64.Build.0 = Release|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|x64.Deploy.0 = Release|x64
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|x86.ActiveCfg = Release|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|x86.Build.0 = Release|x86
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1}.Release|x86.Deploy.0 = Release|x86
 		{088E02C6-1D2F-4D6A-B140-4291D18910EC}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
 		{088E02C6-1D2F-4D6A-B140-4291D18910EC}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
 		{088E02C6-1D2F-4D6A-B140-4291D18910EC}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
@@ -410,6 +338,62 @@ Global
 		{088E02C6-1D2F-4D6A-B140-4291D18910EC}.Release|x64.Build.0 = Release|Any CPU
 		{088E02C6-1D2F-4D6A-B140-4291D18910EC}.Release|x86.ActiveCfg = Release|Any CPU
 		{088E02C6-1D2F-4D6A-B140-4291D18910EC}.Release|x86.Build.0 = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|x64.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Ad-Hoc|x86.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|Any CPU.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|ARM.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|ARM.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|ARM64.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|ARM64.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|iPhone.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|iPhone.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|x64.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|x64.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|x86.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.AppStore|x86.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|ARM.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|ARM64.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|x64.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Debug|x86.Build.0 = Debug|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|ARM.ActiveCfg = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|ARM.Build.0 = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|ARM64.ActiveCfg = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|ARM64.Build.0 = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|iPhone.Build.0 = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|x64.ActiveCfg = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|x64.Build.0 = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|x86.ActiveCfg = Release|Any CPU
+		{3179A0C0-BAAC-48CA-9ED0-D55E56DD219D}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -418,7 +402,6 @@ Global
 		{F4B2EB39-083D-481D-B159-A3B6F15B3C65} = {ECC07E3E-9E01-410F-A706-37FB5E0F6BEB}
 		{77072631-7F94-4709-A898-7ED571B99A06} = {ECC07E3E-9E01-410F-A706-37FB5E0F6BEB}
 		{5098BF01-2DC1-44FD-91DE-FF7CD6B5DE6A} = {ECC07E3E-9E01-410F-A706-37FB5E0F6BEB}
-		{FAAEFCA2-1EF2-4133-989C-C24B42A517E1} = {ECC07E3E-9E01-410F-A706-37FB5E0F6BEB}
 		{088E02C6-1D2F-4D6A-B140-4291D18910EC} = {ECC07E3E-9E01-410F-A706-37FB5E0F6BEB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
diff --git a/samples/LoginApp/LoginApp.csproj b/samples/LoginApp/LoginApp.csproj
index 6f32f1b4..751dd4b6 100644
--- a/samples/LoginApp/LoginApp.csproj
+++ b/samples/LoginApp/LoginApp.csproj
@@ -1,10 +1,12 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ReactiveUI.Fody" Version="19.*" />
-    <PackageReference Include="ReactiveUI.Validation" Version="3.*" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\src\ReactiveUI.Validation\ReactiveUI.Validation.csproj" />
   </ItemGroup>
 </Project>
diff --git a/samples/LoginApp/ViewModels/SignUpViewModel.cs b/samples/LoginApp/ViewModels/SignUpViewModel.cs
index c5f6bec4..d0e51c64 100644
--- a/samples/LoginApp/ViewModels/SignUpViewModel.cs
+++ b/samples/LoginApp/ViewModels/SignUpViewModel.cs
@@ -6,6 +6,7 @@
 using System;
 using System.Linq;
 using System.Reactive;
+using System.Reactive.Disposables;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using LoginApp.Services;
@@ -25,6 +26,7 @@ public class SignUpViewModel : ReactiveValidationObject, IRoutableViewModel, IAc
 {
     private readonly ObservableAsPropertyHelper<bool> _isBusy;
     private readonly IUserDialogs? _dialogs;
+    private readonly CompositeDisposable _disposables = [];
 
     /// <summary>
     /// Initializes a new instance of the <see cref="SignUpViewModel"/> class.
@@ -43,27 +45,31 @@ public SignUpViewModel(IScreen? hostScreen = null, IUserDialogs? dialogs = null)
         this.ValidationRule(
             vm => vm.UserName,
             name => !string.IsNullOrWhiteSpace(name),
-            "UserName is required.");
+            "UserName is required.")
+            .DisposeWith(_disposables);
 
         this.ValidationRule(
             vm => vm.Password,
             password => !string.IsNullOrWhiteSpace(password),
-            "Password is required.");
+            "Password is required.")
+            .DisposeWith(_disposables);
 
         this.ValidationRule(
             vm => vm.Password,
             password => password?.Length > 2,
-            password => $"Password should be longer, current length: {password!.Length}");
+            password => $"Password should be longer, current length: {password!.Length}")
+            .DisposeWith(_disposables);
 
         this.ValidationRule(
             vm => vm.ConfirmPassword,
             confirmation => !string.IsNullOrWhiteSpace(confirmation),
-            "Confirm password field is required.");
+            "Confirm password field is required.")
+            .DisposeWith(_disposables);
 
         // Here we construct an IObservable<bool> that defines a complex validation rule
         // based on multiple properties. We associate this IObservable<bool> with the
         // 'ConfirmPassword' property via a call to the ValidationRule extension method.
-        IObservable<bool> passwordsObservable =
+        var passwordsObservable =
             this.WhenAnyValue(
                 x => x.Password,
                 x => x.ConfirmPassword,
@@ -73,18 +79,19 @@ public SignUpViewModel(IScreen? hostScreen = null, IUserDialogs? dialogs = null)
         this.ValidationRule(
             vm => vm.ConfirmPassword,
             passwordsObservable,
-            "Passwords must match.");
+            "Passwords must match.")
+            .DisposeWith(_disposables);
 
         // Here we pass a complex IObservable<TState> to the ValidationRule. That observable
         // emits an empty string when UserName is valid, and emits a non-empty when UserName
         // is either invalid, or just changed and hasn't been validated yet.
-        IObservable<IValidationState> usernameValidated =
+        var usernameValidated =
             this.WhenAnyValue(x => x.UserName)
                 .Throttle(TimeSpan.FromSeconds(0.7), RxApp.TaskpoolScheduler)
                 .SelectMany(ValidateNameImpl)
                 .ObserveOn(RxApp.MainThreadScheduler);
 
-        IObservable<IValidationState> usernameDirty =
+        var usernameDirty =
             this.WhenAnyValue(x => x.UserName)
                 .Select(_ => new ValidationState(false, "Please wait..."));
 
@@ -95,7 +102,8 @@ public SignUpViewModel(IScreen? hostScreen = null, IUserDialogs? dialogs = null)
         _isBusy = usernameValidated
             .Select(_ => false)
             .Merge(usernameDirty.Select(_ => true))
-            .ToProperty(this, x => x.IsBusy);
+            .ToProperty(this, x => x.IsBusy)
+            .DisposeWith(_disposables);
     }
 
     /// <summary>
@@ -141,6 +149,20 @@ public SignUpViewModel(IScreen? hostScreen = null, IUserDialogs? dialogs = null)
     /// </summary>
     public ViewModelActivator Activator { get; } = new ViewModelActivator();
 
+    /// <summary>
+    /// Disposes the specified disposing.
+    /// </summary>
+    /// <param name="disposing">if set to <c>true</c> [disposing].</param>
+    protected override void Dispose(bool disposing)
+    {
+        if (disposing)
+        {
+            _disposables.Dispose();
+        }
+
+        base.Dispose(disposing);
+    }
+
     private static async Task<IValidationState> ValidateNameImpl(string username)
     {
         await Task.Delay(TimeSpan.FromSeconds(0.5)).ConfigureAwait(false);
diff --git a/src/ReactiveUI.Validation.Tests/ReactiveUI.Validation.Tests.csproj b/src/ReactiveUI.Validation.Tests/ReactiveUI.Validation.Tests.csproj
index 5c61ac4c..a85d3687 100644
--- a/src/ReactiveUI.Validation.Tests/ReactiveUI.Validation.Tests.csproj
+++ b/src/ReactiveUI.Validation.Tests/ReactiveUI.Validation.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
diff --git a/src/ReactiveUI.Validation/ReactiveUI.Validation.csproj b/src/ReactiveUI.Validation/ReactiveUI.Validation.csproj
index fbaa02cc..4e4c20ff 100644
--- a/src/ReactiveUI.Validation/ReactiveUI.Validation.csproj
+++ b/src/ReactiveUI.Validation/ReactiveUI.Validation.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net6.0;net7.0;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst;net8.0;net8.0-android;net8.0-ios;net8.0-tvos;net8.0-macos;net8.0-maccatalyst</TargetFrameworks>
diff --git a/src/global.json b/src/global.json
index cdf9c333..4c312814 100644
--- a/src/global.json
+++ b/src/global.json
@@ -2,8 +2,5 @@
     "sdk": {
         "version": "8.0.10",
         "rollForward": "latestMinor"
-    },
-    "msbuild-sdks": {
-        "MSBuild.Sdk.Extras": "3.0.44"
     }
 }