Update and enable NGEN fix for Linux / macOS

MonoMod · May 11, 2020 · 785eaf3 · 785eaf3
1 parent ee5ea0f
commit 785eaf3
Show file tree

Hide file tree

Showing 4 changed files with 79 additions and 43 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,14 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": ".NET Core Attach",
+            "type": "coreclr",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -0,0 +1,24 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "shell",
+            "args": [
+                "build",
+                // Ask dotnet build to generate full paths for file names.
+                "/property:GenerateFullPaths=true",
+                // Do not generate summary otherwise it leads to duplicate errors in Problems panel
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "group": "build",
+            "presentation": {
+                "reveal": "silent"
+            },
+            "problemMatcher": "$msCompile"
+        }
+    ]
+}
diff --git a/MonoMod.Common b/MonoMod.Common
diff --git a/MonoMod.UnitTest/RuntimeDetour/DetourExtTest.cs b/MonoMod.UnitTest/RuntimeDetour/DetourExtTest.cs
@@ -78,61 +78,59 @@ public void TestDetoursExt() {
                 // This was provided by a Harmony user.
                 // TextWriter's methods (including all overrides) were unable to be hooked on some runtimes.
                 // FIXME: .NET 5 introduces similar behavior for macOS and Linux, but RD isn't ready for that. See DetourRuntimeNETPlatform for more info.
-                if (PlatformHelper.Is(Platform.Windows)) {
 #if true
-                    using (MemoryStream ms = new MemoryStream()) {
-
-                        using (StreamWriter writer = new StreamWriter(ms, Encoding.UTF8, 1024, true)) {
-                            // In case anyone needs to debug this mess anytime in the future ever again:
-                            /*
-                            MethodBase m = typeof(StreamWriter).GetMethod("Write", new Type[] { typeof(string) });
-                            Console.WriteLine($"meth: 0x{(long) m?.MethodHandle.Value:X16}");
-                            Console.WriteLine($"getf: 0x{(long) m?.MethodHandle.GetFunctionPointer():X16}");
-                            Console.WriteLine($"fptr: 0x{(long) m?.GetLdftnPointer():X16}");
-                            Console.WriteLine($"nats: 0x{(long) m?.GetNativeStart():X16}");
-                            */
-
+                using (MemoryStream ms = new MemoryStream()) {
+
+                    using (StreamWriter writer = new StreamWriter(ms, Encoding.UTF8, 1024, true)) {
+                        // In case anyone needs to debug this mess anytime in the future ever again:
+                        /*/
+                        MethodBase m = typeof(StreamWriter).GetMethod("Write", new Type[] { typeof(string) });
+                        Console.WriteLine($"meth: 0x{(long) m?.MethodHandle.Value:X16}");
+                        Console.WriteLine($"getf: 0x{(long) m?.MethodHandle.GetFunctionPointer():X16}");
+                        Console.WriteLine($"fptr: 0x{(long) m?.GetLdftnPointer():X16}");
+                        Console.WriteLine($"nats: 0x{(long) m?.GetNativeStart():X16}");
+                        /**/
+
+                        // Debugger.Break();
+                        writer.Write("A");
+
+                        using (Hook h = new Hook(
+                            typeof(StreamWriter).GetMethod("Write", new Type[] { typeof(string) }),
+                            new Action<Action<StreamWriter, string>, StreamWriter, string>((orig, self, value) => {
+                                orig(self, "-");
+                            })
+                        )) {
                             // Debugger.Break();
-                            writer.Write("A");
-
-                            using (Hook h = new Hook(
-                                typeof(StreamWriter).GetMethod("Write", new Type[] { typeof(string) }),
-                                new Action<Action<StreamWriter, string>, StreamWriter, string>((orig, self, value) => {
-                                    orig(self, "-");
-                                })
-                            )) {
-                                // Debugger.Break();
-                                writer.Write("B");
-                            }
-
-                            writer.Write("C");
+                            writer.Write("B");
                         }
 
-                        ms.Seek(0, SeekOrigin.Begin);
+                        writer.Write("C");
+                    }
 
-                        using (StreamReader reader = new StreamReader(ms, Encoding.UTF8, false, 1024, true)) {
-                            Assert.Equal("A-C", reader.ReadToEnd());
-                        }
+                    ms.Seek(0, SeekOrigin.Begin);
 
+                    using (StreamReader reader = new StreamReader(ms, Encoding.UTF8, false, 1024, true)) {
+                        Assert.Equal("A-C", reader.ReadToEnd());
                     }
+
+                }
 #endif
 
 #if NETFRAMEWORK && true
-                    Assert.Equal("A", new SqlCommand("A").CommandText);
-
-                    using (Hook h = new Hook(
-                        typeof(SqlCommand).GetConstructor(new Type[] { typeof(string) }),
-                        new Action<Action<SqlCommand, string>, SqlCommand, string>((orig, self, value) => {
-                            orig(self, "-");
-                        })
-                    )) {
-                        Assert.Equal("-", new SqlCommand("B").CommandText);
-                    }
+                Assert.Equal("A", new SqlCommand("A").CommandText);
 
-                    Assert.Equal("C", new SqlCommand("C").CommandText);
+                using (Hook h = new Hook(
+                    typeof(SqlCommand).GetConstructor(new Type[] { typeof(string) }),
+                    new Action<Action<SqlCommand, string>, SqlCommand, string>((orig, self, value) => {
+                        orig(self, "-");
+                    })
+                )) {
+                    Assert.Equal("-", new SqlCommand("B").CommandText);
+                }
+
+                Assert.Equal("C", new SqlCommand("C").CommandText);
 #endif
 
-                }
             }
         }