adopt central package management

https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management
SMI · Feb 19, 2023 · 0f47930 · 0f47930
1 parent bc1cafe
commit 0f47930
Show file tree

Hide file tree

Showing 15 changed files with 85 additions and 52 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -80,7 +80,7 @@ jobs:
       - name: set RDMP version
         run: |
           set -euxo pipefail
-          rdmp_cli_ver=$(grep -F -m1 HIC.RDMP.Plugin src/common/Smi.Common/Smi.Common.csproj | sed -n 's/.*Version="\([0-9.]*\)".*/\1/p')
+          rdmp_cli_ver=$(grep -F -m1 HIC.RDMP.Plugin Directory.Packages.props | sed -n 's/.*Version="\([0-9.]*\)".*/\1/p')
           echo "rdmp_cli_ver=$rdmp_cli_ver" >> $GITHUB_ENV
       - name: "[windows] Install SQL LocalDB"
         if: ${{ matrix.os == 'windows' }}

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <EnablePackageVersionOverride>false</EnablePackageVersionOverride>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>  
+    <PackageVersion Include="CommandLineParser" Version="2.9.1"/>
+    <PackageVersion Include="coverlet.msbuild" Version="3.2.0"/>
+    <PackageVersion Include="CsvHelper" Version="30.0.1"/>
+    <PackageVersion Include="Equ" Version="2.3.0"/>
+    <PackageVersion Include="HIC.BadMedicine.Dicom" Version="0.0.15"/>
+    <PackageVersion Include="HIC.DicomTypeTranslation" Version="4.0.2"/>
+    <PackageVersion Include="HIC.FAnsiSql" Version="3.0.1"/>
+    <PackageVersion Include="HIC.RDMP.Dicom" Version="6.0.2"/>
+    <PackageVersion Include="HIC.RDMP.Plugin.Test" Version="8.0.7"/>
+    <PackageVersion Include="HIC.RDMP.Plugin" Version="8.0.7"/>
+    <PackageVersion Include="IsIdentifiable" Version="0.0.9"/>
+    <PackageVersion Include="JetBrains.Annotations" Version="2022.3.1"/>
+    <PackageVersion Include="LibArchive.Net" Version="0.1.3"/>
+    <PackageVersion Include="LineReader" Version="0.1.0"/>
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.4.0"/>
+    <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0"/>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageVersion Include="Moq" Version="4.18.4"/>
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.2"/>
+    <PackageVersion Include="NLog" Version="5.1.1"/>
+    <PackageVersion Include="NUnit" Version="3.13.3" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.3.1"/>
+    <PackageVersion Include="NunitXml.TestLogger" Version="3.0.131"/>
+    <PackageVersion Include="RabbitMQ.Client" Version="6.4.0"/>
+    <PackageVersion Include="SecurityCodeScan.VS2019" Version="5.6.7"/>
+    <PackageVersion Include="Spectre.Console" Version="0.46.0"/>
+    <PackageVersion Include="StackExchange.Redis" Version="2.6.90"/>
+    <PackageVersion Include="System.IO.Abstractions.TestingHelpers" Version="19.1.18"/>
+    <PackageVersion Include="System.IO.Abstractions" Version="19.1.18"/>
+    <PackageVersion Include="System.IO.FileSystem" Version="4.3.0"/>
+    <PackageVersion Include="Terminal.Gui" Version="1.9.0"/>
+    <PackageVersion Include="YamlDotNet" Version="12.3.1"/>
+  </ItemGroup>
+</Project>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
-    <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
-    <ItemGroup>
-        <Compile Include="$(MSBuildThisFileDirectory)\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs" />
-    </ItemGroup>
+  <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))"/>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)\SharedAssemblyInfo.cs" Link="Properties\SharedAssemblyInfo.cs"/>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="SecurityCodeScan.VS2019" />
+  </ItemGroup>
 </Project>
diff --git a/src/applications/Applications.DicomLoader/Applications.DicomLoader.csproj b/src/applications/Applications.DicomLoader/Applications.DicomLoader.csproj
@@ -4,8 +4,8 @@
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="LineReader" Version="0.1.0" />
-    <PackageReference Include="LibArchive.Net" Version="0.1.3" />
+    <PackageReference Include="LineReader" />
+    <PackageReference Include="LibArchive.Net" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\Smi.Common.MongoDb\Smi.Common.MongoDb.csproj" />

diff --git a/...plications/Applications.IsIdentifiableReviewer/Applications.IsIdentifiableReviewer.csproj b/...plications/Applications.IsIdentifiableReviewer/Applications.IsIdentifiableReviewer.csproj
@@ -21,7 +21,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Terminal.Gui" Version="1.4.0" />
+    <PackageReference Include="Terminal.Gui" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\microservices\Microservices.IsIdentifiable\Microservices.IsIdentifiable.csproj" />

