diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2021-08-13 13:19:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-13 13:19:27 +0300 |
| commit | fad530f97a8e4d044ca092b96c025ac69bf93ec3 (patch) | |
| tree | 017abb7b036644a604f9502db3270f54d19902dd /eng/packaging.targets | |
| parent | fddbb5914b7585de1e686c7d319abf3b9a5f71c6 (diff) | |
Add Quic back to aspnetcore transport pack (#57338)
Also make sure that the documentation file is placed next to the
reference assembly if such is included as part of a ProjectReference.
Also move the IsAspNetCore property into packaging.targets as it's not
needed by the binplacing system anymore.
Diffstat (limited to 'eng/packaging.targets')
| -rw-r--r-- | eng/packaging.targets | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/eng/packaging.targets b/eng/packaging.targets index 4acf69bd585..dcd7eec670c 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -32,8 +32,9 @@ <PropertyGroup Condition="'$(ServicingVersion)' != ''"> <!-- Always update the package version in servicing. --> <PackageVersion>$(MajorVersion).$(MinorVersion).$(ServicingVersion)</PackageVersion> - <IsWindowsDesktop Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</IsWindowsDesktop> - <_AssemblyInTargetingPack Condition="'$(IsNETCoreAppSrc)' == 'true' or '$(IsAspNetCoreApp)' == 'true' or '$(IsWindowsDesktop)' == 'true'">true</_AssemblyInTargetingPack> + <_IsWindowsDesktopApp Condition="$(WindowsDesktopCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsWindowsDesktopApp> + <_IsAspNetCoreApp Condition="$(AspNetCoreAppLibrary.Contains('$(AssemblyName);'))">true</_IsAspNetCoreApp> + <_AssemblyInTargetingPack Condition="'$(IsNETCoreAppSrc)' == 'true' or '$(_IsAspNetCoreApp)' == 'true' or '$(_IsWindowsDesktopApp)' == 'true'">true</_AssemblyInTargetingPack> <!-- Assembly version do not get updated in non-netfx ref pack assemblies. --> <AssemblyVersion Condition="'$(_AssemblyInTargetingPack)' != 'true' or '$(TargetFrameworkIdentifier)' == '.NETFramework'">$(MajorVersion).$(MinorVersion).0.$(ServicingVersion)</AssemblyVersion> </PropertyGroup> @@ -206,6 +207,7 @@ Condition="'@(ProjectReference->WithMetadataValue('PrivateAssets', 'all')->WithMetadataValue('Pack', 'true'))' != ''" DependsOnTargets="BuildOnlySettings;ResolveReferences"> <ItemGroup> + <!-- Add ReferenceCopyLocalPaths for ProjectReferences which are flagged as Pack="true" into the package. --> <_projectReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'all')->WithMetadataValue('Pack', 'true'))" /> <TfmSpecificPackageFile Include="@(_projectReferenceCopyLocalPaths)" PackagePath="$([MSBuild]::ValueOrDefault('%(ReferenceCopyLocalPaths.PackagePath)', '$(BuildOutputTargetFolder)/$(TargetFramework)'))" /> @@ -213,19 +215,18 @@ TargetPath="/%(TfmSpecificPackageFile.PackagePath)/%(Filename)%(Extension)" TargetFramework="$(TargetFramework)" Condition="'$(IncludeSymbols)' == 'true'" /> - <!-- Remove symbols from the non symbol package. --> + <!-- Remove symbol from the non symbol package. --> <TfmSpecificPackageFile Remove="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))" /> + <!-- If the reference assembly is included, don't put the documentation file next to the lib assembly. --> + <TfmSpecificPackageFile Remove="@(_projectReferenceCopyLocalPaths->WithMetadataValue('Extension', '.xml')->WithMetadataValue('IncludeReferenceAssemblyInPackage', 'true'))" /> </ItemGroup> <ItemGroup> + <!-- Include the reference assembly and put the documentation file next to it. --> <_referenceAssemblyPaths Include="@(_projectReferenceCopyLocalPaths->WithMetadataValue('Extension', '.dll')->WithMetadataValue('IncludeReferenceAssemblyInPackage', 'true')->Metadata('ReferenceAssembly'))" /> + <_referenceAssemblyPaths Include="@(_projectReferenceCopyLocalPaths->WithMetadataValue('Extension', '.xml')->WithMetadataValue('IncludeReferenceAssemblyInPackage', 'true'))" /> <TfmSpecificPackageFile Include="@(_referenceAssemblyPaths)" PackagePath="ref/$(TargetFramework)" /> - <_referenceSymbolPaths Include="$([System.IO.Path]::ChangeExtension('%(_referenceAssemblyPaths.Identity)', '.pdb'))" /> - <TfmSpecificDebugSymbolsFile Include="@(_referenceSymbolPaths->Exists())" - TargetPath="/ref/$(TargetFramework)/%(Filename)%(Extension)" - TargetFramework="$(TargetFramework)" - Condition="'$(IncludeSymbols)' == 'true'" /> </ItemGroup> </Target> |