[release/6.0 ]Rename namespace of Mono.Cecil to avoid clash

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. Backport of dotnet#169
akoeplinger · Sep 7, 2021 · 5555a8d · 5555a8d
1 parent e46ee55
commit 5555a8d
Show file tree

Hide file tree

Showing 310 changed files with 460 additions and 460 deletions.
diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/BaseImageVisitor.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/BaseImageVisitor.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal abstract class BaseImageVisitor : IBinaryVisitor {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/CLIHeader.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/CLIHeader.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal sealed class CLIHeader : IHeader, IBinaryVisitable {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/CopyImageVisitor.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/CopyImageVisitor.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	sealed class CopyImageVisitor : BaseImageVisitor {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DOSHeader.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DOSHeader.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal sealed class DOSHeader : IHeader, IBinaryVisitable {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DataDirectory.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DataDirectory.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal struct DataDirectory {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DebugHeader.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DebugHeader.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System;
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DebugStoreType.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DebugStoreType.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal enum DebugStoreType : uint {
 		Unknown = 0x00000000,

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ExportTable.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ExportTable.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal sealed class ExportTable : IBinaryVisitable {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/IBinaryVisitable.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/IBinaryVisitable.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal interface IBinaryVisitable {
 		void Accept (IBinaryVisitor visitor);

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/IBinaryVisitor.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/IBinaryVisitor.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal interface IBinaryVisitor {
 		void VisitImage (Image img);

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/IHeader.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/IHeader.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal interface IHeader {
 		void SetDefaultValues ();

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/Image.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/Image.cs
@@ -26,12 +26,12 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System;
 	using System.IO;
 
-	using Mono.Cecil.Metadata;
+	using CilStrip.Mono.Cecil.Metadata;
 
 	internal sealed class Image : IBinaryVisitable {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageCharacteristics.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageCharacteristics.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System;
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageFormatException.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageFormatException.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System;
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageInitializer.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageInitializer.cs
@@ -26,11 +26,11 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System;
 
-	using Mono.Cecil.Metadata;
+	using CilStrip.Mono.Cecil.Metadata;
 
 	sealed class ImageInitializer : BaseImageVisitor {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageReader.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageReader.cs
@@ -26,13 +26,13 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System;
 	using System.IO;
 	using System.Text;
 
-	using Mono.Cecil.Metadata;
+	using CilStrip.Mono.Cecil.Metadata;
 
 	sealed class ImageReader : BaseImageVisitor {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageWriter.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageWriter.cs
@@ -26,12 +26,12 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System.IO;
 	using System.Text;
 
-	using Mono.Cecil.Metadata;
+	using CilStrip.Mono.Cecil.Metadata;
 
 	sealed class ImageWriter : BaseImageVisitor {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/Imports.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/Imports.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal sealed class ImportAddressTable : IBinaryVisitable {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/MemoryBinaryWriter.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/MemoryBinaryWriter.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System.IO;
 	using System.Text;

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/PEFileHeader.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/PEFileHeader.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal sealed class PEFileHeader : IHeader, IBinaryVisitable {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/PEOptionalHeader.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/PEOptionalHeader.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal sealed class PEOptionalHeader : IHeader, IBinaryVisitable {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/RVA.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/RVA.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal struct RVA {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDataEntry.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDataEntry.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal class ResourceDataEntry : ResourceNode {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDirectoryEntry.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDirectoryEntry.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal class ResourceDirectoryEntry : ResourceNode {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDirectoryString.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDirectoryString.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal class ResourceDirectoryString : ResourceNode {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDirectoryTable.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDirectoryTable.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System.Collections;
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceNode.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceNode.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal abstract class ResourceNode {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceReader.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceReader.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System;
 	using System.IO;

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceWriter.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceWriter.cs
@@ -28,7 +28,7 @@
 
 using System.Text;
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System.Collections;
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/RuntimeImage.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/RuntimeImage.cs
@@ -28,7 +28,7 @@
 
 using System;
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	[Flags]
 	internal enum RuntimeImage : uint {

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/Section.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/Section.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal sealed class Section : IHeader, IBinaryVisitable {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/SectionCharacteristics.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/SectionCharacteristics.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System;
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/SectionCollection.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/SectionCollection.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	using System;
 	using System.Collections;

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/SubSystem.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/SubSystem.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Binary {
+namespace CilStrip.Mono.Cecil.Binary {
 
 	internal enum SubSystem : ushort {
 		Unknown = 0x0,

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/BaseCodeVisitor.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/BaseCodeVisitor.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Cil {
+namespace CilStrip.Mono.Cecil.Cil {
 
 	internal abstract class BaseCodeVisitor : ICodeVisitor {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/CilWorker.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/CilWorker.cs
@@ -26,7 +26,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Cil {
+namespace CilStrip.Mono.Cecil.Cil {
 
 	using System;
 	using SR = System.Reflection;

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/Code.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/Code.cs
@@ -29,7 +29,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Cil {
+namespace CilStrip.Mono.Cecil.Cil {
 
 	internal enum Code {
 		Nop,

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/CodeReader.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/CodeReader.cs
@@ -26,15 +26,15 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Cil {
+namespace CilStrip.Mono.Cecil.Cil {
 
 	using System;
 	using System.Collections;
 	using System.IO;
 
-	using Mono.Cecil;
-	using Mono.Cecil.Metadata;
-	using Mono.Cecil.Signatures;
+	using CilStrip.Mono.Cecil;
+	using CilStrip.Mono.Cecil.Metadata;
+	using CilStrip.Mono.Cecil.Signatures;
 
 	sealed class CodeReader : BaseCodeVisitor {
 

diff --git a/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/CodeWriter.cs b/src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/CodeWriter.cs
@@ -26,15 +26,15 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-namespace Mono.Cecil.Cil {
+namespace CilStrip.Mono.Cecil.Cil {
 
 	using System;
 	using System.Collections;
 
-	using Mono.Cecil;
-	using Mono.Cecil.Binary;
-	using Mono.Cecil.Metadata;
-	using Mono.Cecil.Signatures;
+	using CilStrip.Mono.Cecil;
+	using CilStrip.Mono.Cecil.Binary;
+	using CilStrip.Mono.Cecil.Metadata;
+	using CilStrip.Mono.Cecil.Signatures;
 
 	sealed class CodeWriter : BaseCodeVisitor {