reactiveui · ChrisPulman · Nov 21, 2023 · Nov 20, 2023
diff --git a/src/Directory.build.props b/src/Directory.build.props
@@ -32,16 +32,13 @@
     <None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(IsTestProject)' != 'true'">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" /> 
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" /> 
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
     <PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.507" PrivateAssets="all" />
-    <PackageReference Include="Roslynator.Analyzers" Version="4.6.1" PrivateAssets="All" />
+    <PackageReference Include="Roslynator.Analyzers" Version="4.6.2" PrivateAssets="All" />
   </ItemGroup>
   <ItemGroup>
     <AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />

diff --git a/src/ReactiveUI.Validation.AndroidSupport/ReactiveUI.Validation.AndroidSupport.csproj b/src/ReactiveUI.Validation.AndroidSupport/ReactiveUI.Validation.AndroidSupport.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0</TargetFrameworks>
+    <TargetFrameworks>MonoAndroid13.0</TargetFrameworks>
     <PackageDescription>Provides ReactiveUI.Validation extensions for the Android Support Library</PackageDescription>
     <PackageId>ReactiveUI.Validation.AndroidSupport</PackageId>
     <NoWarn>$(NoWarn);CS1591</NoWarn>

diff --git a/src/ReactiveUI.Validation.AndroidX/ReactiveUI.Validation.AndroidX.csproj b/src/ReactiveUI.Validation.AndroidX/ReactiveUI.Validation.AndroidX.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;net7.0-android</TargetFrameworks>
+    <TargetFrameworks>MonoAndroid13.0;net7.0-android;net8.0-android</TargetFrameworks>
     <PackageDescription>Provides ReactiveUI.Validation extensions for the AndroidX Library</PackageDescription>
     <PackageId>ReactiveUI.Validation.AndroidX</PackageId>
     <NoWarn>$(NoWarn);CS1591</NoWarn>

