From edb91d0f4d8f08621faaea24cca1a0d5d78e61f8 Mon Sep 17 00:00:00 2001
From: Doug Bunting <drb24@cornell.edu>
Date: Tue, 2 Apr 2019 22:22:19 -0700
Subject: [PATCH] Include `%(DocumentName)` when invoking the default document
 generator tool (#8982)

- #8319

* Skip dotnet-watch `RenameCompiledFile()` test
    - #8987

* Quote path and name arguments of `dotnet-getdocument` command
---
 .../Microsoft.Extensions.ApiDescription.Design.targets      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.targets b/src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.targets
index 06ee41e1d2..86d88c74f6 100644
--- a/src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.targets
+++ b/src/Mvc/Extensions.ApiDescription.Design/src/build/Microsoft.Extensions.ApiDescription.Design.targets
@@ -176,13 +176,13 @@
     <ItemGroup>
       <!-- @(CurrentServiceProjectReference) item group will never contain more than one item. -->
       <CurrentServiceProjectReference Update="@(CurrentServiceProjectReference)">
-        <Command>dotnet $(MSBuildThisFileDirectory)/../tools/dotnet-getdocument.dll --project %(FullPath)</Command>
+        <Command>dotnet $(MSBuildThisFileDirectory)/../tools/dotnet-getdocument.dll --project "%(FullPath)"</Command>
         <Configuration Condition="'%(Configuration)' == ''">$(Configuration)</Configuration>
         <GenerateDefaultDocumentOptions
             Condition="'%(GenerateDefaultDocumentOptions)' == ''">$(GenerateDefaultDocumentDefaultOptions)</GenerateDefaultDocumentOptions>
       </CurrentServiceProjectReference>
       <CurrentServiceProjectReference Update="@(CurrentServiceProjectReference)">
-        <Command>%(Command) --framework %(TargetFramework) --output %(DocumentPath)</Command>
+        <Command>%(Command) --documentName "%(DocumentName)" --framework %(TargetFramework) --output "%(DocumentPath)"</Command>
       </CurrentServiceProjectReference>
       <CurrentServiceProjectReference Update="@(CurrentServiceProjectReference)">
         <Command Condition="'%(Method)' != ''">%(Command) --method %(Method)</Command>
@@ -192,7 +192,7 @@
       </CurrentServiceProjectReference>
       <CurrentServiceProjectReference Update="@(CurrentServiceProjectReference)">
         <Command
-            Condition="'%(ProjectExtensionsPath)' != ''">%(Command) --projectExtensionsPath %(ProjectExtensionsPath)</Command>
+            Condition="'%(ProjectExtensionsPath)' != ''">%(Command) --projectExtensionsPath "%(ProjectExtensionsPath)"</Command>
       </CurrentServiceProjectReference>
       <CurrentServiceProjectReference Update="@(CurrentServiceProjectReference)">
         <Command>%(Command) --configuration %(Configuration) %(GenerateDefaultDocumentOptions)</Command>