diff --git a/documentation/openapi.json b/documentation/openapi.json
index 3418cc1dc46..a58ee4ca9ff 100644
--- a/documentation/openapi.json
+++ b/documentation/openapi.json
@@ -2203,8 +2203,7 @@
"type": "string"
}
},
- "nullable": true,
- "readOnly": true
+ "nullable": true
}
},
"additionalProperties": { }
diff --git a/documentation/schema.json b/documentation/schema.json
index ce5504e20ff..0ef47c84f3e 100644
--- a/documentation/schema.json
+++ b/documentation/schema.json
@@ -2624,6 +2624,10 @@
"Indented": {
"type": "boolean"
},
+ "MaxDepth": {
+ "type": "integer",
+ "format": "int32"
+ },
"SkipValidation": {
"type": "boolean"
}
diff --git a/eng/Common.props b/eng/Common.props
index ec10eba4230..d85313e7e17 100644
--- a/eng/Common.props
+++ b/eng/Common.props
@@ -3,7 +3,6 @@
net8.0
$(LatestTargetFramework)
- net6.0
$(ArtifactsDir)bundles\$(Configuration)\NonShipping\
\ No newline at end of file
diff --git a/eng/Versions.props b/eng/Versions.props
index 3fbe072a827..b849859d08f 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -28,19 +28,12 @@
-
- true
- false
- net6.0
- $(ToolTargetFrameworks);$(LatestTargetFramework)
+ $(LatestTargetFramework)
- net6.0;net7.0
- $(TestTargetFrameworks);$(LatestTargetFramework)
+ net6.0;net7.0;$(LatestTargetFramework)
- net6.0
-
- $(DefineConstants);INCLUDE_NEXT_DOTNET
+ net8.0
false
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/SchemaGenerationTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/SchemaGenerationTests.cs
index 5f1fd0b327b..fe7d71fd8dd 100644
--- a/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/SchemaGenerationTests.cs
+++ b/src/Tests/Microsoft.Diagnostics.Monitoring.ConfigurationSchema.UnitTests/SchemaGenerationTests.cs
@@ -35,7 +35,7 @@ public class SchemaGenerationTests
AssemblyHelper.GetAssemblyArtifactBinPath(
Assembly.GetExecutingAssembly(),
SchemaGeneratorName,
- TargetFrameworkMoniker.Net60);
+ TargetFrameworkMoniker.Net80);
public SchemaGenerationTests(ITestOutputHelper outputHelper)
{
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/OpenApiGeneratorTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/OpenApiGeneratorTests.cs
index fffbf2ebd01..9f66c2602d2 100644
--- a/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/OpenApiGeneratorTests.cs
+++ b/src/Tests/Microsoft.Diagnostics.Monitoring.OpenApiGen.UnitTests/OpenApiGeneratorTests.cs
@@ -33,7 +33,7 @@ public class OpenApiGeneratorTests
Path.Combine(Path.GetDirectoryName(CurrentExecutingAssemblyPath), OpenApiBaselineName);
private static readonly string OpenApiGenPath =
- AssemblyHelper.GetAssemblyArtifactBinPath(Assembly.GetExecutingAssembly(), OpenApiGenName, TargetFrameworkMoniker.Net60);
+ AssemblyHelper.GetAssemblyArtifactBinPath(Assembly.GetExecutingAssembly(), OpenApiGenName, TargetFrameworkMoniker.Net80);
private readonly ITestOutputHelper _outputHelper;
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/InfoTests.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/InfoTests.cs
index b396caf1c66..7b78b648e4d 100644
--- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/InfoTests.cs
+++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/InfoTests.cs
@@ -51,11 +51,7 @@ public Task InfoEndpointValidationTest(DiagnosticPortConnectionMode mode)
Assert.NotNull(info.Version); // Not sure of how to get Dotnet Monitor version from within tests...
Assert.True(Version.TryParse(info.RuntimeVersion, out Version runtimeVersion), "Unable to parse version from RuntimeVersion property.");
-#if NET7_0_OR_GREATER
Version currentAspNetVersion = TargetFrameworkMoniker.Net80.GetAspNetCoreFrameworkVersion();
-#else
- Version currentAspNetVersion = TargetFrameworkMoniker.Net60.GetAspNetCoreFrameworkVersion();
-#endif
Assert.Equal(currentAspNetVersion.Major, runtimeVersion.Major);
Assert.Equal(currentAspNetVersion.Minor, runtimeVersion.Minor);
Assert.Equal(currentAspNetVersion.Revision, runtimeVersion.Revision);
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj
index e9e9980bc9b..3b632639638 100644
--- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj
+++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj
@@ -92,7 +92,7 @@
false
true
- TargetFramework=net6.0
+ TargetFramework=net8.0
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Runners/MonitorRunner.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Runners/MonitorRunner.cs
index 52250577689..f7068a34d46 100644
--- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Runners/MonitorRunner.cs
+++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Runners/MonitorRunner.cs
@@ -68,22 +68,14 @@ internal class MonitorRunner : IAsyncDisposable
AssemblyHelper.GetAssemblyArtifactBinPath(
Assembly.GetExecutingAssembly(),
"dotnet-monitor",
-#if NET7_0_OR_GREATER
TargetFrameworkMoniker.Net80
-#else
- TargetFrameworkMoniker.Net60
-#endif
);
private static string TestStartupHookPath =>
AssemblyHelper.GetAssemblyArtifactBinPath(
Assembly.GetExecutingAssembly(),
TestStartupHookAssemblyName,
-#if NET7_0_OR_GREATER
TargetFrameworkMoniker.Net80
-#else
- TargetFrameworkMoniker.Net60
-#endif
);
private string SharedConfigDirectoryPath =>
diff --git a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/ActionTestsHelper.cs b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/ActionTestsHelper.cs
index 4451f75b74d..00ac4bb40d7 100644
--- a/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/ActionTestsHelper.cs
+++ b/src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTestCommon/ActionTestsHelper.cs
@@ -25,17 +25,13 @@ internal static class ActionTestsHelper
{
TargetFrameworkMoniker.Net60,
TargetFrameworkMoniker.Net70,
-#if INCLUDE_NEXT_DOTNET
TargetFrameworkMoniker.Net80
-#endif
};
public static TargetFrameworkMoniker[] tfms6PlusToTest = new TargetFrameworkMoniker[]
{
TargetFrameworkMoniker.Net60,
TargetFrameworkMoniker.Net70,
-#if INCLUDE_NEXT_DOTNET
TargetFrameworkMoniker.Net80
-#endif
};
public static IEnumerable