Skip to content

Commit

Permalink
Tidied up projects to minimise on dependencies (#461)
Browse files Browse the repository at this point in the history
Removed duplicated dependencies to minimise Dependabot activity
ChrisPulman authored Aug 1, 2021

Verified

This commit was signed with the committer’s verified signature.
renovate-bot Mend Renovate
1 parent 2395719 commit 33f6620
Showing 10 changed files with 33 additions and 29 deletions.
11 changes: 0 additions & 11 deletions Sample/SextantSample.Android/SextantSample.Android.csproj
Original file line number Diff line number Diff line change
@@ -66,18 +66,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Reactive" Version="5.0.*" />
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
<PackageReference Include="Xamarin.Google.Android.Material" Version="1.3.0.1" />
<PackageReference Include="Xamarin.AndroidX.AppCompat" Version="1.3.0" />
<PackageReference Include="Xamarin.AndroidX.Legacy.Support.V4" Version="1.0.0.7" />
<PackageReference Include="Xamarin.AndroidX.CardView" Version="1.0.0.8" />
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.4" />
<PackageReference Include="ReactiveUI.XamForms" Version="14.*" />
<PackageReference Include="Xamarin.AndroidX.MediaRouter" Version="1.2.4" />
<PackageReference Include="Xamarin.AndroidX.Palette" Version="1.0.0.7" />
<PackageReference Include="Xamarin.Forms" Version="5.0.*" />
<PackageReference Include="Xamarin.AndroidX.Migration" Version="1.0.8" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
4 changes: 0 additions & 4 deletions Sample/SextantSample.Avalonia/SextantSample.Avalonia.csproj
Original file line number Diff line number Diff line change
@@ -4,12 +4,8 @@
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.2" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.0" />
<PackageReference Include="Avalonia.ReactiveUI" Version="0.10.4" />
<PackageReference Include="Citrus.Avalonia" Version="1.4.3" />
<PackageReference Include="MessageBox.Avalonia" Version="1.5.1" />
<PackageReference Include="ReactiveUI" Version="14.*" />
</ItemGroup>
<ItemGroup>
<Compile Update="**\*.xaml.cs">
4 changes: 0 additions & 4 deletions Sample/SextantSample.Core/SextantSample.ViewModels.csproj
Original file line number Diff line number Diff line change
@@ -4,10 +4,6 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ReactiveUI" Version="14.*" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\Sextant\Sextant.csproj" />
</ItemGroup>
2 changes: 0 additions & 2 deletions Sample/SextantSample/SextantSample.csproj
Original file line number Diff line number Diff line change
@@ -4,9 +4,7 @@
<TargetFramework>netstandard2.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="5.0.*" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="ReactiveUI.XamForms" Version="14.*" />
<PackageReference Include="Pharmacist.MsBuild" Version="2.*" PrivateAssets="all" />
<PackageReference Include="Pharmacist.Common" Version="2.*" />
</ItemGroup>
2 changes: 1 addition & 1 deletion src/Directory.build.props
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.220" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.231" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
Original file line number Diff line number Diff line change
@@ -17,4 +17,12 @@
<ProjectReference Include="..\Sextant.Plugins.Popup\Sextant.Plugins.Popup.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="coverlet.msbuild" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="DiffEngine" Version="6.9.2" />
</ItemGroup>

</Project>
8 changes: 8 additions & 0 deletions src/Sextant.Tests/Sextant.Tests.csproj
Original file line number Diff line number Diff line change
@@ -14,4 +14,12 @@
<ProjectReference Include="..\Sextant.Mocks\Sextant.Mocks.csproj" />
<ProjectReference Include="..\Sextant\Sextant.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="coverlet.msbuild" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="DiffEngine" Version="6.9.2" />
</ItemGroup>
</Project>
7 changes: 7 additions & 0 deletions src/Sextant.XamForms.Tests/Sextant.XamForms.Tests.csproj
Original file line number Diff line number Diff line change
@@ -23,4 +23,11 @@
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<ItemGroup>
<PackageReference Update="coverlet.msbuild" Version="3.1.0">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="DiffEngine" Version="6.9.2" />
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions src/Sextant.XamForms/Sextant.XamForms.csproj
Original file line number Diff line number Diff line change
@@ -10,9 +10,8 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="ReactiveUI" Version="14.*" />
<PackageReference Include="ReactiveUI.XamForms" Version="14.*" />
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
<PackageReference Include="Xamarin.Forms" Version="5.0.*" />
</ItemGroup>

<ItemGroup>
13 changes: 8 additions & 5 deletions src/Sextant/DependencyResolverMixins.cs
Original file line number Diff line number Diff line change
@@ -16,6 +16,7 @@ namespace Sextant
#if WINDOWS_UWP
public static partial class DependencyResolverMixins
#else

public static class DependencyResolverMixins
#endif
{
@@ -274,14 +275,16 @@ public static IMutableDependencyResolver RegisterViewModel<TViewModel>(this IMut
}

/// <summary>
/// Registers the provided <see cref="IViewFor{T}"/> to the <see cref="TViewModel"/> for navigation.
/// Registers the provided <see cref="IViewFor{T}" /> to the TViewModel for navigation.
/// </summary>
/// <typeparam name="TView">The view.</typeparam>
/// <typeparam name="TViewModel">The view model.</typeparam>
/// <param name="resolver">The resolver.</param>
/// <param name="viewFactory">The view factory.</param>
/// <param name="viewModelFactory">The view model factory.</param>
/// <typeparam name="TView">The view.</typeparam>
/// <typeparam name="TViewModel">The view model.</typeparam>
/// <returns>The dependency resolver.</returns>
/// <returns>
/// The dependency resolver.
/// </returns>
public static IMutableDependencyResolver RegisterViewForNavigation<TView, TViewModel>(this IMutableDependencyResolver resolver, Func<TView> viewFactory, Func<TViewModel> viewModelFactory)
where TView : class, IViewFor<TViewModel>
where TViewModel : class, IViewModel
@@ -292,7 +295,7 @@ public static IMutableDependencyResolver RegisterViewForNavigation<TView, TViewM
}

/// <summary>
/// Registers the provided <see cref="IViewFor{T}"/> to the <see cref="TViewModel"/> for navigation.
/// Registers the provided <see cref="IViewFor{T}"/> to the TViewModel for navigation.
/// </summary>
/// <param name="resolver">The resolver.</param>
/// <param name="view">The view factory.</param>

0 comments on commit 33f6620

Please sign in to comment.