build: Use Nuget central package management

Move all package versions from `Directory.Build.targets` to `Directory.Packages.props` as shown here: https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management#enabling-central-package-management
2 years ago · 6ed7961c8c
parent 7482bdc616
commit 6ed7961c8c
5 changed files with 95 additions and 78 deletions
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@ -8,7 +8,7 @@
    <DebugType>embedded</DebugType>
    <AnalysisMode>AllEnabledByDefault</AnalysisMode>
    <GitVersionBaseDirectory>$(MSBuildThisFileDirectory)</GitVersionBaseDirectory>
-<!--    <DisableGitVersionTask>true</DisableGitVersionTask>-->
+    <!--<DisableGitVersionTask>true</DisableGitVersionTask>-->
  </PropertyGroup>

  <!--
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@ -1,56 +1,4 @@
 <Project>
-  <ItemGroup>
-    <PackageReference Update="Autofac" Version="6.4.0" />
-    <PackageReference Update="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
-    <PackageReference Update="Autofac.Extras.AggregateService" Version="6.1.2" />
-    <PackageReference Update="Autofac.Extras.Ordering" Version="4.0.0" />
-    <PackageReference Update="AutofacContrib.NSubstitute" Version="7.0.0" />
-    <PackageReference Update="AutoFixture" Version="4.17.0" />
-    <PackageReference Update="AutoFixture.AutoNSubstitute" Version="4.17.0" />
-    <PackageReference Update="AutoFixture.NUnit3" Version="4.17.0" />
-    <PackageReference Update="AutoMapper" Version="11.0.1" />
-    <PackageReference Update="CliFx" Version="2.3.0" />
-    <PackageReference Update="coverlet.collector" Version="3.1.2" />
-    <PackageReference Update="FluentAssertions" Version="6.7.0" />
-    <PackageReference Update="FluentAssertions.Json" Version="6.1.0" />
-    <PackageReference Update="FluentValidation" Version="11.2.1" />
-    <PackageReference Update="Flurl" Version="3.0.6" />
-    <PackageReference Update="Flurl.Http" Version="3.2.4" />
-    <PackageReference Update="GitHubActionsTestLogger" Version="2.0.1" />
-    <PackageReference Update="GitVersion.MsBuild" Version="5.10.3" />
-    <PackageReference Update="JetBrains.Annotations" Version="*" />
-    <PackageReference Update="LibGit2Sharp" Version="0.27.0-preview-0182" />
-    <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.3.0" />
-    <PackageReference Update="morelinq" Version="3.3.2" />
-    <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Update="Newtonsoft.Json.Schema" Version="3.0.14" />
-    <PackageReference Update="NSubstitute" Version="4.4.0" />
-    <PackageReference Update="NSubstitute.Analyzers.CSharp" Version="1.0.15" />
-    <PackageReference Update="NUnit" Version="3.13.3" />
-    <PackageReference Update="NUnit.Analyzers" Version="3.3.0" />
-    <PackageReference Update="NUnit3TestAdapter" Version="4.2.1" />
-    <PackageReference Update="Serilog" Version="2.11.0" />
-    <PackageReference Update="Serilog.Sinks.Console" Version="4.0.1" />
-    <PackageReference Update="Serilog.Sinks.File" Version="5.0.0" />
-    <PackageReference Update="Serilog.Sinks.NUnit" Version="1.0.3" />
-    <PackageReference Update="Serilog.Sinks.TestCorrelator" Version="3.2.0" />
-    <PackageReference Update="System.Data.HashFunction.FNV" Version="2.0.0" />
-    <PackageReference Update="System.IO.Abstractions" Version="17.1.1" />
-    <PackageReference Update="System.IO.Abstractions.TestingHelpers" Version="17.1.1" />
-    <PackageReference Update="System.Reactive" Version="5.0.0" />
-    <PackageReference Update="TestableIO.System.IO.Abstractions.Extensions" Version="1.0.32" />
-    <PackageReference Update="YamlDotNet" Version="12.0.0" />
-
-  </ItemGroup>
-
-  <!-- Following found during vulerabilities Code Scan  -->
-  <ItemGroup>
-    <PackageReference Update="System.Net.Http" Version="4.3.4" />
-    <PackageReference Update="System.Private.Uri" Version="4.3.2" />
-    <PackageReference Update="System.Text.RegularExpressions" Version="4.3.1" />
-  </ItemGroup>
-
  <ItemGroup Condition="$(ProjectName.EndsWith('.Tests'))">
    <None Remove="TestResults/**/*" />
  </ItemGroup>
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@ -0,0 +1,61 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <!-- Central Package Versions -->
+  <ItemGroup>
+    <PackageVersion Include="Autofac" Version="6.4.0" />
+    <PackageVersion Include="Autofac.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageVersion Include="Autofac.Extras.AggregateService" Version="6.1.2" />
+    <PackageVersion Include="Autofac.Extras.Ordering" Version="4.0.0" />
+    <PackageVersion Include="AutofacContrib.NSubstitute" Version="7.0.0" />
+    <PackageVersion Include="AutofacSerilogIntegration" Version="5.0.0" />
+    <PackageVersion Include="AutoFixture" Version="4.17.0" />
+    <PackageVersion Include="AutoFixture.AutoNSubstitute" Version="4.17.0" />
+    <PackageVersion Include="AutoFixture.NUnit3" Version="4.17.0" />
+    <PackageVersion Include="AutoMapper" Version="11.0.1" />
+    <PackageVersion Include="CliFx" Version="2.3.0" />
+    <PackageVersion Include="coverlet.collector" Version="3.1.2" />
+    <PackageVersion Include="FluentAssertions" Version="6.7.0" />
+    <PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
+    <PackageVersion Include="FluentValidation" Version="11.2.1" />
+    <PackageVersion Include="Flurl" Version="3.0.6" />
+    <PackageVersion Include="Flurl.Http" Version="3.2.4" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.0.1" />
+    <PackageVersion Include="GitVersion.MsBuild" Version="5.10.3" />
+    <PackageVersion Include="JetBrains.Annotations" Version="2022.1.0" />
+    <PackageVersion Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageVersion Include="morelinq" Version="3.3.2" />
+    <PackageVersion Include="MudBlazor" Version="6.0.14" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageVersion Include="Newtonsoft.Json.Schema" Version="3.0.14" />
+    <PackageVersion Include="NSubstitute" Version="4.4.0" />
+    <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.15" />
+    <PackageVersion Include="NUnit" Version="3.13.3" />
+    <PackageVersion Include="NUnit.Analyzers" Version="3.3.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.2.1" />
+    <PackageVersion Include="ReactiveUI.Blazor" Version="18.3.1" />
+    <PackageVersion Include="Serilog" Version="2.11.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="6.0.1" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="4.0.1" />
+    <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageVersion Include="Serilog.Sinks.NUnit" Version="1.0.3" />
+    <PackageVersion Include="Serilog.Sinks.TestCorrelator" Version="3.2.0" />
+    <PackageVersion Include="System.Data.HashFunction.FNV" Version="2.0.0" />
+    <PackageVersion Include="System.IO.Abstractions" Version="17.1.1" />
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="17.1.1" />
+    <PackageVersion Include="System.Reactive" Version="5.0.0" />
+    <PackageVersion Include="TestableIO.System.IO.Abstractions.Extensions" Version="1.0.32" />
+    <PackageVersion Include="YamlDotNet" Version="12.0.0" />
+  </ItemGroup>
+
+  <!-- Following found during vulerabilities Code Scan  -->
+  <ItemGroup>
+    <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+    <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
+    <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
+  </ItemGroup>
+</Project>
--- a/src/Recyclarr.Gui/Recyclarr.Gui.csproj
+++ b/src/Recyclarr.Gui/Recyclarr.Gui.csproj
@ -7,11 +7,11 @@
  <ItemGroup>
    <PackageReference Include="Autofac" />
    <PackageReference Include="Autofac.Extensions.DependencyInjection" />
