Removed define 'READ_ONLY'.

stone-payments · Oct 19, 2017 · 6807da2 · 6807da2
1 parent 9bd8edb
commit 6807da2
Show file tree

Hide file tree

Showing 42 changed files with 5 additions and 206 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -3,7 +3,6 @@
   <PropertyGroup>
     <!-- Configuration definitions. -->
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Configurations>Debug;Release;Debug_ReadOnly;Release_ReadOnly</Configurations>
 
     <!-- Path definitions. -->
     <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)\obj\$(MSBuildProjectName)</BaseIntermediateOutputPath>
@@ -17,9 +16,9 @@
 
     <!-- Target framework definitions. -->
     <ProjectTargetFrameworkForNetStandard>netstandard2.0</ProjectTargetFrameworkForNetStandard>
-    <ProjectTargetFrameworks>$(ProjectTargetFrameworkForNetStandard);net40;net35</ProjectTargetFrameworks>
+    <ProjectTargetFrameworks>$(ProjectTargetFrameworkForNetStandard)</ProjectTargetFrameworks>
     <TestProjectTargetFrameworkForNetStandard>net462</TestProjectTargetFrameworkForNetStandard>
-    <TestProjectTargetFrameworks>$(TestProjectTargetFrameworkForNetStandard);net40;net35</TestProjectTargetFrameworks>
+    <TestProjectTargetFrameworks>$(TestProjectTargetFrameworkForNetStandard)</TestProjectTargetFrameworks>
 
     <!-- Compile-time constant for the target framework moniker. -->
     <DefineConstants>$(DefineConstants);$(TargetFramework.TrimEnd('.0123456789').ToUpper())</DefineConstants>
@@ -43,10 +42,6 @@
     <PackageId>$(MSBuildProjectName).NotPackage</PackageId>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" $(Configuration.Contains('ReadOnly')) ">
-    <DefineConstants>$(DefineConstants);READ_ONLY</DefineConstants>
-  </PropertyGroup>
-
   <!-- Split debug and release information. -->
   <PropertyGroup Condition=" $(Configuration.Contains('Debug')) ">
     <DefineDebug>true</DefineDebug>

diff --git a/Mono.Cecil.sln b/Mono.Cecil.sln
@@ -25,58 +25,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil.NuGet", "src\Mon
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug_ReadOnly|Any CPU = Debug_ReadOnly|Any CPU
 		Debug|Any CPU = Debug|Any CPU
-		Release_ReadOnly|Any CPU = Release_ReadOnly|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug_ReadOnly|Any CPU.ActiveCfg = Debug_ReadOnly|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug_ReadOnly|Any CPU.Build.0 = Debug_ReadOnly|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release_ReadOnly|Any CPU.ActiveCfg = Release_ReadOnly|Any CPU
-		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release_ReadOnly|Any CPU.Build.0 = Release_ReadOnly|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}.Debug_ReadOnly|Any CPU.ActiveCfg = Debug_ReadOnly|Any CPU
-		{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}.Debug_ReadOnly|Any CPU.Build.0 = Debug_ReadOnly|Any CPU
 		{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}.Release_ReadOnly|Any CPU.ActiveCfg = Release_ReadOnly|Any CPU
-		{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}.Release_ReadOnly|Any CPU.Build.0 = Release_ReadOnly|Any CPU
 		{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}.Release|Any CPU.Build.0 = Release|Any CPU
