From c4f4db92a7a280ff279fc1b01c6adbba4fe742c0 Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Thu, 23 Sep 2021 20:25:24 +0200
Subject: [PATCH 1/2] Update libgit2 to v1.3.0

---
 libgit2                                                   | 2 +-
 nuget.package/build/LibGit2Sharp.NativeBinaries.props     | 4 ++--
 .../build/net46/LibGit2Sharp.NativeBinaries.props         | 4 ++--
 nuget.package/libgit2/LibGit2Sharp.dll.config             | 8 ++++----
 nuget.package/libgit2/libgit2_hash.txt                    | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/libgit2 b/libgit2
index 4fd32be0..183da2cc 160000
--- a/libgit2
+++ b/libgit2
@@ -1 +1 @@
-Subproject commit 4fd32be01c79a5c003bb47674ac1d76d948518b7
+Subproject commit 183da2cc24e32bd9bc9ff53a570a8e484676728c
diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
index e643759c..be742682 100644
--- a/nuget.package/build/LibGit2Sharp.NativeBinaries.props
+++ b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
-    <libgit2_hash>4fd32be01c79a5c003bb47674ac1d76d948518b7</libgit2_hash>
-    <libgit2_filename>git2-4fd32be</libgit2_filename>
+    <libgit2_hash>183da2cc24e32bd9bc9ff53a570a8e484676728c</libgit2_hash>
+    <libgit2_filename>git2-183da2c</libgit2_filename>
   </PropertyGroup>
 </Project>
diff --git a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
index 7f96771b..e0f4fb06 100644
--- a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
+++ b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
@@ -1,8 +1,8 @@
 <Project>
   <PropertyGroup>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
-    <libgit2_hash>4fd32be01c79a5c003bb47674ac1d76d948518b7</libgit2_hash>
-    <libgit2_filename>git2-4fd32be</libgit2_filename>
+    <libgit2_hash>183da2cc24e32bd9bc9ff53a570a8e484676728c</libgit2_hash>
+    <libgit2_filename>git2-183da2c</libgit2_filename>
   </PropertyGroup>
   <ItemGroup>
     <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
diff --git a/nuget.package/libgit2/LibGit2Sharp.dll.config b/nuget.package/libgit2/LibGit2Sharp.dll.config
index fce9d57a..725e3553 100644
--- a/nuget.package/libgit2/LibGit2Sharp.dll.config
+++ b/nuget.package/libgit2/LibGit2Sharp.dll.config
@@ -1,6 +1,6 @@
 <configuration>
-    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-4fd32be" target="lib/linux-x64/libgit2-4fd32be.so" />
-    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-4fd32be" target="lib/linux-arm/libgit2-4fd32be.so" />
-    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-4fd32be" target="lib/linux-arm64/libgit2-4fd32be.so" />
-    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-4fd32be" target="lib/osx-x64/libgit2-4fd32be.dylib" />
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-183da2c" target="lib/linux-x64/libgit2-183da2c.so" />
+    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-183da2c" target="lib/linux-arm/libgit2-183da2c.so" />
+    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-183da2c" target="lib/linux-arm64/libgit2-183da2c.so" />
+    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-183da2c" target="lib/osx-x64/libgit2-183da2c.dylib" />
 </configuration>
diff --git a/nuget.package/libgit2/libgit2_hash.txt b/nuget.package/libgit2/libgit2_hash.txt
index 698b7143..2d2c778f 100644
--- a/nuget.package/libgit2/libgit2_hash.txt
+++ b/nuget.package/libgit2/libgit2_hash.txt
@@ -1 +1 @@
-4fd32be01c79a5c003bb47674ac1d76d948518b7
+183da2cc24e32bd9bc9ff53a570a8e484676728c

From 7d891985b83de301787e11926af1e2410da4d177 Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Tue, 28 Sep 2021 19:34:45 +0200
Subject: [PATCH 2/2] Update to the real v1.3.0

