Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 39 additions & 4 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"local>reactiveui/.github:renovate"
"local\u003Ereactiveui/.github:renovate"
],
"packageRules": [
{
"description": "Analyzer packages all gate the build through the same warnings-as-errors pass, so landing them separately just means several red CI runs in a row. Move them in one PR.",
"description": "Update the analyzers together.",
"matchManagers": [
"nuget"
],
Expand All @@ -15,7 +15,7 @@
]
},
{
"description": "Packaging, versioning and symbol tooling. These affect how the package is produced, never the shipped API, so they are safe to move as one.",
"description": "Update packaging tools together.",
"matchManagers": [
"nuget"
],
Expand All @@ -26,7 +26,7 @@
]
},
{
"description": "MessageBox.Avalonia is part of the Avalonia sample stack but does not carry the Avalonia prefix the shared preset matches on.",
"description": "Include MessageBox.Avalonia in the Avalonia group.",
"matchManagers": [
"nuget"
],
Expand All @@ -35,6 +35,41 @@
"/^Avalonia(\\.|$)/",
"/^MessageBox\\.Avalonia$/"
]
},
{
"description": "Keep runtime packages in their target framework\u0027s major version.",
"matchManagers": [
"nuget"
],
"matchPackageNames": [
"System.Collections.Immutable"
],
"matchUpdateTypes": [
"major"
],
"enabled": false
},
{
"description": "Allow .NET 11 preview updates within the .NET 11 band.",
"matchManagers": [
"nuget"
],
"matchPackageNames": [
"System.Collections.Immutable"
],
"matchCurrentVersion": "/^11\\./",
"allowedVersions": "/^11\\./",
"ignoreUnstable": false
},
{
"description": "Keep the coverage package pinned until its regression is resolved.",
"matchManagers": [
"nuget"
],
"matchPackageNames": [
"Microsoft.Testing.Extensions.CodeCoverage"
],
"enabled": false
}
]
}
1 change: 1 addition & 0 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ jobs:
build:
uses: reactiveui/actions-common/.github/workflows/workflow-common-setup-and-build.yml@main
with:
configuration: Release
productNamespacePrefix: "ReactiveUI.Validation"
installWorkloads: true
secrets:
Expand Down
10 changes: 5 additions & 5 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@
</PropertyGroup>

<PropertyGroup>
<NetCorePlatforms>net8.0;net9.0;net10.0</NetCorePlatforms>
<NetWindowsPlatforms>net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0</NetWindowsPlatforms>
<NetCorePlatforms>net8.0;net9.0;net10.0;net11.0</NetCorePlatforms>
<NetWindowsPlatforms>net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;net10.0-windows10.0.19041.0;net11.0-windows10.0.19041.0</NetWindowsPlatforms>
<!-- net9 MAUI (android/apple) targets dropped: those workloads are end of support. -->
<MauiAndroidTargets>net10.0-android</MauiAndroidTargets>
<MauiAppleTargets>net10.0-ios;net10.0-tvos;net10.0-macos;net10.0-maccatalyst</MauiAppleTargets>
<MauiAndroidTargets>net10.0-android36.0;net11.0-android37</MauiAndroidTargets>
<MauiAppleTargets>net10.0-ios;net10.0-tvos;net10.0-macos;net10.0-maccatalyst;net11.0-ios;net11.0-tvos;net11.0-macos;net11.0-maccatalyst</MauiAppleTargets>
<NetFrameworkPlatforms>net462;net472;net481</NetFrameworkPlatforms>
<TestTargetFrameworks>net8.0;net9.0;net10.0</TestTargetFrameworks>
<TestTargetFrameworks>net8.0;net9.0;net10.0;net11.0</TestTargetFrameworks>
</PropertyGroup>

<PropertyGroup>
Expand Down
14 changes: 13 additions & 1 deletion src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
<PackageVersion Include="Splat" Version="21.0.0" />
<PackageVersion Include="Splat.Builder" Version="21.0.0" />
<PackageVersion Include="Polyfill" Version="11.4.1" />
<PackageVersion Include="System.Collections.Immutable" Version="10.0.12" />
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.14.0.6" />
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData.Core.Ktx" Version="2.11.0.1" />
Expand All @@ -28,6 +27,19 @@
<PackageVersion Include="Xamarin.AndroidX.Activity.Ktx" Version="1.13.0.1" />
</ItemGroup>

