Skip to content

Commit

Permalink
Use Central Package Management
Browse files Browse the repository at this point in the history
  • Loading branch information
erri120 committed Jul 20, 2023
1 parent bfd3e6d commit d531438
Show file tree
Hide file tree
Showing 20 changed files with 122 additions and 74 deletions.
4 changes: 3 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<Project>
<Import Project="$(MSBuildThisFileDirectory)Packages.props" />
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
Expand Down
63 changes: 63 additions & 0 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
<Project>
<ItemGroup>
<!-- Custom Packages -->
<PackageVersion Include="NexusMods.Paths" Version="0.1.1" />
<PackageVersion Include="NexusMods.Archives.Nx" Version="0.3.3-preview" />
<PackageVersion Include="FomodInstaller.Interface" Version="1.2.0" />
<PackageVersion Include="FomodInstaller.Scripting.XmlScript" Version="1.0.0" />
</ItemGroup>

<ItemGroup>
<!-- Avalonia -->
<PackageVersion Include="Avalonia" Version="11.0.0" />
<PackageVersion Include="Avalonia.Desktop" Version="11.0.0" />
<PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.0.0" />
<PackageVersion Include="Avalonia.Diagnostics" Version="11.0.0" />
<PackageVersion Include="Avalonia.ReactiveUI" Version="11.0.0" />
<PackageVersion Include="Avalonia.Svg.Skia" Version="11.0.0" />
<PackageVersion Include="Avalonia.Themes.Fluent" Version="11.0.0" />
<PackageVersion Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="6.6.0-rc1.1" />
</ItemGroup>

<ItemGroup>
<!-- System -->
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="6.29.0" />
<PackageVersion Include="System.Linq.Async" Version="6.0.1" />
<PackageVersion Include="System.Reactive" Version="6.0.0" />
</ItemGroup>

<ItemGroup>
<!-- Microsoft -->
<PackageVersion Include="Microsoft.Data.Sqlite" Version="7.0.5" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="7.0.5" />
<PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
</ItemGroup>

<ItemGroup>
<!-- Testing -->
<PackageVersion Include="xunit.extensibility.core" Version="2.4.2" />
</ItemGroup>

<ItemGroup>
<!-- Other -->
<PackageVersion Include="BitFaster.Caching" Version="2.1.3" />
<PackageVersion Include="CliWrap" Version="3.6.0" />
<PackageVersion Include="DynamicData" Version="7.14.2" />
<PackageVersion Include="GameFinder" Version="3.1.0" />
<PackageVersion Include="Humanizer" Version="2.14.1" />
<PackageVersion Include="ini-parser-netstandard" Version="2.5.2" />
<PackageVersion Include="Mutagen.Bethesda.Skyrim" Version="0.41.0-pr002" />
<PackageVersion Include="NLog.Extensions.Logging" Version="5.2.3" />
<PackageVersion Include="ReactiveUI.Fody" Version="19.2.1" />
<PackageVersion Include="Sewer56.BitStream" Version="1.3.0" />
<PackageVersion Include="Spectre.Console" Version="0.46.1-preview.0.7" />
<PackageVersion Include="Splat.Microsoft.Extensions.Logging" Version="14.6.8" />
<PackageVersion Include="Vogen" Version="3.0.20" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion NexusMods.App.sln
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".solutionItems", ".solution
LICENSE.md = LICENSE.md
NuGet.Build.props = NuGet.Build.props
README.md = README.md
Packages.props = Packages.props
Directory.Packages.props = Directory.Packages.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NexusMods.Games.FOMOD", "src\Games\NexusMods.Games.FOMOD\NexusMods.Games.FOMOD.csproj", "{B43A31B2-1F08-4D8E-9C45-48015FBA983E}"
Expand Down
5 changes: 0 additions & 5 deletions Packages.props

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="CliWrap" Version="3.6.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="CliWrap" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Mutagen.Bethesda.Skyrim" Version="0.41.0-pr002" />
<PackageReference Include="Mutagen.Bethesda.Skyrim" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Games/NexusMods.Games.FOMOD/NexusMods.Games.FOMOD.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="FomodInstaller.Interface" Version="1.2.0" />
<PackageReference Include="FomodInstaller.Scripting.XmlScript" Version="1.0.0" />
<PackageReference Include="FomodInstaller.Interface" />
<PackageReference Include="FomodInstaller.Scripting.XmlScript" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
<PackageReference Include="ini-parser-netstandard" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,8 @@
<EmbeddedResource Include="Resources\icon.png" />
</ItemGroup>


<ItemGroup>
<InternalsVisibleTo Include="NexusMods.Games.StardewValley.Tests" />
</ItemGroup>



