Skip to content

merge dd/issues/2 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Mar 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
78784c2
Update LibGit2Sharp.csproj
lytico Jan 3, 2021
2f9528f
Update libgit2sharp.yml
lytico Jan 3, 2021
5e710ed
Update libgit2sharp.yml
lytico Jan 3, 2021
0f4aae0
Update libgit2sharp.yml
lytico Jan 3, 2021
dded54f
Update version.json
lytico Jan 3, 2021
14e289e
LibGit2Sharp.Tests.csproj: adjust TargetFramework & RuntimeIdentifiers
lytico Jan 4, 2021
7484a14
libgit2sharp.yml: try fetch v1
lytico Jan 4, 2021
a8a0c1f
libgit2sharp.yml: try fetch v2 fetch-depth: 0
lytico Jan 4, 2021
6695743
libgit2sharp.yml: split build and test
lytico Jan 4, 2021
287d6a8
libgit2sharp.yml: make release
lytico Jan 4, 2021
b100792
Update libgit2sharp.yml
lytico Jan 4, 2021
f935193
Update libgit2sharp.yml
lytico Jan 4, 2021
eeb8873
Update libgit2sharp.yml
lytico Jan 4, 2021
ef47336
Update libgit2sharp.yml
lytico Jan 4, 2021
78a9f28
Update libgit2sharp.yml
lytico Jan 4, 2021
11438da
Update libgit2sharp.yml
lytico Jan 4, 2021
eabe890
Update libgit2sharp.yml
lytico Jan 4, 2021
510292e
Update libgit2sharp.yml
lytico Jan 4, 2021
e9604a2
Update libgit2sharp.yml
lytico Jan 4, 2021
29cf3c0
Update libgit2sharp.yml
lytico Jan 4, 2021
ffafb21
Update libgit2sharp.yml
lytico Jan 4, 2021
8c85ba3
Update libgit2sharp.yml
lytico Jan 4, 2021
d9384f9
Update libgit2sharp.yml
lytico Jan 4, 2021
ef6eecd
Update libgit2sharp.yml
lytico Jan 4, 2021
5335a18
Update libgit2sharp.yml
lytico Jan 4, 2021
3c570be
Update libgit2sharp.yml
lytico Jan 11, 2021
3a544af
upgrade LibGit2Sharp.NativeBinaries to 2.0.312 & version.json
lytico Jan 26, 2021
d9f7324
Fix error in marshaling GitStatusOptions
Molytho Feb 16, 2021
8fb860e
Merge pull request #4 from Molytho/dd/issues/2
lytico Feb 16, 2021
b9e1238
Update libgit2sharp.yml
lytico Feb 16, 2021
3e88e58
try to build/test on debian buster
lytico Feb 16, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions .github/workflows/libgit2sharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,41 @@ name: .NET

on:
push:
branches: [ dotdevelop ]
branches: [ dd/issues/2 ]
pull_request:
branches: [ dotdevelop ]
branches: [ dd/issues/2 ]

jobs:
build:

runs-on: ubuntu-20.04

container:
image: "debian:buster"

steps:
- name: Dependencies
run: |
apt update
apt upgrade -y
apt install git apt-transport-https dirmngr gnupg ca-certificates wget autoconf intltool build-essential sed -y
wget https://packages.microsoft.com/config/debian/10/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
dpkg -i packages-microsoft-prod.deb
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
echo "deb https://download.mono-project.com/repo/debian stable-buster main" > /etc/apt/sources.list.d/mono-official-stable.list
apt update
apt install mono-devel fsharp gtk-sharp2 -y
- uses: actions/checkout@v2
with:
fetch-depth: 0
- name: Setup .NET
uses: actions/setup-dotnet@v1
with:
dotnet-version: 3.1.401
- name: Restore dependencies
run: dotnet restore LibGit2Sharp.sln
- name: Build
run: dotnet build --no-restore LibGit2Sharp.sln
run: dotnet build --no-restore LibGit2Sharp.sln
- name: Test
run: dotnet test --no-build --verbosity normal LibGit2Sharp.sln

8 changes: 3 additions & 5 deletions LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;net48;netcoreapp3.1</TargetFrameworks>
</PropertyGroup>
<TargetFrameworks>netcoreapp3.1</TargetFrameworks>
<RuntimeIdentifiers>linux-x64</RuntimeIdentifiers> </PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\LibGit2Sharp\LibGit2Sharp.csproj" />
<ProjectReference Include="..\NativeLibraryLoadTestApp\x86\NativeLibraryLoadTestApp.x86.csproj" Condition="'$(TargetFramework)' == 'net46'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
<ProjectReference Include="..\NativeLibraryLoadTestApp\x64\NativeLibraryLoadTestApp.x64.csproj" Condition="'$(TargetFramework)' == 'net46'" ReferenceOutputAssembly="false" OutputItemType="TestAppExe" />
</ItemGroup>
</ItemGroup>

<ItemGroup>
<PackageReference Include="coverlet.msbuild" Version="2.7.0" />
Expand Down
2 changes: 2 additions & 0 deletions LibGit2Sharp/Core/GitStatusOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ internal class GitStatusOptions : IDisposable

public GitStrArrayManaged PathSpec;

public unsafe void* Baseline = (void*)0;

public void Dispose()
{
PathSpec.Dispose();
Expand Down
6 changes: 3 additions & 3 deletions LibGit2Sharp/LibGit2Sharp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<Company>LibGit2Sharp contributors</Company>
<Copyright>Copyright © LibGit2Sharp contributors</Copyright>
<PackageTags>libgit2 git</PackageTags>
<PackageProjectUrl>https://github.com/libgit2/libgit2sharp/</PackageProjectUrl>
<PackageProjectUrl>https://github.com/dotdevelop/libgit2sharp/</PackageProjectUrl>
<Authors>LibGit2Sharp contributors</Authors>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
Expand All @@ -33,9 +33,9 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.305]" PrivateAssets="none" />
<PackageReference Include="LibGit2Sharp.NativeBinaries" Version="[2.0.312]" PrivateAssets="none" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.1.91" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.165-alpha" PrivateAssets="all" />
</ItemGroup>

<Import Project="..\Targets\CodeGenerator.targets" />
Expand Down
4 changes: 2 additions & 2 deletions version.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
"version": "0.27.0-preview.{height}",
"version": "0.27.0-preview",
"publicReleaseRefSpec": [
"^refs/heads/master$", // we release out of master
"^refs/heads/dotdevelop$", // we release out of dotdevelop
"^refs/heads/maint/v\\d+(?:\\.\\d+)?$" // and maint/vNN branches
],
"cloudBuild": {
Expand Down