Replace LibGit2Sharp by GitReader (#29)

StefH · web-flow · commit 2ce36c9888a3 · 2024-02-21T11:57:08.000+01:00
* Replace LibGit2Sharp by GitReader

* 1.0.10.1
diff --git a/Chocolatey/GitHubReleaseNotes/GitHubReleaseNotes.nuspec b/Chocolatey/GitHubReleaseNotes/GitHubReleaseNotes.nuspec
@@ -26,7 +26,7 @@ This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Refe
     <!-- version should MATCH as closely as possible with the underlying software -->
     <!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
     <!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
-    <version>1.0.10.0</version>
+    <version>1.0.10.1</version>
     <!-- <packageSourceUrl>Where is this Chocolatey package located (think GitHub)? packageSourceUrl is highly recommended for the community feed</packageSourceUrl>-->
     <!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
     <owners>Stef Heyenrath</owners>
diff --git a/Chocolatey/GitHubReleaseNotes/HowTo.md b/Chocolatey/GitHubReleaseNotes/HowTo.md
@@ -30,5 +30,5 @@ choco apikey --key {KEY} --source https://push.chocolatey.org/
 
 Then push:
 ``` cmd
-choco push githubreleasenotes.1.0.10.0.nupkg --source https://push.chocolatey.org/
+choco push githubreleasenotes.1.0.10.1.nupkg --source https://push.chocolatey.org/
 ```
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -4,7 +4,7 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<Version>1.0.10.0</Version>
+		<Version>1.0.10.1</Version>
 		<Description>Generate Release Notes from a GitHub project.</Description>
 		<Summary>Generate Release Notes from a GitHub project.</Summary>
 		<Authors>Stef Heyenrath</Authors>
diff --git a/GenerateReleaseNotes.cmd b/GenerateReleaseNotes.cmd
@@ -1 +1 @@
-GitHubReleaseNotes --output ReleaseNotes.md --skip-empty-releases --exclude-labels invalid question doc tip --version 1.0.10.0
+GitHubReleaseNotes --output ReleaseNotes.md --skip-empty-releases --exclude-labels invalid question doc tip --version 1.0.10.1
diff --git a/Wix/1.0.10.1/StefHeyenrath.GitHubReleaseNotes.installer.yaml b/Wix/1.0.10.1/StefHeyenrath.GitHubReleaseNotes.installer.yaml
@@ -0,0 +1,18 @@
+﻿# yaml-language-server: $schema=https://aka.ms/winget-manifest.installer.1.6.0.schema.json
+
+PackageIdentifier: StefHeyenrath.GitHubReleaseNotes
+PackageVersion: 1.0.10.1
+InstallerType: zip
+NestedInstallerType: portable
+NestedInstallerFiles:
+- RelativeFilePath: GitHubReleaseNotes.exe
+ProductCode: '{32249977-C6C1-40ED-B6A8-7084E69A0E7A}'
+ReleaseDate: 2024-02-21
+AppsAndFeaturesEntries:
+- UpgradeCode: '{54DA3D9F-E8A2-401F-A6BE-8133C2E04398}'
+Installers:
+- Architecture: x64
+  InstallerUrl: https://github.com/StefH/GitHubReleaseNotes/releases/download/1.0.10.1/GitHubReleaseNotes.zip
+  InstallerSha256: 039727840909AD4E9B906E45902C031A413BAEC7A290ED703D61D3868BFC69AB
+ManifestType: installer
+ManifestVersion: 1.6.0
diff --git a/Wix/1.0.10.1/StefHeyenrath.GitHubReleaseNotes.locale.en-US.yaml b/Wix/1.0.10.1/StefHeyenrath.GitHubReleaseNotes.locale.en-US.yaml
@@ -0,0 +1,25 @@
+﻿# yaml-language-server: $schema=https://aka.ms/winget-manifest.defaultLocale.1.6.0.schema.json
+
+PackageIdentifier: StefHeyenrath.GitHubReleaseNotes
+PackageVersion: 1.0.10.1
+PackageLocale: en-US
+Publisher: Stef Heyenrath
+PublisherUrl: https://github.com/StefH
+PublisherSupportUrl: https://github.com/StefH/GitHubReleaseNotes
+PackageName: GitHubReleaseNotes
+PackageUrl: https://github.com/StefH/GitHubReleaseNotes
+License: MIT
+LicenseUrl: https://github.com/StefH/GitHubReleaseNotes/blob/master/LICENSE
+ShortDescription: Generate Release Notes in MarkDown format from a GitHub project.
+Moniker: githubreleasenotes
+Tags:
+- changelog
+- generate
+- github
+- markdown
+- md
+- releasenotes
+- tags
+ReleaseNotesUrl: https://github.com/StefH/GitHubReleaseNotes/blob/master/ReleaseNotes.md
+ManifestType: defaultLocale
+ManifestVersion: 1.6.0
diff --git a/Wix/1.0.10.1/StefHeyenrath.GitHubReleaseNotes.yaml b/Wix/1.0.10.1/StefHeyenrath.GitHubReleaseNotes.yaml
@@ -0,0 +1,7 @@
+﻿# yaml-language-server: $schema=https://aka.ms/winget-manifest.version.1.6.0.schema.json
+
+PackageIdentifier: StefHeyenrath.GitHubReleaseNotes
+PackageVersion: 1.0.10.1
+DefaultLocale: en-US
+ManifestType: version
+ManifestVersion: 1.6.0
diff --git a/Wix/Setup/Product.wxs b/Wix/Setup/Product.wxs
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="32249977-C6C1-40ED-B6A8-7084E69A0E7A" Name="GitHubReleaseNotes" Language="1033" Manufacturer="Stef Heyenrath" Version="1.0.10.0" UpgradeCode="4E0EDF71-49CA-4113-8EF5-E1518AADE1E1">
+  <Product Id="32249977-C6C1-40ED-B6A8-7084E69A0E7A" Name="GitHubReleaseNotes" Language="1033" Manufacturer="Stef Heyenrath" Version="1.0.10.1" UpgradeCode="54DA3D9F-E8A2-401F-A6BE-8133C2E04398">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate EmbedCab="yes" />
diff --git a/Wix/upgradeGuid.txt b/Wix/upgradeGuid.txt
@@ -1 +1 @@
-4E0EDF71-49CA-4113-8EF5-E1518AADE1E1
+54DA3D9F-E8A2-401F-A6BE-8133C2E04398
diff --git a/examples/RestEase-Client-Generator.md b/examples/RestEase-Client-Generator.md
@@ -1,6 +1,9 @@
-# 1.0.0.0 (23 January 2024)
+# 1.0.0.0 (21 February 2024)
 - [#761](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/761) - Add unit tests for Any [test] contributed by [StefH](https://github.com/StefH)
 - [#765](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/765) - #764 - Introduce Sliding Cache to Constant Expression Helper [feature] contributed by [TWhidden](https://github.com/TWhidden)
+- [#770](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/770) - Enhancements to SlidingCache&lt;&gt; for Improved Thread Safety and Performance [feature] contributed by [TWhidden](https://github.com/TWhidden)
+- [#780](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/780) - Add RadzenDataGrid.BlazorApp example [test] contributed by [StefH](https://github.com/StefH)
+- [#764](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/764) - Possible Memory Leak with ConstantExpressionHelper [bug]
 
 # v1.3.8 (20 January 2024)
 - [#758](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/758) - Update function argument parsing for strings [bug] contributed by [StefH](https://github.com/StefH)
@@ -413,7 +416,7 @@
 - [#239](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/239) - SingleOrDefaultAsync [feature] contributed by [StefH](https://github.com/StefH)
 - [#238](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/238) - Missing SingleOrDefaultAsync for EntityFrameworkCore [feature]
 
-# 1.0.10.0 (07 January 2019)
+# 1.0.9.1 (07 January 2019)
 - [#210](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/210) - Set up CI with Azure Pipelines contributed by [azure-pipelines[bot]](https://github.com/apps/azure-pipelines)
 - [#211](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/211) - ParameterExpressionRenamer contributed by [StefH](https://github.com/StefH)
 - [#212](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/212) - Make ExpressionPromoter plugable contributed by [david-garcia-garcia](https://github.com/david-garcia-garcia)
diff --git a/examples/System.Linq.Dynamic.Core.md b/examples/System.Linq.Dynamic.Core.md
@@ -197,7 +197,7 @@
 - [#248](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/248) - Add IQueryable.OfType support to ExpressionParser.
 - [#252](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/252) - Implement ResolveTypesBySimpleName [feature]
 
-# 1.0.10.0 (05 February 2019)
+# 1.0.10.1 (05 February 2019)
 - [#223](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/223) - Add 'np(...)' Null Propagating function [feature] contributed by [StefH](https://github.com/StefH)
 - [#98](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/98) - Feature: Add the &quot;?.&quot; operator (null-conditional operator) to support navigation properties with null values [feature]
 - [#182](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/182) - Error when navigation property which named &quot;Parent&quot;
@@ -207,7 +207,7 @@
 - [#239](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/239) - SingleOrDefaultAsync [feature] contributed by [StefH](https://github.com/StefH)
 - [#238](https://github.com/zzzprojects/System.Linq.Dynamic.Core/issues/238) - Missing SingleOrDefaultAsync for EntityFrameworkCore [feature]
 
-# 1.0.10.0 (07 January 2019)
+# 1.0.10.1 (07 January 2019)
 - [#210](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/210) - Set up CI with Azure Pipelines contributed by [azure-pipelines[bot]](https://github.com/apps/azure-pipelines)
 - [#211](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/211) - ParameterExpressionRenamer contributed by [StefH](https://github.com/StefH)
 - [#212](https://github.com/zzzprojects/System.Linq.Dynamic.Core/pull/212) - Make ExpressionPromoter plugable contributed by [david-garcia-garcia](https://github.com/david-garcia-garcia)
diff --git a/src/GitHubReleaseNotes.Logic/Extensions/RepositoryExtensions.cs b/src/GitHubReleaseNotes.Logic/Extensions/RepositoryExtensions.cs
@@ -1,32 +1,56 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 using GitHubReleaseNotes.Logic.Models;
-using LibGit2Sharp;
+using GitReader;
+using GitReader.Primitive;
+using GitReader.Structures;
 
 namespace GitHubReleaseNotes.Logic.Extensions;
 
 internal static class RepositoryExtensions
 {
-    public static IReadOnlyList<ReleaseInfo> GetOrderedReleaseInfos(this Repository repo, string version)
+    public static async Task<IReadOnlyList<ReleaseInfo>> GetOrderedReleaseInfosAsync(this StructuredRepository repo, string version)
     {
-        var orderedReleaseInfos = repo.Tags
+        var orderedReleaseInfos = new List<ReleaseInfo>();
 
-            // Convert Tag into ReleaseInfo
-            .Select(tag => new ReleaseInfo
+        var getCommitTasks = new Dictionary<string, Task<Commit?>>();
+
+        foreach (var tag in repo.Tags)
+        {
+            var getCommitTask = repo.GetCommitAsync(tag.Value.ObjectHash);
+            getCommitTasks.Add(tag.Key, getCommitTask);
+        }
+
+        await Task.WhenAll(getCommitTasks.Values);
+
+        foreach (var tag in getCommitTasks)
+        {
+            var tagVersion = GetVersionAsLong(tag.Key);
+            if (tagVersion == null)
             {
-                Version = GetVersionAsLong(tag.FriendlyName) ?? 0,
-                FriendlyName = tag.FriendlyName,
-                When = tag.Target is Commit commit ? commit.Committer.When : DateTimeOffset.MinValue
-            })
+                // Skip invalid versions
+                continue;
+            }
 
-            // Skip invalid versions
-            .Where(tag => tag.Version > 0)
+            var commit = tag.Value.Result;
+            if (commit == null)
+            {
+                throw new InvalidOperationException($"Tag {tag.Key} has no commit.");
+            }
 
-            // Order by the version
-            .OrderBy(tag => tag.Version)
-            .ToList();
+            var releaseInfo = new ReleaseInfo
+            {
+                Version = tagVersion.Value,
+                FriendlyName = tag.Key,
+                When = commit.Committer.Date
+            };
+            orderedReleaseInfos.Add(releaseInfo);
+        }
 
+        orderedReleaseInfos = orderedReleaseInfos.OrderBy(tag => tag.Version).ToList();
+        
         // Add the `next` version
         orderedReleaseInfos.Add(new ReleaseInfo
         {
@@ -41,7 +65,7 @@ public static IReadOnlyList<ReleaseInfo> GetOrderedReleaseInfos(this Repository
     private static long? GetVersionAsLong(string friendlyName)
     {
         var versionAsString = new string(friendlyName.Where(c => char.IsDigit(c) || c == '.').ToArray());
-        if (System.Version.TryParse(versionAsString, out var version))
+        if (Version.TryParse(versionAsString, out var version))
         {
             return version.Major * 1000000000L + version.Minor * 1000000L + (version.Build > 0 ? version.Build : 0) * 1000L + (version.Revision > 0 ? version.Revision : 0);
         }
diff --git a/src/GitHubReleaseNotes.Logic/GitHubReleaseNotes.Logic.csproj b/src/GitHubReleaseNotes.Logic/GitHubReleaseNotes.Logic.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net48;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net48;net6.0</TargetFrameworks>
 		<ProjectGuid>{B6269AAC-170A-43D0-8B9B-579DED3D9A99}</ProjectGuid>
 		<PackageIcon>icon.png</PackageIcon>
 		<Nullable>enable</Nullable>
@@ -12,8 +12,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="LibGit2Sharp" Version="0.26.2" />
-		<PackageReference Include="Octokit" Version="0.48.0" />
+		<PackageReference Include="GitReader" Version="1.7.0" />
+		<PackageReference Include="Octokit" Version="9.1.2" />
 		<PackageReference Include="Handlebars.Net" Version="2.1.4" />
 		<PackageReference Include="IsExternalInit" Version="1.0.3">
 			<PrivateAssets>all</PrivateAssets>
@@ -28,4 +28,8 @@
 	<ItemGroup>
 		<None Include="../../icon.png" Pack="true" PackagePath="" />
 	</ItemGroup>
+
+	<ItemGroup Condition="'$(TargetFramework)' == 'net48'">
+	  <Reference Include="System.Net.Http" />
+	</ItemGroup>
 </Project>
diff --git a/src/GitHubReleaseNotes.Logic/HandleBarsHelper.cs b/src/GitHubReleaseNotes.Logic/HandleBarsHelper.cs
@@ -37,11 +37,10 @@ private string GetTemplateAsString()
 
         // Use default embedded Template
         var assembly = typeof(HandleBarsHelper).GetTypeInfo().Assembly;
-        using (Stream stream = assembly.GetManifestResourceStream(TemplateFilename))
-        using (StreamReader reader = new StreamReader(stream))
-        {
-            return reader.ReadToEnd();
-        }
+        using var stream = assembly.GetManifestResourceStream(TemplateFilename)!;
+        using var reader = new StreamReader(stream);
+
+        return reader.ReadToEnd();
     }
 
     private void RegisterHelpers()
diff --git a/src/GitHubReleaseNotes.Logic/RepositoryHelper.cs b/src/GitHubReleaseNotes.Logic/RepositoryHelper.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using GitHubReleaseNotes.Logic.Extensions;
 using GitHubReleaseNotes.Logic.Models;
+using GitReader.Structures;
 using Octokit;
 
 namespace GitHubReleaseNotes.Logic;
@@ -25,13 +26,14 @@ public RepositoryHelper(IConfiguration configuration)
 
     internal async Task<IEnumerable<ReleaseInfo>> GetReleaseInfoAsync()
     {
-        var repository = new LibGit2Sharp.Repository(_configuration.RepositoryPath);
-        var originUrl = repository.Network.Remotes.First(r => r.Name == "origin").Url;
+        using var repository = await GitReader.Repository.Factory.OpenStructureAsync(_configuration.RepositoryPath);
+
+        var originUrl = repository.RemoteUrls.First(r => r.Key == "origin").Value;
         var gitUrl = !originUrl.EndsWith(".git") ? $"{originUrl}.git" : originUrl;
-        var headBranchName = repository.Head.FriendlyName;
+        var headBranchName = repository.Head?.Name ?? throw new InvalidOperationException("The Head branch has no name.");
 
         Console.WriteLine($"Analyzing Git Repository at '{new FileInfo(_configuration.RepositoryPath).FullName}'");
-        var orderedReleaseInfos = repository.GetOrderedReleaseInfos(_configuration.Version);
+        var orderedReleaseInfos = await repository.GetOrderedReleaseInfosAsync(_configuration.Version);
 
         Console.WriteLine($"Getting Issues and Pull Requests from '{gitUrl}'");
         var result = await GetAllIssuesAndPullRequestsAsync(gitUrl, headBranchName).ConfigureAwait(false);
diff --git a/src/GitHubReleaseNotes.sln b/src/GitHubReleaseNotes.sln
@@ -73,6 +73,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.0.10.0", "1.0.10.0", "{4A
 		..\Wix\1.0.10.0\StefHeyenrath.GitHubReleaseNotes.yaml = ..\Wix\1.0.10.0\StefHeyenrath.GitHubReleaseNotes.yaml
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1.0.10.1", "1.0.10.1", "{1465CF9D-BCBB-450B-AD34-9D4E965C93B6}"
+	ProjectSection(SolutionItems) = preProject
+		..\Wix\1.0.10.1\StefHeyenrath.GitHubReleaseNotes.installer.yaml = ..\Wix\1.0.10.1\StefHeyenrath.GitHubReleaseNotes.installer.yaml
+		..\Wix\1.0.10.1\StefHeyenrath.GitHubReleaseNotes.locale.en-US.yaml = ..\Wix\1.0.10.1\StefHeyenrath.GitHubReleaseNotes.locale.en-US.yaml
+		..\Wix\1.0.10.1\StefHeyenrath.GitHubReleaseNotes.yaml = ..\Wix\1.0.10.1\StefHeyenrath.GitHubReleaseNotes.yaml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -132,6 +139,7 @@ Global
 		{E851802A-C1F1-47BB-8725-1FD1868CC6EB} = {EF77BB40-C919-4644-81A3-968854FB9B23}
 		{B6269AAC-170A-43D0-8B9B-579DED3D9A00} = {EF77BB40-C919-4644-81A3-968854FB9B23}
 		{4A8497B4-9F89-4989-AC7A-7E65245D64BC} = {1D8E407B-B13C-4377-8D6E-76521411105D}
+		{1465CF9D-BCBB-450B-AD34-9D4E965C93B6} = {1D8E407B-B13C-4377-8D6E-76521411105D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6A791AAB-CF55-4174-A6B7-C2AC7E7DECB2}
diff --git a/src/GitHubReleaseNotes/GitHubReleaseNotes.csproj b/src/GitHubReleaseNotes/GitHubReleaseNotes.csproj
@@ -9,15 +9,12 @@
 		<ProjectGuid>{E851802A-C1F1-47BB-8725-1FD1868CC6EB}</ProjectGuid>
 		<PublishSingleFile>true</PublishSingleFile>
 		<SelfContained>True</SelfContained>
+
 		<!--
 		handlebars.net\2.1.4\lib\netstandard2.1\Handlebars.dll : warning IL2104: Assembly 'Handlebars' produced trim warnings.
-		libgit2sharp\0.26.2\lib\netstandard2.0\LibGit2Sharp.dll : warning IL2104: Assembly 'LibGit2Sharp' produced trim warnings.
 		octokit\0.48.0\lib\netstandard2.0\Octokit.dll : warning IL2104: Assembly 'Octokit' produced trim warnings.
 		-->
 		<PublishTrimmed>false</PublishTrimmed>
-
-		<!-- For "git2-106a5f2.dll" (https://learn.microsoft.com/en-us/answers/questions/296816/self-contained-single-file-does-not-produce-a-sing) -->
-		<IncludeAllContentForSelfExtract>true</IncludeAllContentForSelfExtract>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -29,7 +26,7 @@
 	</ItemGroup>
 
 	<Target Name="PublishAndZip" AfterTargets="Build">
-		<Exec Command="dotnet publish --no-build --no-restore -r win-x64 --self-contained" />
+		<Exec Command="dotnet publish --no-build --no-restore -r win-x64 --self-contained --configuration $(Configuration)" />
 		<Zip SourceFile="$(OutputPath)\publish\$(AssemblyName).exe" ZipFileName="$(OutputPath)\publish\$(AssemblyName).zip" />
 	</Target>
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-GitHubReleaseNotes --output ReleaseNotes.md --skip-empty-releases --exclude-labels invalid question doc tip --version 1.0.10.0`
	`1`	`+GitHubReleaseNotes --output ReleaseNotes.md --skip-empty-releases --exclude-labels invalid question doc tip --version 1.0.10.1`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-4E0EDF71-49CA-4113-8EF5-E1518AADE1E1`
	`1`	`+54DA3D9F-E8A2-401F-A6BE-8133C2E04398`