Fix paths with spaces in ilproj
authorViktor <viktor.hofer@microsoft.com>
Sat, 5 Jan 2019 10:46:50 +0000 (11:46 +0100)
committerViktor Hofer <viktor.hofer@microsoft.com>
Sat, 5 Jan 2019 12:21:35 +0000 (13:21 +0100)
Commit migrated from https://github.com/dotnet/corefx/commit/e38bad57a66fd6140da5953a182cd1c3a4ef332a

src/libraries/System.Runtime.CompilerServices.Unsafe/src/System.Runtime.CompilerServices.Unsafe.ilproj

index 2587abf..5ee3f47 100644 (file)
     <PropertyGroup>
       <_IlasmDir>$(ToolsDir)\ilasm</_IlasmDir>
 
-      <_IldasmCommand>$(_IlasmDir)\ildasm.exe</_IldasmCommand>
-      <_IldasmCommand>$(_IldasmCommand) $(ContractOutputPath)/$(MSBuildProjectName).dll</_IldasmCommand>
-      <_IldasmCommand>$(_IldasmCommand) /OUT=$(IntermediateOutputPath)/$(MSBuildProjectName).ref.il</_IldasmCommand>
+      <_IldasmCommand>"$(_IlasmDir)\ildasm.exe"</_IldasmCommand>
+      <_IldasmCommand>$(_IldasmCommand) "$(ContractOutputPath)/$(MSBuildProjectName).dll"</_IldasmCommand>
+      <_IldasmCommand>$(_IldasmCommand) /OUT="$(IntermediateOutputPath)/$(MSBuildProjectName).ref.il"</_IldasmCommand>
 
       <!-- Try to use cvtres.exe from the framework and fallback to the one that is on the PATH in case we can't find it -->
       <_CvtResCommand Condition="Exists('$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\cvtres.exe')">$(SystemRoot)\Microsoft.NET\Framework\v4.0.30319\cvtres.exe</_CvtResCommand>
       <_CvtResCommand Condition="'$(_CvtResCommand)' == ''">cvtres.exe</_CvtResCommand>
       <_CvtResCommand>$(_CvtResCommand) /MACHINE:x86</_CvtResCommand>
-      <_CvtResCommand>$(_CvtResCommand) /OUT:$(IntermediateOutputPath)$(MSBuildProjectName).ref.res.obj</_CvtResCommand>
-      <_CvtResCommand>$(_CvtResCommand) $(IntermediateOutputPath)$(MSBuildProjectName).ref.res</_CvtResCommand>
+      <_CvtResCommand>$(_CvtResCommand) /OUT:"$(IntermediateOutputPath)$(MSBuildProjectName).ref.res.obj"</_CvtResCommand>
+      <_CvtResCommand>$(_CvtResCommand) "$(IntermediateOutputPath)$(MSBuildProjectName).ref.res"</_CvtResCommand>
     </PropertyGroup>
 
     <ItemGroup>