Merge pull request dotdevelop#5 from dotdevelop/dd/issues/2

lytico · web-flow · commit 1a7deaff4b57 · 2021-03-09T16:48:34.000+01:00
merge dd/issues/2
diff --git a/.github/workflows/libgit2sharp.yml b/.github/workflows/libgit2sharp.yml
@@ -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
+   
diff --git a/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj b/LibGit2Sharp.Tests/LibGit2Sharp.Tests.csproj
@@ -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" />
diff --git a/LibGit2Sharp/Core/GitStatusOptions.cs b/LibGit2Sharp/Core/GitStatusOptions.cs
@@ -13,6 +13,8 @@ internal class GitStatusOptions : IDisposable
 
         public GitStrArrayManaged PathSpec;
 
+        public unsafe void* Baseline = (void*)0;
+
         public void Dispose()
         {
             PathSpec.Dispose();
diff --git a/LibGit2Sharp/LibGit2Sharp.csproj b/LibGit2Sharp/LibGit2Sharp.csproj
@@ -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>
@@ -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" />
diff --git a/version.json b/version.json
@@ -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": {

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ internal class GitStatusOptions : IDisposable`
`13`	`13`
`14`	`14`	`public GitStrArrayManaged PathSpec;`
`15`	`15`
	`16`	`+ public unsafe void* Baseline = (void*)0;`
	`17`	`+`
`16`	`18`	`public void Dispose()`
`17`	`19`	`{`
`18`	`20`	`PathSpec.Dispose();`