Fix/skip/comment broken tests

Author: bart-vmware

src/Configuration/src/SpringBoot/SpringBootEnvironmentVariableProvider.cs

@@ -13,6 +13,7 @@ namespace Steeltoe.Configuration.SpringBoot;
 internal sealed class SpringBootEnvironmentVariableProvider : JsonStreamConfigurationProvider
 {
     private const string SpringApplicationJson = "SPRING_APPLICATION_JSON";
+    private static readonly bool IsAtLeastDotNet10 = typeof(JsonStreamConfigurationProvider).Assembly.GetName().Version?.Major >= 10;
     private readonly string? _springApplicationJson;
     private bool _loaded;
 
@@ -61,7 +62,8 @@ public override void Load()
             {
                 string? value = Data[key];
 
-                if (value != null)
+                // Breaking change in JsonConfigurationFileParser at https://github.com/dotnet/runtime/pull/116677.
+                if (IsAtLeastDotNet10 || value != null)
                 {
                     string newKey = key.Contains('.') ? key.Replace('.', ':') : key;
                     data[newKey] = value;

src/Configuration/test/SpringBoot.Test/SpringBootEnvironmentVariableProviderTest.cs

@@ -63,14 +63,34 @@ public void TryGet_Tree()
         value.Should().Be("q");
 
         provider.TryGet("r", out value).Should().BeTrue();
+#if NET10_0_OR_GREATER
+        value.Should().BeNull();
+#else
         value.Should().BeEmpty();
+#endif
 
         provider.TryGet("s:t", out value).Should().BeTrue();
+#if NET10_0_OR_GREATER
+        value.Should().BeNull();
+#else
         value.Should().BeEmpty();
+#endif
 
+#if NET10_0_OR_GREATER
+        provider.TryGet("u", out _).Should().BeTrue();
+        // Needs investigation: what does this mean for the options binder?
+        value.Should().BeNull();
+#else
         provider.TryGet("u", out _).Should().BeFalse();
+#endif
 
+#if NET10_0_OR_GREATER
+        provider.TryGet("v:w", out _).Should().BeTrue();
+        // Needs investigation: what does this mean for the options binder?
+        value.Should().BeNull();
+#else
         provider.TryGet("v:w", out _).Should().BeFalse();
+#endif
     }
 
     [Fact]
@@ -113,14 +133,32 @@ public void TryGet_Array()
         value.Should().Be("q");
 
         provider.TryGet("a:b:c:2:r", out value).Should().BeTrue();
+#if NET10_0_OR_GREATER
+        value.Should().BeNull();
+#else
         value.Should().BeEmpty();
+#endif
 
         provider.TryGet("a:b:c:2:s:t", out value).Should().BeTrue();
+#if NET10_0_OR_GREATER
+        value.Should().BeNull();
+#else
         value.Should().BeEmpty();
-
-        provider.TryGet("a:b:c:3:u", out _).Should().BeFalse();
-
-        provider.TryGet("a:b:c:3:v:w", out _).Should().BeFalse();
+#endif
+
+#if NET10_0_OR_GREATER
+        provider.TryGet("a:b:c:2:u", out _).Should().BeTrue();
+        value.Should().BeNull();
+#else
+        provider.TryGet("a:b:c:2:u", out _).Should().BeFalse();
+#endif
+
+#if NET10_0_OR_GREATER
+        provider.TryGet("a:b:c:2:v:w", out _).Should().BeTrue();
+        value.Should().BeNull();
+#else
+        provider.TryGet("a:b:c:2:v:w", out _).Should().BeFalse();
+#endif
     }
 
     [Fact]

src/Connectors/test/EntityFrameworkCore.Test/MySql/Pomelo/MySqlDbContextOptionsBuilderExtensionsTest.cs

@@ -16,7 +16,11 @@ namespace Steeltoe.Connectors.EntityFrameworkCore.Test.MySql.Pomelo;
 
 public sealed class MySqlDbContextOptionsBuilderExtensionsTest
 {
+#if NET10_0_OR_GREATER
+    [Fact(Skip = "Disabled because there is no Pomelo version that's compatible with EF Core 10 yet.")]
+#else
     [Fact]
+#endif
     public async Task Registers_connection_string_for_default_service_binding()
     {
         var appSettings = new Dictionary<string, string?>
@@ -42,7 +46,11 @@ public async Task Registers_connection_string_for_default_service_binding()
             "Server=localhost;User ID=steeltoe;Password=steeltoe;Database=myDb;Allow User Variables=True;Connection Timeout=15;Use Affected Rows=False;Use Compression=False");
     }
 
+#if NET10_0_OR_GREATER
+    [Fact(Skip = "Disabled because there is no Pomelo version that's compatible with EF Core 10 yet.")]
+#else
     [Fact]
+#endif
     public async Task Registers_connection_string_for_named_service_binding()
     {
         var appSettings = new Dictionary<string, string?>

src/Logging/test/DynamicConsole.Test/DynamicConsoleLoggerProviderTest.cs

@@ -482,6 +482,29 @@ public async Task CanUseJsonFormatterWithScopes()
         await _consoleOutput.WaitForFlushAsync(TestContext.Current.CancellationToken);
         string logOutput = _consoleOutput.ToString();
 
+#if NET10_0_OR_GREATER
+        logOutput.Should().Be("""
+            {
+              "EventId": 0,
+              "LogLevel": "Information",
+              "Category": "Fully.Qualified.Type",
+              "Message": "Processing of { RequestUrl = https://www.example.com, UserAgent = Steeltoe } started.",
+              "State": {
+                "@IncomingRequest": "{ RequestUrl = https://www.example.com, UserAgent = Steeltoe }",
+                "{OriginalFormat}": "Processing of {@IncomingRequest} started."
+              },
+              "Scopes": [
+                "OuterScope",
+                {
+                  "Message": "InnerScope=InnerScopeValue",
+                  "InnerScopeKey": "InnerScopeValue",
+                  "{OriginalFormat}": "InnerScope={InnerScopeKey}"
+                }
+              ]
+            }
+
+            """);
+#else
         logOutput.Should().Be("""
             {
               "EventId": 0,
@@ -504,6 +527,7 @@ public async Task CanUseJsonFormatterWithScopes()
             }
 
             """);
+#endif
     }
 
     [Fact]

src/Tools/test/ConfigurationSchemaGenerator.Tests/ConfigurationSchemaGenerator.Tests.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFrameworks>net10.0;net9.0;net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
@@ -24,7 +24,8 @@
 
   <ItemGroup>
     <PackageReference Include="coverlet.collector" Version="$(CoverletVersion)" PrivateAssets="All" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="$(FoundationalVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' == 'net10.0'" Version="$(MatchTargetFrameworkVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Condition="'$(TargetFramework)' != 'net10.0'" Version="$(FoundationalVersion)" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
     <PackageReference Include="Newtonsoft.Json" Version="$(NewtonsoftJsonVersion)" />
     <PackageReference Include="xunit.v3" Version="$(XunitVersion)" />