From 5ea0d25546f161dbfaf0ce7f1490fa040e76f84a Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Mon, 10 May 2021 11:57:43 +0200
Subject: [PATCH 1/5] Update libgit2 to v1.1.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 6777db8e..7f4fa178 160000
--- a/libgit2
+++ b/libgit2
@@ -1 +1 @@
-Subproject commit 6777db8e8343014d57c41b335e0c60af44d4e9f2
+Subproject commit 7f4fa178629d559c037a1f72f79f79af9c1ef8ce
diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
index ac7742ca..d0c25fe3 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>6777db8e8343014d57c41b335e0c60af44d4e9f2</libgit2_hash>
-    <libgit2_filename>git2-6777db8</libgit2_filename>
+    <libgit2_hash>7f4fa178629d559c037a1f72f79f79af9c1ef8ce</libgit2_hash>
+    <libgit2_filename>git2-7f4fa17</libgit2_filename>
   </PropertyGroup>
 </Project>
diff --git a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
index 324cb47d..c350e048 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>6777db8e8343014d57c41b335e0c60af44d4e9f2</libgit2_hash>
-    <libgit2_filename>git2-6777db8</libgit2_filename>
+    <libgit2_hash>7f4fa178629d559c037a1f72f79f79af9c1ef8ce</libgit2_hash>
+    <libgit2_filename>git2-7f4fa17</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 aa23d92e..1be442f5 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-6777db8" target="lib/linux-x64/libgit2-6777db8.so" />
-    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-6777db8" target="lib/linux-arm/libgit2-6777db8.so" />
-    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-6777db8" target="lib/linux-arm64/libgit2-6777db8.so" />
-    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-6777db8" target="lib/osx-x64/libgit2-6777db8.dylib" />
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-7f4fa17" target="lib/linux-x64/libgit2-7f4fa17.so" />
+    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-7f4fa17" target="lib/linux-arm/libgit2-7f4fa17.so" />
+    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-7f4fa17" target="lib/linux-arm64/libgit2-7f4fa17.so" />
+    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-7f4fa17" target="lib/osx-x64/libgit2-7f4fa17.dylib" />
 </configuration>
diff --git a/nuget.package/libgit2/libgit2_hash.txt b/nuget.package/libgit2/libgit2_hash.txt
index 71fa3112..e60ed101 100644
--- a/nuget.package/libgit2/libgit2_hash.txt
+++ b/nuget.package/libgit2/libgit2_hash.txt
@@ -1 +1 @@
-6777db8e8343014d57c41b335e0c60af44d4e9f2
+7f4fa178629d559c037a1f72f79f79af9c1ef8ce

From 3accd98032a98a7b71e5a84f15539f20d097fc44 Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Mon, 10 May 2021 12:20:05 +0200
Subject: [PATCH 2/5] Remove checks

---
 build.libgit2.ps1 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build.libgit2.ps1 b/build.libgit2.ps1
