From d5e049d1fc6893ff45d0899affe33c063f458543 Mon Sep 17 00:00:00 2001
From: Qinen Zhu <qinzhu@microsoft.com>
Date: Fri, 13 Jan 2017 11:18:16 +0800
Subject: [PATCH] fix comments

---
 .gitignore                                    |  5 +---
 build.ps1                                     | 25 ++++++++++++++-----
 .../DfmHttpService/DfmHttpService.nuspec      |  7 +++---
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index b96b99ce039..cdcf74ce679 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,10 +18,7 @@ target/
 /**/_site/
 .vscode/
 .vs/
-src/nuspec/docfx.console/tools/
-src/nuspec/AzureMarkdownRewriterTool/tools/
-src/nuspec/DfmHttpService/tools/
-
+PACK/
 
 ###############
 #  temp file  #
diff --git a/build.ps1 b/build.ps1
index 39937683546..0eccd20109b 100644
--- a/build.ps1
+++ b/build.ps1
@@ -61,14 +61,27 @@ function NugetPack {
 }
 
 function PackSelfContainProject {
-    param($sourceFolder, $nuspecPath)
-    $targetFolder = (Get-Item $nuspecPath).Directory.FullName
+    param($assemblyFolder, $nuspecPath)
+
+    $nuspecFile = Get-Item $nuspecPath
+    $nuspecName = $nuspecFile.Name
+    $nuspecFolder = $nuspecFile.Directory.FullName
+    $nuspecFolderName = $nuspecFile.Directory.Name
+    $targetFolder = "PACK\$nuspecFolderName"
+
+    if (Test-Path $targetFolder)
+    {
+        $null = Remove-Item $targetFolder -Force -Recurse
+    }
+    $null = New-Item -ItemType Directory -Force -Path $targetFolder
     $null = New-Item -ItemType Directory -Force -Path "$targetFolder\tools\"
-    Copy-Item -Path "$sourceFolder\*.dll" -Destination "$targetFolder\tools\"
-    Copy-Item -Path "$sourceFolder\*.exe" -Destination "$targetFolder\tools\"
-    Copy-Item -Path "$sourceFolder\*.exe.config" -Destination "$targetFolder\tools\"
 
-    & $nuget pack $nuspecPath -Version $version -OutputDirectory artifacts\$configuration
+    Copy-Item -Path "$nuspecFolder\**" -Destination "$targetFolder" -Force -Recurse
+    Copy-Item -Path "$assemblyFolder\*.dll" -Destination "$targetFolder\tools\" -Force
+    Copy-Item -Path "$assemblyFolder\*.exe" -Destination "$targetFolder\tools\" -Force
+    Copy-Item -Path "$assemblyFolder\*.exe.config" -Destination "$targetFolder\tools\" -Force
+
+    & $nuget pack "$targetFolder\$nuspecName" -Version $version -OutputDirectory artifacts\$configuration
     ProcessLastExitCode $lastexitcode "nuget pack error while packing $nuspecPath"
 }
 
diff --git a/src/nuspec/DfmHttpService/DfmHttpService.nuspec b/src/nuspec/DfmHttpService/DfmHttpService.nuspec
index 7c4627fc498..6154af37435 100644
--- a/src/nuspec/DfmHttpService/DfmHttpService.nuspec
+++ b/src/nuspec/DfmHttpService/DfmHttpService.nuspec
@@ -8,11 +8,10 @@
     <owners>Microsoft</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <licenseUrl>https://github.com/dotnet/docfx/blob/dev/LICENSE</licenseUrl>
-    <projectUrl>https://github.com/dotnet/docfx</projectUrl>
-    <description>This is a tool to generate API documentation for .NET projects.</description>
-    <releaseNotes>Support generating both CSHARP and VB projects.</releaseNotes>
+    <projectUrl>https://github.com/dotnet/docfx/tools/DfmHttpService</projectUrl>
+    <description>HTTP Server Wrapper for DocFX Favorable Markdown.</description>
     <copyright>Copyright 2015-2016</copyright>
-    <tags>Documentation API Metadata docascode docfx</tags>
+    <tags>DFM markdown docascode docfx</tags>
   </metadata>
   <files>
     <file src="tools/**" target=""/>