Skip to content

Commit 7de4442

Browse files
ChrisPulmanChrisPulman
authored
Fix API Tests and Update Packages (#3282)
1 parent fa25c48 commit 7de4442

File tree

12 files changed

+20
-37
lines changed

12 files changed

+20
-37
lines changed

‎src/Directory.build.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@
4343
</PropertyGroup>
4444

4545
<ItemGroup Condition="$(IsTestProject)">
46-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
46+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
4747
<PackageReference Include="xunit" Version="2.4.1" />
4848
<PackageReference Include="xunit.runner.console" Version="2.4.1" />
49-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3" />
49+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
5050
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
51-
<PackageReference Include="FluentAssertions" Version="6.6.0" />
51+
<PackageReference Include="FluentAssertions" Version="6.7.0" />
5252
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
5353
<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.7.0" />
55+
<PackageReference Include="Verify.Xunit" Version="17.1.4" />
5656
</ItemGroup>
5757

5858
<ItemGroup Condition="'$(IsTestProject)' != 'true'">
@@ -69,10 +69,10 @@
6969
</ItemGroup>
7070

7171
<ItemGroup>
72-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="all" />
72+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.5.107" PrivateAssets="all" />
7373

7474
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.406" PrivateAssets="all" />
75-
<PackageReference Include="Roslynator.Analyzers" Version="4.1.0" PrivateAssets="All" />
75+
<PackageReference Include="Roslynator.Analyzers" Version="4.1.1" PrivateAssets="All" />
7676
</ItemGroup>
7777
<ItemGroup>
7878
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />

‎src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,22 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
20-
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.7.0.1" />
2120
<Reference Include="System.Runtime.Serialization" />
2221
</ItemGroup>
2322
<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid11'))">
23+
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.7.0.1" />
2424
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.12" />
2525
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.12" />
2626
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.4.0.5" />
2727
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.0.1" />
2828
</ItemGroup>
2929

3030
<ItemGroup Condition="$(TargetFramework.StartsWith('MonoAndroid12'))">
31-
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.0" />
32-
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.13" />
33-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.5.0.1" />
34-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.1" />
31+
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.8.0.1" />
32+
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.0.2" />
33+
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.15" />
34+
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.6.1.1" />
35+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.4.1.2" />
3536
</ItemGroup>
3637

3738
<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.3" />
17+
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.5" />
1818
</ItemGroup>
1919

2020
<ItemGroup>

‎src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
</PropertyGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Fody" Version="6.6.1" PrivateAssets="None" />
16-
<PackageReference Include="FodyPackaging" Version="6.6.1" PrivateAssets="All" />
15+
<PackageReference Include="Fody" Version="6.6.2" PrivateAssets="None" />
16+
<PackageReference Include="FodyPackaging" Version="6.6.2" PrivateAssets="All" />
1717
</ItemGroup>
1818

1919

‎src/ReactiveUI.Fody/ReactiveUI.Fody.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="FodyHelpers" Version="6.6.1" />
11+
<PackageReference Include="FodyHelpers" Version="6.6.2" />
1212
</ItemGroup>
1313
</Project>

‎src/ReactiveUI.LeakTests/ReactiveUI.LeakTests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<IsPackable>false</IsPackable>
55
</PropertyGroup>
66
<ItemGroup>
7-
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.1.20200127.214830" />
7+
<PackageReference Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
88
</ItemGroup>
99
<ItemGroup>
1010
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />

‎src/ReactiveUI.Splat.Tests/ReactiveUI.Splat.Tests.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@
1414
<ItemGroup>
1515
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
1616
</ItemGroup>
17-
1817
</Project>

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -711,7 +711,6 @@ namespace ReactiveUI
711711
public class ReactiveRecord : ReactiveUI.IHandleObservableErrors, ReactiveUI.IReactiveNotifyPropertyChanged<ReactiveUI.IReactiveObject>, ReactiveUI.IReactiveObject, Splat.IEnableLogger, System.ComponentModel.INotifyPropertyChanged, System.ComponentModel.INotifyPropertyChanging, System.IEquatable<ReactiveUI.ReactiveRecord>
712712
{
713713
public ReactiveRecord() { }
714-
protected ReactiveRecord(ReactiveUI.ReactiveRecord original) { }
715714
[System.Runtime.Serialization.IgnoreDataMember]
716715
public System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.IReactiveObject>> Changed { get; }
717716
[System.Runtime.Serialization.IgnoreDataMember]
@@ -721,17 +720,9 @@ namespace ReactiveUI
721720
public System.IObservable<System.Exception> ThrownExceptions { get; }
722721
public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
723722
public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging;
724-
public virtual ReactiveUI.ReactiveRecord <Clone>$() { }
725723
public bool AreChangeNotificationsEnabled() { }
726724
public System.IDisposable DelayChangeNotifications() { }
727-
public virtual bool Equals(ReactiveUI.ReactiveRecord? other) { }
728-
public override bool Equals(object? obj) { }
729-
public override int GetHashCode() { }
730-
protected virtual bool PrintMembers(System.Text.StringBuilder builder) { }
731725
public System.IDisposable SuppressChangeNotifications() { }
732-
public override string ToString() { }
733-
public static bool operator !=(ReactiveUI.ReactiveRecord? left, ReactiveUI.ReactiveRecord? right) { }
734-
public static bool operator ==(ReactiveUI.ReactiveRecord? left, ReactiveUI.ReactiveRecord? right) { }
735726
}
736727
public static class Reflection
737728
{

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,6 @@ namespace ReactiveUI
718718
public class ReactiveRecord : ReactiveUI.IHandleObservableErrors, ReactiveUI.IReactiveNotifyPropertyChanged<ReactiveUI.IReactiveObject>, ReactiveUI.IReactiveObject, Splat.IEnableLogger, System.ComponentModel.INotifyPropertyChanged, System.ComponentModel.INotifyPropertyChanging, System.IEquatable<ReactiveUI.ReactiveRecord>
719719
{
720720
public ReactiveRecord() { }
721-
protected ReactiveRecord(ReactiveUI.ReactiveRecord original) { }
722721
[System.Runtime.Serialization.IgnoreDataMember]
723722
public System.IObservable<ReactiveUI.IReactivePropertyChangedEventArgs<ReactiveUI.IReactiveObject>> Changed { get; }
724723
[System.Runtime.Serialization.IgnoreDataMember]
@@ -728,17 +727,9 @@ namespace ReactiveUI
728727
public System.IObservable<System.Exception> ThrownExceptions { get; }
729728
public event System.ComponentModel.PropertyChangedEventHandler? PropertyChanged;
730729
public event System.ComponentModel.PropertyChangingEventHandler? PropertyChanging;
731-
public virtual ReactiveUI.ReactiveRecord <Clone>$() { }
732730
public bool AreChangeNotificationsEnabled() { }
733731
public System.IDisposable DelayChangeNotifications() { }
734-
public virtual bool Equals(ReactiveUI.ReactiveRecord? other) { }
735-
public override bool Equals(object? obj) { }
736-
public override int GetHashCode() { }
737-
protected virtual bool PrintMembers(System.Text.StringBuilder builder) { }
738732
public System.IDisposable SuppressChangeNotifications() { }
739-
public override string ToString() { }
740-
public static bool operator !=(ReactiveUI.ReactiveRecord? left, ReactiveUI.ReactiveRecord? right) { }
741-
public static bool operator ==(ReactiveUI.ReactiveRecord? left, ReactiveUI.ReactiveRecord? right) { }
742733
}
743734
public static class Reflection
744735
{

‎src/ReactiveUI.Tests/ReactiveUI.Tests.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@
7777
<DependentUpon>TestFormNotCanActivate.resx</DependentUpon>
7878
</Compile>
7979
</ItemGroup>
80+
8081
<ItemGroup>
8182
<Page Update="Platforms\wpf\Mocks\CanExecuteMock\CanExecuteExecutingView.xaml">
8283
<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>

0 commit comments

Comments
 (0)