From 5e08b77a7f13ed29ef95f1b0413c3b334659510e Mon Sep 17 00:00:00 2001
From: chcosta <chcosta@microsoft.com>
Date: Thu, 18 May 2017 16:27:13 -0700
Subject: [PATCH] Create symbols packages, add serviceable attribute, and
 update assembly info (dotnet/core-setup#2331)

* Include copyright info, serviceable attribute, and produce symbols
packages for Microsoft.Extensions.DependencyModel and
Microsoft.DotNet.PlatformAbstractions

* Align AssemblyFileVersion with VersionPrefix, remove env vars from dotnet
pack

* Add license files

* small tweak to packagepath

* Add package licenseurl and projecturl


Commit migrated from https://github.com/dotnet/core-setup/commit/3542d52f0bd5ad6df84140120e954e43acd4b79a
---
 src/installer/BuildToolsVersion.txt       |  2 +-
 src/installer/managed/CommonManaged.props | 20 ++++++++++++++++++++
 src/installer/managed/dir.proj            | 18 ++++++++++--------
 src/installer/pkg/packaging/dir.proj      |  2 +-
 4 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/installer/BuildToolsVersion.txt b/src/installer/BuildToolsVersion.txt
index d58933b..e079aa2 100644
--- a/src/installer/BuildToolsVersion.txt
+++ b/src/installer/BuildToolsVersion.txt
@@ -1 +1 @@
-2.0.0-prerelease-01611-07
+2.0.0-prerelease-01616-04
diff --git a/src/installer/managed/CommonManaged.props b/src/installer/managed/CommonManaged.props
index 4361fd1..b15a7f1 100644
--- a/src/installer/managed/CommonManaged.props
+++ b/src/installer/managed/CommonManaged.props
@@ -6,8 +6,15 @@
   <PropertyGroup>
     <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)../..'))/</RepoRoot>
     <VersionPrefix>2.0.0</VersionPrefix>
+    <AssemblyFileVersion>$(VersionPrefix)</AssemblyFileVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <IncludeSymbols>true</IncludeSymbols>
+    <Serviceable>true</Serviceable>
+    <PackageLicenseUrl>https://github.com/dotnet/core-setup/blob/master/LICENSE.TXT</PackageLicenseUrl>
+    <PackageProjectUrl>https://dot.net</PackageProjectUrl>
+    <PackageLicenseFile>$(RepoRoot)LICENSE.TXT</PackageLicenseFile>
+    <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -26,4 +33,17 @@
     <Reference Include="System.Core" />
   </ItemGroup>
 
+  <!-- Add required legal files to packages -->
+  <ItemGroup>
+    <Content Condition="Exists('$(PackageLicenseFile)')"
+             Include="$(PackageLicenseFile)">
+      <PackagePath />
+    </Content>
+    <Content Condition="Exists('$(PackageThirdPartyNoticesFile)')"
+             Include="$(PackageThirdPartyNoticesFile)">
+      <PackagePath />
+    </Content>
+  </ItemGroup>
+
+  <Import Condition="Exists('$(RepoRoot)Tools/versioning.props')" Project="$(RepoRoot)Tools/versioning.props" /> 
 </Project>
\ No newline at end of file
diff --git a/src/installer/managed/dir.proj b/src/installer/managed/dir.proj
index ced354b..69ec175 100644
--- a/src/installer/managed/dir.proj
+++ b/src/installer/managed/dir.proj
@@ -3,19 +3,21 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
 
-  <Target Name="Build">
-    <MakeDir  Condition="!Exists('$(pOutDir)')" Directories="$(pOutDir)" />
-
-    <PropertyGroup>
-      <Args>/p:Configuration=$(ConfigurationGroup)</Args>
-    </PropertyGroup>
+  <Target Name="Build"
+          DependsOnTargets="GetLatestCommitHash">
+    <MakeDir Condition="!Exists('$(pOutDir)')" Directories="$(pOutDir)" />
 
     <ItemGroup>
       <PackageProjects Include="$(MSBuildThisFileDirectory)Microsoft.DotNet.PlatformAbstractions/Microsoft.DotNet.PlatformAbstractions.csproj" />
       <PackageProjects Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj" />
     </ItemGroup>
 
-    <Exec Command="$(DotnetToolCommand) build $(Args) %(PackageProjects.Identity)"
-          EnvironmentVariables="NUGET_PACKAGES=$(PackagesDir)" />
+    <PropertyGroup>
+      <BuildArgs>/p:Configuration=$(ConfigurationGroup)</BuildArgs>
+      <BuildArgs Condition="'$(LatestCommit)' != ''">$(BuildArgs) /p:LatestCommit=$(LatestCommit)</BuildArgs>
+      <BuildArgs Condition="'$(BuiltByString)' != ''">$(BuildArgs) /p:BuiltByString="$(BuiltByString)"</BuildArgs>
+    </PropertyGroup>
+
+    <Exec Command="$(DotnetToolCommand) build $(BuildArgs) %(PackageProjects.Identity)" />
   </Target>
 </Project>
diff --git a/src/installer/pkg/packaging/dir.proj b/src/installer/pkg/packaging/dir.proj
index 3fe8275..c66170d 100644
--- a/src/installer/pkg/packaging/dir.proj
+++ b/src/installer/pkg/packaging/dir.proj
@@ -172,7 +172,7 @@
       <VersionSuffixArg>--version-suffix $(VersionSuffix)</VersionSuffixArg>
     </PropertyGroup>
 
-    <Exec Command="$(DotnetToolCommand) pack %(PackageProjects.Identity) --no-build --serviceable $(OutputArg) $(ConfigArg) $(VersionSuffixArg)"
+    <Exec Command="$(DotnetToolCommand) pack %(PackageProjects.Identity) --no-build $(OutputArg) $(ConfigArg) $(VersionSuffixArg)"
           Condition="'@(PackageProjects)' != ''" />
   </Target>
   
-- 
2.7.4