Skip to content

Commit 00305af

Browse files
glennawatsonglennawatson
authored
breaking change: Remove fody and add central nuget package (#3731)
Removed Fody, since we aren't changing the API surface it'll be supported longer. Introducing central nuget packages. This pushes the versioning out to a inherited file, so its consistent across the entire project. Also introducing grouping for common dependencies such as Splat, Fody or Maui. This will allow us to have consistent packaging across the entire solution. This also means we are no longer using wildcard nuget versions anymore. The grouping should simplify the number of updates we have to perform though.
1 parent 37cc0e3 commit 00305af

File tree

60 files changed

+226
-3290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+226
-3290
lines changed

‎src/Benchmarks/Directory.Packages.props

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<ItemGroup>
7+
<PackageVersion Include="BenchmarkDotNet" Version="0.13.12" />
8+
</ItemGroup>
9+
10+
<!-- Inherit parent props file if one exists. -->
11+
<Import Condition="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../')) != ''"
12+
Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
13+
</Project>

‎src/Benchmarks/ReactiveUI.Benchmarks.csproj

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<IsPackable>false</IsPackable>
5-
<TargetFrameworks>net472;netcoreapp3.1</TargetFrameworks>
6-
<PackageId>BenchmarkDotNet.Samples</PackageId>
4+
<TargetFrameworks>net8.0</TargetFrameworks>
75
<PlatformTarget>AnyCPU</PlatformTarget>
8-
<DebugType>pdbonly</DebugType>
9-
<DebugSymbols>true</DebugSymbols>
106
<OutputType>Exe</OutputType>
117
<NoWarn>;1591;1701;1702;1705;CA1822</NoWarn>
128
<PackageDescription>A MVVM framework that integrates with the Reactive Extensions for .NET to create elegant, testable User Interfaces that run on any mobile or desktop platform. This is the base package with the base platform implementations</PackageDescription>
139
</PropertyGroup>
14-
1510
<ItemGroup>
1611
<Compile Remove="CreateReactiveListBenchmark.cs" />
1712
<Compile Remove="ReactiveListOperationBenchmark.cs" />
1813
</ItemGroup>
19-
2014
<ItemGroup>
21-
<PackageReference Include="DynamicData" Version="*" />
22-
<PackageReference Include="BenchmarkDotNet" Version="*" />
23-
</ItemGroup>
24-
<ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">
25-
<Reference Include="System.Reflection" />
15+
<PackageReference Include="DynamicData" />
16+
<PackageReference Include="BenchmarkDotNet" />
2617
</ItemGroup>
2718
<ItemGroup>
2819
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />

‎src/Directory.Packages.props

+98
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
<CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled>
5+
</PropertyGroup>
6+
<PropertyGroup>
7+
<FodyVersion>6.8.0</FodyVersion>
8+
<SplatVersion>14.8.12</SplatVersion>
9+
<XamarinAndroidSupportVersion>28.0.0.3</XamarinAndroidSupportVersion>
10+
<XUnitVersion>2.6.6</XUnitVersion>
11+
</PropertyGroup>
12+
<ItemGroup>
13+
<PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
14+
<PackageVersion Include="DynamicData" Version="8.3.27" />
15+
<PackageVersion Include="FluentAssertions" Version="6.12.0" />
16+
<PackageVersion Include="Fody" Version="$(FodyVersion)" />
17+
<PackageVersion Include="FodyHelpers" Version="$(FodyVersion)" />
18+
<PackageVersion Include="FodyPackaging" Version="$(FodyVersion)" />
19+
<PackageVersion Include="JetBrains.DotMemoryUnit" Version="3.2.20220510" />
20+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
21+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.11.0" />
22+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
23+
<PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.0" />
24+
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
25+
<PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" />
26+
<PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
27+
<PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" />
28+
<PackageVersion Include="PublicApiGenerator" Version="11.1.0" />
29+
<PackageVersion Include="Reactive.Wasm" Version="1.2.2" />
30+
<PackageVersion Include="Roslynator.Analyzers" Version="4.7.0" />
31+
<PackageVersion Include="Splat" Version="$(SplatVersion)" />
32+
<PackageVersion Include="Splat.Autofac" Version="$(SplatVersion)" />
33+
<PackageVersion Include="Splat.Drawing" Version="$(SplatVersion)" />
34+
<PackageVersion Include="Splat.DryIoc" Version="$(SplatVersion)" />
35+
<PackageVersion Include="Splat.Ninject" Version="$(SplatVersion)" />
36+
<PackageVersion Include="stylecop.analyzers" Version="1.2.0-beta.556" />
37+
<PackageVersion Include="System.Collections.Immutable" Version="8.0.0" />
38+
<PackageVersion Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
39+
<PackageVersion Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
40+
<PackageVersion Include="System.Text.Json" Version="8.0.0" />
41+
<PackageVersion Include="Verify.Xunit" Version="23.0.1" />
42+
<PackageVersion Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="$(XamarinAndroidSupportVersion)" />
43+
<PackageVersion Include="Xamarin.Android.Support.v4" Version="$(XamarinAndroidSupportVersion)" />
44+
<PackageVersion Include="Xamarin.Android.Support.v7.AppCompat" Version="$(XamarinAndroidSupportVersion)" />
45+
<PackageVersion Include="Xamarin.Android.Support.v7.Preference" Version="$(XamarinAndroidSupportVersion)" />
46+
<PackageVersion Include="Xamarin.Android.Support.v7.RecyclerView" Version="$(XamarinAndroidSupportVersion)" />
47+
<PackageVersion Include="Xamarin.Android.Support.Vector.Drawable" Version="$(XamarinAndroidSupportVersion)" />
48+
<PackageVersion Include="Xamarin.AndroidX.Core" Version="1.12.0.1" />
49+
<PackageVersion Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.21" />
50+
<PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.2.1" />
51+
<PackageVersion Include="Xamarin.AndroidX.Preference" Version="1.2.1.1" />
52+
<PackageVersion Include="Xamarin.Forms" Version="5.0.0.2622" />
53+
<PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" />
54+
<PackageVersion Include="Xamarin.Google.Android.Material" Version="1.9.0.3" />
55+
<PackageVersion Include="xunit" Version="$(XUnitVersion)" />
56+
<PackageVersion Include="xunit.runner.console" Version="$(XUnitVersion)" />
57+
<PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" />
58+
<PackageVersion Include="Xunit.StaFact" Version="1.1.11" />
59+
</ItemGroup>
60+
<ItemGroup Condition="'$(UseMaui)' != 'true'">
61+
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" />
62+
</ItemGroup>
63+
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
64+
<PackageVersion Include="System.ValueTuple" Version="4.5.0" />
65+
</ItemGroup>
66+
<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'))">
67+
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
68+
</ItemGroup>
69+
<ItemGroup Condition="$(TargetFramework.StartsWith('net6'))">
70+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
71+
</ItemGroup>
72+
<ItemGroup Condition="$(TargetFramework.StartsWith('net7'))">
73+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
74+
</ItemGroup>
75+
<ItemGroup Condition="$(TargetFramework.StartsWith('net8'))">
76+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
77+
<PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" />
78+
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
79+
</ItemGroup>
80+
<ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))">
81+
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="3.1.32" />
82+
<PackageVersion Include="System.ComponentModel" Version="4.3.0" />
83+
<PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
84+
<PackageVersion Include="System.Diagnostics.Contracts" Version="4.3.0" />
85+
<PackageVersion Include="System.Dynamic.Runtime" Version="4.3.0" />
86+
</ItemGroup>
87+
<ItemGroup Condition="$(TargetFramework.StartsWith('tizen'))">
88+
<PackageVersion Include="Microsoft.Win32.Primitives" Version="4.3.0" />
89+
<PackageVersion Include="System.Collections" Version="4.3.0" />
90+
<PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
91+
<PackageVersion Include="System.Diagnostics.Tracing" Version="4.3.0" />
92+
<PackageVersion Include="System.IO.FileSystem" Version="4.3.0" />
93+
<PackageVersion Include="System.Net.Primitives" Version="4.3.1" />
94+
<PackageVersion Include="System.Runtime.InteropServices" Version="4.3.0" />
95+
<PackageVersion Include="System.Text.Encoding.Extensions" Version="4.3.0" />
96+
<PackageVersion Include="System.Threading" Version="4.3.0" />
97+
</ItemGroup>
98+
</Project>

