Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit ac0f6f3

Browse files
authored
Revert "Fix unquoted path parameters in Microsoft.NET.Sdk.IL.targets (#27704)" (#27793)
This reverts commit d153122.
1 parent a87fc81 commit ac0f6f3

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ WARNING: DO NOT MODIFY this file unless you are knowledgeable about MSBuild and
77
created a backup copy. Incorrect changes to this file will make it
88
impossible to load or build your projects from the command-line or the IDE.
99
10-
Copyright (c) .NET Foundation. All rights reserved.
10+
Copyright (c) .NET Foundation. All rights reserved.
1111
***********************************************************************************************
1212
-->
1313
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
@@ -30,7 +30,7 @@ Copyright (c) .NET Foundation. All rights reserved.
3030
<MicrosoftNETCoreILAsmVersion Condition="'$(MicrosoftNETCoreILAsmVersion)' == ''">5.0.0</MicrosoftNETCoreILAsmVersion>
3131
<MicrosoftNetCoreIlasmPackageName>runtime.$(MicrosoftNetCoreIlasmPackageRuntimeId).microsoft.netcore.ilasm</MicrosoftNetCoreIlasmPackageName>
3232
<MicrosoftNetCoreIldasmPackageName>runtime.$(MicrosoftNetCoreIlasmPackageRuntimeId).microsoft.netcore.ildasm</MicrosoftNetCoreIldasmPackageName>
33-
33+
3434
<!-- If ILAsmToolPath is specified, it will be used and no packages will be restored
3535
Otherwise packages will be restored and ilasm and ildasm will be referenced from their packages. -->
3636
<_IlasmDir Condition="'$(ILAsmToolPath)' != ''">$([MSBuild]::NormalizeDirectory($(ILAsmToolPath)))</_IlasmDir>
@@ -68,15 +68,15 @@ Copyright (c) .NET Foundation. All rights reserved.
6868
</Target>
6969

7070
<!-- projects can define an ILResourceReference and we'll decompile it to get native resources -->
71-
<Target Name="DisassembleIlasmResourceFile"
72-
BeforeTargets="CoreCompile"
71+
<Target Name="DisassembleIlasmResourceFile"
72+
BeforeTargets="CoreCompile"
7373
Condition="'$(OS)'=='Windows_NT'"
7474
Inputs="@(ILResourceReference)"
7575
Outputs="$(IntermediateOutputPath)$(MSBuildProjectName).ref.res.obj">
7676
<Error Condition="'@(ILResourceReference->Count())' != '1'" Text="Only one ILResourceReference can be specified" />
7777
<PropertyGroup>
7878
<_ilResourceReference>%(ILResourceReference.FullPath)</_ilResourceReference>
79-
<_IldasmCommand>"$(_IldasmDir)ildasm"</_IldasmCommand>
79+
<_IldasmCommand>$(_IldasmDir)ildasm</_IldasmCommand>
8080
<_IldasmCommand>$(_IldasmCommand) "$(_ilResourceReference)"</_IldasmCommand>
8181
<_IldasmCommand>$(_IldasmCommand) /OUT="$(IntermediateOutputPath)/$(MSBuildProjectName).ref.il"</_IldasmCommand>
8282

@@ -122,17 +122,17 @@ Copyright (c) .NET Foundation. All rights reserved.
122122

123123
<_KeyFileArgument Condition="'$(KeyOriginatorFile)' != ''">-KEY="$(KeyOriginatorFile)"</_KeyFileArgument>
124124

125-
<_IlasmSwitches>-QUIET -NOLOGO</_IlasmSwitches>
125+
<_IlasmSwitches>-QUIET -NOLOGO</_IlasmSwitches>
126126
<_IlasmSwitches Condition="'$(FoldIdenticalMethods)' == 'True'">$(_IlasmSwitches) -FOLD</_IlasmSwitches>
127127
<_IlasmSwitches Condition="'$(SizeOfStackReserve)' != ''">$(_IlasmSwitches) -STACK=$(SizeOfStackReserve)</_IlasmSwitches>
128128
<_IlasmSwitches Condition="'$(DebugType)' == 'Full'">$(_IlasmSwitches) -DEBUG</_IlasmSwitches>
129129
<_IlasmSwitches Condition="'$(DebugType)' == 'Impl'">$(_IlasmSwitches) -DEBUG=IMPL</_IlasmSwitches>
130130
<_IlasmSwitches Condition="'$(DebugType)' == 'PdbOnly'">$(_IlasmSwitches) -DEBUG=OPT</_IlasmSwitches>
131131
<_IlasmSwitches Condition="'$(Optimize)' == 'True'">$(_IlasmSwitches) -OPTIMIZE</_IlasmSwitches>
132-
<_IlasmSwitches Condition="'$(IlasmResourceFile)' != ''">$(_IlasmSwitches) -RESOURCES="$(IlasmResourceFile)"</_IlasmSwitches>
132+
<_IlasmSwitches Condition="'$(IlasmResourceFile)' != ''">$(_IlasmSwitches) -RESOURCES=$(IlasmResourceFile)</_IlasmSwitches>
133133
</PropertyGroup>
134134

135-
<Exec Command="&quot;$(_IlasmDir)ilasm&quot; $(_IlasmSwitches) $(_OutputTypeArgument) $(IlasmFlags) -OUTPUT=&quot;@(IntermediateAssembly)&quot; $(_KeyFileArgument) @(Compile, ' ')">
135+
<Exec Command="$(_IlasmDir)ilasm $(_IlasmSwitches) $(_OutputTypeArgument) $(IlasmFlags) -OUTPUT=&quot;@(IntermediateAssembly)&quot; $(_KeyFileArgument) @(Compile, ' ')">
136136
<Output TaskParameter="ExitCode" PropertyName="_ILAsmExitCode" />
137137
</Exec>
138138

0 commit comments

Comments
 (0)