Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/netstandard2.0'
# Conflicts:
#	LibGit2Sharp/Core/NativeMethods.cs
#	LibGit2Sharp/LibGit2Sharp.csproj
  • Loading branch information
olmobrutall committed Sep 6, 2017
commit b576bf13bbca32ece33048cb5dc0c3c0393a452f
8 changes: 4 additions & 4 deletions LibGit2Sharp/Core/NativeMethods.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1596,19 +1596,19 @@ internal static extern void git_strarray_free(
ref GitStrArray array);

[DllImport(libgit2)]
static extern unsafe int git_submodule_add_setup(
internal static extern unsafe int git_submodule_add_setup(
out git_submodule* reference,
git_repository* repo,
[CustomMarshaler(typeof(StrictUtf8Marshaler), typeof(string))] byte* url,
[CustomMarshaler(typeof(StrictFilePathMarshaler), typeof(FilePath))] byte* path,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string url,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictFilePathMarshaler))] FilePath name,
int use_gitlink);

[DllImport(libgit2)]
internal static extern unsafe int git_submodule_add_finalize(
git_submodule* reference);

[DllImport(libgit2)]
private static extern unsafe int git_submodule_lookup(
internal static extern unsafe int git_submodule_lookup(
out git_submodule* reference,
git_repository* repo,
[MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string name);
Expand Down
4 changes: 1 addition & 3 deletions LibGit2Sharp/LibGit2Sharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
<None Include="..\README.md" Pack="true" PackagePath="App_Readme\" />
<None Include="..\LICENSE.md" Pack="true" PackagePath="App_Readme\" />
<None Include="..\CHANGES.md" Pack="true" PackagePath="App_Readme\" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CodeGenerationAttributes\CodeGenerationAttributes.csproj" PrivateAssets="all" />
<Compile Update="Core\Handles\Objects.cs" DependentUpon="Objects.tt" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[1.0.185]" PrivateAssets="contentFiles" />
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.