---
 libgit2                                                |  2 +-
 nuget.package/build/LibGit2Sharp.NativeBinaries.props  |  6 +++---
 .../build/net46/LibGit2Sharp.NativeBinaries.props      |  6 +++---
 nuget.package/libgit2/LibGit2Sharp.dll.config          | 10 +++++-----
 nuget.package/libgit2/libgit2_hash.txt                 |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libgit2 b/libgit2
index 183da2cc..b7bad55e 160000
--- a/libgit2
+++ b/libgit2
@@ -1 +1 @@
-Subproject commit 183da2cc24e32bd9bc9ff53a570a8e484676728c
+Subproject commit b7bad55e4bb0a285b073ba5e02b01d3f522fc95d
diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
index be742682..9c9432c1 100644
--- a/nuget.package/build/LibGit2Sharp.NativeBinaries.props
+++ b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
@@ -1,7 +1,7 @@
-<Project>
+<Project>
   <PropertyGroup>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
-    <libgit2_hash>183da2cc24e32bd9bc9ff53a570a8e484676728c</libgit2_hash>
-    <libgit2_filename>git2-183da2c</libgit2_filename>
+    <libgit2_hash>b7bad55e4bb0a285b073ba5e02b01d3f522fc95d</libgit2_hash>
+    <libgit2_filename>git2-b7bad55</libgit2_filename>
   </PropertyGroup>
 </Project>
diff --git a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
index e0f4fb06..62811535 100644
--- a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
+++ b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
@@ -1,8 +1,8 @@
-<Project>
+<Project>
   <PropertyGroup>
     <libgit2_propsfile>$(MSBuildThisFileFullPath)</libgit2_propsfile>
-    <libgit2_hash>183da2cc24e32bd9bc9ff53a570a8e484676728c</libgit2_hash>
-    <libgit2_filename>git2-183da2c</libgit2_filename>
+    <libgit2_hash>b7bad55e4bb0a285b073ba5e02b01d3f522fc95d</libgit2_hash>
+    <libgit2_filename>git2-b7bad55</libgit2_filename>
   </PropertyGroup>
   <ItemGroup>
     <ContentWithTargetPath Include="$(MSBuildThisFileDirectory)\..\..\runtimes\win-x86\native\*" TargetPath="lib\win32\x86\%(Filename)%(Extension)" CopyToOutputDirectory="PreserveNewest" />
diff --git a/nuget.package/libgit2/LibGit2Sharp.dll.config b/nuget.package/libgit2/LibGit2Sharp.dll.config
index 725e3553..3e818141 100644
--- a/nuget.package/libgit2/LibGit2Sharp.dll.config
+++ b/nuget.package/libgit2/LibGit2Sharp.dll.config
@@ -1,6 +1,6 @@
-<configuration>
-    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-183da2c" target="lib/linux-x64/libgit2-183da2c.so" />
-    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-183da2c" target="lib/linux-arm/libgit2-183da2c.so" />
-    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-183da2c" target="lib/linux-arm64/libgit2-183da2c.so" />
-    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-183da2c" target="lib/osx-x64/libgit2-183da2c.dylib" />
+<configuration>
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-b7bad55" target="lib/linux-x64/libgit2-b7bad55.so" />
+    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-b7bad55" target="lib/linux-arm/libgit2-b7bad55.so" />
+    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-b7bad55" target="lib/linux-arm64/libgit2-b7bad55.so" />
+    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-b7bad55" target="lib/osx-x64/libgit2-b7bad55.dylib" />
 </configuration>
diff --git a/nuget.package/libgit2/libgit2_hash.txt b/nuget.package/libgit2/libgit2_hash.txt
index 2d2c778f..e6de7a27 100644
--- a/nuget.package/libgit2/libgit2_hash.txt
+++ b/nuget.package/libgit2/libgit2_hash.txt
@@ -1 +1 @@
-183da2cc24e32bd9bc9ff53a570a8e484676728c
+b7bad55e4bb0a285b073ba5e02b01d3f522fc95d