‎src/Directory.build.props

+18-27
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@
1818
<RepositoryUrl>https://github.com/reactiveui/reactiveui</RepositoryUrl>
1919
<RepositoryType>git</RepositoryType>
2020
<NoWarn>$(NoWarn);SA1010;RCS1198;RCS1158;RCS1163;RCS1256;IDE0060;IDE1006;VSSpell001</NoWarn>
21-
2221
<!-- Publish the repository URL in the built .nupkg (in the NuSpec <Repository> element) -->
23-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
22+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
2423
<!-- Embed source files that are not tracked by the source control manager in the PDB -->
2524
<EmbedUntrackedSources>true</EmbedUntrackedSources>
2625
<!-- Include PDB in the built .nupkg -->
@@ -33,52 +32,44 @@
3332
<EmbedUntrackedSources>true</EmbedUntrackedSources>
3433
<IncludePackageReferencesDuringMarkupCompilation>true</IncludePackageReferencesDuringMarkupCompilation>
3534
<PublishRepositoryUrl>true</PublishRepositoryUrl>
36-
<XunitVersion>2.6.6</XunitVersion>
3735
</PropertyGroup>
3836
<!--<PropertyGroup Condition="$(IsTestProject) != 'true'">
3937
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
4038
</PropertyGroup>-->
41-
4239
<!-- MonoAndroid doesn't seem to want to allow debugging for maintainers -->
4340
<PropertyGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
4441
<DebugType>portable</DebugType>
4542
</PropertyGroup>
46-
4743
<PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
4844
<ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
4945
</PropertyGroup>
50-
5146
<ItemGroup Condition="$(IsTestProject)">
52-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
53-
<PackageReference Include="xunit" Version="$(XunitVersion)" />
54-
<PackageReference Include="xunit.runner.console" Version="$(XunitVersion)" />
55-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.6" />
56-
<PackageReference Include="Xunit.StaFact" Version="1.1.11" />
57-
<PackageReference Include="FluentAssertions" Version="6.12.0" />
58-
<PackageReference Include="Microsoft.Reactive.Testing" Version="6.0.0" />
59-
<PackageReference Include="PublicApiGenerator" Version="11.1.0" />
60-
<PackageReference Include="coverlet.msbuild" Version="6.0.0" PrivateAssets="All" />
61-
<PackageReference Include="Verify.Xunit" Version="23.0.1" />
47+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
48+
<PackageReference Include="xunit" />
49+
<PackageReference Include="xunit.runner.console" />
50+
<PackageReference Include="xunit.runner.visualstudio" />
51+
<PackageReference Include="Xunit.StaFact" />
52+
<PackageReference Include="FluentAssertions" />
53+
<PackageReference Include="Microsoft.Reactive.Testing" />
54+
<PackageReference Include="PublicApiGenerator" />
55+
<PackageReference Include="coverlet.msbuild" PrivateAssets="All" />
56+
<PackageReference Include="Verify.Xunit" />
6257
</ItemGroup>
63-
6458
<ItemGroup Condition="'$(IsTestProject)' != 'true'">
65-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
59+
<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
6660
</ItemGroup>
67-
68-
<PropertyGroup>
61+
<PropertyGroup>
6962
<SolutionDir Condition="'$(SolutionDir)' == ''">$(MSBuildThisFileDirectory)</SolutionDir>
7063
</PropertyGroup>
71-
7264
<ItemGroup>
73-
<None Include="$(MSBuildThisFileDirectory)..\images\logo.png" Pack="true" PackagePath="\"/>
65+
<None Include="$(MSBuildThisFileDirectory)..\images\logo.png" Pack="true" PackagePath="\" />
7466
<None Include="$(MSBuildThisFileDirectory)..\LICENSE" Pack="true" PackagePath="LICENSE" />
7567
<None Include="$(MSBuildThisFileDirectory)..\README.md" Pack="true" PackagePath="\" />
7668
</ItemGroup>
77-
78-
<ItemGroup>
79-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
80-
<PackageReference Include="stylecop.analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
81-
<PackageReference Include="Roslynator.Analyzers" Version="4.7.0" PrivateAssets="All" />
69+
<ItemGroup>
70+
<PackageReference Include="Nerdbank.GitVersioning" PrivateAssets="all" />
71+
<PackageReference Include="stylecop.analyzers" PrivateAssets="all" />
72+
<PackageReference Include="Roslynator.Analyzers" PrivateAssets="All" />
8273
</ItemGroup>
8374
<ItemGroup>
8475
<AdditionalFiles Include="$(MSBuildThisFileDirectory)stylecop.json" Link="stylecop.json" />

