Skip to content

Commit 8628353

Browse files
glennawatsonglennawatson
authored
housekeeping: Update dependencies (#3188)
* housekeeping: Update dependencies * Update * Update verifications
1 parent e320a26 commit 8628353

17 files changed

+40
-39
lines changed

‎src/Directory.build.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
5151
<PackageReference Include="FluentAssertions" Version="6.5.1" />
5252
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
53-
<PackageReference Include="PublicApiGenerator" Version="10.2.0" />
53+
<PackageReference Include="PublicApiGenerator" Version="10.3.0" />
5454
<PackageReference Include="coverlet.msbuild" Version="3.1.2" PrivateAssets="All" />
55-
<PackageReference Include="Verify.Xunit" Version="16.1.1" />
55+
<PackageReference Include="Verify.Xunit" Version="16.1.2" />
5656
</ItemGroup>
5757

5858
<ItemGroup Condition="'$(IsTestProject)' != 'true'">
@@ -71,7 +71,7 @@
7171
<ItemGroup>
7272
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="all" />
7373

74-
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
74+
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
7575
<PackageReference Include="Roslynator.Analyzers" Version="4.0.2" PrivateAssets="All" />
7676
</ItemGroup>
7777
<ItemGroup>

‎src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
</ItemGroup>
1515

1616
<ItemGroup Condition=" $(TargetFramework.StartsWith('net6')) ">
17-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.0" />
17+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.2" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/ReactiveUI.Maui/ReactiveMasterDetailPage.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
namespace ReactiveUI.Maui;
99

1010
/// <summary>
11-
/// This is an <see cref="MasterDetailPage"/> that is also an <see cref="IViewFor{T}"/>.
11+
/// This is an MasterDetailPage that is also an <see cref="IViewFor{T}"/>.
1212
/// </summary>
1313
/// <typeparam name="TViewModel">The type of the view model.</typeparam>
1414
/// <seealso cref="Microsoft.Maui.Controls" />
@@ -51,4 +51,4 @@ protected override void OnBindingContextChanged()
5151
}
5252

5353
private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue;
54-
}
54+
}

‎src/ReactiveUI.Maui/ReactiveNavigationPage.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace ReactiveUI.Maui;
1111
/// This is an <see cref="NavigationPage"/> that is also an <see cref="IViewFor{T}"/>.
1212
/// </summary>
1313
/// <typeparam name="TViewModel">The type of the view model.</typeparam>
14-
/// <seealso cref="Xamarin.Forms.NavigationPage" />
1514
/// <seealso cref="ReactiveUI.IViewFor{TViewModel}" />
1615
public class ReactiveNavigationPage<TViewModel> : NavigationPage, IViewFor<TViewModel>
1716
where TViewModel : class
@@ -51,4 +50,4 @@ protected override void OnBindingContextChanged()
5150
}
5251

5352
private static void OnViewModelChanged(BindableObject bindableObject, object oldValue, object newValue) => bindableObject.BindingContext = newValue;
54-
}
53+
}

‎src/ReactiveUI.Maui/ReactiveUI.Maui.csproj

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFrameworks>net6.0</TargetFrameworks>
55
<PackageDescription>Contains the ReactiveUI platform specific extensions for Microsoft Maui</PackageDescription>
66
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;maui;android;ios;mac;forms;net</PackageTags>
7+
<UseMaui>true</UseMaui>
78
</PropertyGroup>
89

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.Maui.Controls" Version="6.0.100-preview.*" />
11-
<PackageReference Include="Microsoft.Maui.Core" Version="6.0.100-preview.*" />
12-
</ItemGroup>
13-
1410
<ItemGroup>
1511
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
1612
</ItemGroup>

