Update WhenAnyObservable to allow null sender (#3573)

Fix for #3343
reactiveui · Jul 8, 2023 · c5742c8 · c5742c8
1 parent 5b186ce
commit c5742c8
Show file tree

Hide file tree

Showing 16 changed files with 2,011 additions and 2,000 deletions.
diff --git a/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj b/src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="Xamarin.AndroidX.Core" Version="1.10.1.1" />
     <PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.0.6" />
     <PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.19" />
-    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.7.0.2" />
+    <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.1" />
     <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.1.2" />
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
     <Reference Include="System.Runtime.Serialization" />

diff --git a/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj b/src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj
@@ -14,11 +14,11 @@
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net6')) ">
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.15" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.19" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net7')) ">
-    <PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.8" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj b/src/ReactiveUI.Blend/ReactiveUI.Blend.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="MSBuild.Sdk.Extras">
+<Project Sdk="MSBuild.Sdk.Extras">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows10.0.17763;net7.0-windows10.0.17763</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0</TargetFrameworks>
     <AssemblyName>ReactiveUI.Blend</AssemblyName>
     <RootNamespace>ReactiveUI.Blend</RootNamespace>
     <PackageDescription>Provides reactive extensions based xaml components based on the Blend SDK library, allowing you to fire a observable from XAML</PackageDescription>
@@ -21,7 +21,7 @@
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
   </ItemGroup>
 
-  <ItemGroup Condition=" $(TargetFramework.StartsWith('net6')) or $(TargetFramework.StartsWith('net7')) ">
+  <ItemGroup Condition="$(TargetFramework.EndsWith('-windows10.0.17763.0'))">
     <Compile Include="Platforms\net4\**\*.cs" />
     <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
   </ItemGroup>

diff --git a/src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj b/src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="MSBuild.Sdk.Extras">
   <PropertyGroup>
-    <TargetFrameworks>MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;tizen40;netstandard2.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net472;net6.0-windows10.0.17763</TargetFrameworks>
+    <TargetFrameworks>MonoAndroid12.0;MonoAndroid12.1;MonoAndroid13.0;Xamarin.iOS10;Xamarin.Mac20;Xamarin.TVOS10;tizen40;netstandard2.0;net6.0-android;net6.0-ios;net6.0-tvos;net6.0-macos;net6.0-maccatalyst;net7.0-android;net7.0-ios;net7.0-tvos;net7.0-macos;net7.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(TargetFrameworks);net462;net472;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0</TargetFrameworks>
     <AssemblyName>ReactiveUI.Drawing</AssemblyName>
     <RootNamespace>ReactiveUI.Drawing</RootNamespace>
     <PackageDescription>A extension to the ReactiveUI platform that provides Splat bitmap operation support.</PackageDescription>

diff --git a/src/ReactiveUI.Fody.Analyzer/ReactiveUI.Fody.Analyzer.csproj b/src/ReactiveUI.Fody.Analyzer/ReactiveUI.Fody.Analyzer.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="[3.11.0]" PrivateAssets="all" />
     <PackageReference Include="System.Collections.Immutable" Version="7.0.0" />
   </ItemGroup>
 

diff --git a/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj b/src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj
@@ -12,8 +12,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.7.0" PrivateAssets="None" />
-    <PackageReference Include="FodyPackaging" Version="6.7.0" PrivateAssets="All" />
+    <PackageReference Include="Fody" Version="6.8.0" PrivateAssets="None" />
+    <PackageReference Include="FodyPackaging" Version="6.8.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/ReactiveUI.Fody/ReactiveUI.Fody.csproj b/src/ReactiveUI.Fody/ReactiveUI.Fody.csproj
@@ -8,6 +8,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FodyHelpers" Version="6.7.0" />
+    <PackageReference Include="FodyHelpers" Version="6.8.0" />
   </ItemGroup>
 </Project>
diff --git a/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj b/src/ReactiveUI.Maui/ReactiveUI.Maui.csproj
@@ -8,16 +8,20 @@
     <UseMaui>true</UseMaui>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(TargetFramework.EndsWith('-windows10.0.17763.0'))">
-    <DefineConstants>HAS_WINUI</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition="!$(TargetFramework.EndsWith('-windows10.0.17763.0'))">
-    <DefineConstants>HAS_MAUI</DefineConstants>
-  </PropertyGroup>
+	<PropertyGroup Condition="$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
+		<DefineConstants>HAS_WINUI</DefineConstants>
+	</PropertyGroup>
+	<PropertyGroup Condition="!$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
+		<DefineConstants>HAS_MAUI</DefineConstants>
+	</PropertyGroup>
 
-  <ItemGroup Condition="$(TargetFramework.EndsWith('-windows10.0.17763.0'))">
+  <ItemGroup Condition="$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
     <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
   </ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
+	</ItemGroup>
 
   <ItemGroup>
     <Compile Remove="Common\RoutedViewHost.cs" />