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
5 changes: 3 additions & 2 deletions src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<PropertyGroup>
<SplatVersion>16.0.1</SplatVersion>
<SplatVersion>16.1.1</SplatVersion>
<XamarinAndroidXCoreVersion>1.13.1.4</XamarinAndroidXCoreVersion>
<XamarinAndroidXLifecycleLiveDataVersion>2.8.4.1</XamarinAndroidXLifecycleLiveDataVersion>
</PropertyGroup>
Expand All @@ -16,7 +16,8 @@
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.14.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.1" />
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.2" />
<PackageVersion Include="System.Reactive" Version="6.0.2" />
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.4948" />
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.135" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public static class AndroidXReactiveUIBuilderExtensions
/// </summary>
/// <param name="builder">The builder instance.</param>
/// <returns>The builder instance for chaining.</returns>
public static ReactiveUIBuilder WithAndroidX(this ReactiveUIBuilder builder)
public static IReactiveUIBuilder WithAndroidX(this IReactiveUIBuilder builder)
{
if (builder is null)
{
Expand All @@ -42,7 +42,7 @@ public static ReactiveUIBuilder WithAndroidX(this ReactiveUIBuilder builder)
/// </summary>
/// <param name="builder">The builder.</param>
/// <returns>The builder instance for chaining.</returns>
public static ReactiveUIBuilder WithAndroidXScheduler(this ReactiveUIBuilder builder)
public static IReactiveUIBuilder WithAndroidXScheduler(this IReactiveUIBuilder builder)
{
if (builder is null)
{
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" />
<PackageReference Include="Xamarin.Google.Android.Material" />
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
<PackageReference Include="System.Reactive" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
Expand Down
6 changes: 0 additions & 6 deletions src/ReactiveUI.AndroidX/Registrations.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,6 @@ namespace ReactiveUI.AndroidX;
public class Registrations : IWantsToRegisterStuff
{
/// <inheritdoc/>
#if NET6_0_OR_GREATER
[RequiresDynamicCode("Register uses methods that require dynamic code generation")]
[RequiresUnreferencedCode("Register uses methods that may require unreferenced code")]
[SuppressMessage("Trimming", "IL2046:'RequiresUnreferencedCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
[SuppressMessage("AOT", "IL3051:'RequiresDynamicCodeAttribute' annotations must match across all interface implementations or overrides.", Justification = "Not all paths use reflection")]
#endif
public void Register(Action<Func<object>, Type> registerFunction)
{
#if NET6_0_OR_GREATER
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public static class BlazorReactiveUIBuilderExtensions
/// </summary>
/// <param name="builder">The builder instance.</param>
/// <returns>The builder instance for chaining.</returns>
public static ReactiveUIBuilder WithBlazor(this ReactiveUIBuilder builder)
public static IReactiveUIBuilder WithBlazor(this IReactiveUIBuilder builder)
{
if (builder is null)
{
Expand All @@ -40,7 +40,7 @@ public static ReactiveUIBuilder WithBlazor(this ReactiveUIBuilder builder)
/// </summary>
/// <param name="builder">The builder.</param>
/// <returns>The builder instance for chaining.</returns>
public static ReactiveUIBuilder WithBlazorScheduler(this ReactiveUIBuilder builder)
public static IReactiveUIBuilder WithBlazorScheduler(this IReactiveUIBuilder builder)
{
if (builder is null)
{
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<ItemGroup>
<PackageReference Include="Reactive.Wasm" />
<PackageReference Include="Microsoft.AspNetCore.Components" />
<PackageReference Include="System.Reactive" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI.Blend/ReactiveUI.Blend.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
<ItemGroup>
<Compile Include="Platforms\net4\**\*.cs" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
<PackageReference Include="System.Reactive" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ public static class ReactiveUIBuilderDrawingExtensions
/// </summary>
/// <param name="builder">The builder instance.</param>
/// <returns>The builder instance for method chaining.</returns>
public static ReactiveUIBuilder WithDrawing(this ReactiveUIBuilder builder)
public static IReactiveUIBuilder WithDrawing(this IReactiveUIBuilder builder)
{
if (builder is null)
{
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Splat.Drawing" />
<PackageReference Include="System.Reactive" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static class MauiReactiveUIBuilderExtensions
/// <param name="builder">The builder instance.</param>
/// <param name="dispatcher">The MAUI dispatcher to use for the main thread scheduler.</param>
/// <returns>The builder instance for chaining.</returns>
public static ReactiveUIBuilder WithMaui(this ReactiveUIBuilder builder, IDispatcher? dispatcher = null)
public static IReactiveUIBuilder WithMaui(this IReactiveUIBuilder builder, IDispatcher? dispatcher = null)
{
if (builder is null)
{
Expand All @@ -43,7 +43,7 @@ public static ReactiveUIBuilder WithMaui(this ReactiveUIBuilder builder, IDispat
/// </summary>
/// <param name="builder">The builder.</param>
/// <returns>The builder instance for chaining.</returns>
public static ReactiveUIBuilder WithMauiScheduler(this ReactiveUIBuilder builder)
public static IReactiveUIBuilder WithMauiScheduler(this IReactiveUIBuilder builder)
{
if (builder is null)
{
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI.Maui/Common/ReactivePage.cs
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@ namespace ReactiveUI;
[RequiresDynamicCode("ReactivePage uses methods that require dynamic code generation")]
[RequiresUnreferencedCode("ReactivePage uses methods that may require unreferenced code")]
#endif
[SuppressMessage("WinRT", "CsWinRT1029:Types used in signatures should be WinRT types", Justification = "This is a netstandard2.0 library")]
public partial class ReactivePage<TViewModel> :
Page, IViewFor<TViewModel>
where TViewModel : class
Expand Down
1 change: 1 addition & 0 deletions src/ReactiveUI.Maui/Common/ReactiveUserControl.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ namespace ReactiveUI;
/// <typeparam name="TViewModel">
/// The type of the view model backing the view.
/// </typeparam>
[SuppressMessage("WinRT", "CsWinRT1029:Types used in signatures should be WinRT types", Justification = "This is a netstandard2.0 library")]
public partial class ReactiveUserControl<TViewModel> :
UserControl, IViewFor<TViewModel>
where TViewModel : class
Expand Down
3 changes: 2 additions & 1 deletion src/ReactiveUI.Maui/ReactiveUI.Maui.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
<PackageReference Include="Microsoft.Windows.CsWinRT" />
<PackageReference Include="Microsoft.Windows.CsWinRT" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Maui.Controls" />
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" />
<PackageReference Include="System.Reactive" />
</ItemGroup>
<ItemGroup>
<Compile Remove="Common\RoutedViewHost.cs" />
Expand Down
Loading
Loading