Skip to content

Commit

Permalink
Rename namespace of Mono.Cecil to avoid clash
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 d6c7cf7 commit d3820ab
Show file tree
Hide file tree
Showing 312 changed files with 460 additions and 460 deletions.
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/BaseImageVisitor.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/CLIHeader.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/CopyImageVisitor.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DOSHeader.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DataDirectory.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DebugHeader.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/DebugStoreType.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ExportTable.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/IBinaryVisitable.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/IBinaryVisitor.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/IHeader.cs
100644 → 100755
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
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/Image.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageCharacteristics.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageFormatException.cs
100644 → 100755
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
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageInitializer.cs
100644 → 100755
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
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageReader.cs
100644 → 100755
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
4 changes: 2 additions & 2 deletions src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ImageWriter.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/Imports.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/MemoryBinaryWriter.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/PEFileHeader.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/PEOptionalHeader.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/RVA.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDataEntry.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDirectoryEntry.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceDirectoryTable.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceNode.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceReader.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/ResourceWriter.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/RuntimeImage.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/Section.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/SectionCharacteristics.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/SectionCollection.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Binary/SubSystem.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/BaseCodeVisitor.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/CilWorker.cs
100644 → 100755
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
2 changes: 1 addition & 1 deletion src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/Code.cs
100644 → 100755
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
8 changes: 4 additions & 4 deletions src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/CodeReader.cs
100644 → 100755
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
10 changes: 5 additions & 5 deletions src/Microsoft.DotNet.CilStrip.Sources/src/Mono.Cecil.Cil/CodeWriter.cs
100644 → 100755
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 d3820ab

Please sign in to comment.