Skip to content

Commit a77b391

Browse files
authored
Change namespace of embedded Cecil in ILStrip task (#58763)
We hit a case where the ILStrip task assembly is IL-merged with a few other task assemblies on the Xamarin side which causes a clash because of trying to merge different Mono.Cecil versions. Rename the Mono.Cecil used here to avoid that clash. Brings in dotnet/runtime-assets#169
1 parent 01c4028 commit a77b391

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,9 +122,9 @@
122122
<Uri>https://github.com/dotnet/runtime-assets</Uri>
123123
<Sha>e46ee5551e1ecf232833eb18ef341eedbdb08f38</Sha>
124124
</Dependency>
125-
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.21430.1">
125+
<Dependency Name="Microsoft.DotNet.CilStrip.Sources" Version="6.0.0-beta.21457.5">
126126
<Uri>https://github.com/dotnet/runtime-assets</Uri>
127-
<Sha>e46ee5551e1ecf232833eb18ef341eedbdb08f38</Sha>
127+
<Sha>16f58bb2e869e434a13a91bab36f2517c276bf3e</Sha>
128128
</Dependency>
129129
<Dependency Name="runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk" Version="11.1.0-alpha.1.21416.1">
130130
<Uri>https://github.com/dotnet/llvm-project</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<SystemRuntimeTimeZoneDataVersion>6.0.0-beta.21430.1</SystemRuntimeTimeZoneDataVersion>
125125
<SystemSecurityCryptographyX509CertificatesTestDataVersion>6.0.0-beta.21430.1</SystemSecurityCryptographyX509CertificatesTestDataVersion>
126126
<SystemWindowsExtensionsTestDataVersion>6.0.0-beta.21430.1</SystemWindowsExtensionsTestDataVersion>
127-
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.21430.1</MicrosoftDotNetCilStripSourcesVersion>
127+
<MicrosoftDotNetCilStripSourcesVersion>6.0.0-beta.21457.5</MicrosoftDotNetCilStripSourcesVersion>
128128
<!-- dotnet-optimization dependencies -->
129129
<optimizationwindows_ntx64MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx64MIBCRuntimeVersion>
130130
<optimizationwindows_ntx86MIBCRuntimeVersion>1.0.0-prerelease.21416.5</optimizationwindows_ntx86MIBCRuntimeVersion>

src/tasks/ILStripTask/ILStrip.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
using System.Threading.Tasks;
99
using Microsoft.Build.Framework;
1010
using Microsoft.Build.Utilities;
11-
using Mono.Cecil;
12-
using Mono.Cecil.Binary;
13-
using Mono.Cecil.Cil;
14-
using Mono.Cecil.Metadata;
11+
using CilStrip.Mono.Cecil;
12+
using CilStrip.Mono.Cecil.Binary;
13+
using CilStrip.Mono.Cecil.Cil;
14+
using CilStrip.Mono.Cecil.Metadata;
1515

1616
public class ILStrip : Microsoft.Build.Utilities.Task
1717
{

0 commit comments

Comments
 (0)