-    <PackageReference Include="AutofacSerilogIntegration" Version="5.0.0" />
-    <PackageReference Include="MudBlazor" Version="6.0.14" />
-    <PackageReference Include="ReactiveUI.Blazor" Version="18.3.1" />
-    <PackageReference Include="Serilog.AspNetCore" Version="6.0.1" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="AutofacSerilogIntegration" />
+    <PackageReference Include="MudBlazor" />
+    <PackageReference Include="ReactiveUI.Blazor" />
+    <PackageReference Include="Serilog.AspNetCore" />
+    <PackageReference Include="Serilog.Sinks.File" />
  </ItemGroup>

  <ItemGroup>
--- a/src/Recyclarr.sln
+++ b/src/Recyclarr.sln
@ -1,39 +1,43 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr", "Recyclarr\Recyclarr.csproj", "{CD5C6F99-C587-4B7C-86AE-550FA4A5594A}"
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32825.248
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr", "Recyclarr\Recyclarr.csproj", "{CD5C6F99-C587-4B7C-86AE-550FA4A5594A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Tests", "Recyclarr.Tests\Recyclarr.Tests.csproj", "{217D5972-4BB7-4343-9043-C30BD9A1811E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Tests", "Recyclarr.Tests\Recyclarr.Tests.csproj", "{217D5972-4BB7-4343-9043-C30BD9A1811E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLibrary", "TestLibrary\TestLibrary.csproj", "{49F28A82-468F-4C48-9A59-D41B8FE26D6E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLibrary", "TestLibrary\TestLibrary.csproj", "{49F28A82-468F-4C48-9A59-D41B8FE26D6E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestLibrary.Tests", "TestLibrary.Tests\TestLibrary.Tests.csproj", "{BF105B2F-8E13-48AD-BF72-DF7EFEB018B6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLibrary.Tests", "TestLibrary.Tests\TestLibrary.Tests.csproj", "{BF105B2F-8E13-48AD-BF72-DF7EFEB018B6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Props", "Props", "{305C2AC5-803F-41B3-92D8-4AD2B2E3E130}"
-ProjectSection(SolutionItems) = preProject
-	Directory.Build.props = Directory.Build.props
-	Directory.Build.targets = Directory.Build.targets
-	.editorconfig = .editorconfig
-EndProjectSection
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+		Directory.Build.props = Directory.Build.props
+		Directory.Build.targets = Directory.Build.targets
+		Directory.Packages.props = Directory.Packages.props
+	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common", "Common\Common.csproj", "{18CF1FCA-7983-4423-8B7E-4A830108C624}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common", "Common\Common.csproj", "{18CF1FCA-7983-4423-8B7E-4A830108C624}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.Tests", "Common.Tests\Common.Tests.csproj", "{0720939D-1CA6-43D7-BBED-F8F894C4F562}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Tests", "Common.Tests\Common.Tests.csproj", "{0720939D-1CA6-43D7-BBED-F8F894C4F562}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrashLib.TestLibrary", "TrashLib.TestLibrary\TrashLib.TestLibrary.csproj", "{33226068-65E3-4890-8671-59A56BA3F6F0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrashLib.TestLibrary", "TrashLib.TestLibrary\TrashLib.TestLibrary.csproj", "{33226068-65E3-4890-8671-59A56BA3F6F0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrashLib", "TrashLib\TrashLib.csproj", "{4F6ACBA6-9A7D-487C-ACC1-787CCC90A381}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrashLib", "TrashLib\TrashLib.csproj", "{4F6ACBA6-9A7D-487C-ACC1-787CCC90A381}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrashLib.Tests", "TrashLib.Tests\TrashLib.Tests.csproj", "{A4EC7E0D-C591-4874-B9AC-EB12A96F3E83}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TrashLib.Tests", "TrashLib.Tests\TrashLib.Tests.csproj", "{A4EC7E0D-C591-4874-B9AC-EB12A96F3E83}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionControl", "VersionControl\VersionControl.csproj", "{CF5BB1A7-3D21-48CB-B6B0-526612B2D94D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VersionControl", "VersionControl\VersionControl.csproj", "{CF5BB1A7-3D21-48CB-B6B0-526612B2D94D}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VersionControl.Tests", "VersionControl.Tests\VersionControl.Tests.csproj", "{F81C7EA3-4ACA-4171-8A60-531F129A33C5}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VersionControl.Tests", "VersionControl.Tests\VersionControl.Tests.csproj", "{F81C7EA3-4ACA-4171-8A60-531F129A33C5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.TestLibrary", "Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj", "{77D1C695-94D4-46A9-8F12-41E54AF97750}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.TestLibrary", "Recyclarr.TestLibrary\Recyclarr.TestLibrary.csproj", "{77D1C695-94D4-46A9-8F12-41E54AF97750}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Recyclarr.Gui", "Recyclarr.Gui\Recyclarr.Gui.csproj", "{53EECBC0-E0EA-4D6C-925C-5DB8C42CCB85}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Recyclarr.Gui", "Recyclarr.Gui\Recyclarr.Gui.csproj", "{53EECBC0-E0EA-4D6C-925C-5DB8C42CCB85}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Common.TestLibrary", "Common.TestLibrary\Common.TestLibrary.csproj", "{A92321B5-2796-467B-B5A5-2BFC41167A25}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.TestLibrary", "Common.TestLibrary\Common.TestLibrary.csproj", "{A92321B5-2796-467B-B5A5-2BFC41167A25}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -98,6 +102,10 @@ Global
 		{A92321B5-2796-467B-B5A5-2BFC41167A25}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A92321B5-2796-467B-B5A5-2BFC41167A25}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AFBE3E4F-DA4D-4EBD-8700-C3C42B59D6AB}
 	EndGlobalSection
 EndGlobal