‎src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj

+11-15
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,28 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
2-
32
<PropertyGroup>
43
<TargetFrameworks>MonoAndroid13.0</TargetFrameworks>
54
<PackageDescription>Provides ReactiveUI extensions for the Android Support Library</PackageDescription>
65
<PackageId>ReactiveUI.AndroidSupport</PackageId>
76
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags>
87
</PropertyGroup>
9-
108
<ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) ">
119
<!-- Hack to get around invalid version of Java.Interop -->
1210
<Reference Include="Java.Interop">
13-
<!-- Path to a VS 2019 Java.Interop.dll -->
14-
<HintPath>..\Java.Interop.dll</HintPath>
15-
</Reference>
11+
<!-- Path to a VS 2019 Java.Interop.dll -->
12+
<HintPath>..\Java.Interop.dll</HintPath>
13+
</Reference>
1614
</ItemGroup>
17-
1815
<ItemGroup>
19-
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="28.*" />
20-
<PackageReference Include="Xamarin.Android.Support.v4" Version="28.*" />
21-
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.*" />
22-
<PackageReference Include="Xamarin.Android.Support.v7.Preference" Version="28.*" />
23-
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.*" />
24-
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.*" />
25-
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
16+
<PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" />
17+
<PackageReference Include="Xamarin.Android.Support.v4" />
18+
<PackageReference Include="Xamarin.Android.Support.v7.AppCompat" />
19+
<PackageReference Include="Xamarin.Android.Support.v7.Preference" />
20+
<PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" />
21+
<PackageReference Include="Xamarin.Android.Support.Vector.Drawable" />
22+
<PackageReference Include="System.Runtime.Serialization.Primitives" />
2623
<Reference Include="System.Runtime.Serialization" />
2724
</ItemGroup>
28-
2925
<ItemGroup>
3026
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
3127
</ItemGroup>
32-
</Project>
28+
</Project>

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

