Rename LEGACY to CECIL0_9 (and CECIL0_10 for future)

MonoMod · Nov 8, 2018 · f71b022 · f71b022
1 parent cb6aeaa
commit f71b022
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 31 deletions.
diff --git a/MonoMod.BaseLoader/ModRelinker.cs b/MonoMod.BaseLoader/ModRelinker.cs
@@ -207,7 +207,7 @@ public static Assembly GetRelinkedAssembly(ModMetadata meta, Stream stream,
                 return null;
             } finally {
                 Modder.ClearCaches(moduleSpecific: true);
-#if !LEGACY
+#if !CECIL0_9
                 Modder.Module.Dispose();
 #endif
                 Modder.Module = null;

diff --git a/MonoMod.BaseLoader/RelinkerSymbolReaderProvider.cs b/MonoMod.BaseLoader/RelinkerSymbolReaderProvider.cs
@@ -20,7 +20,7 @@ public ISymbolReader GetSymbolReader(ModuleDefinition module, Stream symbolStrea
                     return new MdbReaderProvider().GetSymbolReader(module, symbolStream);
 
                 case DebugSymbolFormat.PDB:
-#if !LEGACY
+#if !CECIL0_9
                     if (IsPortablePdb(symbolStream))
                         return new PortablePdbReaderProvider().GetSymbolReader(module, symbolStream);
                     return new NativePdbReaderProvider().GetSymbolReader(module, symbolStream);

diff --git a/MonoMod.Common.csproj b/MonoMod.Common.csproj
@@ -50,20 +50,19 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>DEBUG;TRACE;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
   <!-- Release -->
   <PropertyGroup Condition="'$(Configuration)' == 'Release' Or '$(Configuration)' == 'ReleaseLegacy'">
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;$(DefineConstants)</DefineConstants>
   </PropertyGroup>
 
   <!-- Legacy -->
   <PropertyGroup Condition="'$(Configuration)' == 'DebugLegacy' Or '$(Configuration)' == 'ReleaseLegacy'">
     <CecilLegacy>true</CecilLegacy>
-    <DefineConstants>LEGACY</DefineConstants>
   </PropertyGroup>
 
   <!-- Common references. -->
@@ -75,6 +74,8 @@
         <NETStandard1X Condition="$(TargetFramework.StartsWith('netstandard1')) Or $(TargetFramework.StartsWith('netcoreapp1'))">true</NETStandard1X>
         <DefineConstants>NETSTANDARD;$(DefineConstants)</DefineConstants>
         <DefineConstants Condition="$(NETStandard1X)">NETSTANDARD1_X;$(DefineConstants)</DefineConstants>
+        <DefineConstants Condition="$(CecilLegacy)">CECIL0_10;$(DefineConstants)</DefineConstants>
+        <CecilVersion Condition="$(CecilLegacy) And '$(CecilVersion)' == ''">0.10.0</CecilVersion>
       </PropertyGroup>
       <ItemGroup>
         <!-- These are also required when targeting .NET Standard 2.0 to resolve a version conflict with Mono.Cecil, which targets .NET Standard 1.0 -->
@@ -91,7 +92,9 @@
       <PropertyGroup>
         <NETFramework>true</NETFramework>
         <DefineConstants>NETFRAMEWORK;$(DefineConstants)</DefineConstants>
-      </PropertyGroup>
+        <DefineConstants Condition="$(CecilLegacy)">CECIL0_9;$(DefineConstants)</DefineConstants>
+        <CecilVersion Condition="$(CecilLegacy) And '$(CecilVersion)' == ''">0.9.6</CecilVersion>
+	  </PropertyGroup>
       <ItemGroup>
         <!-- <Reference Include="mscorlib" /> -->
         <Reference Include="System" />
@@ -100,11 +103,12 @@
   </Choose>
 
   <!-- Mono.Cecil reference. -->
+  <PropertyGroup>
+    <CecilVersion Condition="'$(CecilVersion)' == ''">0.10.0</CecilVersion>
+  </PropertyGroup>
   <ItemGroup Condition="$(Cecil)">
     <PackageReference Include="Mono.Cecil">
-      <Version>0.10.0</Version>
-      <Version Condition="$(CecilLegacy)">0.9.6</Version>
-      <Version Condition="$(CecilLegacy) And $(NETStandard)">0.10.0</Version>
+      <Version>$(CecilVersion)</Version>
     </PackageReference>
   </ItemGroup>
 

diff --git a/MonoMod.DebugIL/DebugILGenerator.cs b/MonoMod.DebugIL/DebugILGenerator.cs
@@ -1,4 +1,4 @@
-#if !LEGACY
+#if !CECIL0_9
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using MonoMod.Utils;

diff --git a/MonoMod.DebugIL/DebugILGeneratorExt.cs b/MonoMod.DebugIL/DebugILGeneratorExt.cs
@@ -1,4 +1,4 @@
-#if !LEGACY
+#if !CECIL0_9
 using Mono.Cecil;
 using Mono.Cecil.Cil;
 using System;

diff --git a/MonoMod.DebugIL/Program.cs b/MonoMod.DebugIL/Program.cs
@@ -10,7 +10,7 @@ namespace MonoMod.DebugIL {
     class Program {
 
         public static void Main(string[] args) {
-#if LEGACY
+#if CECIL0_9
             throw new NotSupportedException();
 #else
             Console.WriteLine("MonoMod.DebugIL " + typeof(Program).GetTypeInfo().Assembly.GetName().Version);

diff --git a/MonoMod.RuntimeDetour.HookGen/Program.cs b/MonoMod.RuntimeDetour.HookGen/Program.cs
@@ -87,7 +87,7 @@ static void Main(string[] args) {
 
                 mm.Log("[HookGen] Starting HookGenerator");
                 HookGenerator gen = new HookGenerator(mm, Path.GetFileName(pathOut));
-#if !LEGACY
+#if !CECIL0_9
                 using (ModuleDefinition mOut = gen.OutputModule) {
 #else
                 ModuleDefinition mOut = gen.OutputModule;

diff --git a/MonoMod.Utils/DynamicMethodDefinition.cs b/MonoMod.Utils/DynamicMethodDefinition.cs
@@ -90,7 +90,7 @@ public void Reload(Func<AssemblyName, ModuleDefinition> moduleGen = null, bool f
                     if (_Module != null && !force) {
                         module = _Module;
                     } else {
-#if !LEGACY
+#if !CECIL0_9
                         _Module?.Dispose();
 #endif
                         _Module = null;
@@ -107,7 +107,7 @@ public void Reload(Func<AssemblyName, ModuleDefinition> moduleGen = null, bool f
 
             bool _DisposeEarly() {
                 if (moduleTmp != null) {
-#if !LEGACY
+#if !CECIL0_9
                     moduleTmp.Dispose();
 #endif
                     _Module = null;
@@ -238,7 +238,7 @@ public DynamicMethod Generate() {
 
         public void Dispose() {
             if (_Module != null && (--_ModuleRef) == 0) {
-#if !LEGACY
+#if !CECIL0_9
                 _Module.Dispose();
 #endif
                 _Module = null;
@@ -267,7 +267,7 @@ public AssemblyDefinition Resolve(AssemblyNameReference name, ReaderParameters p
                 return Cache[name.FullName] = Gen(new AssemblyName(name.FullName)).Assembly ?? Fallback.Resolve(name, parameters);
             }
 
-#if LEGACY
+#if CECIL0_9
 
             public AssemblyDefinition Resolve(string fullName) {
                 if (Cache.TryGetValue(fullName, out AssemblyDefinition asm))

diff --git a/MonoMod.Utils/MonoModExt.cs b/MonoMod.Utils/MonoModExt.cs
@@ -73,7 +73,7 @@ public static MethodBody Clone(this MethodBody o, MethodDefinition m) {
             c.ExceptionHandlers.AddRange(o.ExceptionHandlers);
             c.Variables.AddRange(o.Variables);
 
-#if !LEGACY
+#if !CECIL0_9
             m.CustomDebugInformations.AddRange(o.Method.CustomDebugInformations);
             m.DebugInformation.SequencePoints.AddRange(o.Method.DebugInformation.SequencePoints);
 #endif
@@ -882,7 +882,7 @@ public static IMetadataTokenProvider ImportReference(this ModuleDefinition mod,
             return mtp;
         }
 
-#if LEGACY
+#if CECIL0_9
         public static TypeReference ImportReference(this ModuleDefinition mod, TypeReference type)
             => mod.Import(type);
         public static TypeReference ImportReference(this ModuleDefinition mod, Type type, IGenericParameterProvider context)

diff --git a/MonoMod/MonoModder.cs b/MonoMod/MonoModder.cs
@@ -164,7 +164,7 @@ public virtual WriterParameters WriterParameters {
                     _writerParameters = new WriterParameters() {
                         WriteSymbols = true,
                         SymbolWriterProvider =
-#if !LEGACY
+#if !CECIL0_9
                             pdb ? new NativePdbWriterProvider() :
 #else
                             pdb ? new PdbWriterProvider() :
@@ -261,7 +261,7 @@ public MonoModder() {
 
         public virtual void ClearCaches(bool all = false, bool shareable = false, bool moduleSpecific = false) {
             if (all || shareable) {
-#if !LEGACY
+#if !CECIL0_9
                 foreach (KeyValuePair<string, ModuleDefinition> dep in DependencyCache)
                     dep.Value.Dispose();
 #endif
@@ -277,17 +277,17 @@ public virtual void ClearCaches(bool all = false, bool shareable = false, bool m
         public virtual void Dispose() {
             ClearCaches(all: true);
 
-#if !LEGACY
+#if !CECIL0_9
             Module?.Dispose();
 #endif
             Module = null;
 
-#if !LEGACY
+#if !CECIL0_9
             AssemblyResolver?.Dispose();
 #endif
             AssemblyResolver = null;
 
-#if !LEGACY
+#if !CECIL0_9
             foreach (ModuleDefinition mod in Mods)
                 mod?.Dispose();
 
@@ -406,7 +406,7 @@ public virtual void MapDependency(ModuleDefinition main, string name, string ful
                     dep = AssemblyResolver.Resolve(depRef)?.MainModule;
                 } catch { }
                 if (dep != null)
-#if !LEGACY
+#if !CECIL0_9
                     path = dep.FileName;
 #else
                     path = dep.FullyQualifiedName;
@@ -451,7 +451,7 @@ public virtual void MapDependency(ModuleDefinition main, string name, string ful
                     dep = AssemblyResolver.Resolve(new AssemblyNameReference(fullName ?? name, new Version(0, 0, 0, 0)))?.MainModule;
                 } catch { }
                 if (dep != null)
-#if !LEGACY
+#if !CECIL0_9
                     path = dep.FileName;
 #else
                     path = dep.FullyQualifiedName;
@@ -523,7 +523,7 @@ public virtual ReaderParameters GenReaderParameters(bool mainModule, string path
             ReaderParameters rp = new ReaderParameters(_rp.ReadingMode);
             rp.AssemblyResolver = _rp.AssemblyResolver;
             rp.MetadataResolver = _rp.MetadataResolver;
-#if !LEGACY
+#if !CECIL0_9
             rp.MetadataImporterProvider = _rp.MetadataImporterProvider;
             rp.ReflectionImporterProvider = _rp.ReflectionImporterProvider;
 #endif
@@ -1500,8 +1500,7 @@ public virtual MethodDefinition PatchMethod(TypeDefinition targetType, MethodDef
 
 #region PatchRefs Pass
         public virtual void PatchRefs() {
-            if (Environment.GetEnvironmentVariable("MONOMOD_LEGACY_RELINKMAP") != "0") {
-                // TODO: Make this "opt-in" in the future.
+            if (Environment.GetEnvironmentVariable("MONOMOD_LEGACY_RELINKMAP") == "1") {
                 _SplitUpgrade();
             }
 
@@ -1578,7 +1577,7 @@ private void _SplitUpgrade() {
             Log("[UpgradeSplit] It is only meant to preserve compatibility with mods during the transition to a \"split\" MonoMod.");
 
             string root = Path.GetDirectoryName(DependencyCache["MonoMod"]
-#if !LEGACY
+#if !CECIL0_9
                 .FileName
 #else
                 .FullyQualifiedName
@@ -1659,7 +1658,7 @@ public virtual void PatchRefsInType(TypeDefinition type) {
 
             // Don't foreach when modifying the collection
             for (int i = 0; i < type.Interfaces.Count; i++) {
-#if !LEGACY
+#if !CECIL0_9
                 InterfaceImplementation interf = type.Interfaces[i];
                 InterfaceImplementation newInterf = new InterfaceImplementation(interf.InterfaceType.Relink(Relinker, type));
                 foreach (CustomAttribute attrib in interf.CustomAttributes)