-		{AC71DF9C-99FA-4A63-990A-66C8010355A6}.Debug_ReadOnly|Any CPU.ActiveCfg = Debug_ReadOnly|Any CPU
-		{AC71DF9C-99FA-4A63-990A-66C8010355A6}.Debug_ReadOnly|Any CPU.Build.0 = Debug_ReadOnly|Any CPU
 		{AC71DF9C-99FA-4A63-990A-66C8010355A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AC71DF9C-99FA-4A63-990A-66C8010355A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{AC71DF9C-99FA-4A63-990A-66C8010355A6}.Release_ReadOnly|Any CPU.ActiveCfg = Release_ReadOnly|Any CPU
-		{AC71DF9C-99FA-4A63-990A-66C8010355A6}.Release_ReadOnly|Any CPU.Build.0 = Release_ReadOnly|Any CPU
 		{AC71DF9C-99FA-4A63-990A-66C8010355A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AC71DF9C-99FA-4A63-990A-66C8010355A6}.Release|Any CPU.Build.0 = Release|Any CPU
-		{29300103-CB76-4A1D-B6FD-FFD91C1EC8AA}.Debug_ReadOnly|Any CPU.ActiveCfg = Debug_ReadOnly|Any CPU
-		{29300103-CB76-4A1D-B6FD-FFD91C1EC8AA}.Debug_ReadOnly|Any CPU.Build.0 = Debug_ReadOnly|Any CPU
 		{29300103-CB76-4A1D-B6FD-FFD91C1EC8AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{29300103-CB76-4A1D-B6FD-FFD91C1EC8AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{29300103-CB76-4A1D-B6FD-FFD91C1EC8AA}.Release_ReadOnly|Any CPU.ActiveCfg = Release_ReadOnly|Any CPU
-		{29300103-CB76-4A1D-B6FD-FFD91C1EC8AA}.Release_ReadOnly|Any CPU.Build.0 = Release_ReadOnly|Any CPU
 		{29300103-CB76-4A1D-B6FD-FFD91C1EC8AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{29300103-CB76-4A1D-B6FD-FFD91C1EC8AA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}.Debug_ReadOnly|Any CPU.ActiveCfg = Debug_ReadOnly|Any CPU
-		{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}.Debug_ReadOnly|Any CPU.Build.0 = Debug_ReadOnly|Any CPU
 		{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}.Release_ReadOnly|Any CPU.ActiveCfg = Release_ReadOnly|Any CPU
-		{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}.Release_ReadOnly|Any CPU.Build.0 = Release_ReadOnly|Any CPU
 		{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}.Release|Any CPU.Build.0 = Release|Any CPU
-		{17B250AA-691E-4E14-AF82-EF8D5C45260E}.Debug_ReadOnly|Any CPU.ActiveCfg = Debug_ReadOnly|Any CPU
-		{17B250AA-691E-4E14-AF82-EF8D5C45260E}.Debug_ReadOnly|Any CPU.Build.0 = Debug_ReadOnly|Any CPU
 		{17B250AA-691E-4E14-AF82-EF8D5C45260E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{17B250AA-691E-4E14-AF82-EF8D5C45260E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{17B250AA-691E-4E14-AF82-EF8D5C45260E}.Release_ReadOnly|Any CPU.ActiveCfg = Release_ReadOnly|Any CPU
-		{17B250AA-691E-4E14-AF82-EF8D5C45260E}.Release_ReadOnly|Any CPU.Build.0 = Release_ReadOnly|Any CPU
 		{17B250AA-691E-4E14-AF82-EF8D5C45260E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17B250AA-691E-4E14-AF82-EF8D5C45260E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection

diff --git a/src/Mono.Cecil/Cecil.Cil/CodeReader.cs b/src/Mono.Cecil/Cecil.Cil/CodeReader.cs
@@ -442,8 +442,6 @@ public MetadataToken ReadToken ()
 			return new MetadataToken (ReadUInt32 ());
 		}
 
-#if !READ_ONLY
-
 		public ByteBuffer PatchRawMethodBody (MethodDefinition method, CodeWriter writer, out int code_size, out MetadataToken local_var_token)
 		{
 			var position = MoveTo (method);
@@ -635,8 +633,5 @@ void PatchRawExceptionHandlers (ByteBuffer buffer, MetadataBuilder metadata, int
 				}
 			}
 		}
-
-#endif
-
 	}
 }
diff --git a/src/Mono.Cecil/Cecil.Cil/CodeWriter.cs b/src/Mono.Cecil/Cecil.Cil/CodeWriter.cs
@@ -18,8 +18,6 @@
 
 using RVA = System.UInt32;
 
-#if !READ_ONLY
-
 namespace Mono.Cecil.Cil {
 
 	sealed class CodeWriter : ByteBuffer {
@@ -655,5 +653,3 @@ void Align (int align)
 		}
 	}
 }
-
-#endif
diff --git a/src/Mono.Cecil/Cecil.Cil/PortablePdb.cs b/src/Mono.Cecil/Cecil.Cil/PortablePdb.cs
@@ -60,12 +60,10 @@ internal PortablePdbReader (Image image, ModuleDefinition module)
 			this.debug_reader = new MetadataReader (image, module, this.reader);
 		}
 
-#if !READ_ONLY
 		public ISymbolWriterProvider GetWriterProvider ()
 		{
 			return new PortablePdbWriterProvider ();
 		}
-#endif
 
 		public bool ProcessDebugHeader (ImageDebugHeader header)
 		{
@@ -201,12 +199,11 @@ internal EmbeddedPortablePdbReader (PortablePdbReader reader)
 			this.reader = reader;
 		}
 
-#if !READ_ONLY
 		public ISymbolWriterProvider GetWriterProvider ()
 		{
 			return new EmbeddedPortablePdbWriterProvider ();
 		}
-#endif
+
 		public bool ProcessDebugHeader (ImageDebugHeader header)
 		{
 			return reader.ProcessDebugHeader (header);
@@ -223,9 +220,6 @@ public void Dispose ()
 		}
 	}
 
