From 201cb97092713c0c8b8a0c74f64f954032a6f604 Mon Sep 17 00:00:00 2001
From: William Godbe <wigodbe@microsoft.com>
Date: Thu, 13 Nov 2025 13:32:35 -0800
Subject: [PATCH 1/2] Fix conflict

---
 .../src/Microsoft.Extensions.ApiDescription.Server.csproj | 2 +-
 .../src/Microsoft.Extensions.ApiDescription.Server.nuspec | 4 +---
 .../GetDocumentInsider/src/GetDocument.Insider.csproj     | 8 +-------
 .../dotnet-getdocument/src/Commands/InvokeCommand.cs      | 6 +-----
 .../dotnet-getdocument/src/dotnet-getdocument.csproj      | 2 +-
 5 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
index 2db57db2538c..adca7bcf7696 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
+++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
@@ -3,7 +3,7 @@
 
   <PropertyGroup>
     <!-- Included primarily to ensure dotnet-getdocument and GetDocument.Insider can be referenced. -->
-    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
 
     <Description>MSBuild tasks and targets for build-time Swagger and OpenApi document generation</Description>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
index be5d875fb7aa..5309d4ec91d1 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
+++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
@@ -8,10 +8,8 @@
     $CommonFileElements$
     <file src="build\*" target="build" />
     <file src="buildMultiTargeting\*" target="buildMultiTargeting" />
-    <file src="$artifactsBinDir$\dotnet-getdocument\$configuration$\netcoreapp2.1\publish\*.*" target="tools" />
     <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net462\*.*" target="tools\net462" />
     <file src="$artifactsBinDir$\GetDocument.Insider\x86\$configuration$\net462\*.*" target="tools\net462-x86" />
-    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\netcoreapp2.1\publish\*.*" target="tools\netcoreapp2.1" />
-    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net8.0\publish\*.*" target="tools\net8.0" />
+    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net8.0\publish\*.*" target="tools\net9.0" />
   </files>
 </package>
diff --git a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
index 77e80185d292..578807985ad4 100644
--- a/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
+++ b/src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
@@ -5,7 +5,7 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RootNamespace>Microsoft.Extensions.ApiDescription.Tool</RootNamespace>
-    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework)</TargetFrameworks>
     <IsShippingPackage>false</IsShippingPackage>
     <NoWarn>$(NoWarn);nullable</NoWarn>
   </PropertyGroup>
@@ -19,12 +19,6 @@
     <Reference Include="Microsoft.Extensions.Hosting.Abstractions" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1'">
-    <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="4.6.0">
-      <AllowExplicitReference>true</AllowExplicitReference>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework)' != 'netcoreapp2.1'">
     <Reference Include="System.Diagnostics.DiagnosticSource" />
   </ItemGroup>
diff --git a/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs b/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
index 593719792974..a04aab04701f 100644
--- a/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
+++ b/src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
@@ -79,13 +79,9 @@ protected override int Execute()
                             projectName,
                             targetFramework.Version));
                     }
-                    else if (targetFramework.Version >= new Version(7, 0))
-                    {
-                        toolsDirectory = Path.Combine(thisPath, $"net{targetFramework.Version}");
-                    }
                     else
                     {
-                        toolsDirectory = Path.Combine(thisPath, "netcoreapp2.1");
+                        toolsDirectory = Path.Combine(thisPath, $"net{targetFramework.Version}");
                     }
 
                     executable = DotNetMuxer.MuxerPathOrDefault();
diff --git a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
index 3b37a5ea7841..d8e25cf29741 100644
--- a/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
+++ b/src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
@@ -5,7 +5,7 @@
     <IsPackable>false</IsPackable>
     <OutputType>Exe</OutputType>
     <RootNamespace>Microsoft.Extensions.ApiDescription.Tool</RootNamespace>
-    <TargetFrameworks>netcoreapp2.1;$(DefaultNetCoreTargetFramework)</TargetFrameworks>
+    <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
     <UseAppHost>false</UseAppHost>
     <IsShippingPackage>false</IsShippingPackage>
   </PropertyGroup>

From 096882c5e6b526fe89c71b4c4afe4b71732b8bc9 Mon Sep 17 00:00:00 2001
From: wigodbe <wigodbe@microsoft.com>
Date: Wed, 4 Feb 2026 14:47:47 -0800
Subject: [PATCH 2/2] Package from top-level

---
 .../src/Microsoft.Extensions.ApiDescription.Server.nuspec      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
index 5309d4ec91d1..1a96aa8e8d4f 100644
--- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
+++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
@@ -8,8 +8,9 @@
     $CommonFileElements$
     <file src="build\*" target="build" />
     <file src="buildMultiTargeting\*" target="buildMultiTargeting" />
+    <file src="$artifactsBinDir$\dotnet-getdocument\$configuration$\net8.0\publish\*.*" target="tools" />
     <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net462\*.*" target="tools\net462" />
     <file src="$artifactsBinDir$\GetDocument.Insider\x86\$configuration$\net462\*.*" target="tools\net462-x86" />
-    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net8.0\publish\*.*" target="tools\net9.0" />
+    <file src="$artifactsBinDir$\GetDocument.Insider\$configuration$\net8.0\publish\*.*" target="tools\net8.0" />
   </files>
 </package>