Task/rdmp-140 Migrate to centrally managed dependancies (#1753)

* centrally managed dependacies * add directory.project.props file
HicServices · Feb 16, 2024 · 36ca498 · 36ca498
1 parent 9bf0552
commit 36ca498
Show file tree

Hide file tree

Showing 10 changed files with 516 additions and 467 deletions.
diff --git a/Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj b/Application/ResearchDataManagementPlatform/ResearchDataManagementPlatform.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <ProjectGuid>{550988FD-F1FA-41D8-BE0F-00B4DE47D320}</ProjectGuid>
     <OutputType>WinExe</OutputType>
@@ -29,10 +29,10 @@
     <EmbeddedResource Remove="Updates\UpdaterUI.resx" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ConsoleControl" Version="1.3.0" />
-    <PackageReference Include="Autoupdater.NET.Official" Version="1.8.4" />
-    <PackageReference Include="DockPanelSuite.ThemeVS2015" Version="3.1.0" />
-    <PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
+    <PackageReference Include="ConsoleControl"/>
+    <PackageReference Include="Autoupdater.NET.Official"/>
+    <PackageReference Include="DockPanelSuite.ThemeVS2015" />
+    <PackageReference Include="System.Resources.Extensions" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\SharedAssemblyInfo.cs" Link="SharedAssemblyInfo.cs" />

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,47 @@
+<Project>
+	<PropertyGroup>
+		<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageVersion Include="CommandLineParser" Version="2.9.1"/>
+		<PackageVersion Include="CsvHelper" Version="30.0.1"/>
+		<PackageVersion Include="Equ" Version="2.3.0"/>
+		<PackageVersion Include="ExcelNumberFormat" Version="1.1.0"/>
+		<PackageVersion Include="FluentFTP" Version="49.0.1"/>
+		<PackageVersion Include="HIC.BadMedicine" Version="1.1.2"/>
+		<PackageVersion Include="HIC.FAnsiSql" Version="3.1.1"/>
+		<PackageVersion Include="LibArchive.Net" Version="0.1.4"/>
+		<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+		</PackageVersion>
+		<PackageVersion Include="Microsoft.XmlSerializer.Generator" Version="8.0.0"/>
+		<PackageVersion Include="MongoDB.Driver" Version="2.23.1"/>
+		<PackageVersion Include="Newtonsoft.Json" Version="13.0.3"/>
+		<PackageVersion Include="NPOI" Version="2.6.2"/>
+		<PackageVersion Include="NLog" Version="5.2.8"/>
+		<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.2"/>
+		<PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.1.0"/>
+		<PackageVersion Include="Spectre.Console" Version="0.48.0"/>
+		<PackageVersion Include="SSH.NET" Version="2023.0.1"/>
+		<PackageVersion Include="Terminal.Gui" Version="1.15.1"/>
+		<PackageVersion Include="YamlDotNet" Version="15.1.1"/>
+		<PackageVersion Include="ConsoleControl" Version="1.3.0"/>
+		<PackageVersion Include="Autoupdater.NET.Official" Version="1.8.4"/>
+		<PackageVersion Include="DockPanelSuite.ThemeVS2015" Version="3.1.0"/>
+		<PackageVersion Include="System.Threading.ThreadPool" Version="4.3.0"/>
+		<PackageVersion Include="WeCantSpell.Hunspell" Version="5.0.0"/>
+		<PackageVersion Include="NUnit" Version="4.0.1"/>
+		<PackageVersion Include="ObjectListView.Repack.NET6Plus" Version="2.9.4"/>
+		<PackageVersion Include="Scintilla.NET" Version="5.3.2.9"/>
+		<PackageVersion Include="System.Resources.Extensions" Version="8.0.0"/>
+		<PackageVersion Include="VPKSoft.ScintillaLexers.NET" Version="1.1.16"/>
+		<PackageVersion Include="HIC.System.Windows.Forms.DataVisualization" Version="1.0.1"/>
+		<PackageVersion Include="NunitXml.TestLogger" Version="3.1.20"/>
+		<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0"/>
+		<PackageVersion Include="NUnit.Analyzers" Version="4.0.1"/>
+		<PackageVersion Include="NSubstitute" Version="5.1.0"/>
+		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0"/>
+		<PackageVersion Include="coverlet.collector" Version="6.0.0"/>
+	</ItemGroup>
+</Project>
diff --git a/HIC.DataManagementPlatform.sln b/HIC.DataManagementPlatform.sln
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		deadlinksconfig.json = deadlinksconfig.json
 		directory.build.props = directory.build.props
 		.github\workflows\links.yml = .github\workflows\links.yml
+		Directory.Packages.props = Directory.Packages.props
 		NoteForNewDevelopers.md = NoteForNewDevelopers.md
 		Documentation\CodeTutorials\Packages.md = Documentation\CodeTutorials\Packages.md
 		rdmp-client.xml = rdmp-client.xml

diff --git a/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj b/Rdmp.Core.Tests/Rdmp.Core.Tests.csproj
@@ -65,22 +65,22 @@
         <EmbeddedResource Include="DataLoad\Engine\Unit\TestFile\OddFormats.xls" />
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="coverlet.collector">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-        <PackageReference Include="NSubstitute" Version="5.1.0" />
-        <PackageReference Include="NUnit" Version="4.0.1" />
-        <PackageReference Include="NUnit.Analyzers" Version="4.0.1">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="NSubstitute"/>
+        <PackageReference Include="NUnit"/>
+        <PackageReference Include="NUnit.Analyzers">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.5.0">
+        <PackageReference Include="NUnit3TestAdapter">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="NunitXml.TestLogger" Version="3.1.20" />
+        <PackageReference Include="NunitXml.TestLogger"/>
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\Rdmp.Core\Rdmp.Core.csproj" />

diff --git a/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs b/Rdmp.Core.Tests/ReusableCodeTests/PackageListIsCorrectTests.cs
@@ -24,10 +24,11 @@ public class PackageListIsCorrectTests
         { RecurseSubdirectories = true, MatchCasing = MatchCasing.CaseInsensitive, IgnoreInaccessible = true };
 
     //<PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
-    private static readonly Regex RPackageRef =
-        new(@"<PackageReference\s+Include=""(.*)""\s+Version=""([^""]*)""",
+    private static readonly Regex RPackageRefNoVersion =
+        new(@"<PackageReference\s+Include=""(.*)""",
             RegexOptions.IgnoreCase | RegexOptions.Compiled | RegexOptions.CultureInvariant);
 
+
     // | Org.SomePackage |
     //
     private static readonly Regex RMarkdownEntry = new(@"^\|\s*\[?([^ |\]]+)(\]\([^)]+\))?\s*\|",
@@ -53,8 +54,10 @@ public void TestPackagesDocumentCorrect(string rootPath = null)
             .ToHashSet(StringComparer.InvariantCultureIgnoreCase);
 
         // Extract the named packages from csproj files
-        var usedPackages = GetCsprojFiles(root).Select(File.ReadAllText).SelectMany(s => RPackageRef.Matches(s))
-            .Select(m => m.Groups[1].Value).ToHashSet(StringComparer.InvariantCultureIgnoreCase);
+        var usedPackages = GetCsprojFiles(root).Select(File.ReadAllText)
+          .SelectMany(s => RPackageRefNoVersion.Matches(s))
+            .Select(m => m.Groups[1].Value)
+              .ToHashSet(StringComparer.InvariantCultureIgnoreCase);
 
         // Then subtract those listed in PACKAGES.md (should be empty)
         var undocumentedPackages = usedPackages.Except(packagesMarkdown).Select(BuildRecommendedMarkdownLine).ToList();