diff --git a/src/applications/Applications.SmiRunner/Applications.SmiRunner.csproj b/src/applications/Applications.SmiRunner/Applications.SmiRunner.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
+    <PackageReference Include="CommandLineParser" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/applications/Setup/Setup.csproj b/src/applications/Setup/Setup.csproj
@@ -6,9 +6,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Plugin" Version="8.0.7" />
-    <PackageReference Include="Spectre.Console" Version="0.46.0" />
-    <PackageReference Include="Terminal.Gui" Version="1.9.0" />
+    <PackageReference Include="HIC.RDMP.Plugin" />
+    <PackageReference Include="Spectre.Console" />
+    <PackageReference Include="Terminal.Gui" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/common/Smi.Common/Smi.Common.csproj b/src/common/Smi.Common/Smi.Common.csproj
@@ -19,23 +19,18 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="30.0.1" />
-    <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="Equ" Version="2.3.0" />
-    <PackageReference Include="coveralls.io" Version="1.4.2" />
-    <PackageReference Include="HIC.DicomTypeTranslation" Version="4.0.2" />
-    <PackageReference Include="HIC.FAnsiSql" Version="3.0.1" />
-  	<PackageReference Include="IsIdentifiable" Version="0.0.9" />
-    <PackageReference Include="HIC.RDMP.Plugin" Version="8.0.7" />
-    <PackageReference Include="JetBrains.Annotations" Version="2022.3.1" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="NLog" Version="5.1.1" />
-    <PackageReference Include="RabbitMQ.Client" Version="6.4.0" />
-    <PackageReference Include="SecurityCodeScan.VS2019" Version="5.6.7">
-        <PrivateAssets>all</PrivateAssets>
-        <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="System.IO.Abstractions" Version="19.1.18" />
-    <PackageReference Include="YamlDotNet" Version="12.3.1" />
+    <PackageReference Include="CsvHelper" />
+    <PackageReference Include="CommandLineParser" />
+    <PackageReference Include="Equ" />
+    <PackageReference Include="HIC.DicomTypeTranslation" />
+    <PackageReference Include="HIC.FAnsiSql" />
+  	<PackageReference Include="IsIdentifiable" />
+    <PackageReference Include="HIC.RDMP.Plugin" />
+    <PackageReference Include="JetBrains.Annotations" />
+    <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="NLog" />
+    <PackageReference Include="RabbitMQ.Client" />
+    <PackageReference Include="System.IO.Abstractions" />
+    <PackageReference Include="YamlDotNet" />
   </ItemGroup>
 </Project>
diff --git a/src/microservices/Microservices.CohortExtractor/Microservices.CohortExtractor.csproj b/src/microservices/Microservices.CohortExtractor/Microservices.CohortExtractor.csproj
@@ -15,7 +15,7 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.4.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\Smi.Common\Smi.Common.csproj" />

diff --git a/...roservices/Microservices.DicomRelationalMapper/Microservices.DicomRelationalMapper.csproj b/...roservices/Microservices.DicomRelationalMapper/Microservices.DicomRelationalMapper.csproj
@@ -7,7 +7,7 @@
     <None Include="DicomRelationalMapper.cd" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HIC.RDMP.Dicom" Version="6.0.2" />
+    <PackageReference Include="HIC.RDMP.Dicom" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\Smi.Common\Smi.Common.csproj" />

diff --git a/src/microservices/Microservices.IdentifierMapper/Microservices.IdentifierMapper.csproj b/src/microservices/Microservices.IdentifierMapper/Microservices.IdentifierMapper.csproj
@@ -7,8 +7,8 @@
     <None Include="IdentifierMapper.cd" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.6.90" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+    <PackageReference Include="StackExchange.Redis" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\Smi.Common\Smi.Common.csproj" />

diff --git a/src/microservices/Microservices.IsIdentifiable/Microservices.IsIdentifiable.csproj b/src/microservices/Microservices.IsIdentifiable/Microservices.IsIdentifiable.csproj
@@ -9,9 +9,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="IsIdentifiable" Version="0.0.9" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
-    <PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
+    <PackageReference Include="IsIdentifiable" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+    <PackageReference Include="System.IO.FileSystem" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\common\Smi.Common.MongoDb\Smi.Common.MongoDb.csproj" />

diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project>
     <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))" />
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
-        <PackageReference Include="NUnit3TestAdapter" Version="4.3.1">
+        <PackageReference Include="coverlet.msbuild">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.msbuild" Version="3.2.0">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" />
+        <PackageReference Include="NUnit" />
+        <PackageReference Include="NUnit3TestAdapter">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

diff --git a/tests/common/Smi.Common.Tests/Smi.Common.Tests.csproj b/tests/common/Smi.Common.Tests/Smi.Common.Tests.csproj
@@ -22,12 +22,11 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="HIC.BadMedicine.Dicom" Version="0.0.15" />
-    <PackageReference Include="HIC.RDMP.Plugin.Test" Version="8.0.7" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NunitXml.TestLogger" Version="3.0.131" />
-    <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="19.1.18" />
+    <PackageReference Include="HIC.BadMedicine.Dicom" />
+    <PackageReference Include="HIC.RDMP.Plugin.Test" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="NunitXml.TestLogger" />
+    <PackageReference Include="System.IO.Abstractions.TestingHelpers" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\src\common\Smi.Common\Smi.Common.csproj" />

diff --git a/tests/run-all-tests.proj b/tests/run-all-tests.proj