From fa9d14cdde6cea5efb36c5fb1bd8f0a1d8af6ccf Mon Sep 17 00:00:00 2001
From: Aaron Powell <me@aaron-powell.com>
Date: Tue, 16 Jul 2024 02:12:02 +0000
Subject: [PATCH] Using CPM to make it easier to have dependency consistency

---
 Directory.Build.props                         | 15 ++------
 Directory.Packages.props                      | 34 +++++++++++++++++++
 ...CommunityToolkit.Aspire.Java.ApiApp.csproj |  4 +--
 ...ommunityToolkit.Aspire.Java.AppHost.csproj |  2 +-
 ...Toolkit.Aspire.Java.ServiceDefaults.csproj | 16 ++++-----
 ...ommunityToolkit.Aspire.Hosting.Java.csproj |  2 +-
 ...t.Aspire.Java.Hosting.EndToEndTests.csproj | 12 +++----
 7 files changed, 54 insertions(+), 31 deletions(-)
 create mode 100644 Directory.Packages.props

diff --git a/Directory.Build.props b/Directory.Build.props
index f2235af5..23cdffcc 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,17 +7,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
-    <AspireVersion>8.*</AspireVersion>
-    <AspNetCoreVersion>8.*</AspNetCoreVersion>
-    <CoverletVersion>6.*</CoverletVersion>
-    <FluentAssertionsVersion>6.*</FluentAssertionsVersion>
-    <MicrosoftExtensionsVersion>8.*</MicrosoftExtensionsVersion>
-    <MicrosoftNetTestSdkVersion>17.*</MicrosoftNetTestSdkVersion>
-    <MSTestVersion>3.*</MSTestVersion>
-    <OpenTelemetryExporterVersion>1.*</OpenTelemetryExporterVersion>
-    <OpenTelemetryExtensionsVersion>1.*</OpenTelemetryExtensionsVersion>
-    <OpenTelemetryInstrumentationVersion>1.*</OpenTelemetryInstrumentationVersion>
-    <SwashbuckleVersion>6.*</SwashbuckleVersion>
-    <XunitVersion>2.*</XunitVersion>
+    <AspireVersion>8.0.2</AspireVersion>
+    <AspNetCoreVersion>8.0.7</AspNetCoreVersion>
+    <OpenTelemetryVersion>1.9.0</OpenTelemetryVersion>
 </PropertyGroup>
 </Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 00000000..5debd3f5
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,34 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <!-- Aspire packages -->
+    <PackageVersion Include="Aspire.Hosting" Version="$(AspireVersion)" />
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
+
+    <!-- AspNetCore packages -->
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="$(AspNetCoreVersion)" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+
+    <!-- .NET packages -->
+    <PackageVersion Include="Microsoft.Extensions.Http.Resilience" Version="8.7.0" />
+    <PackageVersion Include="Microsoft.Extensions.ServiceDiscovery" Version="8.0.2" />
+
+    <!-- OpenTelemetry packages -->
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryVersion)" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryVersion)" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OpenTelemetryVersion)" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryVersion)" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="$(OpenTelemetryVersion)" />
+
+    <!-- Testing packages -->
+    <PackageVersion Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="xunit" Version="2.9.0" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/examples/java/CommunityToolkit.Aspire.Java.ApiApp/CommunityToolkit.Aspire.Java.ApiApp.csproj b/examples/java/CommunityToolkit.Aspire.Java.ApiApp/CommunityToolkit.Aspire.Java.ApiApp.csproj
index 9c7880f9..a09a0dce 100644
--- a/examples/java/CommunityToolkit.Aspire.Java.ApiApp/CommunityToolkit.Aspire.Java.ApiApp.csproj
+++ b/examples/java/CommunityToolkit.Aspire.Java.ApiApp/CommunityToolkit.Aspire.Java.ApiApp.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="$(AspNetCoreVersion)" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="$(SwashbuckleVersion)" />
+    <PackageReference Include="Microsoft.AspNetCore.OpenApi" />
+    <PackageReference Include="Swashbuckle.AspNetCore" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/java/CommunityToolkit.Aspire.Java.AppHost/CommunityToolkit.Aspire.Java.AppHost.csproj b/examples/java/CommunityToolkit.Aspire.Java.AppHost/CommunityToolkit.Aspire.Java.AppHost.csproj
index 66d7b97a..997a3d3e 100644
--- a/examples/java/CommunityToolkit.Aspire.Java.AppHost/CommunityToolkit.Aspire.Java.AppHost.csproj
+++ b/examples/java/CommunityToolkit.Aspire.Java.AppHost/CommunityToolkit.Aspire.Java.AppHost.csproj
@@ -13,7 +13,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.AppHost" Version="$(AspireVersion)" />
+    <PackageReference Include="Aspire.Hosting.AppHost" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/examples/java/CommunityToolkit.Aspire.Java.ServiceDefaults/CommunityToolkit.Aspire.Java.ServiceDefaults.csproj b/examples/java/CommunityToolkit.Aspire.Java.ServiceDefaults/CommunityToolkit.Aspire.Java.ServiceDefaults.csproj
index d3f0aa02..f9fc270a 100644
--- a/examples/java/CommunityToolkit.Aspire.Java.ServiceDefaults/CommunityToolkit.Aspire.Java.ServiceDefaults.csproj
+++ b/examples/java/CommunityToolkit.Aspire.Java.ServiceDefaults/CommunityToolkit.Aspire.Java.ServiceDefaults.csproj
@@ -8,15 +8,13 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="$(MicrosoftExtensionsVersion)" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="$(OpenTelemetryExporterVersion)" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryExtensionsVersion)" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OpenTelemetryInstrumentationVersion)" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryInstrumentationVersion)" />
-    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="$(OpenTelemetryInstrumentationVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Http" />
+    <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" />
   </ItemGroup>
 
 </Project>
diff --git a/src/CommunityToolkit.Aspire.Hosting.Java/CommunityToolkit.Aspire.Hosting.Java.csproj b/src/CommunityToolkit.Aspire.Hosting.Java/CommunityToolkit.Aspire.Hosting.Java.csproj
index 62384bee..e90ee15f 100644
--- a/src/CommunityToolkit.Aspire.Hosting.Java/CommunityToolkit.Aspire.Hosting.Java.csproj
+++ b/src/CommunityToolkit.Aspire.Hosting.Java/CommunityToolkit.Aspire.Hosting.Java.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting" Version="$(AspireVersion)" />
+    <PackageReference Include="Aspire.Hosting" />
   </ItemGroup>
 
 </Project>
diff --git a/test/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests.csproj b/test/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests.csproj
index 56435842..d42a6d7b 100644
--- a/test/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests.csproj
+++ b/test/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests/CommunityToolkit.Aspire.Java.Hosting.EndToEndTests.csproj
@@ -6,12 +6,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Aspire.Hosting.Testing" Version="$(AspireVersion)" />
-    <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" />
-    <PackageReference Include="FluentAssertions" Version="$(FluentAssertionsVersion)" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNetTestSdkVersion)" />
-    <PackageReference Include="xunit" Version="$(XunitVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="Aspire.Hosting.Testing" />
+    <PackageReference Include="coverlet.collector" />
+    <PackageReference Include="FluentAssertions" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="xunit" />
+    <PackageReference Include="xunit.runner.visualstudio" />
   </ItemGroup>
 
   <ItemGroup>