diff --git a/.travis.yml b/.travis.yml
index f21fdf45..ee2a209a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,26 +9,6 @@ matrix:
dist: trusty
sudo: required
env: RID=linux-x64
- - os: linux
- dist: trusty
- sudo: required
- env: RID=ubuntu.18.04-x64
- - os: linux
- dist: trusty
- sudo: required
- env: RID=rhel-x64
- - os: linux
- dist: trusty
- sudo: required
- env: RID=fedora-x64
- - os: linux
- dist: trusty
- sudo: required
- env: RID=debian.9-x64
- - os: linux
- dist: trusty
- sudo: required
- env: RID=alpine-x64
- os: osx
env: RID=osx
@@ -45,6 +25,6 @@ before_install:
install: true
-script: if [[ $RID == "osx" ]]; then ./build.libgit2.sh ; else ./dockerbuild.sh ; fi
+script: ./build.libgit2.sh
after_success: ./uploadbinaries.sh
diff --git a/UpdateLibgit2ToSha.ps1 b/UpdateLibgit2ToSha.ps1
index 92e2316a..ace577e4 100644
--- a/UpdateLibgit2ToSha.ps1
+++ b/UpdateLibgit2ToSha.ps1
@@ -1,6 +1,6 @@
<#
.SYNOPSIS
- Updates the libgit2 submodule to the specified commit and updates libgit2_hash.txt and NativeBinaries.props with the new hash value.
+ Updates the libgit2 submodule to the specified commit and updates libgit2_hash.txt and NativeBinaries.NoTLS.props with the new hash value.
.PARAMETER sha
Desired libgit2 version. This is run through `git rev-parse`, so branch names are okay too.
#>
@@ -101,7 +101,7 @@ Push-Location $libgit2Directory
"@
- Set-Content -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\LibGit2Sharp.NativeBinaries.props") $buildProperties
+ Set-Content -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\LibGit2Sharp.NativeBinaries.NoTLS.props") $buildProperties
$net461BuildProperties = @"
@@ -164,7 +164,7 @@ Push-Location $libgit2Directory
"@
- Set-Content -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\net461\LibGit2Sharp.NativeBinaries.props") $net461BuildProperties
+ Set-Content -Encoding UTF8 (Join-Path $projectDirectory "nuget.package\build\net461\LibGit2Sharp.NativeBinaries.NoTLS.props") $net461BuildProperties
$dllConfig = @"
diff --git a/build.libgit2.sh b/build.libgit2.sh
index 80c6950e..1ee3e1d4 100755
--- a/build.libgit2.sh
+++ b/build.libgit2.sh
@@ -15,6 +15,9 @@ cmake -DCMAKE_BUILD_TYPE:STRING=Release \
-DENABLE_TRACE=ON \
-DLIBGIT2_FILENAME=git2-$SHORTSHA \
-DCMAKE_OSX_ARCHITECTURES="i386;x86_64" \
+ -DUSE_HTTPS=OFF \
+ -DCURL=OFF \
+ -DUSE_BUNDLED_ZLIB=ON \
..
cmake --build .
diff --git a/download.build.artifacts.and.package.ps1 b/download.build.artifacts.and.package.ps1
index fc32b982..c5e6c81a 100644
--- a/download.build.artifacts.and.package.ps1
+++ b/download.build.artifacts.and.package.ps1
@@ -149,7 +149,7 @@ Push-location "$($package.FullName).ext"
Remove-Item -Path ".\_rels\" -Recurse
Remove-Item -Path ".\package\" -Recurse
Remove-Item -Path '.\`[Content_Types`].xml'
-& "$root/Nuget.exe" pack "LibGit2Sharp.NativeBinaries.nuspec" -OutputDirectory "$path" -NoPackageAnalysis -Verbosity "detailed"
+& "$root/Nuget.exe" pack "LibGit2Sharp.NativeBinaries.NoTLS.nuspec" -OutputDirectory "$path" -NoPackageAnalysis -Verbosity "detailed"
$newPackage = Get-ChildItem -Path $path -Filter "*.nupkg"
Pop-Location
diff --git a/libgit2 b/libgit2
index f23dc5b2..58519816 160000
--- a/libgit2
+++ b/libgit2
@@ -1 +1 @@
-Subproject commit f23dc5b29f1394928a940d7ec447f4bfd53dad1f
+Subproject commit 585198165bdc4557305eed56c9e31b9655c13a02
diff --git a/nuget.package/NativeBinaries.nuspec b/nuget.package/NativeBinaries.nuspec
index 360bfb72..ada5a6f0 100644
--- a/nuget.package/NativeBinaries.nuspec
+++ b/nuget.package/NativeBinaries.nuspec
@@ -1,14 +1,14 @@
- LibGit2Sharp.NativeBinaries
+ LibGit2Sharp.NativeBinaries.NoTLS
1.0.155
LibGit2Sharp contributors
- nulltoken
+ ethomson
https://raw.githubusercontent.com/libgit2/libgit2/master/COPYING
https://github.com/libgit2/libgit2sharp.nativebinaries
https://raw.githubusercontent.com/libgit2/libgit2sharp/master/square-logo.png
false
- Native binaries for LibGit2Sharp
+ Native binaries for LibGit2Sharp: Experimental Builtin HTTPS Support
diff --git a/nuget.package/build/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/LibGit2Sharp.NativeBinaries.NoTLS.props
similarity index 66%
rename from nuget.package/build/LibGit2Sharp.NativeBinaries.props
rename to nuget.package/build/LibGit2Sharp.NativeBinaries.NoTLS.props
index 0a41f45d..4ebc0d82 100644
--- a/nuget.package/build/LibGit2Sharp.NativeBinaries.props
+++ b/nuget.package/build/LibGit2Sharp.NativeBinaries.NoTLS.props
@@ -2,7 +2,7 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
$(MSBuildThisFileFullPath)
- f23dc5b29f1394928a940d7ec447f4bfd53dad1f
- git2-f23dc5b
+ 585198165bdc4557305eed56c9e31b9655c13a02
+ git2-5851981
diff --git a/nuget.package/build/net461/LibGit2Sharp.NativeBinaries.props b/nuget.package/build/net461/LibGit2Sharp.NativeBinaries.NoTLS.props
similarity index 62%
rename from nuget.package/build/net461/LibGit2Sharp.NativeBinaries.props
rename to nuget.package/build/net461/LibGit2Sharp.NativeBinaries.NoTLS.props
index 7d3731f6..38bb34ca 100644
--- a/nuget.package/build/net461/LibGit2Sharp.NativeBinaries.props
+++ b/nuget.package/build/net461/LibGit2Sharp.NativeBinaries.NoTLS.props
@@ -2,52 +2,52 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
$(MSBuildThisFileFullPath)
- f23dc5b29f1394928a940d7ec447f4bfd53dad1f
- git2-f23dc5b
+ 585198165bdc4557305eed56c9e31b9655c13a02
+ git2-5851981
-
- lib\win32\x64\git2-f23dc5b.dll
+
+ lib\win32\x64\git2-5851981.dll
PreserveNewest
-
- lib\win32\x64\git2-f23dc5b.pdb
+
+ lib\win32\x64\git2-5851981.pdb
PreserveNewest
-
- lib\win32\x86\git2-f23dc5b.dll
+
+ lib\win32\x86\git2-5851981.dll
PreserveNewest
-
- lib\win32\x86\git2-f23dc5b.pdb
+
+ lib\win32\x86\git2-5851981.pdb
PreserveNewest
-
- lib\osx\libgit2-f23dc5b.dylib
+
+ lib\osx\libgit2-5851981.dylib
PreserveNewest
-
- lib\linux-x64\libgit2-f23dc5b.so
+
+ lib\linux-x64\libgit2-5851981.so
PreserveNewest
-
- lib\ubuntu.18.04-x64\libgit2-f23dc5b.so
+
+ lib\ubuntu.18.04-x64\libgit2-5851981.so
PreserveNewest
-
- lib\rhel-x64\libgit2-f23dc5b.so
+
+ lib\rhel-x64\libgit2-5851981.so
PreserveNewest
-
- lib\fedora-x64\libgit2-f23dc5b.so
+
+ lib\fedora-x64\libgit2-5851981.so
PreserveNewest
-
- lib\debian.9-x64\libgit2-f23dc5b.so
+
+ lib\debian.9-x64\libgit2-5851981.so
PreserveNewest
-
- lib\alpine-x64\libgit2-f23dc5b.so
+
+ lib\alpine-x64\libgit2-5851981.so
PreserveNewest
diff --git a/nuget.package/buildMultiTargeting/LibGit2Sharp.NativeBinaries.NoTLS.props b/nuget.package/buildMultiTargeting/LibGit2Sharp.NativeBinaries.NoTLS.props
new file mode 100644
index 00000000..61bfa638
--- /dev/null
+++ b/nuget.package/buildMultiTargeting/LibGit2Sharp.NativeBinaries.NoTLS.props
@@ -0,0 +1,3 @@
+
+
+
diff --git a/nuget.package/buildMultiTargeting/LibGit2Sharp.NativeBinaries.props b/nuget.package/buildMultiTargeting/LibGit2Sharp.NativeBinaries.props
deleted file mode 100644
index a3c30204..00000000
--- a/nuget.package/buildMultiTargeting/LibGit2Sharp.NativeBinaries.props
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/nuget.package/buildMultiTargeting/net461/LibGit2Sharp.NativeBinaries.props b/nuget.package/buildMultiTargeting/net461/LibGit2Sharp.NativeBinaries.NoTLS.props
similarity index 71%
rename from nuget.package/buildMultiTargeting/net461/LibGit2Sharp.NativeBinaries.props
rename to nuget.package/buildMultiTargeting/net461/LibGit2Sharp.NativeBinaries.NoTLS.props
index 707c7024..fee49e2b 100644
--- a/nuget.package/buildMultiTargeting/net461/LibGit2Sharp.NativeBinaries.props
+++ b/nuget.package/buildMultiTargeting/net461/LibGit2Sharp.NativeBinaries.NoTLS.props
@@ -1,3 +1,3 @@
-
-
\ No newline at end of file
+
+
diff --git a/nuget.package/libgit2/LibGit2Sharp.dll.config b/nuget.package/libgit2/LibGit2Sharp.dll.config
index 15ceddaa..bac1eb75 100644
--- a/nuget.package/libgit2/LibGit2Sharp.dll.config
+++ b/nuget.package/libgit2/LibGit2Sharp.dll.config
@@ -1,4 +1,4 @@
-
-
+
+
diff --git a/nuget.package/libgit2/libgit2_hash.txt b/nuget.package/libgit2/libgit2_hash.txt
index 047447e9..8bf0208f 100644
--- a/nuget.package/libgit2/libgit2_hash.txt
+++ b/nuget.package/libgit2/libgit2_hash.txt
@@ -1 +1 @@
-f23dc5b29f1394928a940d7ec447f4bfd53dad1f
+585198165bdc4557305eed56c9e31b9655c13a02