diff --git a/.github/workflows/manual_release_prep.yml b/.github/workflows/manual_release_prep.yml index a6402824c..993ffccc4 100644 --- a/.github/workflows/manual_release_prep.yml +++ b/.github/workflows/manual_release_prep.yml @@ -15,11 +15,11 @@ jobs: uses: actions/setup-dotnet@v5 with: dotnet-version: | - 5.x.x 6.x.x 7.x.x 8.x.x 9.x.x + 10.x.x - name: Setup Nuget uses: NuGet/setup-nuget@v2 @@ -63,10 +63,10 @@ jobs: - name: Build and Sign NuGet package run: | - call scripts\win\build_release_nuget.bat EasyPost EasyPostNETStrongNameSigning.snk "${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}" Release + call scripts\win\build_release_nuget.bat EasyPost EasyPostNETStrongNameSigning.snk "${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}" "${{ secrets.SM_CODE_SIGNING_CERT_SHA256_HASH }}" Release shell: cmd - name: Upload NuGet package to Action output uses: actions/upload-artifact@v4 with: - path: "*.nupkg" + path: '*.nupkg' diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 037880006..794b8eab7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,11 +16,11 @@ jobs: uses: actions/setup-dotnet@v5 with: dotnet-version: | - 5.x.x 6.x.x 7.x.x 8.x.x 9.x.x + 10.x.x - name: Setup Nuget uses: NuGet/setup-nuget@v2 @@ -64,7 +64,7 @@ jobs: - name: Build and Sign NuGet package run: | - call scripts\win\build_release_nuget.bat EasyPost EasyPostNETStrongNameSigning.snk "${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}" Release + call scripts\win\build_release_nuget.bat EasyPost EasyPostNETStrongNameSigning.snk "${{ secrets.SM_CODE_SIGNING_CERT_SHA1_HASH }}" "${{ secrets.SM_CODE_SIGNING_CERT_SHA256_HASH }}" Release shell: cmd - name: Publish to NuGet @@ -73,5 +73,5 @@ jobs: - name: Upload NuGet package to release uses: AButler/upload-release-assets@v3.0.1 with: - files: "*.nupkg" + files: '*.nupkg' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/scripts/win/build_release_nuget.bat b/scripts/win/build_release_nuget.bat index 8965c2a94..0fc8f9d26 100644 --- a/scripts/win/build_release_nuget.bat +++ b/scripts/win/build_release_nuget.bat @@ -11,8 +11,9 @@ :: Parse command line arguments SET projectName=%1 SET strongNameCertFile=%2 -SET authCertFingerprint=%3 -SET buildMode=%4 +SET authCertSha1Fingerprint=%3 +SET authCertSha256Fingerprint=%4 +SET buildMode=%5 :: Delete old files CALL "scripts\win\delete_old_assemblies.bat" @@ -24,13 +25,13 @@ CALL "scripts\win\build_project.bat" %buildMode% || GOTO :commandFailed CALL "scripts\win\strong_name_dlls.bat" %strongNameCertFile% || GOTO :commandFailed :: Sign the DLLs for authenticity -CALL "scripts\win\sign_dlls.bat" %authCertFingerprint% || GOTO :commandFailed +CALL "scripts\win\sign_dlls.bat" %authCertSha1Fingerprint% || GOTO :commandFailed :: Package the DLLs in a NuGet package (will fail if DLLs are missing) CALL "scripts\win\pack_nuget.bat" %projectName% || GOTO :commandFailed :: Sign the NuGet package for authenticity -CALL "scripts\win\sign_nuget.bat" %authCertFingerprint% || GOTO :commandFailed +CALL "scripts\win\sign_nuget.bat" %authCertSha256Fingerprint% || GOTO :commandFailed SET nugetFileName= FOR /R %%F IN (*.nupkg) DO ( SET nugetFileName="%%F"