index aeefd202..1aa41f8b 100644
--- a/build.libgit2.ps1
+++ b/build.libgit2.ps1
@@ -93,8 +93,6 @@ function Assert-Consistent-Naming($expected, $path) {
     $dll = get-item $path
 
     Ensure-Property $expected $dll.Name "Name" $dll.Fullname
-    Ensure-Property $expected $dll.VersionInfo.InternalName "VersionInfo.InternalName" $dll.Fullname
-    Ensure-Property $expected $dll.VersionInfo.OriginalFilename "VersionInfo.OriginalFilename" $dll.Fullname
 }
 
 try {

From 0bab4fff5e0a891fbfe30458f78466559412388d Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Mon, 16 Aug 2021 15:30:43 +0200
Subject: [PATCH 3/5] Update to 1.1.1

---
 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 7f4fa178..8a0dc678 160000
--- a/libgit2
+++ b/libgit2
@@ -1 +1 @@
-Subproject commit 7f4fa178629d559c037a1f72f79f79af9c1ef8ce
+Subproject commit 8a0dc6783c340e61a44c179c48f832165ad2053c
diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.props
index d0c25fe3..2081ac68 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>7f4fa178629d559c037a1f72f79f79af9c1ef8ce</libgit2_hash>
-    <libgit2_filename>git2-7f4fa17</libgit2_filename>
+    <libgit2_hash>8a0dc6783c340e61a44c179c48f832165ad2053c</libgit2_hash>
+    <libgit2_filename>git2-8a0dc67</libgit2_filename>
   </PropertyGroup>
 </Project>
diff --git a/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net46/LibGit2Sharp.NativeBinaries.props
index c350e048..1da2c35c 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>7f4fa178629d559c037a1f72f79f79af9c1ef8ce</libgit2_hash>
-    <libgit2_filename>git2-7f4fa17</libgit2_filename>
+    <libgit2_hash>8a0dc6783c340e61a44c179c48f832165ad2053c</libgit2_hash>
+    <libgit2_filename>git2-8a0dc67</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 1be442f5..a3bbabd8 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-7f4fa17" target="lib/linux-x64/libgit2-7f4fa17.so" />
-    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-7f4fa17" target="lib/linux-arm/libgit2-7f4fa17.so" />
-    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-7f4fa17" target="lib/linux-arm64/libgit2-7f4fa17.so" />
-    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-7f4fa17" target="lib/osx-x64/libgit2-7f4fa17.dylib" />
+    <dllmap os="linux" cpu="x86-64" wordsize="64" dll="git2-8a0dc67" target="lib/linux-x64/libgit2-8a0dc67.so" />
+    <dllmap os="linux" cpu="arm" wordsize="32" dll="git2-8a0dc67" target="lib/linux-arm/libgit2-8a0dc67.so" />
+    <dllmap os="linux" cpu="armv8" wordsize="64" dll="git2-8a0dc67" target="lib/linux-arm64/libgit2-8a0dc67.so" />
+    <dllmap os="osx" cpu="x86-64" wordsize="64" dll="git2-8a0dc67" target="lib/osx-x64/libgit2-8a0dc67.dylib" />
 </configuration>
diff --git a/nuget.package/libgit2/libgit2_hash.txt b/nuget.package/libgit2/libgit2_hash.txt
index e60ed101..eae3ea79 100644
--- a/nuget.package/libgit2/libgit2_hash.txt
+++ b/nuget.package/libgit2/libgit2_hash.txt
@@ -1 +1 @@
-7f4fa178629d559c037a1f72f79f79af9c1ef8ce
+8a0dc6783c340e61a44c179c48f832165ad2053c

From 989f084a287c7e0e3b3c994799d9a2915166a359 Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Tue, 17 Aug 2021 11:45:18 +0200
Subject: [PATCH 4/5] Add check back + patch CMakeLists.txt

---
 build.libgit2.ps1 | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/build.libgit2.ps1 b/build.libgit2.ps1
index 1aa41f8b..5c4b60d7 100644
--- a/build.libgit2.ps1
+++ b/build.libgit2.ps1
@@ -93,11 +93,17 @@ function Assert-Consistent-Naming($expected, $path) {
     $dll = get-item $path
 
     Ensure-Property $expected $dll.Name "Name" $dll.Fullname
+    Ensure-Property $expected $dll.VersionInfo.InternalName "VersionInfo.InternalName" $dll.Fullname
+    Ensure-Property $expected $dll.VersionInfo.OriginalFilename "VersionInfo.OriginalFilename" $dll.Fullname
 }
 
 try {
     Push-Location $libgit2Directory
 
+    # Patch CMakeLists.txt to fix LIBGIT2_FILENAME not being used when compiling the .rc file
+    $libgit2CMakeLists = Join-Path $libgit2Directory "src\CMakeLists.txt"
+    (Get-Content $libgit2CMakeLists).Replace('target_compile_definitions(git2internal PRIVATE LIBGIT2_FILENAME', 'target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME') | Set-Content $libgit2CMakeLists
+
     $cmake = Find-CMake
     $ctest = Join-Path (Split-Path -Parent $cmake) "ctest.exe"
 

From 55e4a1c77e4059d87c6e9f91c70184f13a93c81c Mon Sep 17 00:00:00 2001
From: Julien Richard <julien.richard@ubisoft.com>
Date: Tue, 17 Aug 2021 11:53:49 +0200
Subject: [PATCH 5/5] Add comment

---
 build.libgit2.ps1 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.libgit2.ps1 b/build.libgit2.ps1
index 5c4b60d7..a68a38a3 100644
--- a/build.libgit2.ps1
+++ b/build.libgit2.ps1
@@ -101,6 +101,7 @@ try {
     Push-Location $libgit2Directory
 
     # Patch CMakeLists.txt to fix LIBGIT2_FILENAME not being used when compiling the .rc file
+    # To remove when https://github.com/libgit2/libgit2/pull/5994 is included
     $libgit2CMakeLists = Join-Path $libgit2Directory "src\CMakeLists.txt"
     (Get-Content $libgit2CMakeLists).Replace('target_compile_definitions(git2internal PRIVATE LIBGIT2_FILENAME', 'target_compile_definitions(git2 PRIVATE LIBGIT2_FILENAME') | Set-Content $libgit2CMakeLists