+10-14
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,27 @@
11
<Project Sdk="MSBuild.Sdk.Extras">
2-
32
<PropertyGroup>
43
<TargetFrameworks>MonoAndroid13.0</TargetFrameworks>
54
<PackageDescription>Provides ReactiveUI extensions for the AndroidX Library</PackageDescription>
65
<PackageId>ReactiveUI.AndroidX</PackageId>
76
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags>
87
</PropertyGroup>
9-
108
<ItemGroup>
119
<!-- Hack to get around invalid version of Java.Interop -->
1210
<Reference Include="Java.Interop">
13-
<!-- Path to a VS 2019 Java.Interop.dll -->
14-
<HintPath>..\Java.Interop.dll</HintPath>
15-
</Reference>
11+
<!-- Path to a VS 2019 Java.Interop.dll -->
12+
<HintPath>..\Java.Interop.dll</HintPath>
13+
</Reference>
1614
</ItemGroup>
17-
1815
<ItemGroup>
19-
<PackageReference Include="Xamarin.AndroidX.Core" Version="1.12.0.1" />
20-
<PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.1.1" />
21-
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.21" />
22-
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.3" />
23-
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.2.1" />
24-
<PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
16+
<PackageReference Include="Xamarin.AndroidX.Core" />
17+
<PackageReference Include="Xamarin.AndroidX.Preference" />
18+
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" />
19+
<PackageReference Include="Xamarin.Google.Android.Material" />
20+
<PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" />
21+
<PackageReference Include="System.Runtime.Serialization.Primitives" />
2522
<Reference Include="System.Runtime.Serialization" />
2623
</ItemGroup>
27-
2824
<ItemGroup>
2925
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
3026
</ItemGroup>
31-
</Project>
27+
</Project>

‎src/ReactiveUI.Blazor/ReactiveUI.Blazor.csproj

+3-18
Original file line numberDiff line numberDiff line change
@@ -5,27 +5,12 @@
55
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;eventsnet;netstandard;blazor;web;</PackageTags>
66
<NoWarn>$(NoWarn);BL0007;</NoWarn>
77
</PropertyGroup>
8-
98
<ItemGroup>
10-
<PackageReference Include="Reactive.Wasm" Version="1.*" />
9+
<PackageReference Include="Reactive.Wasm" />
1110
</ItemGroup>
12-
13-
<ItemGroup Condition=" $(TargetFramework.StartsWith('netstandard')) ">
14-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.32" />
15-
</ItemGroup>
16-
17-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net6')) ">
18-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="6.0.25" />
19-
</ItemGroup>
20-
21-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net7')) ">
22-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="7.0.14" />
23-
</ItemGroup>
24-
25-
<ItemGroup Condition=" $(TargetFramework.StartsWith('net8')) ">
26-
<PackageReference Include="Microsoft.AspNetCore.Components" Version="8.0.0" />
11+
<ItemGroup>
12+
<PackageReference Include="Microsoft.AspNetCore.Components" />
2713
</ItemGroup>
28-
2914
<ItemGroup>
3015
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
3116
</ItemGroup>

‎src/ReactiveUI.Blend/ReactiveUI.Blend.csproj

+2-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
32
<PropertyGroup>
43
<TargetFrameworks>net462;net472;net6.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net8.0-windows10.0.17763.0</TargetFrameworks>
54
<AssemblyName>ReactiveUI.Blend</AssemblyName>
@@ -9,22 +8,18 @@
98
<PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;Blend;wpf;net;</PackageTags>
109
<UseWPF>true</UseWPF>
1110
</PropertyGroup>
12-
1311
<ItemGroup>
1412
<Compile Remove="Platforms\**\*.cs" />
1513
<None Include="Platforms\**\*.cs" />
1614
</ItemGroup>
17-
1815
<ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">
1916
<Reference Include="PresentationFramework.Aero" />
2017
</ItemGroup>
21-
2218
<ItemGroup>
2319
<Compile Include="Platforms\net4\**\*.cs" />
24-
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
20+
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" />
2521
</ItemGroup>
26-
2722
<ItemGroup>
2823
<ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" />
2924
</ItemGroup>
30-
</Project>
25+
</Project>

0 commit comments

Comments
 (0)