Skip to content

[release/9.0] Don't use netcoreapp2.1 in dotnet-get-document #64351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wtgodbe merged 4 commits into from
Nov 13, 2025
Merged

[release/9.0] Don't use netcoreapp2.1 in dotnet-get-document #64351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f98f36b
Don't use netcoreapp2.1 in dotnet-get-document
wtgodbe Nov 13, 2025
ac4b569
Fixup
wtgodbe Nov 13, 2025
4937d4d
More
wtgodbe Nov 13, 2025
b355d78
TFM
wtgodbe Nov 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ls/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions ...ls/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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$\net9.0\publish\*.*" target="tools\net9.0" />
</files>
</package>
8 changes: 1 addition & 7 deletions src/Tools/GetDocumentInsider/src/GetDocument.Insider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
6 changes: 1 addition & 5 deletions src/Tools/dotnet-getdocument/src/Commands/InvokeCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/Tools/dotnet-getdocument/src/dotnet-getdocument.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading