Fix packaging and AoT tests

Author: captainsafia

eng/testing/linker/project.csproj.template

@@ -16,6 +16,8 @@
     <InterceptorsPreviewNamespaces>$(InterceptorsPreviewNamespaces);Microsoft.AspNetCore.Http.Generated</InterceptorsPreviewNamespaces>
     <!-- Ensure individual warnings are shown when publishing -->
     <TrimmerSingleWarn>false</TrimmerSingleWarn>
+    <!-- But ignore the single warn files marked below to suppress their known warnings. -->
+    <NoWarn>$(NoWarn);IL2104</NoWarn>
     {AdditionalProperties}
   </PropertyGroup>
 
@@ -27,4 +29,19 @@
     {AdditionalProjectReferences}
   </ItemGroup>
 
+  <!-- Single warn the following assemblies, which have known warnings, so the warnings can be suppressed for now.
+  Remove this (and the above NoWarn IL2104) once  https://github.com/microsoft/OpenAPI.NET/issues/1875 is addressed. -->
+  <Target Name="ConfigureTrimming"
+          BeforeTargets="PrepareForILLink">
+    <ItemGroup>
+      <IlcArg Include="--singlewarnassembly:Microsoft.OpenApi" />
+    </ItemGroup>
+    <ItemGroup>
+      <ManagedAssemblyToLink Condition="'%(Filename)' == 'Microsoft.OpenApi'">
+        <IsTrimmable>true</IsTrimmable>
+        <TrimmerSingleWarn>true</TrimmerSingleWarn>
+      </ManagedAssemblyToLink>
+    </ItemGroup>
+  </Target>
+
 </Project>

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$\net10.0\publish\*.*" target="tools\net10.0" />
   </files>
 </package>

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