Merge remote-tracking branch 'origin/master'

# Conflicts:
#	LibGit2Sharp/Core/NativeMethods.cs

Author: olmobrutall

.editorconfig

@@ -10,9 +10,9 @@ trim_trailing_whitespace = true
 insert_final_newline = true
 
 ; Not change VS generated files
-[*.{sln,csroj}]
+[*.{sln,csproj}]
 trim_trailing_whitespace = false
 insert_final_newline = false
 
-[*.{props,targets}]
+[*.{props,targets,csproj,config}]
 indent_size = 2

.github/ISSUE_TEMPLATE

@@ -0,0 +1,17 @@
+You are opening a _bug report_ against the LibGit2Sharp project: we
+use GitHub Issues for tracking bug reports and feature requests.  If
+you have a question about an API or usage, please ask on StackOverflow:
+http://stackoverflow.com/questions/tagged/libgit2sharp.
+
+Otherwise, to report a bug, please fill out the reproduction steps
+(below) and delete these introductory paragraphs.  Thanks!
+
+### Reproduction steps
+
+### Expected behavior
+
+### Actual behavior
+
+### Version of LibGit2Sharp (release number or SHA1)
+
+### Operating system(s) tested; .NET runtime tested

.github/workflows/ci.yml

@@ -0,0 +1,102 @@
+name: CI
+on:
+  push:
+    branches: [master, release-*]
+    tags:
+      - '[0-9]+.[0-9]+.[0-9]+'
+      - '[0-9]+.[0-9]+.[0-9]+-*'
+  pull_request:
+  workflow_dispatch:
+env:
+  DOTNET_NOLOGO: true
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.2
+        with:
+          fetch-depth: 0
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v4.0.0
+        with:
+          dotnet-version: 9.0.x
+      - name: Build
+        run: dotnet build LibGit2Sharp.sln --configuration Release
+      - name: Upload packages
+        uses: actions/upload-artifact@v4.3.1
+        with:
+          name: NuGet packages
+          path: artifacts/package/
+          retention-days: 7
+      - name: Verify trimming compatibility
+        run: dotnet publish TrimmingTestApp
+  test:
+    name: Test / ${{ matrix.os }} / ${{ matrix.arch }} / ${{ matrix.tfm }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        arch: [ x64 ]
+        os: [ windows-2019, windows-2022, macos-13 ]
+        tfm: [ net472, net8.0, net9.0 ]
+        exclude:
+          - os: macos-13
+            tfm: net472
+        include:
+          - arch: arm64
+            os: macos-14
+            tfm: net8.0
+          - arch: arm64
+            os: macos-14
+            tfm: net9.0
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.2
+        with:
+          fetch-depth: 0
+      - name: Install .NET SDK
+        uses: actions/setup-dotnet@v4.0.0
+        with:
+          dotnet-version: |
+            9.0.x
+            8.0.x
+      - name: Run ${{ matrix.tfm }} tests
+        run: dotnet test LibGit2Sharp.sln --configuration Release --framework ${{ matrix.tfm }} --logger "GitHubActions" /p:ExtraDefine=LEAKS_IDENTIFYING
+  test-linux:
+    name: Test / ${{ matrix.distro }} / ${{ matrix.arch }} / ${{ matrix.tfm }}
+    runs-on: ${{ matrix.runnerImage }}
+    strategy:
+      matrix:
+        arch: [ amd64, arm64 ]
+        distro: [ alpine.3.17, alpine.3.18, alpine.3.19, alpine.3.20, centos.stream.9, debian.12, fedora.40, ubuntu.20.04, ubuntu.22.04, ubuntu.24.04 ]
+        sdk:  [ '8.0', '9.0' ]
+        exclude:
+          - distro: alpine.3.17
+            sdk: '9.0'
+          - distro: alpine.3.18
+            sdk: '9.0'
+          - distro: alpine.3.19
+            sdk: '9.0'
+        include:
+          - sdk: '8.0'
+            tfm: net8.0
+          - sdk: '9.0'
+            tfm: net9.0
+          - arch: amd64
+            runnerImage: ubuntu-22.04
+          - arch: arm64
+            runnerImage: ubuntu-22.04-arm
+      fail-fast: false
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4.1.2
+        with:
+          fetch-depth: 0
+      - name: Run ${{ matrix.tfm }} tests
+        run: |
+            git_command="git config --global --add safe.directory /app"
+            test_command="dotnet test LibGit2Sharp.sln --configuration Release -p:TargetFrameworks=${{ matrix.tfm }} --logger "GitHubActions" -p:ExtraDefine=LEAKS_IDENTIFYING"
+            docker run -t --rm --platform linux/${{ matrix.arch }} -v "$PWD:/app" -e OPENSSL_ENABLE_SHA1_SIGNATURES=1 gittools/build-images:${{ matrix.distro }}-sdk-${{ matrix.sdk }} sh -c "$git_command && $test_command"
+

.gitignore

@@ -38,3 +38,5 @@ _ReSharper*/
 *.DotSettings
 
 _NCrunch_LibGit2Sharp/
+artifacts/
+worktree.playlist

.travis.yml

@@ -1,18 +1,110 @@
 # LibGit2Sharp Changes
 
-**LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono.**
+## v0.31 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.30.0..0.31.0))
 
- - Source code: <https://github.com/libgit2/libgit2sharp>
- - NuGet package: <http://nuget.org/List/Packages/LibGit2Sharp>
- - Issue tracker: <https://github.com/libgit2/libgit2sharp/issues>
- - @libgit2sharp: <http://twitter.com/libgit2sharp>
- - CI servers:
-  - Windows (x86/amd64): <https://ci.appveyor.com/project/libgit2/libgit2sharp>
-  - Linux/Mac OS X: <https://travis-ci.org/libgit2/libgit2sharp>
+### Changes
+- This release includes [libgit2 v1.8.4](https://github.com/libgit2/libgit2/releases/tag/v1.8.4).
+  - SSH is now supported through [libgit2's support for OpenSSH](https://github.com/libgit2/libgit2/pull/6617).
+- The ppc64le architecture is now supported on Linux.
+- .NET 6 has reached end of support, so LibGit2Sharp now targets `net472` and `net8.0`.
+
+### Additions
+- Adds Depth to FetchOptions allowing for shallow cloning [#2070](https://github.com/libgit2/libgit2sharp/pull/2070)
+- Make owner validation configurable [#2093](https://github.com/libgit2/libgit2sharp/pull/2093)
+- Add a CloneOptions constructor that takes a FetchOptions [#2132](https://github.com/libgit2/libgit2sharp/pull/2132)
+
+### Fixes
+- TreeDefinition.Remove fails to remove unwrapped trees [#1869](https://github.com/libgit2/libgit2sharp/issues/1869) 
+- ObjectDatabase.Write<T>(Stream stream...) overload does not respect T [#2071](https://github.com/libgit2/libgit2sharp/issues/2071)
+- Repository.Worktrees.Add leaves now worktree empty [#2037](https://github.com/libgit2/libgit2sharp/issues/2037)
 
-## v0.24 + 1
+## v0.30 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.29.0..0.30.0))
+
+### Changes
+- This release includes [libgit2 v1.7.2](https://github.com/libgit2/libgit2/releases/tag/v1.7.2).
+- Updates for trimming compatibility [#2084](https://github.com/libgit2/libgit2sharp/pull/2084)
+- Updates for .NET 8 [#2085](https://github.com/libgit2/libgit2sharp/pull/2085)
+
+## v0.29 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.28.0..0.29.0))
+
+### Changes
+- This release includes [libgit2 v1.7.1](https://github.com/libgit2/libgit2/releases/tag/v1.7.1).
+  - CI changes for the native binaries has removed support for CentOS 7. See [#2066](https://github.com/libgit2/libgit2sharp/pull/2066) for details.
 
 ### Additions
+- Add proxy options [#2065](https://github.com/libgit2/libgit2sharp/pull/2065)
+  - See PR for details, including some breaking changes to `CloneOptions` and `SubmoduleUpdateOptions`
+
+## v0.28 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.27.2..0.28.0))
+
+### Additions
+- Add CustomHeaders to PushOptions [#2052](https://github.com/libgit2/libgit2sharp/pull/2052)
+
+## v0.27.2 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.27.1..0.27.2))
+
+### Changes
+- This release includes [libgit2 v1.6.4](https://github.com/libgit2/libgit2/releases/tag/v1.6.4).
+
+### Fixes
+- Can't access GIT config (Repository.Config) since v0.27.0 [#2031](https://github.com/libgit2/libgit2sharp/issues/2031)
+
+## v0.27.1 - ([diff](https://github.com/libgit2/libgit2sharp/compare/0.27.0..0.27.1))
+
+### Fixes
+- AssemblyVersion of v0.27.0 is `0.0.0.0`, which is lower than the AssemblyVersion of the v0.26.x releases. [#2030](https://github.com/libgit2/libgit2sharp/pull/2030)
+
+## v0.27 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.26..0.27.0))
+
+### Changes
+- LibGit2Sharp now targets .NET Framework 4.7.2 and .NET 6.
+- This release includes [libgit2 v1.6.3](https://github.com/libgit2/libgit2/releases/tag/v1.6.3).
+- Changes to the native binaries let LibGit2Sharp work on all [.NET 6 supported OS versions and architectures](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md).
+- `GlobalSetings.NativeLibraryPath` used to automatically append architecture to the path when running on .NET Framework. This behavior has been removed to make it consistent. [#1918](https://github.com/libgit2/libgit2sharp/pull/1918)
+
+### Additions
+- Add support for adding and clearing multi-valued configuration [#1720](https://github.com/libgit2/libgit2sharp/pull/1720)
+- added lines and deleted lines in content changes [#1790](https://github.com/libgit2/libgit2sharp/pull/1790)
+- Set / get supported extensions [#1908](https://github.com/libgit2/libgit2sharp/pull/1908)
+- Simplify dealing with missing git objects [#1909](https://github.com/libgit2/libgit2sharp/pull/1909)
+- Throw NotFoundException if trees are missing when computing diff [#1936](https://github.com/libgit2/libgit2sharp/pull/1936)
+
+### Fixes
+- Adjust GitStatusOptions to match structure of native libgit2 [#1884](https://github.com/libgit2/libgit2sharp/pull/1884)
+- Update git_worktree_add_options struct to include ref pointer [#1890](https://github.com/libgit2/libgit2sharp/pull/1890)
+- Fix git_remote_connect not throwing on non-zero result [#1913](https://github.com/libgit2/libgit2sharp/pull/1913)
+- Fix incorrect information in exceptions [#1919](https://github.com/libgit2/libgit2sharp/pull/1919)
+- Checkout branch looks to remote tracking branches as fallback [#1820](https://github.com/libgit2/libgit2sharp/pull/1820)
+- Fixed calling into native libgit2 on osx-arm64 [#1955](https://github.com/libgit2/libgit2sharp/pull/1955)
+
+## v0.26 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.25..v0.26))
+
+### Additions
+
+* Add `CherryPickCommitIntoIndex` to `ObjectDatabase`
+* The underlying native library (libgit2) now no longer relies on libcurl
+* The underlying native library now no longer relies on zlib
+* Add `IndentHeuristic` option to `CompareOptions`
+
+## v0.25 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.24..v0.25))
+
+LibGit2Sharp is now .NET Core 2.0+ and .NET Framework compatible.
+
+### Additions
+
+ - `GitObject` now has a `Peel` method that will let you peel (for example)
+    a `Tag` to a `Tree`.
+ - `MergeOptions` now includes an option to `IgnoreWhitespaceChanges`.
+ - `TreeDefinition` can now `Add` an object with only the ID, which allows
+   users of large files to add entries without realizing a `Blob`.
+ - `ObjectDatabase` can now `Write` a `Stream`, which allows users of
+   large files to stream an object into storage without loading it into
+   memory.
+ - `ObjectDatabase` can now `MergeCommitsIntoIndex` allowing users to perform
+   an in-memory merge that produces an `Index` structure with conflicts.
+ - Users can enable or disable dependent object existence checks when
+   creating new objects with `GlobalSettings.SetEnableStrictObjectCreation`
+ - Users can enable or disable `ofs_delta` support with
+   `GlobalSettings.SetEnableOfsDelta`
 
 ### Changes
 
@@ -21,11 +113,15 @@
    the `StatusOptions.RecurseUntrackedDirs` options.
  - Status now does not show the ignored files by default.  To retrieve
    ignored files, include the `StatusOptions.IncludeIgnored` option.
+ - `Commands.Pull` can now provide a `null` value for `PullOptions`,
+   which indicates that default values should be used.
 
 ### Fixes
 
  - The exception thrown when the native library cannot be loaded is now
    able to be caught and will no longer crash the process.
+ - Getting the `Notes` collection from a `Repository` no longer throws an
+   exception when the repository has no notes.
 
 ## v0.24 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.23..v0.24))
 

CHANGES.md

@@ -4,7 +4,7 @@ We love Pull Requests! Your contributions help make LibGit2Sharp great.
 
 ## Getting Started
 
-So you want to contribute to LibGit2Sharp. Great! Contributions take many forms from 
+So you want to contribute to LibGit2Sharp. Great! Contributions take many forms from
 submitting issues, writing documentation, to making code changes. We welcome it all.
 
 But first things first...
@@ -14,18 +14,25 @@ But first things first...
   * Clearly describe the issue including steps to reproduce when it is a bug.
   * Make sure you fill in the earliest version that you know has the issue.
 * Fork the repository on GitHub, then clone it using your favorite Git client.
-* Make sure the project builds and all tests pass on your machine by running 
-  the `build.libgit2sharp.cmd` script on Windows or `build.libgit2sharp.sh` on Linux/Mac.
+* Make sure the project builds and all tests pass on your machine by running
+  the `buildandtest.cmd` script on Windows or `buildandtest.sh` on Linux/Mac.
 
 ## LibGit2
 
 LibGit2Sharp brings all the might and speed of libgit2, a native Git implementation, to the managed world of .Net and Mono.
-LibGit2 is a git submodule referencing the [libgit2 project](https://github.com/libgit2/libgit2). To learn more about 
+LibGit2 is a git submodule referencing the [libgit2 project](https://github.com/libgit2/libgit2). To learn more about
 submodules read [here](http://git-scm.com/book/en/v2/Git-Tools-Submodules).
 To build libgit2 see [here](https://github.com/libgit2/libgit2sharp/wiki/How-to-build-x64-libgit2-and-LibGit2Sharp).
 
 ## Making Changes
 
+Make sure you have the required .NET Core SDK and runtimes installed.
+The easiest way to do this is run our `tools\Install-DotNetSdk.ps1` script.
+Using the `-InstallLocality Machine` switch requires elevation but ensures
+that Visual Studio will be able to load the solution even when launched from a shortcut.
+
+Then proceed to:
+
 * Create a topic branch off master (don't work directly on master).
 * Implement your feature or fix your bug. Please following existing coding styles and do not introduce new ones.
 * Make atomic, focused commits with good commit messages.
@@ -42,10 +49,10 @@ Some things that will increase the chance that your pull request is accepted.
 * Following existing code conventions.
 * Including unit tests that would otherwise fail without the patch, but pass after applying it.
 * Updating the documentation and tests that are affected by the contribution.
-* If code from elsewhere is used, proper credit and a link to the source should exist in the code comments. 
+* If code from elsewhere is used, proper credit and a link to the source should exist in the code comments.
   Then licensing issues can be checked against LibGit2Sharp's very permissive MIT based open source license.
 * Having a configured git client that converts line endings to LF. [See here.](https://help.github.com/articles/dealing-with-line-endings/).
 # Additional Resources
 
 * [General GitHub documentation](http://help.github.com/)
-* [GitHub pull request documentation](https://help.github.com/articles/using-pull-requests/)
+* [GitHub pull request documentation](https://help.github.com/articles/using-pull-requests/)

CONTRIBUTING.md

@@ -1,10 +1,14 @@
 <Project>
 
   <PropertyGroup>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <OutputPath>$(MSBuildThisFileDirectory)bin\$(MSBuildProjectName)\$(Configuration)\</OutputPath>
-    <BaseIntermediateOutputPath>$(MSBuildThisFileDirectory)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+    <UseArtifactsOutput>true</UseArtifactsOutput>
     <DefineConstants Condition=" '$(ExtraDefine)' != '' ">$(DefineConstants);$(ExtraDefine)</DefineConstants>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(CI)' != ''">
+    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
+  </PropertyGroup>
+
 </Project>