</Project>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<ItemGroup>
<PackageReference Include="xunit.extensibility.core" Version="2.4.2" />
<PackageReference Include="xunit.extensibility.core" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\NexusMods.DataModel.RateLimiting\NexusMods.DataModel.RateLimiting.csproj" />
<ProjectReference Include="..\..\NexusMods.DataModel\NexusMods.DataModel.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('NuGet.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<ItemGroup>
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.29.0" />
<PackageReference Include="System.Linq.Async" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,13 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('NuGet.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<ItemGroup>
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.29.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="System.Linq.Async" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Vogen" Version="3.0.15" />
<PackageReference Include="Vogen" />
</ItemGroup>

</Project>
32 changes: 16 additions & 16 deletions src/NexusMods.App.UI/NexusMods.App.UI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -77,27 +77,27 @@
<ItemGroup>
<TrimmerRootDescriptor Include="Roots.xml" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="NexusMods.UI.Tests" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="11.0.0" />
<PackageReference Include="Avalonia" />
<PackageReference Include="Avalonia.Desktop" />
<PackageReference Include="Avalonia.Controls.DataGrid" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0" />
<PackageReference Include="Avalonia.ReactiveUI" Version="11.0.0" />
<PackageReference Include="Avalonia.Svg.Skia" Version="11.0.0" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0" />
<PackageReference Include="DynamicData" Version="7.14.2" />
<PackageReference Include="Humanizer" Version="2.14.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" Version="6.6.0-rc1.1" />
<PackageReference Include="ReactiveUI.Fody" Version="19.2.1" />
<PackageReference Include="Splat.Microsoft.Extensions.Logging" Version="14.6.8" />
<PackageReference Include="System.Reactive" Version="6.0.0" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" />
<PackageReference Include="Avalonia.ReactiveUI" />
<PackageReference Include="Avalonia.Svg.Skia" />
<PackageReference Include="Avalonia.Themes.Fluent" />
<PackageReference Include="DynamicData" />
<PackageReference Include="Humanizer" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Projektanker.Icons.Avalonia.MaterialDesign" />
<PackageReference Include="ReactiveUI.Fody" />
<PackageReference Include="Splat.Microsoft.Extensions.Logging" />
<PackageReference Include="System.Reactive" />
</ItemGroup>

<ItemGroup>
Expand Down
8 changes: 4 additions & 4 deletions src/NexusMods.App/NexusMods.App.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="7.0.0" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.3" />
<PackageReference Include="Spectre.Console" Version="0.46.1-preview.0.7" />
<PackageReference Include="Microsoft.Extensions.Hosting" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
<PackageReference Include="NLog.Extensions.Logging" />
<PackageReference Include="Spectre.Console" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/NexusMods.CLI/NexusMods.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
<Import Project="$([MSBuild]::GetPathOfFileAbove('NuGet.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<ItemGroup>
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine.NamingConventionBinder" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="System.CommandLine" />
<PackageReference Include="System.CommandLine.NamingConventionBinder" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/NexusMods.Common/NexusMods.Common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

<ItemGroup>
<PackageReference Include="NexusMods.Paths" />
<PackageReference Include="CliWrap" Version="3.6.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="CliWrap" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
</ItemGroup>

<ItemGroup>
Expand Down
20 changes: 10 additions & 10 deletions src/NexusMods.DataModel/NexusMods.DataModel.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="BitFaster.Caching" Version="2.1.3" />
<PackageReference Include="DynamicData" Version="7.14.2" />
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.5" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="7.0.5" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
<PackageReference Include="NexusMods.Archives.Nx" Version="0.3.3-preview" />
<PackageReference Include="Sewer56.BitStream" Version="1.3.0" />
<PackageReference Include="System.Reactive" Version="6.0.0" />
<PackageReference Include="BitFaster.Caching" />
<PackageReference Include="DynamicData" />
<PackageReference Include="Microsoft.Data.Sqlite" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Logging" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" />
<PackageReference Include="NexusMods.Archives.Nx" />
<PackageReference Include="Sewer56.BitStream" />
<PackageReference Include="System.Reactive" />
</ItemGroup>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk">
<!-- NuGet Package Shared Details -->
<Import Project="$([MSBuild]::GetPathOfFileAbove('NuGet.Build.props', '$(MSBuildThisFileDirectory)../'))" />

<ItemGroup>
<PackageReference Include="GameFinder" Version="3.1.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
<PackageReference Include="GameFinder" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
</ItemGroup>

<ItemGroup>
Expand Down

0 comments on commit d531438

Please sign in to comment.