Skip to content

Commit

Permalink
Reassert changes to ReactiveUI after merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@ChrisPulman
ChrisPulman committed May 18, 2024
1 parent 0b262ed commit 6960cff
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 30 deletions.
35 changes: 6 additions & 29 deletions src/Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,12 @@
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
</PropertyGroup>
<PropertyGroup>
<FodyVersion>6.8.0</FodyVersion>
<SplatVersion>15.1.1</SplatVersion>
<XamarinAndroidSupportVersion>28.0.0.3</XamarinAndroidSupportVersion>
<XUnitVersion>2.8.0</XUnitVersion>
<VerifyXUnitVersion>24.2.0</VerifyXUnitVersion>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="coverlet.msbuild" Version="6.0.2" />
<PackageVersion Include="DynamicData" Version="8.4.1" />
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
<PackageVersion Include="Fody" Version="$(FodyVersion)" />
<PackageVersion Include="FodyHelpers" Version="$(FodyVersion)" />
<PackageVersion Include="FodyPackaging" Version="$(FodyVersion)" />
<PackageVersion Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
Expand All @@ -40,22 +33,9 @@
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
<PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
<PackageVersion Include="System.Text.Json" Version="8.0.3" />
<PackageVersion Include="Verify.Xunit" Version="$(VerifyXUnitVersion)" />
<PackageVersion Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="$(XamarinAndroidSupportVersion)" />
<PackageVersion Include="Xamarin.Android.Support.v4" Version="$(XamarinAndroidSupportVersion)" />
<PackageVersion Include="Xamarin.Android.Support.v7.AppCompat" Version="$(XamarinAndroidSupportVersion)" />
<PackageVersion Include="Xamarin.Android.Support.v7.Preference" Version="$(XamarinAndroidSupportVersion)" />
<PackageVersion Include="Xamarin.Android.Support.v7.RecyclerView" Version="$(XamarinAndroidSupportVersion)" />
<PackageVersion Include="Xamarin.Android.Support.Vector.Drawable" Version="$(XamarinAndroidSupportVersion)" />
<PackageVersion Include="Xamarin.AndroidX.Core" Version="1.13.0" />
<PackageVersion Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.24" />
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.7.0.1" />
<PackageVersion Include="Xamarin.AndroidX.Preference" Version="1.2.1.4" />
<PackageVersion Include="Xamarin.Forms" Version="5.0.0.2662" />
<PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.10.0.3" />
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />
<PackageVersion Include="xunit.runner.console" Version="$(XUnitVersion)" />
<PackageVersion Include="Verify.Xunit" Version="24.2.0" />
<PackageVersion Include="xunit" Version="2.8.0" />
<PackageVersion Include="xunit.runner.console" Version="2.8.0" />
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.0" />
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
</ItemGroup>
Expand All @@ -65,17 +45,14 @@
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0'))">
<ItemGroup Condition="$(TargetFramework.StartsWith('net4')) or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0'))">
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.29" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.18" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.30" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.4" />
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.5" />
<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
</ItemGroup>
Expand Down
8 changes: 7 additions & 1 deletion src/ReactiveUI/ReactiveUI.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
<Compile Include="Platforms\netstandard2.0\**\*.cs" />
<Compile Include="Platforms\shared\**\*.cs" />
<PackageReference Include="System.ComponentModel" />
<PackageReference Include="System.ComponentModel.Annotations" />
<PackageReference Include="System.Diagnostics.Contracts" />
<PackageReference Include="System.Dynamic.Runtime" />
<PackageReference Include="System.Runtime.Serialization.Primitives" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.EndsWith('-ios')) or $(TargetFramework.EndsWith('-maccatalyst'))">
<Compile Include="Platforms\apple-common\**\*.cs" />
Expand All @@ -47,8 +52,9 @@
<Compile Include="Platforms\android\**\*.cs" />
<Compile Include="Platforms\mobile-common\**\*.cs" />
</ItemGroup>
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0')) ">
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) or '$(TargetFramework)' == 'net6.0' or '$(TargetFramework)' == 'net8.0' or $(TargetFramework.EndsWith('-windows10.0.17763.0')) or $(TargetFramework.EndsWith('-windows10.0.19041.0')) ">
<Compile Include="Platforms\net\**\*.cs" />
<PackageReference Include="System.ComponentModel.Annotations" />
</ItemGroup>
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard')) or $(TargetFramework.StartsWith('net4')) or $(TargetFramework.StartsWith('net6'))">
<PackageReference Include="System.Text.Json" />
Expand Down

0 comments on commit 6960cff

Please sign in to comment.