Fixes for LibGit2Sharp 0.25.0

Fix build bugs
Fix cross-platform native assembly loading
Fix changed properties (or at least, those caught by tests)

Author: Jaykul

Build.ps1

@@ -127,16 +127,15 @@ function clean {
         Remove-Item $ReleasePath -Force -Recurse
     }
 
-    if(Test-Path $Path\packages) {
+    if (Test-Path $Path\packages) {
         Trace-Message "DELETE $Path\packages"
         # force reinstall by cleaning the old ones
         Remove-Item $Path\packages\ -Recurse -Force -ErrorAction Continue
     }
-    if(Test-Path $Path\packages\build.log) {
+    if (Test-Path $OutputPath\packages\build.log) {
         Trace-Message "DELETE $OutputPath\build.log"
         Remove-Item $OutputPath\build.log -Recurse -Force -ErrorAction Continue
     }
-
 }
 
 function update {
@@ -243,10 +242,12 @@ function build {
         $ReleaseModule = Join-Path $ReleasePath ${RootModule}
         Trace-Message "       Setting content for $ReleaseModule"
 
-        $FunctionsToExport = Join-Path $SourcePath Public\*.ps1 -Resolve | % { [System.IO.Path]::GetFileNameWithoutExtension($_) }
+        $FunctionsToExport = Join-Path $SourcePath Public\*.ps1 -Resolve |
+            ForEach-Object { [System.IO.Path]::GetFileNameWithoutExtension($_) }
+
         Set-Content $ReleaseModule ((
-            (Get-Content (Join-Path $SourcePath Private\*.ps1) -Raw) +
-            (Get-Content (Join-Path $SourcePath Public\*.ps1) -Raw)) -join "`r`n`r`n`r`n") -Encoding UTF8
+            $(Get-Content -Raw $(Join-Path $SourcePath Private\*.ps1) -ErrorAction SilentlyContinue) +
+            $(Get-Content -Raw $(Join-Path $SourcePath Public\*.ps1))) -join "`r`n`r`n`r`n") -Encoding UTF8
 
         # If there are any folders that aren't Public, Private, Tests, or Specs ...
         $OtherFolders = Get-ChildItem $SourcePath -Directory -Exclude Public, Private, Tests, Specs

src/Public/Get-Log.ps1 Get-Log.ps1src/Public/Get-Log.ps1 renamed to Get-Log.ps1

@@ -69,7 +69,7 @@ function Get-Log {
                         $Parents = @($Parents)[0].Parents
                         $CommitsSinceVersionSource += 1
                         Write-Verbose "Check parent $(@($Parents)[0].Id) for tags"
-                    } while ($Parents.Tags.Name -notmatch $TagPattern)
+                    } while ($Parents -and ($Parents.Tags.Name -notmatch $TagPattern))
 
                     # We are always building the NEXT version
                     if (@($Parents)[0].Tags.Name -match $TagPattern) {

lib/Pester

@@ -0,0 +1 @@
+Subproject commit 1e7f118f920f8648ed0be8ed88a2184f6a0b3ccc

src/PSGit.formats.ps1xml

@@ -121,6 +121,6 @@
                 </TableRowEntry>
             </TableRowEntries>
         </TableControl>
-    </View>    
+    </View>
 </ViewDefinitions>
 </Configuration>

src/PSGit.psm1

@@ -5,28 +5,15 @@
 # } catch {}
 # $Arch = "-" + [Runtime.InteropServices.RuntimeInformation]::ProcessArchitecture
 
-Get-ChildItem -Directory -Path $PSScriptRoot\runtimes\ -Recurse -Filter 'native' |
-    ForEach-Object {
-    # For windows
-    $env:PATH = '{0}{1}{2}' -f @(
-        $_.FullName
-        [System.IO.Path]::PathSeparator
-        $env:PATH
-    )
-    # For Linux
-    $env:LD_LIBRARY_PATH = '{0}{1}{2}' -f @(
-        $_.FullName
-        [System.IO.Path]::PathSeparator
-        $env:LD_LIBRARY_PATH
-    )
-    # For macOS
-    $env:DYLD_LIBRARY_PATH = '{0}{1}{2}' -f @(
-        $_.FullName
-        [System.IO.Path]::PathSeparator
-        $env:DYLD_LIBRARY_PATH
-    )
+# Add-Type -Path (Join-Path (Join-Path $PSScriptRoot NativeBinaries\$runtime)
+${;} = [System.IO.Path]::PathSeparator
+switch -Wildcard (Get-ChildItem -Path "$PSScriptRoot\lib\NativeBinaries\*\native" -Recurse -Filter '*git2-6311e88.*') {
+    "*.so"   { $env:LD_LIBRARY_PATH = "" + $_.Directory + ${;} + $Env:LD_LIBRARY_PATH }
+    "*.dll"  { $env:PATH = "" + $_.Directory + ${;} + $Env:PATH }
+    "*.dyld" { $env:DYLD_LIBRARY_PATH = "" + $_.Directory + ${;} + $Env:DYLD_LIBRARY_PATH }
 }
 
+
 # Internal Functions
 #region Interal Functions
 function WriteMessage {
@@ -260,10 +247,12 @@ function Get-Change {
 }
 
 $BranchProperties =
-    @{ Name="Branch"; Expr={$_.Name}},
+    @{ Name="Branch"; Expr={$_.FriendlyName}}, # Changed in LibGit2Sharp 0.25
     @{ Name="IsHead"; Expr={ $_.IsCurrentRepositoryHead}}, "IsRemote", "IsTracking",
     @{ Name="Tip"; Expr={$_.Tip.Sha}},
-    @{ Name="Remote"; expr = { $_.Remote.Url } },
+    # This got more expensive in LibGit2Sharp 0.25
+    # Might be easier to use RemoteName, but to maintain compatibility:
+    @{ Name="Remote"; expr = { $_.Repository.Network.Remotes[$_.RemoteName].Url } },
     @{ Name="Ahead"; Expr= { $_.TrackingDetails.AheadBy }},
     @{ Name="Behind"; Expr = { $_.TrackingDetails.BehindBy }},
     @{ Name="CommonAncestor"; Expr={ $_.TrackingDetails.CommonAncestor.Sha }},

src/PSGit.types.ps1xml

@@ -5,7 +5,7 @@
         <Members>
             <AliasProperty>
                 <Name>Branch</Name>
-                <ReferencedMemberName>Name</ReferencedMemberName>
+                <ReferencedMemberName>FriendlyName</ReferencedMemberName>
             </AliasProperty>
             <ScriptProperty>
                 <Name>Ahead</Name>