diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2022-02-10 16:15:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 16:15:18 +0300 |
| commit | 2f7726e3bacd2cf948068cf6574eebfa9ada45fa (patch) | |
| tree | 7448e3b64416126f434473c4c83734f9f485a574 /eng/packaging.targets | |
| parent | 855594f3d0845274c7ac4891bef2a5ae9e660398 (diff) | |
Clean-up DllImportGenerator packaging infra (#64810)
* Clean-up DllImportGenerator packaging infra
Most of what DllImportGenerator was trying to achieve via targets or by setting common packaging properties is already handled by libraries common packaging infrastructure (packaging.props) which is imported when a project sets `IsPackable=true`.
Diffstat (limited to 'eng/packaging.targets')
| -rw-r--r-- | eng/packaging.targets | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/eng/packaging.targets b/eng/packaging.targets index 7a29b7d9927..e705b4e7110 100644 --- a/eng/packaging.targets +++ b/eng/packaging.targets @@ -9,7 +9,7 @@ BeforePack must be used. Setting both to ensure that we are always running before other targets. --> <PackDependsOn>AddNETStandardCompatErrorFileForPackaging;IncludeAnalyzersInPackage;$(PackDependsOn)</PackDependsOn> <BeforePack>AddNETStandardCompatErrorFileForPackaging;IncludeAnalyzersInPackage;$(BeforePack)</BeforePack> - <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddRuntimeSpecificFilesToPackage;IncludePrivateProjectReferencesWithPackAttributeInPackage</TargetsForTfmSpecificContentInPackage> + <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);AddRuntimeSpecificFilesToPackage;IncludeProjectReferencesWithPackAttributeInPackage</TargetsForTfmSpecificContentInPackage> <IncludeBuildOutput Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetPlatformIdentifier)' != ''">false</IncludeBuildOutput> <!-- Don't include target platform specific dependencies, since we use the target platform to represent RIDs instead --> <SuppressDependenciesWhenPacking Condition="'$(TargetFrameworkIdentifier)' == '.NETCoreApp' and '$(TargetPlatformIdentifier)' != ''">true</SuppressDependenciesWhenPacking> @@ -226,12 +226,12 @@ </ItemGroup> </Target> - <Target Name="IncludePrivateProjectReferencesWithPackAttributeInPackage" - Condition="'@(ProjectReference->WithMetadataValue('PrivateAssets', 'all')->WithMetadataValue('Pack', 'true'))' != ''" + <Target Name="IncludeProjectReferencesWithPackAttributeInPackage" + Condition="'@(ProjectReference->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'))" /> + <_projectReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('Pack', 'true'))" /> <TfmSpecificPackageFile Include="@(_projectReferenceCopyLocalPaths)" PackagePath="$([MSBuild]::ValueOrDefault('%(ReferenceCopyLocalPaths.PackagePath)', '$(BuildOutputTargetFolder)/$(TargetFramework)'))" /> <TfmSpecificDebugSymbolsFile Include="@(TfmSpecificPackageFile->WithMetadataValue('Extension', '.pdb'))" |