Skip to content

Commit 630b816

Browse files
A-Ovchinnikov-mxtmdsbordingAArnottqmfrederik
authored and
A-Ovchinnikov-mx
committed
Support Windows ARM64 (#13)
* Cherry-pick some commits from `master` branch * Delete Travis, AppVeyor and Azure Pipelines CI * Enable loading arm64 libgit2 * Use .NET 5.0 for tests Co-authored-by: Tom Deseyn <[email protected]> Co-authored-by: Brandon Ording <[email protected]> Co-authored-by: Andrew Arnott <[email protected]> Co-authored-by: Frederik Carlier <[email protected]> Co-authored-by: Edward Thomson <[email protected]>
1 parent ea09b8c commit 630b816

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

LibGit2Sharp.Tests/GlobalSettingsFixture.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public void CanGetMinimumCompiledInFeatures()
2323
public void CanRetrieveValidVersionString()
2424
{
2525
// Version string format is:
26-
// Major.Minor.Patch[-previewTag]+{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features)
26+
// Major.Minor.Patch[-previewTag]+{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64|arm64 - features)
2727
// Example output:
2828
// "0.25.0-preview.52+871d13a67f.libgit2-15e1193 (x86 - Threads, Https)"
2929

@@ -32,7 +32,7 @@ public void CanRetrieveValidVersionString()
3232
// The GlobalSettings.Version returned string should contain :
3333
// version: '0.25.0[-previewTag]' LibGit2Sharp version number.
3434
// git2SharpHash: '871d13a67f' LibGit2Sharp hash.
35-
// arch: 'x86' or 'x64' libgit2 target.
35+
// arch: 'x86', 'x64' or 'arm64' libgit2 target.
3636
// git2Features: 'Threads, Ssh' libgit2 features compiled with.
3737
string regex = @"^(?<version>\d+\.\d+\.\d+(-[\w\-\.]+)?\+((?<git2SharpHash>[a-f0-9]{10})\.)?libgit2-[a-f0-9]{7}) \((?<arch>\w+) - (?<git2Features>(?:\w*(?:, )*\w+)*)\)$";
3838

@@ -41,7 +41,7 @@ public void CanRetrieveValidVersionString()
4141
Match regexResult = Regex.Match(versionInfo, regex);
4242

4343
Assert.True(regexResult.Success, "The following version string format is enforced:" +
44-
"Major.Minor.Patch[-previewTag]+{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features). " +
44+
"Major.Minor.Patch[-previewTag]+{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64|arm64 - features). " +
4545
"But found \"" + versionInfo + "\" instead.");
4646
}
4747

LibGit2Sharp/LibGit2Sharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</ItemGroup>
3535

3636
<ItemGroup>
37-
<PackageReference Include="Mendix.LibGit2Sharp.NativeBinaries" Version="[1.110.1]" PrivateAssets="none" />
37+
<PackageReference Include="Mendix.LibGit2Sharp.NativeBinaries" Version="[1.110.10]" PrivateAssets="none" />
3838
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
3939
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.220" PrivateAssets="all" />
4040
</ItemGroup>

LibGit2Sharp/Version.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ private string RetrieveAbbrevShaFrom(string sha)
5555
/// </summary>
5656
/// <para>
5757
/// The format of the version number is as follows:
58-
/// <para>Major.Minor.Patch[-previewTag]+{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64 - features)</para>
58+
/// <para>Major.Minor.Patch[-previewTag]+{LibGit2Sharp_abbrev_hash}.libgit2-{libgit2_abbrev_hash} (x86|x64|arm64 - features)</para>
5959
/// </para>
6060
/// <returns></returns>
6161
public override string ToString()

version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "1.110.11",
3+
"version": "1.110.20",
44
"cloudBuild": {
55
"buildNumber": {
66
"enabled": true

0 commit comments

Comments
 (0)