Revert "Merge branch 'main' into main"

This reverts commit 03c0c60fd7, reversing
changes made to 77fe2e4d48.

Directory.Build.targets

@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup
-    Condition="@(PackageReference->WithMetadataValue('Identity','Microsoft.AspNetCore.OpenApi')->Count()) &gt; 0">
+    Condition="'$(UsingMicrosoftNETSdkWeb)' == 'True' AND @(PackageReference->WithMetadataValue('Identity','Microsoft.AspNetCore.OpenApi')->Count()) &gt; 0">
     <PackageReference Include="Microsoft.Extensions.ApiDescription.Server">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -33,6 +33,14 @@
       Condition="Exists('$(OpenApiDocumentsDirectory)/$(MSBuildProjectName).json')" />
   </Target>
 
+  <Target Name="SetHierarchicalPackageOutputPath"
+    BeforeTargets="_GetAbsoluteOutputPathsForPack"
+    Condition="'$(ArtifactsPath)' != '' AND '$(PackageVersion)' != ''">
+    <PropertyGroup>
+      <PackageOutputPath>$(ArtifactsPath)/nuget/$(PackageId)/$(PackageVersion)</PackageOutputPath>
+    </PropertyGroup>
+  </Target>
+
   <Target Name="AddInternalsVisibleTo" BeforeTargets="BeforeCompile">
     <!--
       Add an ItemGroup with tags in the following format:

Directory.Packages.template.props

@@ -1,6 +1,6 @@
 <Project>
   <ItemGroup Label="Packages">
-    <PackageVersion Include="GitVersion.MsBuild" Version="6.6.2" />
+    <PackageVersion Include="GitVersion.MsBuild" Version="6.7.0" />
     <PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.5" />
     <PackageVersion Include="NewStyleCop.Analyzers" Version="1.2.1" />
     <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />