Remove leftovers of custom marshaler cookies

AArnott · AArnott · commit 75823e8b907e · 2017-04-24T21:10:18.000-07:00
diff --git a/CodeGeneration/OfferFriendlyInteropOverloadsGenerator.cs b/CodeGeneration/OfferFriendlyInteropOverloadsGenerator.cs
@@ -148,7 +148,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab
                                                 SyntaxKind.SimpleMemberAccessExpression,
                                                 type,
                                                 SyntaxFactory.IdentifierName("GetInstance")),
-                                            SyntaxFactory.ArgumentList().AddArguments(SyntaxFactory.Argument(SyntaxFactory.LiteralExpression(SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal(""))))))))));
+                                            SyntaxFactory.ArgumentList()))))));
                 }
 
                 return marshalerLocalName;
diff --git a/LibGit2Sharp/CodeGenerator.targets b/LibGit2Sharp/CodeGenerator.targets
@@ -26,7 +26,7 @@
 
   <Target Name="GenerateCodeFirst">
     <PropertyGroup>
-      <CoreCompileDependsOn>$(CoreCompileDependsOn);GenerateNativeDllNameCs;GenerateUniqueIdentifierCs</CoreCompileDependsOn>
+      <CoreCompileDependsOn>$(CoreCompileDependsOn);GenerateNativeDllNameCs</CoreCompileDependsOn>
       <PrepareResourceNamesDependsOn>GenerateCommitIdVersion;$(PrepareResourceNamesDependsOn)</PrepareResourceNamesDependsOn>
       <NativeDllNamePath>$(IntermediateOutputPath)NativeDllName.cs</NativeDllNamePath>
       <UniqueIdentifierPath>$(IntermediateOutputPath)UniqueIdentifier.cs</UniqueIdentifierPath>
@@ -61,33 +61,6 @@ namespace LibGit2Sharp.Core
     </ItemGroup>
   </Target>
 
-  <!-- This target runs if any of the projects or .cs files for the project have changed since the last time
-       the UniqueIdentifier.cs file was generated. -->
-  <Target Name="GenerateUniqueIdentifierCs"
-          Inputs="$(MSBuildThisFileFullPath);$(MSBuildAllProjects);@(Compile)"
-          Outputs="$(UniqueIdentifierPath)">
-    <PropertyGroup>
-      <UniqueIdSourceLines>
-namespace LibGit2Sharp.Core
-{
-  internal static class UniqueId
-  {
-    public const string UniqueIdentifier = "$([System.Guid]::NewGuid())"%3b
-  }
-}
-      </UniqueIdSourceLines>
-    </PropertyGroup>
-
-    <WriteLinesToFile File="$(UniqueIdentifierPath)"
-                      Lines="$(UniqueIdSourceLines)"
-                      Overwrite="true" />
-
-    <ItemGroup>
-      <Compile Include="$(UniqueIdentifierPath)" />
-      <FileWrites Include="$(UniqueIdentifierPath)" />
-    </ItemGroup>
-  </Target>
-
   <Target Name="GenerateCommitIdVersion"
           DependsOnTargets="GetBuildVersion">
     <WriteLinesToFile File="$(CommitIdVersionPath)"
diff --git a/LibGit2Sharp/Core/FilePathMarshaler.cs b/LibGit2Sharp/Core/FilePathMarshaler.cs
@@ -10,15 +10,13 @@ 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: MarshalAs(UnmanagedType.CustomMarshaler,
-    ///                    MarshalCookie = UniqueId.UniqueIdentifier,
-    ///                    MarshalTypeRef = typeof(LaxFilePathNoCleanupMarshaler))]
+    /// [return: CustomMarshaler(typeof(LaxFilePathNoCleanupMarshaler), typeof(FilePath))]
     /// </summary>
     internal class LaxFilePathNoCleanupMarshaler : LaxFilePathMarshaler
     {
         private static readonly LaxFilePathNoCleanupMarshaler staticInstance = new LaxFilePathNoCleanupMarshaler();
 
-        public new static ICustomMarshaler GetInstance(String cookie)
+        public new static ICustomMarshaler GetInstance()
         {
             return staticInstance;
         }
@@ -41,16 +39,15 @@ public override void CleanUpNativeData(IntPtr pNativeData)
     ///
     /// Use this marshaler for function parameters, for example:
     /// [DllImport(libgit2)]
-    /// internal static extern int git_index_open(out IndexSafeHandle index,
-    ///     [MarshalAs(UnmanagedType.CustomMarshaler,
-    ///                MarshalCookie = UniqueId.UniqueIdentifier,
-    ///                MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath indexpath);
+    /// private static extern unsafe int git_index_remove_bypath(
+    ///     git_index* index,
+    ///     [CustomMarshaler(typeof(StrictFilePathMarshaler), typeof(FilePath))] byte* path);
     /// </summary>
     internal class StrictFilePathMarshaler : StrictUtf8Marshaler
     {
         private static readonly StrictFilePathMarshaler staticInstance = new StrictFilePathMarshaler();
 
-        public new static ICustomMarshaler GetInstance(String cookie)
+        public new static ICustomMarshaler GetInstance()
         {
             return staticInstance;
         }
@@ -98,7 +95,7 @@ internal class LaxFilePathMarshaler : LaxUtf8Marshaler
     {
         private static readonly LaxFilePathMarshaler staticInstance = new LaxFilePathMarshaler();
 
-        public new static ICustomMarshaler GetInstance(String cookie)
+        public new static ICustomMarshaler GetInstance()
         {
             return staticInstance;
         }
diff --git a/LibGit2Sharp/Core/Utf8Marshaler.cs b/LibGit2Sharp/Core/Utf8Marshaler.cs
@@ -11,15 +11,13 @@ 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: MarshalAs(UnmanagedType.CustomMarshaler,
-    ///                    MarshalCookie = UniqueId.UniqueIdentifier,
-    ///                    MarshalTypeRef = typeof(LaxUtf8NoCleanupMarshaler))]
+    /// [return: CustomMarshaler(typeof(LaxUtf8NoCleanupMarshaler), typeof(string))]
     /// </summary>
     internal class LaxUtf8NoCleanupMarshaler : LaxUtf8Marshaler
     {
         private static readonly LaxUtf8NoCleanupMarshaler staticInstance = new LaxUtf8NoCleanupMarshaler();
 
-        public new static ICustomMarshaler GetInstance(String cookie)
+        public new static ICustomMarshaler GetInstance()
         {
             return staticInstance;
         }
@@ -41,10 +39,9 @@ public override void CleanUpNativeData(IntPtr pNativeData)
     ///
     /// Use this marshaler for function parameters, for example:
     /// [DllImport(libgit2)]
-    /// internal static extern int git_tag_delete(RepositorySafeHandle repo,
-    ///     [MarshalAs(UnmanagedType.CustomMarshaler,
-    ///                MarshalCookie = UniqueId.UniqueIdentifier,
-    ///                MarshalTypeRef = typeof(StrictUtf8Marshaler))] String tagName);
+    /// private static extern unsafe int git_tag_delete(
+    ///     git_repository* repo,
+    ///     [CustomMarshaler(typeof(StrictUtf8Marshaler), typeof(string))] byte* tagName);
     /// </summary>
     internal class StrictUtf8Marshaler : EncodingMarshaler
     {
@@ -60,7 +57,7 @@ static StrictUtf8Marshaler()
         public StrictUtf8Marshaler() : base(encoding)
         { }
 
-        public static ICustomMarshaler GetInstance(String cookie)
+        public static ICustomMarshaler GetInstance()
         {
             return staticInstance;
         }
@@ -96,7 +93,7 @@ internal class LaxUtf8Marshaler : EncodingMarshaler
         public LaxUtf8Marshaler() : base(Encoding)
         { }
 
-        public static ICustomMarshaler GetInstance(String cookie)
+        public static ICustomMarshaler GetInstance()
         {
             return staticInstance;
         }
diff --git a/lkg/CodeGeneration.dll b/lkg/CodeGeneration.dll

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ private BlockSyntax CreateBodyFor(MethodDeclarationSyntax innerMethod, IEnumerab`
`148`	`148`	`SyntaxKind.SimpleMemberAccessExpression,`
`149`	`149`	`type,`
`150`	`150`	`SyntaxFactory.IdentifierName("GetInstance")),`
`151`		`- SyntaxFactory.ArgumentList().AddArguments(SyntaxFactory.Argument(SyntaxFactory.LiteralExpression(SyntaxKind.StringLiteralExpression, SyntaxFactory.Literal(""))))))))));`
	`151`	`+ SyntaxFactory.ArgumentList()))))));`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`return marshalerLocalName;`
Original file line number	Diff line number	Diff line change
`@@ -10,15 +10,13 @@ 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: MarshalAs(UnmanagedType.CustomMarshaler,`
`14`		`- /// MarshalCookie = UniqueId.UniqueIdentifier,`
`15`		`- /// MarshalTypeRef = typeof(LaxFilePathNoCleanupMarshaler))]`
	`13`	`+ /// [return: CustomMarshaler(typeof(LaxFilePathNoCleanupMarshaler), typeof(FilePath))]`
`16`	`14`	`/// </summary>`
`17`	`15`	`internal class LaxFilePathNoCleanupMarshaler : LaxFilePathMarshaler`
`18`	`16`	`{`
`19`	`17`	`private static readonly LaxFilePathNoCleanupMarshaler staticInstance = new LaxFilePathNoCleanupMarshaler();`
`20`	`18`
`21`		`- public new static ICustomMarshaler GetInstance(String cookie)`
	`19`	`+ public new static ICustomMarshaler GetInstance()`
`22`	`20`	`{`
`23`	`21`	`return staticInstance;`
`24`	`22`	`}`
`@@ -41,16 +39,15 @@ public override void CleanUpNativeData(IntPtr pNativeData)`
`41`	`39`	`///`
`42`	`40`	`/// Use this marshaler for function parameters, for example:`
`43`	`41`	`/// [DllImport(libgit2)]`
`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);`
	`42`	`+ /// private static extern unsafe int git_index_remove_bypath(`
	`43`	`+ /// git_index* index,`
	`44`	`+ /// [CustomMarshaler(typeof(StrictFilePathMarshaler), typeof(FilePath))] byte* path);`
`48`	`45`	`/// </summary>`
`49`	`46`	`internal class StrictFilePathMarshaler : StrictUtf8Marshaler`
`50`	`47`	`{`
`51`	`48`	`private static readonly StrictFilePathMarshaler staticInstance = new StrictFilePathMarshaler();`
`52`	`49`
`53`		`- public new static ICustomMarshaler GetInstance(String cookie)`
	`50`	`+ public new static ICustomMarshaler GetInstance()`
`54`	`51`	`{`
`55`	`52`	`return staticInstance;`
`56`	`53`	`}`
`@@ -98,7 +95,7 @@ internal class LaxFilePathMarshaler : LaxUtf8Marshaler`
`98`	`95`	`{`
`99`	`96`	`private static readonly LaxFilePathMarshaler staticInstance = new LaxFilePathMarshaler();`
`100`	`97`
`101`		`- public new static ICustomMarshaler GetInstance(String cookie)`
	`98`	`+ public new static ICustomMarshaler GetInstance()`
`102`	`99`	`{`
`103`	`100`	`return staticInstance;`
`104`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,15 +11,13 @@ namespace LibGit2Sharp.Core`
`11`	`11`	`/// free the native pointer after conversion, because the memory is owned by libgit2.`
`12`	`12`	`///`
`13`	`13`	`/// Use this marshaler for return values, for example:`
`14`		`- /// [return: MarshalAs(UnmanagedType.CustomMarshaler,`
`15`		`- /// MarshalCookie = UniqueId.UniqueIdentifier,`
`16`		`- /// MarshalTypeRef = typeof(LaxUtf8NoCleanupMarshaler))]`
	`14`	`+ /// [return: CustomMarshaler(typeof(LaxUtf8NoCleanupMarshaler), typeof(string))]`
`17`	`15`	`/// </summary>`
`18`	`16`	`internal class LaxUtf8NoCleanupMarshaler : LaxUtf8Marshaler`
`19`	`17`	`{`
`20`	`18`	`private static readonly LaxUtf8NoCleanupMarshaler staticInstance = new LaxUtf8NoCleanupMarshaler();`
`21`	`19`
`22`		`- public new static ICustomMarshaler GetInstance(String cookie)`
	`20`	`+ public new static ICustomMarshaler GetInstance()`
`23`	`21`	`{`
`24`	`22`	`return staticInstance;`
`25`	`23`	`}`
`@@ -41,10 +39,9 @@ public override void CleanUpNativeData(IntPtr pNativeData)`
`41`	`39`	`///`
`42`	`40`	`/// Use this marshaler for function parameters, for example:`
`43`	`41`	`/// [DllImport(libgit2)]`
`44`		`- /// internal static extern int git_tag_delete(RepositorySafeHandle repo,`
`45`		`- /// [MarshalAs(UnmanagedType.CustomMarshaler,`
`46`		`- /// MarshalCookie = UniqueId.UniqueIdentifier,`
`47`		`- /// MarshalTypeRef = typeof(StrictUtf8Marshaler))] String tagName);`
	`42`	`+ /// private static extern unsafe int git_tag_delete(`
	`43`	`+ /// git_repository* repo,`
	`44`	`+ /// [CustomMarshaler(typeof(StrictUtf8Marshaler), typeof(string))] byte* tagName);`
`48`	`45`	`/// </summary>`
`49`	`46`	`internal class StrictUtf8Marshaler : EncodingMarshaler`
`50`	`47`	`{`
`@@ -60,7 +57,7 @@ static StrictUtf8Marshaler()`
`60`	`57`	`public StrictUtf8Marshaler() : base(encoding)`
`61`	`58`	`{ }`
`62`	`59`
`63`		`- public static ICustomMarshaler GetInstance(String cookie)`
	`60`	`+ public static ICustomMarshaler GetInstance()`
`64`	`61`	`{`
`65`	`62`	`return staticInstance;`
`66`	`63`	`}`
`@@ -96,7 +93,7 @@ internal class LaxUtf8Marshaler : EncodingMarshaler`
`96`	`93`	`public LaxUtf8Marshaler() : base(Encoding)`
`97`	`94`	`{ }`
`98`	`95`
`99`		`- public static ICustomMarshaler GetInstance(String cookie)`
	`96`	`+ public static ICustomMarshaler GetInstance()`
`100`	`97`	`{`
`101`	`98`	`return staticInstance;`
`102`	`99`	`}`