‎src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.DotNet6_0.verified.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ namespace ReactiveUI
273273
}
274274
public interface IPropertyBindingHook
275275
{
276-
bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction);
276+
bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction);
277277
}
278278
public class IROObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger
279279
{
@@ -402,7 +402,7 @@ namespace ReactiveUI
402402
public class Interaction<TInput, TOutput>
403403
{
404404
public Interaction(System.Reactive.Concurrency.IScheduler? handlerScheduler = null) { }
405-
protected System.Func<, >[] GetHandlers() { }
405+
protected System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.IObservable<System.Reactive.Unit>>[] GetHandlers() { }
406406
public virtual System.IObservable<TOutput> Handle(TInput input) { }
407407
public System.IDisposable RegisterHandler(System.Action<ReactiveUI.InteractionContext<TInput, TOutput>> handler) { }
408408
public System.IDisposable RegisterHandler(System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.Threading.Tasks.Task> handler) { }
@@ -745,7 +745,7 @@ namespace ReactiveUI
745745
public static System.Type? ReallyFindType(string? type, bool throwOnFailure) { }
746746
public static System.Linq.Expressions.Expression Rewrite(System.Linq.Expressions.Expression? expression) { }
747747
public static void ThrowIfMethodsNotOverloaded(string callingTypeName, object targetObject, params string[] methodsToCheck) { }
748-
public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<, >[] changeValues, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
748+
public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<object, object?>[] changeValues, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
749749
public static bool TryGetValueForPropertyChain<TValue>(out TValue changeValue, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
750750
public static bool TrySetValueToPropertyChain<TValue>(object? target, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain, TValue value, bool shouldThrow = true) { }
751751
}
@@ -824,7 +824,7 @@ namespace ReactiveUI
824824
public int GetAffinityForObjects(System.Type fromType, System.Type toType) { }
825825
public bool TryConvert(object? from, System.Type toType, object? conversionHint, out object result) { }
826826
}
827-
[System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.All)]
827+
[System.AttributeUsage(System.AttributeTargets.Class)]
828828
public sealed class SingleInstanceViewAttribute : System.Attribute
829829
{
830830
public SingleInstanceViewAttribute() { }
@@ -873,7 +873,7 @@ namespace ReactiveUI
873873
public ReactiveUI.Interaction<TInput, TOutput>? Interaction { get; }
874874
public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
875875
}
876-
[System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.All)]
876+
[System.AttributeUsage(System.AttributeTargets.Class)]
877877
public sealed class ViewContractAttribute : System.Attribute
878878
{
879879
public ViewContractAttribute(string contract) { }

‎src/ReactiveUI.Tests/API/ApiApprovalTests.ReactiveUI.Net4_8.verified.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ namespace ReactiveUI
280280
}
281281
public interface IPropertyBindingHook
282282
{
283-
bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction);
283+
bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction);
284284
}
285285
public class IROObservableForProperty : ReactiveUI.ICreatesObservableForProperty, Splat.IEnableLogger
286286
{
@@ -409,7 +409,7 @@ namespace ReactiveUI
409409
public class Interaction<TInput, TOutput>
410410
{
411411
public Interaction(System.Reactive.Concurrency.IScheduler? handlerScheduler = null) { }
412-
protected System.Func<, >[] GetHandlers() { }
412+
protected System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.IObservable<System.Reactive.Unit>>[] GetHandlers() { }
413413
public virtual System.IObservable<TOutput> Handle(TInput input) { }
414414
public System.IDisposable RegisterHandler(System.Action<ReactiveUI.InteractionContext<TInput, TOutput>> handler) { }
415415
public System.IDisposable RegisterHandler(System.Func<ReactiveUI.InteractionContext<TInput, TOutput>, System.Threading.Tasks.Task> handler) { }
@@ -752,7 +752,7 @@ namespace ReactiveUI
752752
public static System.Type? ReallyFindType(string? type, bool throwOnFailure) { }
753753
public static System.Linq.Expressions.Expression Rewrite(System.Linq.Expressions.Expression? expression) { }
754754
public static void ThrowIfMethodsNotOverloaded(string callingTypeName, object targetObject, params string[] methodsToCheck) { }
755-
public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<, >[] changeValues, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
755+
public static bool TryGetAllValuesForPropertyChain(out ReactiveUI.IObservedChange<object, object?>[] changeValues, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
756756
public static bool TryGetValueForPropertyChain<TValue>(out TValue changeValue, object? current, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain) { }
757757
public static bool TrySetValueToPropertyChain<TValue>(object? target, System.Collections.Generic.IEnumerable<System.Linq.Expressions.Expression> expressionChain, TValue value, bool shouldThrow = true) { }
758758
}
@@ -831,7 +831,7 @@ namespace ReactiveUI
831831
public int GetAffinityForObjects(System.Type fromType, System.Type toType) { }
832832
public bool TryConvert(object? from, System.Type toType, object? conversionHint, out object result) { }
833833
}
834-
[System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.All)]
834+
[System.AttributeUsage(System.AttributeTargets.Class)]
835835
public sealed class SingleInstanceViewAttribute : System.Attribute
836836
{
837837
public SingleInstanceViewAttribute() { }
@@ -880,7 +880,7 @@ namespace ReactiveUI
880880
public ReactiveUI.Interaction<TInput, TOutput>? Interaction { get; }
881881
public override void GetObjectData(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) { }
882882
}
883-
[System.AttributeUsage(System.AttributeTargets.Class | System.AttributeTargets.All)]
883+
[System.AttributeUsage(System.AttributeTargets.Class)]
884884
public sealed class ViewContractAttribute : System.Attribute
885885
{
886886
public ViewContractAttribute(string contract) { }

‎src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.DotNet6_0.verified.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace ReactiveUI.Winforms
1212
public class ContentControlBindingHook : ReactiveUI.IPropertyBindingHook
1313
{
1414
public ContentControlBindingHook() { }
15-
public bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { }
15+
public bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { }
1616
}
1717
public class CreatesWinformsCommandBinding : ReactiveUI.ICreatesCommandBinding
1818
{

‎src/ReactiveUI.Tests/Platforms/winforms/API/WinformsApiApprovalTests.Winforms.Net4_8.verified.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace ReactiveUI.Winforms
1010
public class ContentControlBindingHook : ReactiveUI.IPropertyBindingHook
1111
{
1212
public ContentControlBindingHook() { }
13-
public bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<, >[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { }
13+
public bool ExecuteHook(object? source, object target, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewModelProperties, System.Func<ReactiveUI.IObservedChange<object, object>[]> getCurrentViewProperties, ReactiveUI.BindingDirection direction) { }
1414
}
1515
public class CreatesWinformsCommandBinding : ReactiveUI.ICreatesCommandBinding
1616
{

‎src/ReactiveUI.Uno.WinUI/ReactiveUI.Uno.WinUI.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</ItemGroup>
3131

3232
<ItemGroup Condition=" !$(TargetFramework.StartsWith('net6.0-windows10')) ">
33-
<PackageReference Include="Uno.WinUI" Version="4.0.9" />
33+
<PackageReference Include="Uno.WinUI" Version="4.0.13" />
3434
</ItemGroup>
3535
<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-windows10'))">
3636
<DefineConstants>$(DefineConstants);HAS_UNO_WINUI</DefineConstants>

0 commit comments

Comments
 (0)