Skip to content

Commit

Permalink
Rename namespace of Mono.Cecil to avoid clash (#169)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
akoeplinger committed Sep 7, 2021
1 parent 8834ff2 commit 1d113f1
Show file tree
Hide file tree
Showing 310 changed files with 460 additions and 460 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 ();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

using System.Text;

namespace Mono.Cecil.Binary {
namespace CilStrip.Mono.Cecil.Binary {

using System.Collections;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

using System;

namespace Mono.Cecil.Binary {
namespace CilStrip.Mono.Cecil.Binary {

[Flags]
internal enum RuntimeImage : uint {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down
Loading

0 comments on commit 1d113f1

Please sign in to comment.