Remove net6.0 TFM build and packaging

documentation/openapi.json

@@ -2203,8 +2203,7 @@
                 "type": "string"
               }
             },
-            "nullable": true,
-            "readOnly": true
+            "nullable": true
           }
         },
         "additionalProperties": { }

documentation/schema.json

@@ -2624,6 +2624,10 @@
         "Indented": {
           "type": "boolean"
         },
+        "MaxDepth": {
+          "type": "integer",
+          "format": "int32"
+        },
         "SkipValidation": {
           "type": "boolean"
         }

eng/Common.props

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <LatestTargetFramework>net8.0</LatestTargetFramework>
     <LatestToolTargetFramework>$(LatestTargetFramework)</LatestToolTargetFramework>
-    <OlderToolTargetFramework>net6.0</OlderToolTargetFramework>
     <ArtifactsNonShippingBundlesDir>$(ArtifactsDir)bundles\$(Configuration)\NonShipping\</ArtifactsNonShippingBundlesDir>
   </PropertyGroup>
 </Project>

eng/Versions.props

@@ -28,19 +28,12 @@
   </PropertyGroup>
   <Import Project="$(MSBuildThisFileDirectory)Common.props" />
   <PropertyGroup Label="TargetFrameworks">
-    <!-- Conditionally exclude when building in Visual Studio until stable SDK is available. -->
-    <ExcludeLatestTargetFramework Condition="'$(ExcludeLatestTargetFramework)' == '' and '$(BuildingInsideVisualStudio)' == 'true'">true</ExcludeLatestTargetFramework>
-    <ExcludeLatestTargetFramework Condition="'$(ExcludeLatestTargetFramework)' == ''">false</ExcludeLatestTargetFramework>
     <!-- The TFMs of the dotnet-monitor tool.  -->
-    <ToolTargetFrameworks>net6.0</ToolTargetFrameworks>
-    <ToolTargetFrameworks Condition="'$(ExcludeLatestTargetFramework)' != 'true'">$(ToolTargetFrameworks);$(LatestTargetFramework)</ToolTargetFrameworks>
+    <ToolTargetFrameworks>$(LatestTargetFramework)</ToolTargetFrameworks>
     <!-- The TFMs of that the dotnet-monitor tool supports diagnosing. -->
-    <TestTargetFrameworks>net6.0;net7.0</TestTargetFrameworks>
-    <TestTargetFrameworks Condition="'$(ExcludeLatestTargetFramework)' != 'true'">$(TestTargetFrameworks);$(LatestTargetFramework)</TestTargetFrameworks>
+    <TestTargetFrameworks>net6.0;net7.0;$(LatestTargetFramework)</TestTargetFrameworks>
     <!-- The TFM for generating schema.json and OpenAPI docs. -->
-    <SchemaTargetFramework>net6.0</SchemaTargetFramework>
-    <!-- Defines for including the next .NET version -->
-    <DefineConstants Condition="'$(ExcludeLatestTargetFramework)' != 'true'">$(DefineConstants);INCLUDE_NEXT_DOTNET</DefineConstants>
+    <SchemaTargetFramework>net8.0</SchemaTargetFramework>
   </PropertyGroup>
   <PropertyGroup Label="Arcade">
     <UsingToolXliff>false</UsingToolXliff>

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)
         {

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;
 

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);

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests/Microsoft.Diagnostics.Monitoring.Tool.FunctionalTests.csproj

@@ -92,7 +92,7 @@
     <ProjectReference Include="..\..\Tools\dotnet-monitor\dotnet-monitor.csproj">
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <SkipGetTargetFrameworkProperties>true</SkipGetTargetFrameworkProperties>
-      <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
+      <SetTargetFramework>TargetFramework=net8.0</SetTargetFramework>
     </ProjectReference>
     <ProjectReference Include="..\Microsoft.Diagnostics.Monitoring.TestCommon\Microsoft.Diagnostics.Monitoring.TestCommon.csproj" />
   </ItemGroup>

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 =>

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<object[]> GetTfms()

src/Tests/Microsoft.Diagnostics.Monitoring.Tool.UnitTests/CollectionRulePipelineTests.cs

@@ -576,18 +576,12 @@ public static IEnumerable<object[]> GetTfmsSupportingPortListener()
         {
             yield return new object[] { TargetFrameworkMoniker.Net60 };
             yield return new object[] { TargetFrameworkMoniker.Net70 };
-#if INCLUDE_NEXT_DOTNET
             yield return new object[] { TargetFrameworkMoniker.Net80 };
-#endif
         }
 
         public static IEnumerable<object[]> GetCurrentTfm()
         {
-#if INCLUDE_NEXT_DOTNET
             yield return new object[] { TargetFrameworkMoniker.Net80 };
-#else
-            yield return new object[] { TargetFrameworkMoniker.Net70 };
-#endif
         }
     }
 }

src/archives/AzureBlobStorage/ProjectsToPublish.props

@@ -16,8 +16,5 @@
     <ProjectToPublish Include="$(AzureBlobStorageProjectPath)">
       <AdditionalProperties>TargetFramework=$(LatestToolTargetFramework);RuntimeIdentifier=;PublishDir=$(AzureBlobStoragePublishRootPath)$(LatestToolTargetFramework)\any\;SelfContained=false</AdditionalProperties>
     </ProjectToPublish>
-    <ProjectToPublish Include="$(AzureBlobStorageProjectPath)">
-      <AdditionalProperties>TargetFramework=$(OlderToolTargetFramework);RuntimeIdentifier=;PublishDir=$(AzureBlobStoragePublishRootPath)$(OlderToolTargetFramework)\any\;SelfContained=false</AdditionalProperties>
-    </ProjectToPublish>
   </ItemGroup>
 </Project>

src/archives/S3Storage/ProjectsToPublish.props

@@ -16,8 +16,5 @@
     <ProjectToPublish Include="$(S3StorageProjectPath)">
       <AdditionalProperties>TargetFramework=$(LatestToolTargetFramework);RuntimeIdentifier=;PublishDir=$(S3StoragePublishRootPath)$(LatestToolTargetFramework)\any\;SelfContained=false</AdditionalProperties>
     </ProjectToPublish>
-    <ProjectToPublish Include="$(S3StorageProjectPath)">
-      <AdditionalProperties>TargetFramework=$(OlderToolTargetFramework);RuntimeIdentifier=;PublishDir=$(S3StoragePublishRootPath)$(OlderToolTargetFramework)\any\;SelfContained=false</AdditionalProperties>
-    </ProjectToPublish>
   </ItemGroup>
 </Project>

startvs.cmd

@@ -14,9 +14,6 @@ SET DOTNET_MULTILEVEL_LOOKUP=0
 :: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use
 SET PATH=%DOTNET_ROOT%;%PATH%
 
-:: Allow building of the latest target framework because SDK from the repository will be used to build
-SET ExcludeLatestTargetFramework=false
-
 SET sln=%~1
 
 IF NOT EXIST "%DOTNET_ROOT%\dotnet.exe" (