Merge pull request #27 from s2quake/ci/package-sha

Set actual sha to PackageProjectUrl property

.github/scripts/pack.ps1

@@ -5,7 +5,8 @@ param (
     [ValidateScript({ $_ -ge 0 })]
     [int]$PullRequestNumber = 0,
     [ValidateScript({ ($_ -eq "") -or (Test-Path $_) })]
-    [string]$KeyPath = ""
+    [string]$KeyPath = "",
+    [string]$CommitSHA = ""
 )
 
 $namespaces = @{
@@ -18,8 +19,16 @@ if ($null -eq $result) {
     Write-Host "File version not found"
     exit 1
 }
-
 $fileVersion = $result.Node.InnerText
+
+$packageProjectUrlPath = "/ns:Project/ns:PropertyGroup/ns:PackageProjectUrl"
+$result = Select-Xml -Path $propsPath -Namespace $namespaces -XPath $packageProjectUrlPath
+if ($null -eq $result) {
+    Write-Host "Package project URL not found"
+    exit 1
+}
+$packageProjectUrl = $result.Node.InnerText
+
 $KeyPath = $KeyPath ? $(Resolve-Path -Path $KeyPath) : ""
 $OutputPath = $OutputPath ? [System.IO.Path]::GetFullPath($OutputPath) : ""
 $keyPathExits = Test-Path -Path $KeyPath
@@ -30,6 +39,7 @@ $options = @(
     $PullRequestNumber ? "--version-suffix pr.$PullRequestNumber" : ""
     $keyPathExits ? "-p:TreatWarningsAsErrors=true" : ""
     $keyPathExits ? "-p:AssemblyOriginatorKeyFile='$KeyPath'" : ""
+    $CommitSHA ? "-p:PackageProjectUrl='$packageProjectUrl/tree/$CommitSHA'" : ""
 ) | Where-Object { $_ }
 
 Invoke-Expression -Command "dotnet pack $($options -join " ")"

.github/workflows/pack.yml

@@ -34,10 +34,12 @@ jobs:
 
           Remove-Item -Force -Recurse pack -ErrorAction SilentlyContinue  
 
+          $commitSHA = "$(git log -1 --pretty=%H)"
           .github/scripts/pack.ps1 `
             -OutputPath "pack" `
             -PullRequestNumber $matches[1] `
-            -KeyPath "$pwd/private.snk"
+            -KeyPath "$pwd/private.snk" `
+            -CommitSHA $commitSHA
 
           Get-ChildItem -Path pack -Filter "*.nupkg" | ForEach-Object {
             dotnet nuget push `

CHANGES.md

@@ -6,9 +6,11 @@ Communication changes
 
 To be released.
 
-* Improve CI to make sure minimal checks are done before merge [[#26]]
+* Improve CI to make sure minimal checks are done before merge  [[#26]]
+* Set actual sha to PackageProjectUrl property  [[#27]]
 
-[26]: https://github.com/s2quake/communication/pull/26
+[#26]: https://github.com/s2quake/communication/pull/26
+[#27]: https://github.com/s2quake/communication/pull/27
 
 
 2.0.2