Merge pull request #106 from bojanrajkovic/custom-attribute-types

Compilation: Fix custom attributes using types defined in the workbook

Clients/Xamarin.Interactive.Client/Compilation/Roslyn/MonoScriptCompilationPatcher.cs

@@ -112,7 +112,7 @@ public unsafe AssemblyDefinition Patch (
 
         /// <summary>
         /// Search the target byte array for an 8-byte magic value, then rewrite the string prefixed
-        /// by the magic value. Strings are terminated by '\0', '.', or '>'. This is very aggressive
+        /// by the magic value. Strings are terminated by '\0', '.', '>', or '+'. This is very aggressive
         /// and has nothing to do with the PE format, so the magic value should be very unique!
         /// </summary>
         static unsafe void Patch (byte [] target, byte [] magicBytes, PatchHandler patchHandler)
@@ -131,7 +131,7 @@ static unsafe void Patch (byte [] target, byte [] magicBytes, PatchHandler patch
                         var length = 8;
                         while (true) {
                             var b = target [i + length];
-                            if (b == 0 || b == '.' || b == '>')
+                            if (b == 0 || b == '.' || b == '>' || b == '+')
                                 break;
                             length++;
                         }

Clients/Xamarin.Interactive.Client/Compilation/Roslyn/RoslynCompilationWorkspace.cs

@@ -500,7 +500,7 @@ public void RemoveSubmission (DocumentId documentId, DocumentId nextDocumentId)
             workspace.RemoveProject (project.Id);
         }
 
-        const string assemblyNamePrefix = "🐵 XIS";
+        const string assemblyNamePrefix = "🐵🐻";
         static readonly byte [] assemblyNamePrefixBytes = Encoding.UTF8.GetBytes (assemblyNamePrefix);
 
         ProjectInfo CreateSubmissionProjectInfo ()

Tests/Workbooks/Regression/Custom Attribute Types.workbook

@@ -0,0 +1,26 @@
+---
+uti: com.xamarin.workbook
+id: 60f1e237-ac68-4dd6-8069-4f1ab3049a28
+title: Custom Attribute Types
+platforms:
+- Console
+---
+
+```csharp
+public class MyCustomAttribute : Attribute
+{
+    public Type TestType { get; set; }
+    public MyCustomAttribute(Type type) => TestType = type;
+}
+
+public class Foo {}
+
+public class Class
+{
+    [MyCustom(typeof(Foo))]
+    public string Foo { get; set; }
+}
+
+typeof(Class).GetMember("Foo").First().GetCustomAttributes(inherit: false)
+	.OfType<MyCustomAttribute>().First().TestType.AssemblyQualifiedName;
+```