diff --git a/...sts.ValidationProject.net6.0.approved.txt → ....ValidationProject.DotNet6_0.verified.txt b/...sts.ValidationProject.net6.0.approved.txt → ....ValidationProject.DotNet6_0.verified.txt
@@ -1,5 +1,4 @@
-[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/reactiveui/reactiveui.validation")]
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v6.0", FrameworkDisplayName=".NET 6.0")]
 namespace ReactiveUI.Validation.Abstractions
 {
     public interface IValidatableViewModel

diff --git a/...idationProject.netcoreapp3.1.approved.txt → ....ValidationProject.DotNet7_0.verified.txt b/...idationProject.netcoreapp3.1.approved.txt → ....ValidationProject.DotNet7_0.verified.txt
@@ -1,5 +1,4 @@
-[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/reactiveui/reactiveui.validation")]
-[assembly: System.Runtime.Versioning.TargetFramework(".NETStandard,Version=v2.0", FrameworkDisplayName="")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v7.0", FrameworkDisplayName=".NET 7.0")]
 namespace ReactiveUI.Validation.Abstractions
 {
     public interface IValidatableViewModel
@@ -9,17 +8,18 @@ namespace ReactiveUI.Validation.Abstractions
 }
 namespace ReactiveUI.Validation.Collections
 {
-    public class ValidationText : System.Collections.Generic.IEnumerable<string>, System.Collections.IEnumerable
+    public interface IValidationText : System.Collections.Generic.IEnumerable<string>, System.Collections.Generic.IReadOnlyCollection<string>, System.Collections.Generic.IReadOnlyList<string>, System.Collections.IEnumerable
     {
-        public static readonly ReactiveUI.Validation.Collections.ValidationText Empty;
-        public static readonly ReactiveUI.Validation.Collections.ValidationText None;
-        public int Count { get; }
-        public string this[int index] { get; }
-        public System.Collections.Generic.IEnumerator<string> GetEnumerator() { }
-        public string ToSingleLine(string? separator = ",") { }
-        public static ReactiveUI.Validation.Collections.ValidationText Create(System.Collections.Generic.IEnumerable<ReactiveUI.Validation.Collections.ValidationText>? validationTexts) { }
-        public static ReactiveUI.Validation.Collections.ValidationText Create(System.Collections.Generic.IEnumerable<string>? validationTexts) { }
-        public static ReactiveUI.Validation.Collections.ValidationText Create(params string?[]? validationTexts) { }
+        string ToSingleLine(string? separator = ",");
+    }
+    public static class ValidationText
+    {
+        public static readonly ReactiveUI.Validation.Collections.IValidationText Empty;
+        public static readonly ReactiveUI.Validation.Collections.IValidationText None;
+        public static ReactiveUI.Validation.Collections.IValidationText Create(System.Collections.Generic.IEnumerable<ReactiveUI.Validation.Collections.IValidationText>? validationTexts) { }
+        public static ReactiveUI.Validation.Collections.IValidationText Create(System.Collections.Generic.IEnumerable<string?>? validationTexts) { }
+        public static ReactiveUI.Validation.Collections.IValidationText Create(string? validationText) { }
+        public static ReactiveUI.Validation.Collections.IValidationText Create(params string?[]? validationTexts) { }
     }
 }
 namespace ReactiveUI.Validation.Comparators
@@ -43,7 +43,7 @@ namespace ReactiveUI.Validation.Components.Abstractions
     public interface IValidationComponent
     {
         bool IsValid { get; }
-        ReactiveUI.Validation.Collections.ValidationText? Text { get; }
+        ReactiveUI.Validation.Collections.IValidationText? Text { get; }
         System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationStatusChange { get; }
     }
 }
@@ -55,7 +55,7 @@ namespace ReactiveUI.Validation.Components
         public bool IsValid { get; }
         public System.Collections.Generic.IEnumerable<string> Properties { get; }
         public int PropertyCount { get; }
-        public ReactiveUI.Validation.Collections.ValidationText? Text { get; }
+        public ReactiveUI.Validation.Collections.IValidationText? Text { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationStatusChange { get; }
         protected void AddProperty<TProp>(System.Linq.Expressions.Expression<System.Func<TViewModel, TProp>> property) { }
         public bool ContainsPropertyName(string propertyName, bool exclusively = false) { }
@@ -74,11 +74,11 @@ namespace ReactiveUI.Validation.Components
     public abstract class ObservableValidationBase<TViewModel, TValue> : ReactiveUI.ReactiveObject, ReactiveUI.Validation.Components.Abstractions.IPropertyValidationComponent, ReactiveUI.Validation.Components.Abstractions.IValidatesProperties, ReactiveUI.Validation.Components.Abstractions.IValidationComponent, System.IDisposable
     {
         protected ObservableValidationBase(System.IObservable<ReactiveUI.Validation.States.IValidationState> observable) { }
-        protected ObservableValidationBase(TViewModel viewModel, System.IObservable<TValue> observable, System.Func<TViewModel, TValue, bool> isValidFunc, System.Func<TViewModel, TValue, bool, ReactiveUI.Validation.Collections.ValidationText> messageFunc) { }
+        protected ObservableValidationBase(TViewModel viewModel, System.IObservable<TValue> observable, System.Func<TViewModel, TValue, bool> isValidFunc, System.Func<TViewModel, TValue, bool, ReactiveUI.Validation.Collections.IValidationText> messageFunc) { }
         public bool IsValid { get; }
         public System.Collections.Generic.IEnumerable<string> Properties { get; }
         public int PropertyCount { get; }
-        public ReactiveUI.Validation.Collections.ValidationText? Text { get; }
+        public ReactiveUI.Validation.Collections.IValidationText? Text { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationStatusChange { get; }
         protected void AddProperty<TProp>(System.Linq.Expressions.Expression<System.Func<TViewModel, TProp>> property) { }
         public bool ContainsPropertyName(string propertyName, bool exclusively = false) { }
@@ -110,7 +110,7 @@ namespace ReactiveUI.Validation.Contexts
     {
         public ValidationContext(System.Reactive.Concurrency.IScheduler? scheduler = null) { }
         public bool IsValid { get; }
-        public ReactiveUI.Validation.Collections.ValidationText Text { get; }
+        public ReactiveUI.Validation.Collections.IValidationText Text { get; }
         public System.IObservable<bool> Valid { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationStatusChange { get; }
         public System.Collections.ObjectModel.ReadOnlyObservableCollection<ReactiveUI.Validation.Components.Abstractions.IValidationComponent> Validations { get; }
@@ -180,7 +180,7 @@ namespace ReactiveUI.Validation.Formatters.Abstractions
 {
     public interface IValidationTextFormatter<out TOut>
     {
-        TOut Format(ReactiveUI.Validation.Collections.ValidationText validationText);
+        TOut Format(ReactiveUI.Validation.Collections.IValidationText validationText);
     }
 }
 namespace ReactiveUI.Validation.Formatters
@@ -189,7 +189,7 @@ namespace ReactiveUI.Validation.Formatters
     {
         public SingleLineFormatter(string? separator = null) { }
         public static ReactiveUI.Validation.Formatters.SingleLineFormatter Default { get; }
-        public string Format(ReactiveUI.Validation.Collections.ValidationText? validationText) { }
+        public string Format(ReactiveUI.Validation.Collections.IValidationText? validationText) { }
     }
 }
 namespace ReactiveUI.Validation.Helpers
@@ -207,7 +207,7 @@ namespace ReactiveUI.Validation.Helpers
     {
         public ValidationHelper(ReactiveUI.Validation.Components.Abstractions.IValidationComponent validation, System.IDisposable? cleanup = null) { }
         public bool IsValid { get; }
-        public ReactiveUI.Validation.Collections.ValidationText? Message { get; }
+        public ReactiveUI.Validation.Collections.IValidationText? Message { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationChanged { get; }
         public void Dispose() { }
         protected virtual void Dispose(bool disposing) { }
@@ -218,15 +218,15 @@ namespace ReactiveUI.Validation.States
     public interface IValidationState
     {
         bool IsValid { get; }
-        ReactiveUI.Validation.Collections.ValidationText Text { get; }
+        ReactiveUI.Validation.Collections.IValidationText Text { get; }
     }
     public class ValidationState : ReactiveUI.Validation.States.IValidationState
     {
-        public static readonly ReactiveUI.Validation.States.ValidationState Valid;
-        public ValidationState(bool isValid, ReactiveUI.Validation.Collections.ValidationText text) { }
+        public static readonly ReactiveUI.Validation.States.IValidationState Valid;
+        public ValidationState(bool isValid, ReactiveUI.Validation.Collections.IValidationText text) { }
         public ValidationState(bool isValid, string text) { }
         public bool IsValid { get; }
-        public ReactiveUI.Validation.Collections.ValidationText Text { get; }
+        public ReactiveUI.Validation.Collections.IValidationText Text { get; }
     }
 }
 namespace ReactiveUI.Validation.ValidationBindings.Abstractions

diff --git a/...sts.ValidationProject.net5.0.approved.txt → ....ValidationProject.DotNet8_0.verified.txt b/...sts.ValidationProject.net5.0.approved.txt → ....ValidationProject.DotNet8_0.verified.txt
@@ -1,5 +1,4 @@
-[assembly: System.Reflection.AssemblyMetadata("RepositoryUrl", "https://github.com/reactiveui/reactiveui.validation")]
-[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v5.0", FrameworkDisplayName="")]
+[assembly: System.Runtime.Versioning.TargetFramework(".NETCoreApp,Version=v8.0", FrameworkDisplayName=".NET 8.0")]
 namespace ReactiveUI.Validation.Abstractions
 {
     public interface IValidatableViewModel
@@ -9,17 +8,18 @@ namespace ReactiveUI.Validation.Abstractions
 }
 namespace ReactiveUI.Validation.Collections
 {
-    public class ValidationText : System.Collections.Generic.IEnumerable<string>, System.Collections.IEnumerable
+    public interface IValidationText : System.Collections.Generic.IEnumerable<string>, System.Collections.Generic.IReadOnlyCollection<string>, System.Collections.Generic.IReadOnlyList<string>, System.Collections.IEnumerable
     {
-        public static readonly ReactiveUI.Validation.Collections.ValidationText Empty;
-        public static readonly ReactiveUI.Validation.Collections.ValidationText None;
-        public int Count { get; }
-        public string this[int index] { get; }
-        public System.Collections.Generic.IEnumerator<string> GetEnumerator() { }
-        public string ToSingleLine(string? separator = ",") { }
-        public static ReactiveUI.Validation.Collections.ValidationText Create(System.Collections.Generic.IEnumerable<ReactiveUI.Validation.Collections.ValidationText>? validationTexts) { }
-        public static ReactiveUI.Validation.Collections.ValidationText Create(System.Collections.Generic.IEnumerable<string>? validationTexts) { }
-        public static ReactiveUI.Validation.Collections.ValidationText Create(params string?[]? validationTexts) { }
+        string ToSingleLine(string? separator = ",");
+    }
+    public static class ValidationText
+    {
+        public static readonly ReactiveUI.Validation.Collections.IValidationText Empty;
+        public static readonly ReactiveUI.Validation.Collections.IValidationText None;
+        public static ReactiveUI.Validation.Collections.IValidationText Create(System.Collections.Generic.IEnumerable<ReactiveUI.Validation.Collections.IValidationText>? validationTexts) { }
+        public static ReactiveUI.Validation.Collections.IValidationText Create(System.Collections.Generic.IEnumerable<string?>? validationTexts) { }
+        public static ReactiveUI.Validation.Collections.IValidationText Create(string? validationText) { }
+        public static ReactiveUI.Validation.Collections.IValidationText Create(params string?[]? validationTexts) { }
     }
 }
 namespace ReactiveUI.Validation.Comparators
@@ -43,7 +43,7 @@ namespace ReactiveUI.Validation.Components.Abstractions
     public interface IValidationComponent
     {
         bool IsValid { get; }
-        ReactiveUI.Validation.Collections.ValidationText? Text { get; }
+        ReactiveUI.Validation.Collections.IValidationText? Text { get; }
         System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationStatusChange { get; }
     }
 }
@@ -55,7 +55,7 @@ namespace ReactiveUI.Validation.Components
         public bool IsValid { get; }
         public System.Collections.Generic.IEnumerable<string> Properties { get; }
         public int PropertyCount { get; }
-        public ReactiveUI.Validation.Collections.ValidationText? Text { get; }
+        public ReactiveUI.Validation.Collections.IValidationText? Text { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationStatusChange { get; }
         protected void AddProperty<TProp>(System.Linq.Expressions.Expression<System.Func<TViewModel, TProp>> property) { }
         public bool ContainsPropertyName(string propertyName, bool exclusively = false) { }
@@ -74,11 +74,11 @@ namespace ReactiveUI.Validation.Components
     public abstract class ObservableValidationBase<TViewModel, TValue> : ReactiveUI.ReactiveObject, ReactiveUI.Validation.Components.Abstractions.IPropertyValidationComponent, ReactiveUI.Validation.Components.Abstractions.IValidatesProperties, ReactiveUI.Validation.Components.Abstractions.IValidationComponent, System.IDisposable
     {
         protected ObservableValidationBase(System.IObservable<ReactiveUI.Validation.States.IValidationState> observable) { }
-        protected ObservableValidationBase(TViewModel viewModel, System.IObservable<TValue> observable, System.Func<TViewModel, TValue, bool> isValidFunc, System.Func<TViewModel, TValue, bool, ReactiveUI.Validation.Collections.ValidationText> messageFunc) { }
+        protected ObservableValidationBase(TViewModel viewModel, System.IObservable<TValue> observable, System.Func<TViewModel, TValue, bool> isValidFunc, System.Func<TViewModel, TValue, bool, ReactiveUI.Validation.Collections.IValidationText> messageFunc) { }
         public bool IsValid { get; }
         public System.Collections.Generic.IEnumerable<string> Properties { get; }
         public int PropertyCount { get; }
-        public ReactiveUI.Validation.Collections.ValidationText? Text { get; }
+        public ReactiveUI.Validation.Collections.IValidationText? Text { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationStatusChange { get; }
         protected void AddProperty<TProp>(System.Linq.Expressions.Expression<System.Func<TViewModel, TProp>> property) { }
         public bool ContainsPropertyName(string propertyName, bool exclusively = false) { }
@@ -110,7 +110,7 @@ namespace ReactiveUI.Validation.Contexts
     {
         public ValidationContext(System.Reactive.Concurrency.IScheduler? scheduler = null) { }
         public bool IsValid { get; }
-        public ReactiveUI.Validation.Collections.ValidationText Text { get; }
+        public ReactiveUI.Validation.Collections.IValidationText Text { get; }
         public System.IObservable<bool> Valid { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationStatusChange { get; }
         public System.Collections.ObjectModel.ReadOnlyObservableCollection<ReactiveUI.Validation.Components.Abstractions.IValidationComponent> Validations { get; }
@@ -180,7 +180,7 @@ namespace ReactiveUI.Validation.Formatters.Abstractions
 {
     public interface IValidationTextFormatter<out TOut>
     {
-        TOut Format(ReactiveUI.Validation.Collections.ValidationText validationText);
+        TOut Format(ReactiveUI.Validation.Collections.IValidationText validationText);
     }
 }
 namespace ReactiveUI.Validation.Formatters
@@ -189,7 +189,7 @@ namespace ReactiveUI.Validation.Formatters
     {
         public SingleLineFormatter(string? separator = null) { }
         public static ReactiveUI.Validation.Formatters.SingleLineFormatter Default { get; }
-        public string Format(ReactiveUI.Validation.Collections.ValidationText? validationText) { }
+        public string Format(ReactiveUI.Validation.Collections.IValidationText? validationText) { }
     }
 }
 namespace ReactiveUI.Validation.Helpers
@@ -207,7 +207,7 @@ namespace ReactiveUI.Validation.Helpers
     {
         public ValidationHelper(ReactiveUI.Validation.Components.Abstractions.IValidationComponent validation, System.IDisposable? cleanup = null) { }
         public bool IsValid { get; }
-        public ReactiveUI.Validation.Collections.ValidationText? Message { get; }
+        public ReactiveUI.Validation.Collections.IValidationText? Message { get; }
         public System.IObservable<ReactiveUI.Validation.States.IValidationState> ValidationChanged { get; }
         public void Dispose() { }
         protected virtual void Dispose(bool disposing) { }
@@ -218,15 +218,15 @@ namespace ReactiveUI.Validation.States
     public interface IValidationState
     {
         bool IsValid { get; }
-        ReactiveUI.Validation.Collections.ValidationText Text { get; }
+        ReactiveUI.Validation.Collections.IValidationText Text { get; }
     }
     public class ValidationState : ReactiveUI.Validation.States.IValidationState
     {
-        public static readonly ReactiveUI.Validation.States.ValidationState Valid;
-        public ValidationState(bool isValid, ReactiveUI.Validation.Collections.ValidationText text) { }
+        public static readonly ReactiveUI.Validation.States.IValidationState Valid;
+        public ValidationState(bool isValid, ReactiveUI.Validation.Collections.IValidationText text) { }
         public ValidationState(bool isValid, string text) { }
         public bool IsValid { get; }
-        public ReactiveUI.Validation.Collections.ValidationText Text { get; }
+        public ReactiveUI.Validation.Collections.IValidationText Text { get; }
     }
 }
 namespace ReactiveUI.Validation.ValidationBindings.Abstractions