<Choose>
<When Condition="$(TargetFramework.StartsWith('net11.0'))">
<ItemGroup>
<PackageVersion Include="System.Collections.Immutable" Version="11.0.0-rc.1.26425.128" />
</ItemGroup>
</When>
<Otherwise>
<ItemGroup>
<PackageVersion Include="System.Collections.Immutable" Version="10.0.12" />
</ItemGroup>
</Otherwise>
</Choose>

<ItemGroup Label="Build tools">
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.401" />
<PackageVersion Include="MinVer" Version="8.0.0" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[assembly: System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
[assembly: System.Runtime.Versioning.SupportedOSPlatform("Android24.0")]
namespace ReactiveUI.Validation.Reactive.Extensions;

public static class ViewForExtensions
{
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public static System.IDisposable BindValidation<TView, TViewModel>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Reactive.Helpers.ValidationHelper?>> viewModelHelperProperty, Google.Android.Material.TextField.TextInputLayout viewProperty) where TView : ReactiveUI.Binding.Reactive.IViewFor<TViewModel> where TViewModel : class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Reactive.Abstractions.IValidatableViewModel { }
public static System.IDisposable BindValidation<TView, TViewModel>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Reactive.Helpers.ValidationHelper?>> viewModelHelperProperty, Google.Android.Material.TextField.TextInputLayout viewProperty, ReactiveUI.Validation.Reactive.Formatters.Abstractions.IValidationTextFormatter<string>? formatter) where TView : ReactiveUI.Binding.Reactive.IViewFor<TViewModel> where TViewModel : class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Reactive.Abstractions.IValidatableViewModel { }
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public static System.IDisposable BindValidation<TView, TViewModel, TViewModelProperty>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty?>> viewModelProperty, Google.Android.Material.TextField.TextInputLayout viewProperty) where TView : ReactiveUI.Binding.Reactive.IViewFor<TViewModel> where TViewModel : class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Reactive.Abstractions.IValidatableViewModel { }
public static System.IDisposable BindValidation<TView, TViewModel, TViewModelProperty>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty?>> viewModelProperty, Google.Android.Material.TextField.TextInputLayout viewProperty, ReactiveUI.Validation.Reactive.Formatters.Abstractions.IValidationTextFormatter<string>? formatter) where TView : ReactiveUI.Binding.Reactive.IViewFor<TViewModel> where TViewModel : class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Reactive.Abstractions.IValidatableViewModel { }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[assembly: System.Runtime.Versioning.SupportedOSPlatform("Android24.0")]
namespace ReactiveUI.Validation.Extensions
{
public static class ViewForExtensions
{
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public static System.IDisposable BindValidation<TView, TViewModel>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Helpers.ValidationHelper?>> viewModelHelperProperty, Google.Android.Material.TextField.TextInputLayout viewProperty) where TView : ReactiveUI.Binding.IViewFor<TViewModel> where TViewModel : class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
public static System.IDisposable BindValidation<TView, TViewModel>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel?, ReactiveUI.Validation.Helpers.ValidationHelper?>> viewModelHelperProperty, Google.Android.Material.TextField.TextInputLayout viewProperty, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<string>? formatter) where TView : ReactiveUI.Binding.IViewFor<TViewModel> where TViewModel : class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
[System.Runtime.CompilerServices.MethodImpl(System.Runtime.CompilerServices.MethodImplOptions.AggressiveInlining)]
public static System.IDisposable BindValidation<TView, TViewModel, TViewModelProperty>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty?>> viewModelProperty, Google.Android.Material.TextField.TextInputLayout viewProperty) where TView : ReactiveUI.Binding.IViewFor<TViewModel> where TViewModel : class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
public static System.IDisposable BindValidation<TView, TViewModel, TViewModelProperty>(this TView view, TViewModel? viewModel, System.Linq.Expressions.Expression<System.Func<TViewModel, TViewModelProperty?>> viewModelProperty, Google.Android.Material.TextField.TextInputLayout viewProperty, ReactiveUI.Validation.Formatters.Abstractions.IValidationTextFormatter<string>? formatter) where TView : ReactiveUI.Binding.IViewFor<TViewModel> where TViewModel : class, ReactiveUI.IReactiveObject, ReactiveUI.Validation.Abstractions.IValidatableViewModel { }
}
}
Loading
Loading