Skip to content

Commit 72b9634

Browse files
fix: Update nullability, pick dependencies (#2720)
* build(deps): bump Xamarin.AndroidX.Fragment in /src Bumps [Xamarin.AndroidX.Fragment](https://github.com/xamarin/AndroidX) from 1.3.0.1 to 1.3.1. - [Release notes](https://github.com/xamarin/AndroidX/releases) - [Commits](https://github.com/xamarin/AndroidX/commits) Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump DiffEngine from 6.5.7 to 6.6.1 in /src Bumps [DiffEngine](https://github.com/VerifyTests/DiffEngine) from 6.5.7 to 6.6.1. - [Release notes](https://github.com/VerifyTests/DiffEngine/releases) - [Commits](VerifyTests/DiffEngine@6.5.7...6.6.1) Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump Acr.UserDialogs in /integrationtests Bumps [Acr.UserDialogs](https://github.com/aritchie/userdialogs) from 7.1.0.481 to 7.1.0.483. - [Release notes](https://github.com/aritchie/userdialogs/releases) - [Commits](https://github.com/aritchie/userdialogs/commits) Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump Fody from 6.4.0 to 6.5.0 in /src Bumps [Fody](https://github.com/Fody/Fody) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/Fody/Fody/releases) - [Commits](Fody/Fody@6.4.0...6.5.0) Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump FodyPackaging from 6.4.0 to 6.5.0 in /src Bumps [FodyPackaging](https://github.com/Fody/Fody) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/Fody/Fody/releases) - [Commits](Fody/Fody@6.4.0...6.5.0) Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump FodyHelpers from 6.4.0 to 6.5.0 in /src Bumps [FodyHelpers](https://github.com/Fody/Fody) from 6.4.0 to 6.5.0. - [Release notes](https://github.com/Fody/Fody/releases) - [Commits](Fody/Fody@6.4.0...6.5.0) Signed-off-by: dependabot[bot] <[email protected]> * Command binder nullability hint * Fix a few more nullability issues Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent 9583e38 commit 72b9634

File tree

11 files changed

+17
-13
lines changed

11 files changed

+17
-13
lines changed

integrationtests/IntegrationTests.XamarinForms.Android/IntegrationTests.XamarinForms.Android.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<Reference Include="System.Xml" />
5151
</ItemGroup>
5252
<ItemGroup>
53-
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.481" />
53+
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.483" />
5454
<PackageReference Include="ReactiveUI.AndroidSupport" Version="*" />
5555
<PackageReference Include="Xamarin.Android.Support.Design" Version="28.0.*" />
5656
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.0.*" />

integrationtests/IntegrationTests.XamarinForms.UWP/IntegrationTests.XamarinForms.UWP.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
</ItemGroup>
146146
<ItemGroup>
147147
<PackageReference Include="Acr.UserDialogs">
148-
<Version>7.1.0.481</Version>
148+
<Version>7.1.0.483</Version>
149149
</PackageReference>
150150
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.2.*" />
151151
</ItemGroup>

integrationtests/IntegrationTests.XamarinForms.iOS/IntegrationTests.XamarinForms.iOS.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@
160160
<Reference Include="Xamarin.iOS" />
161161
</ItemGroup>
162162
<ItemGroup>
163-
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.481" />
163+
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.483" />
164164
</ItemGroup>
165165
<ItemGroup>
166166
<ProjectReference Include="..\IntegrationTests.XamarinForms\IntegrationTests.XamarinForms.csproj">

integrationtests/IntegrationTests.XamarinForms/IntegrationTests.XamarinForms.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.481" />
8+
<PackageReference Include="Acr.UserDialogs" Version="7.1.0.483" />
99
<PackageReference Include="ReactiveUI.XamForms" Version="*" />
1010
<PackageReference Include="Xamarin.Forms" Version="4.8.*" />
1111
</ItemGroup>

src/Directory.build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<PackageReference Include="FluentAssertions" Version="5.10.3" />
4343
<PackageReference Include="Microsoft.Reactive.Testing" Version="5.0.0" />
4444
<PackageReference Include="PublicApiGenerator" Version="10.2.0" />
45-
<PackageReference Include="DiffEngine" Version="6.5.7" />
45+
<PackageReference Include="DiffEngine" Version="6.6.1" />
4646
<PackageReference Include="coverlet.msbuild" Version="3.0.3" PrivateAssets="All" />
4747
</ItemGroup>
4848

src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<ItemGroup>
1313
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
1414
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.2.0.7" />
15-
<PackageReference Include="Xamarin.AndroidX.Fragment" Version="1.3.0.1" />
15+
<PackageReference Include="Xamarin.AndroidX.Fragment" Version="1.3.1" />
1616
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.1.1.8" />
1717
<PackageReference Include="Xamarin.AndroidX.RecyclerView" Version="1.1.0.8" />
1818
<Reference Include="System.Runtime.Serialization" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</PropertyGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Fody" Version="6.4.0" PrivateAssets="None" />
21-
<PackageReference Include="FodyPackaging" Version="6.4.0" PrivateAssets="All" />
20+
<PackageReference Include="Fody" Version="6.5.0" PrivateAssets="None" />
21+
<PackageReference Include="FodyPackaging" Version="6.5.0" PrivateAssets="All" />
2222
<PackageReference Include="System.Reactive" Version="5.0.0" />
2323
</ItemGroup>
2424

src/ReactiveUI.Fody/ReactiveUI.Fody.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
</PropertyGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="FodyHelpers" Version="6.4.0" />
13+
<PackageReference Include="FodyHelpers" Version="6.5.0" />
1414
</ItemGroup>
1515
</Project>

src/ReactiveUI/Bindings/Command/CommandBinderImplementation.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,13 @@ private static IDisposable BindCommandInternal<TView, TProp, TParam>(
155155
(val, host) => new { val, host });
156156

157157
var propSub = bindInfo
158-
.Where(x => x.host is not null)
159158
.Subscribe(x =>
160159
{
160+
if (x.host is null)
161+
{
162+
return;
163+
}
164+
161165
disposable.Dispose();
162166
if (x is null)
163167
{

src/ReactiveUI/Bindings/Property/PropertyBinderImplementation.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ bool VmToViewFunc(TVMProp vmValue, out TVProp vValue)
8282
var result = vmToViewConverter.TryConvert(vmValue, typeof(TVProp), conversionHint, out object? tmp);
8383

8484
#pragma warning disable CS8605 // Unboxing a possibly null value.
85-
vValue = result ? (TVProp)tmp : default;
85+
vValue = result && tmp != null ? (TVProp)tmp : default;
8686
#pragma warning restore CS8605 // Unboxing a possibly null value.
8787
return result;
8888
}
@@ -92,7 +92,7 @@ bool ViewToVmFunc(TVProp vValue, out TVMProp vmValue)
9292
var result = viewToVMConverter.TryConvert(vValue, typeof(TVMProp), conversionHint, out object? tmp);
9393

9494
#pragma warning disable CS8605 // Unboxing a possibly null value.
95-
vmValue = result ? (TVMProp)tmp : default;
95+
vmValue = result && tmp != null ? (TVMProp)tmp : default;
9696
#pragma warning restore CS8605 // Unboxing a possibly null value.
9797
return result;
9898
}

0 commit comments

Comments
 (0)