Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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.
- Loading branch information
1 parent
37cc0e3
commit 00305af
Showing
60 changed files
with
226 additions
and
3,290 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> | ||
| <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageVersion Include="BenchmarkDotNet" Version="0.13.12" /> | ||
| </ItemGroup> | ||
|
|
||
| <!-- Inherit parent props file if one exists. --> | ||
| <Import Condition="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../')) != ''" | ||
| Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" /> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> | ||
| <CentralPackageTransitivePinningEnabled>true</CentralPackageTransitivePinningEnabled> | ||
| </PropertyGroup> | ||
| <PropertyGroup> | ||
| <FodyVersion>6.8.0</FodyVersion> | ||
| <SplatVersion>14.8.12</SplatVersion> | ||
| <XamarinAndroidSupportVersion>28.0.0.3</XamarinAndroidSupportVersion> | ||
| <XUnitVersion>2.6.6</XUnitVersion> | ||
| </PropertyGroup> | ||
| <ItemGroup> | ||
| <PackageVersion Include="coverlet.msbuild" Version="6.0.0" /> | ||
| <PackageVersion Include="DynamicData" Version="8.3.27" /> | ||
| <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="3.11.0" /> | ||
| <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> | ||
| <PackageVersion Include="Microsoft.Reactive.Testing" Version="6.0.0" /> | ||
| <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" /> | ||
| <PackageVersion Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.2428" /> | ||
| <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" /> | ||
| <PackageVersion Include="Nerdbank.GitVersioning" Version="3.6.133" /> | ||
| <PackageVersion Include="PublicApiGenerator" Version="11.1.0" /> | ||
| <PackageVersion Include="Reactive.Wasm" Version="1.2.2" /> | ||
| <PackageVersion Include="Roslynator.Analyzers" Version="4.7.0" /> | ||
| <PackageVersion Include="Splat" Version="$(SplatVersion)" /> | ||
| <PackageVersion Include="Splat.Autofac" Version="$(SplatVersion)" /> | ||
| <PackageVersion Include="Splat.Drawing" Version="$(SplatVersion)" /> | ||
| <PackageVersion Include="Splat.DryIoc" Version="$(SplatVersion)" /> | ||
| <PackageVersion Include="Splat.Ninject" Version="$(SplatVersion)" /> | ||
| <PackageVersion Include="stylecop.analyzers" Version="1.2.0-beta.556" /> | ||
| <PackageVersion Include="System.Collections.Immutable" Version="8.0.0" /> | ||
| <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.0" /> | ||
| <PackageVersion Include="Verify.Xunit" Version="23.0.1" /> | ||
| <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.12.0.1" /> | ||
| <PackageVersion Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.21" /> | ||
| <PackageVersion Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.2.1" /> | ||
| <PackageVersion Include="Xamarin.AndroidX.Preference" Version="1.2.1.1" /> | ||
| <PackageVersion Include="Xamarin.Forms" Version="5.0.0.2622" /> | ||
| <PackageVersion Include="Xamarin.Forms.Mocks" Version="4.7.0.1" /> | ||
| <PackageVersion Include="Xamarin.Google.Android.Material" Version="1.9.0.3" /> | ||
| <PackageVersion Include="xunit" Version="$(XUnitVersion)" /> | ||
| <PackageVersion Include="xunit.runner.console" Version="$(XUnitVersion)" /> | ||
| <PackageVersion Include="xunit.runner.visualstudio" Version="2.5.6" /> | ||
| <PackageVersion Include="Xunit.StaFact" Version="1.1.11" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="'$(UseMaui)' != 'true'"> | ||
| <PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.4.231115000" /> | ||
| </ItemGroup> | ||
| <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'))"> | ||
| <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="$(TargetFramework.StartsWith('net6'))"> | ||
| <PackageVersion Include="Microsoft.AspNetCore.Components" Version="6.0.25" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="$(TargetFramework.StartsWith('net7'))"> | ||
| <PackageVersion Include="Microsoft.AspNetCore.Components" Version="7.0.14" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="$(TargetFramework.StartsWith('net8'))"> | ||
| <PackageVersion Include="Microsoft.AspNetCore.Components" Version="8.0.0" /> | ||
| <PackageVersion Include="Microsoft.Maui.Controls" Version="$(MauiVersion)" /> | ||
| <PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard'))"> | ||
| <PackageVersion Include="Microsoft.AspNetCore.Components" Version="3.1.32" /> | ||
| <PackageVersion Include="System.ComponentModel" Version="4.3.0" /> | ||
| <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" /> | ||
| <PackageVersion Include="System.Diagnostics.Contracts" Version="4.3.0" /> | ||
| <PackageVersion Include="System.Dynamic.Runtime" Version="4.3.0" /> | ||
| </ItemGroup> | ||
| <ItemGroup Condition="$(TargetFramework.StartsWith('tizen'))"> | ||
| <PackageVersion Include="Microsoft.Win32.Primitives" Version="4.3.0" /> | ||
| <PackageVersion Include="System.Collections" Version="4.3.0" /> | ||
| <PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" /> | ||
| <PackageVersion Include="System.Diagnostics.Tracing" Version="4.3.0" /> | ||
| <PackageVersion Include="System.IO.FileSystem" Version="4.3.0" /> | ||
| <PackageVersion Include="System.Net.Primitives" Version="4.3.1" /> | ||
| <PackageVersion Include="System.Runtime.InteropServices" Version="4.3.0" /> | ||
| <PackageVersion Include="System.Text.Encoding.Extensions" Version="4.3.0" /> | ||
| <PackageVersion Include="System.Threading" Version="4.3.0" /> | ||
| </ItemGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 11 additions & 15 deletions
26
src/ReactiveUI.AndroidSupport/ReactiveUI.AndroidSupport.csproj
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,28 @@ | ||
| <Project Sdk="MSBuild.Sdk.Extras"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>MonoAndroid13.0</TargetFrameworks> | ||
| <PackageDescription>Provides ReactiveUI extensions for the Android Support Library</PackageDescription> | ||
| <PackageId>ReactiveUI.AndroidSupport</PackageId> | ||
| <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup Condition=" $(TargetFramework.StartsWith('MonoAndroid')) "> | ||
| <!-- Hack to get around invalid version of Java.Interop --> | ||
| <Reference Include="Java.Interop"> | ||
| <!-- Path to a VS 2019 Java.Interop.dll --> | ||
| <HintPath>..\Java.Interop.dll</HintPath> | ||
| </Reference> | ||
| <!-- Path to a VS 2019 Java.Interop.dll --> | ||
| <HintPath>..\Java.Interop.dll</HintPath> | ||
| </Reference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" Version="28.*" /> | ||
| <PackageReference Include="Xamarin.Android.Support.v4" Version="28.*" /> | ||
| <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" Version="28.*" /> | ||
| <PackageReference Include="Xamarin.Android.Support.v7.Preference" Version="28.*" /> | ||
| <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" Version="28.*" /> | ||
| <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" Version="28.*" /> | ||
| <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" /> | ||
| <PackageReference Include="Xamarin.Android.Support.Animated.Vector.Drawable" /> | ||
| <PackageReference Include="Xamarin.Android.Support.v4" /> | ||
| <PackageReference Include="Xamarin.Android.Support.v7.AppCompat" /> | ||
| <PackageReference Include="Xamarin.Android.Support.v7.Preference" /> | ||
| <PackageReference Include="Xamarin.Android.Support.v7.RecyclerView" /> | ||
| <PackageReference Include="Xamarin.Android.Support.Vector.Drawable" /> | ||
| <PackageReference Include="System.Runtime.Serialization.Primitives" /> | ||
| <Reference Include="System.Runtime.Serialization" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" /> | ||
| </ItemGroup> | ||
| </Project> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,31 +1,27 @@ | ||
| <Project Sdk="MSBuild.Sdk.Extras"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFrameworks>MonoAndroid13.0</TargetFrameworks> | ||
| <PackageDescription>Provides ReactiveUI extensions for the AndroidX Library</PackageDescription> | ||
| <PackageId>ReactiveUI.AndroidX</PackageId> | ||
| <PackageTags>mvvm;reactiveui;rx;reactive extensions;observable;LINQ;events;frp;xamarin;android;forms;monodroid;monotouch;xamarin.android;net;</PackageTags> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <!-- Hack to get around invalid version of Java.Interop --> | ||
| <Reference Include="Java.Interop"> | ||
| <!-- Path to a VS 2019 Java.Interop.dll --> | ||
| <HintPath>..\Java.Interop.dll</HintPath> | ||
| </Reference> | ||
| <!-- Path to a VS 2019 Java.Interop.dll --> | ||
| <HintPath>..\Java.Interop.dll</HintPath> | ||
| </Reference> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Xamarin.AndroidX.Core" Version="1.12.0.1" /> | ||
| <PackageReference Include="Xamarin.AndroidX.Preference" Version="1.2.1.1" /> | ||
| <PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" Version="1.0.0.21" /> | ||
| <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.3" /> | ||
| <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" Version="2.6.2.1" /> | ||
| <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" /> | ||
| <PackageReference Include="Xamarin.AndroidX.Core" /> | ||
| <PackageReference Include="Xamarin.AndroidX.Preference" /> | ||
| <PackageReference Include="Xamarin.AndroidX.Legacy.Support.Core.UI" /> | ||
| <PackageReference Include="Xamarin.Google.Android.Material" /> | ||
| <PackageReference Include="Xamarin.AndroidX.Lifecycle.LiveData" /> | ||
| <PackageReference Include="System.Runtime.Serialization.Primitives" /> | ||
| <Reference Include="System.Runtime.Serialization" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\ReactiveUI\ReactiveUI.csproj" /> | ||
| </ItemGroup> | ||
| </Project> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.