From 4834579356655bd51b243f55c2ed2ead216a616a Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 25 Dec 2020 03:02:42 +0100
Subject: Consolidate packaging properties (#46331)

* Consolidate packaging properties

* Remove versions.txt file from packages

The versions.txt file was added to packages to know which SHA a package
was built against. As the nuspec now contains the SHA, the versions file
isn't necessary anymore.
---
 Directory.Build.targets | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'Directory.Build.targets')

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 6b1d21054a2..e8bb87918af 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -22,6 +22,17 @@
   </PropertyGroup>
 
   <!-- Packaging -->
+  <ItemGroup Condition="'$(IsPackable)' == 'true'">
+    <!-- The sfxproj files add the license themselves. -->
+    <None Include="$(LicenseFile)"
+          PackagePath="$([System.IO.Path]::GetFileName('$(LicenseFile)'))"
+          Pack="true"
+          Condition="'$(MSBuildProjectExtension)' != '.sfxproj'" />
+    <None Include="$(PackageThirdPartyNoticesFile)"
+          PackagePath="$([System.IO.Path]::GetFileName('$(PackageThirdPartyNoticesFile)'))"
+          Pack="true" />
+  </ItemGroup>
+
   <PropertyGroup>
     <PackageDescription Condition="'$(PackageDescription)' == '' and '$(Description)' != ''">$(Description)</PackageDescription>
     <RuntimePackageDisclaimer>Internal implementation package not meant for direct consumption. Please do not reference directly.</RuntimePackageDisclaimer>
-- 
cgit v1.2.3