diff --git a/documentation/schema.json b/documentation/schema.json
index fc88415a895..07f35a5ccb9 100644
--- a/documentation/schema.json
+++ b/documentation/schema.json
@@ -2718,12 +2718,22 @@
"Indented": {
"type": "boolean"
},
+ "IndentCharacter": {
+ "type": "string"
+ },
+ "IndentSize": {
+ "type": "integer",
+ "format": "int32"
+ },
"MaxDepth": {
"type": "integer",
"format": "int32"
},
"SkipValidation": {
"type": "boolean"
+ },
+ "NewLine": {
+ "type": "string"
}
}
},
diff --git a/eng/Versions.props b/eng/Versions.props
index 7b3ae79a780..5da57d3953f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -80,11 +80,15 @@
$(MicrosoftAspNetCoreApp80Version)
$(MicrosoftAspNetCoreApp80Version)
- $(MicrosoftExtensionsConfigurationAbstractions80Version)
+
+ $(MicrosoftExtensionsConfigurationAbstractions100Version)
$(MicrosoftExtensionsLogging80Version)
- $(MicrosoftExtensionsLoggingAbstractions80Version)
+ $(MicrosoftExtensionsLoggingAbstractions100Version)
$(MicrosoftExtensionsLoggingConsole80Version)
- $(SystemTextJson80Version)
+ $(SystemTextJson100Version)
$(MicrosoftDiagnosticsMonitoringShippedVersion)
diff --git a/eng/dependabot/Versions.props b/eng/dependabot/Versions.props
index 09eecd761fb..4e0f73f7b14 100644
--- a/eng/dependabot/Versions.props
+++ b/eng/dependabot/Versions.props
@@ -2,4 +2,5 @@
+
diff --git a/eng/dependabot/independent/Versions.props b/eng/dependabot/independent/Versions.props
index 0cd91aee9c2..78fd29d1da9 100644
--- a/eng/dependabot/independent/Versions.props
+++ b/eng/dependabot/independent/Versions.props
@@ -2,8 +2,8 @@
- 1.50.0
- 1.17.1
+ 1.51.1
+ 1.18.0
12.27.0
12.25.0
4.3.0
diff --git a/eng/dependabot/net10.0/Directory.Build.props b/eng/dependabot/net10.0/Directory.Build.props
new file mode 100644
index 00000000000..fe86741bd6c
--- /dev/null
+++ b/eng/dependabot/net10.0/Directory.Build.props
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/eng/dependabot/net10.0/Packages.props b/eng/dependabot/net10.0/Packages.props
new file mode 100644
index 00000000000..0ee0b07d144
--- /dev/null
+++ b/eng/dependabot/net10.0/Packages.props
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/dependabot/net10.0/Versions.props b/eng/dependabot/net10.0/Versions.props
new file mode 100644
index 00000000000..8b05659d286
--- /dev/null
+++ b/eng/dependabot/net10.0/Versions.props
@@ -0,0 +1,17 @@
+
+
+
+
+ 10.0.3
+
+ 10.0.3
+
+ 10.0.3
+
+ 10.0.3
+
+ 10.0.3
+
+ 10.0.1
+
+
diff --git a/eng/dependabot/net10.0/dependabot.csproj b/eng/dependabot/net10.0/dependabot.csproj
new file mode 100644
index 00000000000..34fdf6e5f06
--- /dev/null
+++ b/eng/dependabot/net10.0/dependabot.csproj
@@ -0,0 +1,6 @@
+
+
+
+ net10.0
+
+
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DiagnosticPortTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DiagnosticPortTests.cs
index e97066cbe61..57a9285df40 100644
--- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DiagnosticPortTests.cs
+++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/DiagnosticPortTests.cs
@@ -8,6 +8,7 @@
using Microsoft.Diagnostics.Monitoring.WebApi;
using System;
using System.IO;
+using System.Threading;
using System.Threading.Tasks;
using Xunit;
using Xunit.Abstractions;
@@ -80,7 +81,7 @@ public async Task DefaultDiagnosticPort_Supported_ListenModeOnNonWindows()
await toolRunner.StartAsync();
- AssertDefaultDiagnosticPortExists(defaultSharedTempDir);
+ await AssertDefaultDiagnosticPortExistsAsync(defaultSharedTempDir);
}
///
@@ -107,10 +108,16 @@ private static string GetDefaultSharedSocketPath(string defaultSharedPath)
return Path.Combine(defaultSharedPath, ToolIdentifiers.DefaultSocketName);
}
- private static void AssertDefaultDiagnosticPortExists(TemporaryDirectory dir)
+ private static async Task AssertDefaultDiagnosticPortExistsAsync(TemporaryDirectory dir)
{
string diagnosticPort = GetDefaultSharedSocketPath(dir.FullName);
- Assert.True(File.Exists(diagnosticPort), $"Expected socket to exist at '{diagnosticPort}'.");
+
+ using CancellationTokenSource cancellationSource = new CancellationTokenSource(CommonTestTimeouts.GeneralTimeout);
+
+ while (!File.Exists(diagnosticPort))
+ {
+ await Task.Delay(TimeSpan.FromMilliseconds(50), cancellationSource.Token);
+ }
}
private static void AssertDefaultDiagnosticPortNotExists(TemporaryDirectory dir)
diff --git a/src/Tools/dotnet-monitor/Commands/CollectCommandHandler.cs b/src/Tools/dotnet-monitor/Commands/CollectCommandHandler.cs
index cdae1908e94..0ed7e070221 100644
--- a/src/Tools/dotnet-monitor/Commands/CollectCommandHandler.cs
+++ b/src/Tools/dotnet-monitor/Commands/CollectCommandHandler.cs
@@ -163,11 +163,13 @@ private static IHostBuilder Configure(this IHostBuilder builder, StartupAuthenti
ServerUrlsBlockingConfigurationManager? manager =
context.Properties[typeof(ServerUrlsBlockingConfigurationManager)] as ServerUrlsBlockingConfigurationManager;
Debug.Assert(null != manager, $"Expected {typeof(ServerUrlsBlockingConfigurationManager).FullName} to be a {typeof(HostBuilderContext).FullName} property.");
+#pragma warning disable IDE0031 // Use null propagation
if (null != manager)
{
// Block reading of the Urls option so that Kestrel is unable to read it from the composed configuration.
manager.IsBlocking = true;
}
+#pragma warning restore IDE0031 // Use null propagation
});
}