|
6 | 6 | using Aspire.Cli.DotNet; |
7 | 7 | using Aspire.Cli.Resources; |
8 | 8 | using Microsoft.Extensions.Configuration; |
| 9 | +using Semver; |
9 | 10 |
|
10 | 11 | namespace Aspire.Cli.Tests; |
11 | 12 |
|
@@ -238,6 +239,70 @@ public void ErrorMessage_Format_IsCorrect() |
238 | 239 | Assert.Equal("The Aspire CLI requires .NET SDK version 9.0.302 or later. Detected: (not found).", message); |
239 | 240 | } |
240 | 241 |
|
| 242 | + [Fact] |
| 243 | + public void MeetsMinimumRequirement_AllowsDotNet10Prereleases_ForSingleFileAppHost() |
| 244 | + { |
| 245 | + // Test the logic we added for allowing .NET 10 prereleases |
| 246 | + var installedVersion = SemVersion.Parse("10.0.100-preview.1.25463.5", SemVersionStyles.Strict); |
| 247 | + var requiredVersion = SemVersion.Parse("10.0.100", SemVersionStyles.Strict); |
| 248 | + var requiredVersionString = "10.0.100"; |
| 249 | + |
| 250 | + // Use reflection to access the private method |
| 251 | + var method = typeof(DotNetSdkInstaller).GetMethod("MeetsMinimumRequirement", |
| 252 | + System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static); |
| 253 | + var result = (bool)method!.Invoke(null, new object[] { installedVersion, requiredVersion, requiredVersionString })!; |
| 254 | + |
| 255 | + Assert.True(result); |
| 256 | + } |
| 257 | + |
| 258 | + [Fact] |
| 259 | + public void MeetsMinimumRequirement_AllowsDotNet10LatestPrerelease_ForSingleFileAppHost() |
| 260 | + { |
| 261 | + // Test with a more recent .NET 10 prerelease |
| 262 | + var installedVersion = SemVersion.Parse("10.1.0-preview.2.25999.99", SemVersionStyles.Strict); |
| 263 | + var requiredVersion = SemVersion.Parse("10.0.100", SemVersionStyles.Strict); |
| 264 | + var requiredVersionString = "10.0.100"; |
| 265 | + |
| 266 | + // Use reflection to access the private method |
| 267 | + var method = typeof(DotNetSdkInstaller).GetMethod("MeetsMinimumRequirement", |
| 268 | + System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static); |
| 269 | + var result = (bool)method!.Invoke(null, new object[] { installedVersion, requiredVersion, requiredVersionString })!; |
| 270 | + |
| 271 | + Assert.True(result); |
| 272 | + } |
| 273 | + |
| 274 | + [Fact] |
| 275 | + public void MeetsMinimumRequirement_RejectsDotNet9_ForSingleFileAppHost() |
| 276 | + { |
| 277 | + // Test that .NET 9 is still rejected for single file apphost requirements |
| 278 | + var installedVersion = SemVersion.Parse("9.0.999", SemVersionStyles.Strict); |
| 279 | + var requiredVersion = SemVersion.Parse("10.0.100", SemVersionStyles.Strict); |
| 280 | + var requiredVersionString = "10.0.100"; |
| 281 | + |
| 282 | + // Use reflection to access the private method |
| 283 | + var method = typeof(DotNetSdkInstaller).GetMethod("MeetsMinimumRequirement", |
| 284 | + System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static); |
| 285 | + var result = (bool)method!.Invoke(null, new object[] { installedVersion, requiredVersion, requiredVersionString })!; |
| 286 | + |
| 287 | + Assert.False(result); |
| 288 | + } |
| 289 | + |
| 290 | + [Fact] |
| 291 | + public void MeetsMinimumRequirement_UsesStrictComparison_ForNonSingleFileAppHost() |
| 292 | + { |
| 293 | + // Test that other version requirements still use strict comparison |
| 294 | + var installedVersion = SemVersion.Parse("9.0.301", SemVersionStyles.Strict); |
| 295 | + var requiredVersion = SemVersion.Parse("9.0.302", SemVersionStyles.Strict); |
| 296 | + var requiredVersionString = "9.0.302"; |
| 297 | + |
| 298 | + // Use reflection to access the private method |
| 299 | + var method = typeof(DotNetSdkInstaller).GetMethod("MeetsMinimumRequirement", |
| 300 | + System.Reflection.BindingFlags.NonPublic | System.Reflection.BindingFlags.Static); |
| 301 | + var result = (bool)method!.Invoke(null, new object[] { installedVersion, requiredVersion, requiredVersionString })!; |
| 302 | + |
| 303 | + Assert.False(result); |
| 304 | + } |
| 305 | + |
241 | 306 | private static IConfiguration CreateEmptyConfiguration() |
242 | 307 | { |
243 | 308 | return new ConfigurationBuilder().Build(); |
|
0 commit comments