Merge pull request #365 from BalassaMarton/central-package-management

Enable Central Package Management for .NET projects
morganstanley · Oct 3, 2023 · 7c5f1b4 · 7c5f1b4
2 parents 190378a + b03a395
commit 7c5f1b4
Show file tree

Hide file tree

Showing 40 changed files with 200 additions and 156 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,9 @@
 <Project>
-    <Import Project="../Directory.Build.props" Condition="Exists('../Directory.Build.props')" />
+    <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" Condition="Exists($([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..)))"/>
+
+    <PropertyGroup>
+        <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+    </PropertyGroup>
 
     <PropertyGroup>
         <ComposeUIRepositoryRoot>$(MSBuildThisFileDirectory.TrimEnd('/').TrimEnd('\'))</ComposeUIRepositoryRoot>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,64 @@
+<Project>
+    <ItemGroup>
+        <PackageVersion Include="coverlet.collector" Version="3.1.2" />
+        <PackageVersion Include="FluentAssertions.Json" Version="6.1.0" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
+        <PackageVersion Include="Moq" Version="4.18.1" />
+        <PackageVersion Include="Xunit.Combinatorial" Version="1.5.25" />
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+        <PackageVersion Include="xunit" Version="2.4.2" />
+        <PackageVersion Include="CommunityToolkit.HighPerformance" Version="8.2.1" />
+        <PackageVersion Include="coverlet.collector" Version="6.0.0" />
+        <PackageVersion Include="coverlet.msbuild" Version="6.0.0" />
+        <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+        <PackageVersion Include="Google.Protobuf" Version="3.23.4" />
+        <PackageVersion Include="Grpc.AspNetCore.Server" Version="2.53.0" />
+        <PackageVersion Include="Grpc.AspNetCore" Version="2.55.0" />
+        <PackageVersion Include="Grpc.Core.Testing" Version="2.46.6" />
+        <PackageVersion Include="Grpc.Net.Client" Version="2.53.0" />
+        <PackageVersion Include="Grpc.Tools" Version="2.54.0" />
+        <PackageVersion Include="Grpc" Version="2.46.6" />
+        <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="4.4.0" />
+        <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
+        <PackageVersion Include="Microsoft.Extensions.Http" Version="6.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
+        <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+        <PackageVersion Include="Microsoft.Extensions.Options" Version="6.0.0" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageVersion Include="Microsoft.Web.WebView2" Version="1.0.1901.177" />
+        <PackageVersion Include="Moq.Contrib.HttpClient" Version="1.4.0" />
+        <PackageVersion Include="Moq" Version="4.18.4" />
+        <PackageVersion Include="MorganStanley.Fdc3.AppDirectory" Version="2.0.0-alpha.6" />
+        <PackageVersion Include="MorganStanley.Fdc3.NewtonsoftJson" Version="2.0.0-alpha.6" />
+        <PackageVersion Include="MorganStanley.Fdc3" Version="2.0.0-alpha.6" />
+        <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+        <PackageVersion Include="Nito.AsyncEx.Coordination" Version="5.1.2" />
+        <PackageVersion Include="Nito.AsyncEx" Version="5.1.2" />
+        <PackageVersion Include="Roslyn.System.IO.Abstractions.Analyzers" Version="12.2.19" />
+        <PackageVersion Include="Serilog.Extensions.Logging" Version="3.1.0" />
+        <PackageVersion Include="Serilog.Sinks.File" Version="5.0.0" />
+        <PackageVersion Include="Serilog" Version="2.11.0" />
+        <PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+        <PackageVersion Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
+        <PackageVersion Include="System.IO.Pipelines" Version="6.0.3" />
+        <PackageVersion Include="System.Management" Version="6.0.1" />
+        <PackageVersion Include="System.Net.Http" Version="4.3.4" />
+        <PackageVersion Include="System.Reactive.Async" Version="6.0.0-alpha.18" />
+        <PackageVersion Include="System.Reactive" Version="6.0.0" />
+        <PackageVersion Include="System.ServiceModel.Primitives" Version="6.0.0" />
+        <PackageVersion Include="System.Text.Json" Version="6.0.8" />
+        <PackageVersion Include="TestableIO.System.IO.Abstractions.Wrappers" Version="19.2.69" />
+        <PackageVersion Include="TestableIO.System.IO.Abstractions" Version="19.2.69" />
+        <PackageVersion Include="Testably.Abstractions.Testing" Version="2.4.1" />
+        <PackageVersion Include="Xunit.Combinatorial" Version="1.6.24" />
+        <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5" />
+        <PackageVersion Include="xunit" Version="2.4.2" />
+    </ItemGroup>
+</Project>
diff --git a/...s/multi-module-example/ComposeUI.Example.DataService/ComposeUI.Example.DataService.csproj b/...s/multi-module-example/ComposeUI.Example.DataService/ComposeUI.Example.DataService.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-	<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-	<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
+	<PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+	<PackageReference Include="Microsoft.Extensions.Logging.Console" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...les/multi-module-example/ComposeUI.Example.WPFDataGrid.TestApp/WPFDataGrid.TestApp.csproj b/...les/multi-module-example/ComposeUI.Example.WPFDataGrid.TestApp/WPFDataGrid.TestApp.csproj
@@ -8,11 +8,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Include="Serilog" Version="2.11.0" />
-    <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.Logging" />
+    <PackageReference Include="Serilog" />
+    <PackageReference Include="Serilog.Extensions.Logging" />
+    <PackageReference Include="Serilog.Sinks.File" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...-prototype/examples/multi-module-example/ComposeUI.Example.WPFDataGrid/WPFDataGrid.csproj b/...-prototype/examples/multi-module-example/ComposeUI.Example.WPFDataGrid/WPFDataGrid.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...i-module-prototype/examples/multi-module-example/ModulesPrototype/ModulesPrototype.csproj b/...i-module-prototype/examples/multi-module-example/ModulesPrototype/ModulesPrototype.csproj
@@ -36,8 +36,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
   </ItemGroup>
   <ItemGroup>
     <!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="Nito.AsyncEx" Version="5.1.2" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" />
+    <PackageReference Include="Nito.AsyncEx" />
   </ItemGroup>
   <ItemGroup>
 	  <ProjectReference Include="../../../../../src/messaging/dotnet/src/Core/MorganStanley.ComposeUI.Messaging.Core.csproj" />

diff --git a/...ototype/src/module-loader/dotnet/ModuleLoader/MorganStanley.ComposeUI.ModuleLoader.csproj b/...ototype/src/module-loader/dotnet/ModuleLoader/MorganStanley.ComposeUI.ModuleLoader.csproj
@@ -35,6 +35,6 @@ See the License for the specific language governing permissions and limitations
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Reactive" Version="6.0.0" />
+    <PackageReference Include="System.Reactive" />
   </ItemGroup>
 </Project>
diff --git a/....ProcessExplorer.Abstractions/MorganStanley.ComposeUI.ProcessExplorer.Abstractions.csproj b/....ProcessExplorer.Abstractions/MorganStanley.ComposeUI.ProcessExplorer.Abstractions.csproj
@@ -19,17 +19,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.23.4" />
-    <PackageReference Include="Grpc.AspNetCore.Server" Version="2.53.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.54.0">
+    <PackageReference Include="Google.Protobuf" />
+    <PackageReference Include="Grpc.AspNetCore.Server" />
+    <PackageReference Include="Grpc.Tools">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="6.0.0" />
-    <PackageReference Include="System.Diagnostics.PerformanceCounter" Version="6.0.1" />
-    <PackageReference Include="System.Reactive" Version="6.0.0" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="6.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" />
+    <PackageReference Include="System.Diagnostics.PerformanceCounter" />
+    <PackageReference Include="System.Reactive" />
+    <PackageReference Include="System.ServiceModel.Primitives" />
   </ItemGroup>
 
 </Project>
diff --git a/...ey.ComposeUI.ProcessExplorer.Client/MorganStanley.ComposeUI.ProcessExplorer.Client.csproj b/...ey.ComposeUI.ProcessExplorer.Client/MorganStanley.ComposeUI.ProcessExplorer.Client.csproj
@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc" Version="2.46.6" />
-    <PackageReference Include="Grpc.Net.Client" Version="2.53.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Grpc" />
+    <PackageReference Include="Grpc.Net.Client" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...tanley.ComposeUI.ProcessExplorer.Core/MorganStanley.ComposeUI.ProcessExplorer.Core.csproj b/...tanley.ComposeUI.ProcessExplorer.Core/MorganStanley.ComposeUI.ProcessExplorer.Core.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Management" Version="6.0.1" />
+    <PackageReference Include="System.Management" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ey.ComposeUI.ProcessExplorer.Server/MorganStanley.ComposeUI.ProcessExplorer.Server.csproj b/...ey.ComposeUI.ProcessExplorer.Server/MorganStanley.ComposeUI.ProcessExplorer.Server.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc" Version="2.46.6" />
-    <PackageReference Include="Grpc.AspNetCore" Version="2.55.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
+    <PackageReference Include="Grpc" />
+    <PackageReference Include="Grpc.AspNetCore" />
+    <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/....ProcessExplorer.Client.Tests/MorganStanley.ComposeUI.ProcessExplorer.Client.Tests.csproj b/....ProcessExplorer.Client.Tests/MorganStanley.ComposeUI.ProcessExplorer.Client.Tests.csproj
@@ -7,18 +7,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/...seUI.ProcessExplorer.Core.Tests/MorganStanley.ComposeUI.ProcessExplorer.Core.Tests.csproj b/...seUI.ProcessExplorer.Core.Tests/MorganStanley.ComposeUI.ProcessExplorer.Core.Tests.csproj
@@ -7,18 +7,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/...Explorer.IntegrationTests/MorganStanley.ComposeUI.ProcessExplorer.IntegrationTests.csproj b/...Explorer.IntegrationTests/MorganStanley.ComposeUI.ProcessExplorer.IntegrationTests.csproj
@@ -7,18 +7,18 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="coverlet.msbuild" Version="6.0.0">
+    <PackageReference Include="coverlet.msbuild">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="coverlet.collector">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/....ProcessExplorer.Server.Tests/MorganStanley.ComposeUI.ProcessExplorer.Server.Tests.csproj b/....ProcessExplorer.Server.Tests/MorganStanley.ComposeUI.ProcessExplorer.Server.Tests.csproj
@@ -9,15 +9,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Core.Testing" Version="2.46.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="Grpc.Core.Testing" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="Moq" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
diff --git a/src/fdc3/Directory.Build.props b/src/fdc3/Directory.Build.props
diff --git a/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.csproj b/src/fdc3/dotnet/AppDirectory/src/AppDirectory/AppDirectory.csproj
@@ -9,20 +9,20 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
-		<PackageReference Include="MorganStanley.Fdc3.AppDirectory" Version="2.0.0-alpha.6" />
-		<PackageReference Include="MorganStanley.Fdc3.NewtonsoftJson" Version="2.0.0-alpha.6" />
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-		<PackageReference Include="Roslyn.System.IO.Abstractions.Analyzers" Version="12.2.19">
+		<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+		<PackageReference Include="Microsoft.Extensions.Http" />
+		<PackageReference Include="Microsoft.Extensions.Options" />
+		<PackageReference Include="MorganStanley.Fdc3.AppDirectory" />
+		<PackageReference Include="MorganStanley.Fdc3.NewtonsoftJson" />
+		<PackageReference Include="Newtonsoft.Json" />
+		<PackageReference Include="Roslyn.System.IO.Abstractions.Analyzers">
 		  <PrivateAssets>all</PrivateAssets>
 		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="System.Reactive" Version="6.0.0" />
-		<PackageReference Include="TestableIO.System.IO.Abstractions" Version="19.2.69" />
-		<PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="19.2.69" />
+		<PackageReference Include="System.Reactive" />
+		<PackageReference Include="TestableIO.System.IO.Abstractions" />
+		<PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.Tests.csproj b/src/fdc3/dotnet/AppDirectory/test/AppDirectory.Tests/AppDirectory.Tests.csproj
@@ -11,21 +11,21 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FluentAssertions" Version="6.12.0" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-		<PackageReference Include="Moq" Version="4.20.69" />
-		<PackageReference Include="Moq.Contrib.HttpClient" Version="1.4.0" />
-		<PackageReference Include="xunit" Version="2.5.1" />
-		<PackageReference Include="Xunit.Combinatorial" Version="1.6.24" />
-		<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1">
+		<PackageReference Include="FluentAssertions" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" />
+		<PackageReference Include="Moq" />
+		<PackageReference Include="Moq.Contrib.HttpClient" />
+		<PackageReference Include="xunit" />
+		<PackageReference Include="Xunit.Combinatorial" />
+		<PackageReference Include="xunit.runner.visualstudio">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="coverlet.collector" Version="6.0.0">
+		<PackageReference Include="coverlet.collector">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="Testably.Abstractions.Testing" Version="2.4.1" />
+		<PackageReference Include="Testably.Abstractions.Testing" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/fdc3/dotnet/DesktopAgent/Directory.Build.props b/src/fdc3/dotnet/DesktopAgent/Directory.Build.props
diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/DesktopAgent.csproj b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/DesktopAgent.csproj
@@ -8,10 +8,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.4" />
-		<PackageReference Include="MorganStanley.Fdc3" Version="2.0.0-alpha.5" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
+		<PackageReference Include="MorganStanley.Fdc3" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Directory.Build.props b/src/fdc3/dotnet/DesktopAgent/src/DesktopAgent/Directory.Build.props