Skip to content

Commit 5dc63a6

Browse files
authored
Fix hardcoded ILAsm package version in Microsoft.NET.SDK.IL (dotnet#96069)
We were still hardcoding version 6.0.0 of ILAsm in the targets, fix it by using a template and injecting the PackageVersion. Fixes dotnet#49135
1 parent 8725a6e commit 5dc63a6

2 files changed

Lines changed: 25 additions & 1 deletion

File tree

src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.pkgproj

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,29 @@
1515
</File>
1616
</ItemGroup>
1717

18+
<PropertyGroup>
19+
<ILTargetsTemplateFile>Microsoft.NET.Sdk.IL.targets.template</ILTargetsTemplateFile>
20+
<ILTargetsOutputFile>$(IntermediateOutputPath)Microsoft.NET.Sdk.IL.targets</ILTargetsOutputFile>
21+
</PropertyGroup>
22+
23+
<Target Name="ReplaceTemplateParametersInILTargetsTemplate"
24+
Inputs="$(ILTargetsTemplateFile)"
25+
Outputs="$(ILTargetsOutputFile)"
26+
BeforeTargets="GetPackageFiles"
27+
DependsOnTargets="CalculatePackageVersion">
28+
29+
<GenerateFileFromTemplate TemplateFile="$(ILTargetsTemplateFile)"
30+
OutputPath="$(ILTargetsOutputFile)"
31+
Properties="IlAsmVersion=$(PackageVersion)">
32+
<Output TaskParameter="ResolvedOutputPath" ItemName="FileWrites" />
33+
</GenerateFileFromTemplate>
34+
35+
<ItemGroup>
36+
<File Include="$(ILTargetsOutputFile)">
37+
<TargetPath>targets</TargetPath>
38+
</File>
39+
</ItemGroup>
40+
</Target>
41+
1842
<Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
1943
</Project>

src/coreclr/.nuget/Microsoft.NET.Sdk.IL/targets/Microsoft.NET.Sdk.IL.targets renamed to src/coreclr/.nuget/Microsoft.NET.Sdk.IL/Microsoft.NET.Sdk.IL.targets.template

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Copyright (c) .NET Foundation. All rights reserved.
2828

2929
<PropertyGroup>
3030
<MicrosoftNetCoreIlasmPackageRuntimeId Condition="'$(MicrosoftNetCoreIlasmPackageRuntimeId)' == ''">$(NETCoreSdkPortableRuntimeIdentifier)</MicrosoftNetCoreIlasmPackageRuntimeId>
31-
<MicrosoftNETCoreILAsmVersion Condition="'$(MicrosoftNETCoreILAsmVersion)' == ''">6.0.0</MicrosoftNETCoreILAsmVersion>
31+
<MicrosoftNETCoreILAsmVersion Condition="'$(MicrosoftNETCoreILAsmVersion)' == ''">${IlAsmVersion}</MicrosoftNETCoreILAsmVersion>
3232
<MicrosoftNetCoreIlasmPackageName>runtime.$(MicrosoftNetCoreIlasmPackageRuntimeId).microsoft.netcore.ilasm</MicrosoftNetCoreIlasmPackageName>
3333
<MicrosoftNetCoreIldasmPackageName>runtime.$(MicrosoftNetCoreIlasmPackageRuntimeId).microsoft.netcore.ildasm</MicrosoftNetCoreIldasmPackageName>
3434

0 commit comments

Comments
 (0)