Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update WhenAnyObservable to allow null sender #3573

Merged
merged 4 commits into from
Jul 8, 2023
Merged

Update WhenAnyObservable to allow null sender #3573

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c5910c3
Update WhenAnyObservable to allow null sender
ChrisPulman Jul 2, 2023
f0fdf73
Merge branch 'main' into CP_AllowNullWhenanyobservable
ChrisPulman Jul 3, 2023
c330ace
Merge branch 'main' into CP_AllowNullWhenanyobservable
ChrisPulman Jul 8, 2023
21cff2b
Add missing target to ReactiveUI
ChrisPulman Jul 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ReactiveUI.AndroidX/ReactiveUI.AndroidX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions src/ReactiveUI.Blend/ReactiveUI.Blend.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI.Drawing/ReactiveUI.Drawing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Fody.Analyzer/ReactiveUI.Fody.Analyzer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
4 changes: 2 additions & 2 deletions src/ReactiveUI.Fody.Helpers/ReactiveUI.Fody.Helpers.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/ReactiveUI.Fody/ReactiveUI.Fody.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="FodyHelpers" Version="6.7.0" />
<PackageReference Include="FodyHelpers" Version="6.8.0" />
</ItemGroup>
</Project>
10 changes: 5 additions & 5 deletions src/ReactiveUI.Maui/ReactiveUI.Maui.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
<UseMaui>true</UseMaui>
</PropertyGroup>

<PropertyGroup Condition="$(TargetFramework.StartsWith('net6.0-windows10')) or $(TargetFramework.StartsWith('net7.0-windows10'))">
<PropertyGroup Condition="$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
<DefineConstants>HAS_WINUI</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="!$(TargetFramework.StartsWith('net6.0-windows10')) and !$(TargetFramework.StartsWith('net7.0-windows10'))">
<PropertyGroup Condition="!$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
<DefineConstants>HAS_MAUI</DefineConstants>
</PropertyGroup>

<ItemGroup Condition="$(TargetFramework.StartsWith('net6.0-windows10')) or $(TargetFramework.StartsWith('net7.0-windows10'))">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230502000" />
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
<ItemGroup Condition="$(TargetFramework.EndsWith('-windows10.0.19041.0'))">
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230602002" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
</ItemGroup>
Expand Down