-
-#if !READ_ONLY
-
 	public sealed class PortablePdbWriterProvider : ISymbolWriterProvider
 	{
 		public ISymbolWriter GetSymbolWriter (ModuleDefinition module, string fileName)
@@ -496,8 +490,6 @@ void IMetadataSymbolWriter.WriteModule ()
 		}
 	}
 
-#endif
-
 	static class PdbGuidMapping {
 
 		static readonly Dictionary<Guid, DocumentLanguage> guid_language = new Dictionary<Guid, DocumentLanguage> ();

diff --git a/src/Mono.Cecil/Cecil.Cil/Symbols.cs b/src/Mono.Cecil/Cecil.Cil/Symbols.cs
@@ -738,9 +738,7 @@ public bool TryGetName (VariableDefinition variable, out string name)
 	}
 
 	public interface ISymbolReader : IDisposable {
-#if !READ_ONLY
 		ISymbolWriterProvider GetWriterProvider ();
-#endif
 		bool ProcessDebugHeader (ImageDebugHeader header);
 		MethodDebugInformation Read (MethodDefinition method);
 	}
@@ -894,8 +892,6 @@ static string GetSymbolNamespace (SymbolKind kind)
 		}
 	}
 
-#if !READ_ONLY
-
 	public interface ISymbolWriter : IDisposable {
 
 		ISymbolReaderProvider GetReaderProvider ();
@@ -928,8 +924,6 @@ public ISymbolWriter GetSymbolWriter (ModuleDefinition module, Stream symbolStre
 			throw new NotSupportedException ();
 		}
 	}
-
-#endif
 }
 
 namespace Mono.Cecil {

diff --git a/src/Mono.Cecil/Cecil.Mdb/MdbReader.cs b/src/Mono.Cecil/Cecil.Mdb/MdbReader.cs
@@ -58,12 +58,10 @@ public MdbReader (ModuleDefinition module, MonoSymbolFile symFile)
 			this.documents = new Dictionary<string, Document> ();
 		}
 
-#if !READ_ONLY
 		public ISymbolWriterProvider GetWriterProvider ()
 		{
 			return new MdbWriterProvider ();
 		}
-#endif
 
 		public bool ProcessDebugHeader (ImageDebugHeader header)
 		{

diff --git a/src/Mono.Cecil/Cecil.Mdb/MdbWriter.cs b/src/Mono.Cecil/Cecil.Mdb/MdbWriter.cs
@@ -18,7 +18,6 @@
 
 namespace Mono.Cecil.Mdb {
 
-#if !READ_ONLY
 	public sealed class MdbWriterProvider : ISymbolWriterProvider {
 
 		public ISymbolWriter GetSymbolWriter (ModuleDefinition module, string fileName)
@@ -211,5 +210,4 @@ public SourceMethod (MethodDefinition method)
 			}
 		}
 	}
-#endif
 }
diff --git a/src/Mono.Cecil/Cecil.Metadata/Buffers.cs b/src/Mono.Cecil/Cecil.Metadata/Buffers.cs
@@ -16,8 +16,6 @@
 
 using RVA = System.UInt32;
 
-#if !READ_ONLY
-
 namespace Mono.Cecil.Metadata {
 
 	sealed class TableHeapBuffer : HeapBuffer {
@@ -501,5 +499,3 @@ public PdbHeapBuffer ()
 		}
 	}
 }
-
-#endif
diff --git a/src/Mono.Cecil/Cecil.Metadata/Utilities.cs b/src/Mono.Cecil/Cecil.Metadata/Utilities.cs
@@ -300,7 +300,6 @@ public static MetadataToken GetMetadataToken (this CodedIndex self, uint data)
 			return MetadataToken.Zero;
 		}
 
-#if !READ_ONLY
 		public static uint CompressMetadataToken (this CodedIndex self, MetadataToken token)
 		{
 			uint ret = 0;
@@ -561,7 +560,6 @@ public static uint CompressMetadataToken (this CodedIndex self, MetadataToken to
 		exit:
 			throw new ArgumentException ();
 		}
-#endif
 
 		public static int GetSize (this CodedIndex self, Func<Table, int> counter)
 		{

diff --git a/src/Mono.Cecil/Cecil.PE/BinaryStreamWriter.cs b/src/Mono.Cecil/Cecil.PE/BinaryStreamWriter.cs
@@ -11,8 +11,6 @@
 using System;
 using System.IO;
 
-#if !READ_ONLY
-
 namespace Mono.Cecil.PE {
 
 	class BinaryStreamWriter : BinaryWriter {
@@ -89,5 +87,3 @@ public void Align (int align)
 		}
 	}
 }
-
-#endif
diff --git a/src/Mono.Cecil/Cecil.PE/ByteBuffer.cs b/src/Mono.Cecil/Cecil.PE/ByteBuffer.cs
@@ -160,8 +160,6 @@ public double ReadDouble ()
 			return value;
 		}
 
