libgit2
diff --git a/‎LibGit2Sharp/Core/EncodingMarshaler.cs
Lines changed: 0 additions & 8 deletions b/‎LibGit2Sharp/Core/EncodingMarshaler.cs
Lines changed: 0 additions & 8 deletions
diff --git a/‎LibGit2Sharp/Core/FilePathMarshaler.cs
Lines changed: 10 additions & 7 deletions b/‎LibGit2Sharp/Core/FilePathMarshaler.cs
Lines changed: 10 additions & 7 deletions
@@ -117,11 +117,7 @@ public static unsafe string FromNative(Encoding encoding, byte* pNativeData)
                 return String.Empty;
             }
 
-#if DESKTOP
             return new String((sbyte*)pNativeData, 0, (int)(walk - start), encoding);
-#else
-            return encoding.GetString(pNativeData, (int)(walk - start));
-#endif
         }
 
         public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData, int length)
@@ -136,11 +132,7 @@ public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData, in
                 return String.Empty;
             }
 
-#if DESKTOP
             return new String((sbyte*)pNativeData.ToPointer(), 0, length, encoding);
-#else
-            return encoding.GetString((byte*)pNativeData.ToPointer(), length);
-#endif
         }
 
         public static string FromBuffer(Encoding encoding, byte[] buffer)
 
@@ -10,13 +10,15 @@ namespace LibGit2Sharp.Core
     /// free the native pointer after conversion, because the memory is owned by libgit2.
     ///
     /// Use this marshaler for return values, for example:
-    /// [return: CustomMarshaler(typeof(LaxFilePathNoCleanupMarshaler), typeof(FilePath))]
+    /// [return: MarshalAs(UnmanagedType.CustomMarshaler,
+    ///                    MarshalCookie = UniqueId.UniqueIdentifier,
+    ///                    MarshalTypeRef = typeof(LaxFilePathNoCleanupMarshaler))]
     /// </summary>
     internal class LaxFilePathNoCleanupMarshaler : LaxFilePathMarshaler
     {
         private static readonly LaxFilePathNoCleanupMarshaler staticInstance = new LaxFilePathNoCleanupMarshaler();
 
-        public new static ICustomMarshaler GetInstance()
+        public new static ICustomMarshaler GetInstance(string cookie)
         {
             return staticInstance;
         }
@@ -39,15 +41,16 @@ public override void CleanUpNativeData(IntPtr pNativeData)
     ///
     /// Use this marshaler for function parameters, for example:
     /// [DllImport(libgit2)]
-    /// private static extern unsafe int git_index_remove_bypath(
-    ///     git_index* index,
-    ///     [CustomMarshaler(typeof(StrictFilePathMarshaler), typeof(FilePath))] byte* path);
+    /// internal static extern int git_index_open(out IndexSafeHandle index,
+    ///     [MarshalAs(UnmanagedType.CustomMarshaler,
+    ///                MarshalCookie = UniqueId.UniqueIdentifier,
+    ///                MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath indexpath);
     /// </summary>
     internal class StrictFilePathMarshaler : StrictUtf8Marshaler
     {
         private static readonly StrictFilePathMarshaler staticInstance = new StrictFilePathMarshaler();
 
-        public new static ICustomMarshaler GetInstance()
+        public new static ICustomMarshaler GetInstance(string cookie)
         {
             return staticInstance;
         }
@@ -95,7 +98,7 @@ internal class LaxFilePathMarshaler : LaxUtf8Marshaler
     {
         private static readonly LaxFilePathMarshaler staticInstance = new LaxFilePathMarshaler();
 
-        public new static ICustomMarshaler GetInstance()
+        public new static ICustomMarshaler GetInstance(string cookie)
         {
             return staticInstance;
         }
Original file line number	Diff line number	Diff line change
`@@ -117,11 +117,7 @@ public static unsafe string FromNative(Encoding encoding, byte* pNativeData)`
`117`	`117`	`return String.Empty;`
`118`	`118`	`}`
`119`	`119`
`120`		`-#if DESKTOP`
`121`	`120`	`return new String((sbyte*)pNativeData, 0, (int)(walk - start), encoding);`
`122`		`-#else`
`123`		`- return encoding.GetString(pNativeData, (int)(walk - start));`
`124`		`-#endif`
`125`	`121`	`}`
`126`	`122`
`127`	`123`	`public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData, int length)`
`@@ -136,11 +132,7 @@ public static unsafe string FromNative(Encoding encoding, IntPtr pNativeData, in`
`136`	`132`	`return String.Empty;`
`137`	`133`	`}`
`138`	`134`
`139`		`-#if DESKTOP`
`140`	`135`	`return new String((sbyte*)pNativeData.ToPointer(), 0, length, encoding);`
`141`		`-#else`
`142`		`- return encoding.GetString((byte*)pNativeData.ToPointer(), length);`
`143`		`-#endif`
`144`	`136`	`}`
`145`	`137`
`146`	`138`	`public static string FromBuffer(Encoding encoding, byte[] buffer)`
Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,15 @@ namespace LibGit2Sharp.Core`
`10`	`10`	`/// free the native pointer after conversion, because the memory is owned by libgit2.`
`11`	`11`	`///`
`12`	`12`	`/// Use this marshaler for return values, for example:`
`13`		`- /// [return: CustomMarshaler(typeof(LaxFilePathNoCleanupMarshaler), typeof(FilePath))]`
	`13`	`+ /// [return: MarshalAs(UnmanagedType.CustomMarshaler,`
	`14`	`+ /// MarshalCookie = UniqueId.UniqueIdentifier,`
	`15`	`+ /// MarshalTypeRef = typeof(LaxFilePathNoCleanupMarshaler))]`
`14`	`16`	`/// </summary>`
`15`	`17`	`internal class LaxFilePathNoCleanupMarshaler : LaxFilePathMarshaler`
`16`	`18`	`{`
`17`	`19`	`private static readonly LaxFilePathNoCleanupMarshaler staticInstance = new LaxFilePathNoCleanupMarshaler();`
`18`	`20`
`19`		`- public new static ICustomMarshaler GetInstance()`
	`21`	`+ public new static ICustomMarshaler GetInstance(string cookie)`
`20`	`22`	`{`
`21`	`23`	`return staticInstance;`
`22`	`24`	`}`
`@@ -39,15 +41,16 @@ public override void CleanUpNativeData(IntPtr pNativeData)`
`39`	`41`	`///`
`40`	`42`	`/// Use this marshaler for function parameters, for example:`
`41`	`43`	`/// [DllImport(libgit2)]`
`42`		`- /// private static extern unsafe int git_index_remove_bypath(`
`43`		`- /// git_index* index,`
`44`		`- /// [CustomMarshaler(typeof(StrictFilePathMarshaler), typeof(FilePath))] byte* path);`
	`44`	`+ /// internal static extern int git_index_open(out IndexSafeHandle index,`
	`45`	`+ /// [MarshalAs(UnmanagedType.CustomMarshaler,`
	`46`	`+ /// MarshalCookie = UniqueId.UniqueIdentifier,`
	`47`	`+ /// MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath indexpath);`
`45`	`48`	`/// </summary>`
`46`	`49`	`internal class StrictFilePathMarshaler : StrictUtf8Marshaler`
`47`	`50`	`{`
`48`	`51`	`private static readonly StrictFilePathMarshaler staticInstance = new StrictFilePathMarshaler();`
`49`	`52`
`50`		`- public new static ICustomMarshaler GetInstance()`
	`53`	`+ public new static ICustomMarshaler GetInstance(string cookie)`
`51`	`54`	`{`
`52`	`55`	`return staticInstance;`
`53`	`56`	`}`
`@@ -95,7 +98,7 @@ internal class LaxFilePathMarshaler : LaxUtf8Marshaler`
`95`	`98`	`{`
`96`	`99`	`private static readonly LaxFilePathMarshaler staticInstance = new LaxFilePathMarshaler();`
`97`	`100`
`98`		`- public new static ICustomMarshaler GetInstance()`
	`101`	`+ public new static ICustomMarshaler GetInstance(string cookie)`
`99`	`102`	`{`
`100`	`103`	`return staticInstance;`
`101`	`104`	`}`