summaryrefslogtreecommitdiff
path: root/src/.nuget
diff options
context:
space:
mode:
authorViktor Hofer <viktor.hofer@microsoft.com>2019-01-08 14:13:48 +0100
committerGitHub <noreply@github.com>2019-01-08 14:13:48 +0100
commitb3498fd9788651659b478ce4aad7c9b6bf4eafc2 (patch)
tree719cf905c724c3f28abbecbcdf12c6badf84821f /src/.nuget
parentc885564832facf8a9cdcbe9baa1c7a18321cb9bd (diff)
downloadcoreclr-b3498fd9788651659b478ce4aad7c9b6bf4eafc2.tar.gz
coreclr-b3498fd9788651659b478ce4aad7c9b6bf4eafc2.tar.bz2
coreclr-b3498fd9788651659b478ce4aad7c9b6bf4eafc2.zip
Attempt to fix paths with spaces again (#21837)
Diffstat (limited to 'src/.nuget')
-rw-r--r--src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets b/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets
index 49089166df..7b392f23c7 100644
--- a/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets
+++ b/src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets
@@ -64,12 +64,12 @@ Copyright (c) .NET Foundation. All rights reserved.
</ItemGroup>
<PropertyGroup>
- <_IlasmDir>$(ToolsDir)\ilasm</_IlasmDir>
+ <_IlasmDir>$([MSBuild]::NormalizeDirectory('$(ToolsDir)', 'ilasm'))</_IlasmDir>
<_OutputTypeArgument Condition="'$(OutputType)' == 'Library'">-DLL</_OutputTypeArgument>
<_OutputTypeArgument Condition="'$(OutputType)' == 'Exe'">-EXE</_OutputTypeArgument>
- <_KeyFileArgument Condition="'$(KeyOriginatorFile)' != ''">-KEY=$(KeyOriginatorFile)</_KeyFileArgument>
+ <_KeyFileArgument Condition="'$(KeyOriginatorFile)' != ''">-KEY="$(KeyOriginatorFile)"</_KeyFileArgument>
<_IlasmSwitches>-QUIET -NOLOGO</_IlasmSwitches>
<_IlasmSwitches Condition="'$(FoldIdenticalMethods)' == 'True'">$(_IlasmSwitches) -FOLD</_IlasmSwitches>
@@ -85,7 +85,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<MakeDir Directories="$(_IlasmDir)" />
<Copy DestinationFolder="$(_IlasmDir)" SourceFiles="@(_IlasmSourceFiles)" />
- <Exec Command="$(_IlasmDir)\ilasm $(_IlasmSwitches) $(_OutputTypeArgument) $(IlasmFlags) -OUTPUT=@(IntermediateAssembly) $(_KeyFileArgument) @(Compile, ' ')">
+ <Exec Command="$(_IlasmDir)ilasm $(_IlasmSwitches) $(_OutputTypeArgument) $(IlasmFlags) -OUTPUT=&quot;@(IntermediateAssembly)&quot; $(_KeyFileArgument) @(Compile, ' ')">
<Output TaskParameter="ExitCode" PropertyName="_ILAsmExitCode" />
</Exec>