-#if !READ_ONLY
-
 		public void WriteByte (byte value)
 		{
 			if (position == buffer.Length)
@@ -334,8 +332,5 @@ void Grow (int desired)
 			Buffer.BlockCopy (current, 0, buffer, 0, current_length);
 			this.buffer = buffer;
 		}
-
-#endif
-
 	}
 }
diff --git a/src/Mono.Cecil/Cecil.PE/ImageWriter.cs b/src/Mono.Cecil/Cecil.PE/ImageWriter.cs
@@ -11,8 +11,6 @@
 using System;
 using System.IO;
 
-#if !READ_ONLY
-
 using Mono.Cecil.Cil;
 using Mono.Cecil.Metadata;
 
@@ -847,5 +845,3 @@ void PatchResourceDataEntry (ByteBuffer resources)
 		}
 	}
 }
-
-#endif
diff --git a/src/Mono.Cecil/Cecil.PE/TextMap.cs b/src/Mono.Cecil/Cecil.PE/TextMap.cs
@@ -10,8 +10,6 @@
 
 using System;
 
-#if !READ_ONLY
-
 using RVA = System.UInt32;
 
 namespace Mono.Cecil.PE {
@@ -108,5 +106,3 @@ public uint GetLength ()
 		}
 	}
 }
-
-#endif
diff --git a/src/Mono.Cecil/Cecil.Pdb/ISymUnmanagedDocumentWriter.cs b/src/Mono.Cecil/Cecil.Pdb/ISymUnmanagedDocumentWriter.cs
@@ -8,8 +8,6 @@
 
 using System.Runtime.InteropServices;
 
-#if !READ_ONLY
-
 namespace Mono.Cecil.Pdb {
 
 	[Guid ("B01FAFEB-C450-3A4D-BEEC-B4CEEC01E006")]
@@ -18,5 +16,3 @@ namespace Mono.Cecil.Pdb {
 	interface ISymUnmanagedDocumentWriter {
 	}
 }
-
-#endif
diff --git a/src/Mono.Cecil/Cecil.Pdb/ISymUnmanagedWriter2.cs b/src/Mono.Cecil/Cecil.Pdb/ISymUnmanagedWriter2.cs
@@ -13,8 +13,6 @@
 
 using Mono.Cecil.Cil;
 
-#if !READ_ONLY
-
 namespace Mono.Cecil.Pdb {
 
 	[Guid ("0B97726E-9E6D-4f05-9A26-424022093CAA")]
@@ -86,5 +84,3 @@ void DefineConstant2 (
 			[In] int sigToken);
 	}
 }
-
-#endif
diff --git a/src/Mono.Cecil/Cecil.Pdb/ModuleMetadata.cs b/src/Mono.Cecil/Cecil.Pdb/ModuleMetadata.cs
@@ -3,8 +3,6 @@
 using System.Runtime.InteropServices;
 using System.Text;
 
-#if !READ_ONLY
-
 namespace Mono.Cecil.Pdb {
 
 	[ComImport, InterfaceType (ComInterfaceType.InterfaceIsIUnknown), Guid ("BA3FEE4C-ECB9-4e41-83B7-183FA41CD859")]
@@ -792,5 +790,3 @@ public int IsGlobal (uint pd)
 		}
 	}
 }
-
-#endif
diff --git a/src/Mono.Cecil/Cecil.Pdb/NativePdbReader.cs b/src/Mono.Cecil/Cecil.Pdb/NativePdbReader.cs
@@ -35,12 +35,10 @@ internal NativePdbReader (Disposable<Stream> file)
 			this.pdb_file = file;
 		}
 
-#if !READ_ONLY
 		public ISymbolWriterProvider GetWriterProvider ()
 		{
 			return new NativePdbWriterProvider ();
 		}
-#endif
 		/*
 		uint Magic = 0x53445352;
 		Guid Signature;

diff --git a/src/Mono.Cecil/Cecil.Pdb/NativePdbWriter.cs b/src/Mono.Cecil/Cecil.Pdb/NativePdbWriter.cs
@@ -18,8 +18,6 @@
 using Mono.Cecil.PE;
 using Mono.Collections.Generic;
 
-#if !READ_ONLY
-
 namespace Mono.Cecil.Pdb {
 
 	public class NativePdbWriter : ISymbolWriter, IMetadataSymbolWriter {
@@ -370,5 +368,3 @@ public void Dispose ()
 		}
 	}
 }
-
-#endif