Skip to content

Commit b36b8de

Browse files
committed
Removed pfx password arguments from the scripts.
1 parent ae2a0b1 commit b36b8de

File tree

3 files changed

+7
-16
lines changed

3 files changed

+7
-16
lines changed

publish/publish.library.ps1

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
param (
55
[string]$library,
6-
[string]$pfxPassword = '',
76
[string]$version = $env:NuGetVersion,
87
[string]$commit = $env:GitCommitId,
98
[parameter(mandatory=$true)][string]$destination
@@ -12,7 +11,7 @@ param (
1211
. $PSScriptRoot\..\tools\windows\utils.ps1
1312
. $PSScriptRoot\publish.shared.ps1
1413

15-
function createMagickNetLibraryNuGetPackage($library, $version, $commit, $pfxPassword) {
14+
function createMagickNetLibraryNuGetPackage($library, $version, $commit) {
1615
$xml = loadAndInitNuSpec $library $version $commit
1716

1817
if ($library -eq "Magick.NET.SystemWindowsMedia") {
@@ -27,8 +26,8 @@ function createMagickNetLibraryNuGetPackage($library, $version, $commit, $pfxPas
2726
addLibrary $xml $library "" "AnyCPU" "net8.0"
2827
}
2928

30-
createAndSignNuGetPackage $xml $library $version $pfxPassword
29+
createNuGetPackage $xml $library $version
3130
}
3231

33-
createMagickNetLibraryNuGetPackage $library $version $commit $pfxPassword
32+
createMagickNetLibraryNuGetPackage $library $version $commit
3433
copyNuGetPackages $destination

publish/publish.ps1

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
param (
55
[string]$quantumName = $env:QuantumName,
66
[string]$platformName = $env:PlatformName,
7-
[string]$pfxPassword = '',
87
[string]$version = $env:NuGetVersion,
98
[string]$commit = $env:GitCommitId,
109
[parameter(mandatory=$true)][string]$destination
@@ -67,7 +66,7 @@ function addNativeLibraries($xml, $quantumName, $platform) {
6766
}
6867
}
6968

70-
function createMagickNetNuGetPackage($quantumName, $platform, $version, $commit, $pfxPassword) {
69+
function createMagickNetNuGetPackage($quantumName, $platform, $version, $commit) {
7170
$xml = loadAndInitNuSpec "Magick.NET" $version $commit
7271

7372
$name = "Magick.NET-$quantumName-$platform"
@@ -79,7 +78,7 @@ function createMagickNetNuGetPackage($quantumName, $platform, $version, $commit,
7978
addFile $xml "Magick.NET.targets" "build\netstandard20\$name.targets"
8079
addFile $xml "Magick.NET.targets" "buildTransitive\netstandard20\$name.targets"
8180

82-
createAndSignNuGetPackage $xml $name $version $pfxPassword
81+
createNuGetPackage $xml $name $version
8382
}
8483

8584
$platform = $platformName
@@ -88,5 +87,5 @@ if ($platform -eq "Any CPU") {
8887
$platform = "AnyCPU"
8988
}
9089

91-
createMagickNetNuGetPackage $quantumName $platform $version $commit $pfxPassword
90+
createMagickNetNuGetPackage $quantumName $platform $version $commit
9291
copyNuGetPackages $destination

publish/publish.shared.ps1

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,13 @@ function copyNuGetPackages($destination) {
4949
Copy-Item "*.nupkg" $destination
5050
}
5151

52-
function createAndSignNuGetPackage($xml, $library, $version, $pfxPassword) {
52+
function createNuGetPackage($xml, $library, $version) {
5353
$fileName = fullPath "publish\$library.nuspec"
5454
$xml.Save($fileName)
5555

5656
$nuget = fullPath "tools\windows\nuget.exe"
5757
& $nuget pack $fileName -NoPackageAnalysis
5858
checkExitCode "Failed to create NuGet package"
59-
60-
if ($pfxPassword.Length -gt 0) {
61-
$nupkgFile = fullPath "$library*.nupkg"
62-
$certificate = fullPath "build\windows\ImageMagick.pfx"
63-
& $nuget sign $nupkgFile -CertificatePath "$certificate" -CertificatePassword "$pfxPassword" -Timestamper http://sha256timestamp.ws.symantec.com/sha256/timestamp
64-
checkExitCode "Failed to sign NuGet package"
65-
}
6659
}
6760

6861
function loadAndInitNuSpec($library, $version, $commit) {

0 commit comments

Comments
 (0)