LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correct package prerelease and sign zip package content (#1900)

Browse Source
This commit is contained in:
James Newton-King
2018-10-28 16:33:40 +13:00
committed by GitHub
parent e3c4c6aa6b
commit fcd0f00007
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Build/Sign-Package.ps1
+5 -5
View File
@@ -13,14 +13,14 @@ dotnet tool install --tool-path . SignClient
$appSettings = "$currentDirectory\appsettings.json"
$nupkgs = gci $Env:ArtifactDirectory\*.nupkg -recurse | Select -ExpandProperty FullName
$files = gci $Env:ArtifactDirectory\*.nupkg,*.zip -recurse | Select -ExpandProperty FullName
foreach ($nupkg in $nupkgs){
Write-Host "Submitting $nupkg for signing"
foreach ($file in $files){
Write-Host "Submitting $file for signing"
.\SignClient 'sign' -c $appSettings -i $nupkg -r $Env:SignClientUser -s $Env:SignClientSecret -n 'Json.NET' -d 'Json.NET' -u 'https://www.newtonsoft.com/json'
.\SignClient 'sign' -c $appSettings -i $file -r $Env:SignClientUser -s $Env:SignClientSecret -n 'Json.NET' -d 'Json.NET' -u 'https://www.newtonsoft.com/json'
Write-Host "Finished signing $nupkg"
Write-Host "Finished signing $file"
}
Write-Host "Sign-package complete"
azure-pipelines.yml
+3 -3
View File
@@ -5,10 +5,10 @@ steps:
- powershell: |
$basePath = resolve-path .
$keyPath = "$basePath\key.snk"
$keyData = [System.Convert]::FromBase64String($Env:KEY_DATA)
$keyData = [System.Convert]::FromBase64String($Env:KeyData)
[System.IO.File]::WriteAllBytes($keyPath, $keyData)
env:
KEY_DATA: $(newtonsoft.keyData)
KeyData: $(newtonsoft.keyData)
displayName: 'Prepare signing key'
condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')))
@@ -20,7 +20,7 @@ steps:
$version = Get-Content .\Build\version.json | Out-String | ConvertFrom-Json
$buildNumber = [int]$Env:BuildId
write-host "Build number $buildNumber" -fore white
$nugetPrerelease = if ($Env:SourceBranch -eq "refs/heads/master") { $version.Prerelease } else { "build$($buildNumber.ToString("D6"))" }
$nugetPrerelease = if ($Env:SourceBranch.StartsWith("refs/heads/release/")) { $version.Prerelease } else { "build$($buildNumber.ToString("D6"))" }
write-host "Prerelease $nugetPrerelease" -fore white
.\Build\runbuild.ps1 -properties @{"majorVersion"="$($version.Major).0"; "majorWithReleaseVersion"="$($version.Major).0.$($version.Release)"; "nugetPrerelease"=$nugetPrerelease; "zipFileName"="Json$($version.Major)0r$($version.Release).zip"; "signAssemblies"=$sign; "signKeyPath"=$keyPath; "treatWarningsAsErrors"=$true; "buildNuGet"=$true}
env: