From b6ad296f7bdf536eacc14792e24c54215ab30643 Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 24 Mar 2026 12:57:45 -0700 Subject: [PATCH 1/2] chore: fix version leakage in esdk release --- AwsEncryptionSDK/codebuild/release/release-prod.yml | 2 +- AwsEncryptionSDK/codebuild/release/release-staging.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/AwsEncryptionSDK/codebuild/release/release-prod.yml b/AwsEncryptionSDK/codebuild/release/release-prod.yml index 99daa104e..394b3b074 100644 --- a/AwsEncryptionSDK/codebuild/release/release-prod.yml +++ b/AwsEncryptionSDK/codebuild/release/release-prod.yml @@ -45,6 +45,6 @@ phases: commands: - mkdir build - export VERSION=`grep '' runtimes/net/ESDK.csproj | sed 's/.*\(.*\)<\/Version>/\1/'` - - dotnet pack runtimes/net/ESDK.csproj --no-build /p:Configuration=Release,Version=$VERSION --output build + - dotnet pack runtimes/net/ESDK.csproj --no-build /p:Configuration=Release --output build - export API_ACCESS_KEY=$(python $BASE/retrieve_api_access_key.py) - dotnet nuget push build/AWS.Cryptography.EncryptionSDK.$VERSION.nupkg --api-key "$API_ACCESS_KEY" --source https://api.nuget.org/v3/index.json diff --git a/AwsEncryptionSDK/codebuild/release/release-staging.yml b/AwsEncryptionSDK/codebuild/release/release-staging.yml index 69b2a9e5f..93c424570 100644 --- a/AwsEncryptionSDK/codebuild/release/release-staging.yml +++ b/AwsEncryptionSDK/codebuild/release/release-staging.yml @@ -68,7 +68,7 @@ phases: # Set a unique version for releasing to staging, because this may fail and we don't # want to collide with previous runs - export VERSION=`grep '' runtimes/net/ESDK.csproj | sed 's/.*\(.*\)<\/Version>/\1/'` - - dotnet pack runtimes/net/ESDK.csproj --no-build /p:Configuration=Release,Version=$VERSION --output build + - dotnet pack runtimes/net/ESDK.csproj --no-build /p:Configuration=Release --output build - dotnet nuget push build/AWS.Cryptography.EncryptionSDK.$VERSION.nupkg --source crypto-tools-internal/esdk-net-staging # Now validate we can run examples - sed -i.backup "/\/d" runtimes/net/tests/Test-ESDK.csproj From afa939b162bde098b104720526e62ddbccb2bf5a Mon Sep 17 00:00:00 2001 From: Jose Corella Date: Tue, 24 Mar 2026 13:06:29 -0700 Subject: [PATCH 2/2] m --- .../codebuild/release/release.yml | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/AwsEncryptionSDK/codebuild/release/release.yml b/AwsEncryptionSDK/codebuild/release/release.yml index 84d55ed1f..4f894d261 100644 --- a/AwsEncryptionSDK/codebuild/release/release.yml +++ b/AwsEncryptionSDK/codebuild/release/release.yml @@ -22,18 +22,18 @@ batch: image: aws/codebuild/standard:6.0 depend-on: - sign - - identifier: release_prod - buildspec: AwsEncryptionSDK/codebuild/release/release-prod.yml - env: - type: LINUX_CONTAINER - image: aws/codebuild/standard:6.0 - depend-on: - - verify - - release_staging - - identifier: test_prod - buildspec: AwsEncryptionSDK/codebuild/release/test-prod.yml - env: - type: LINUX_CONTAINER - image: aws/codebuild/standard:6.0 - depend-on: - - release_prod + #- identifier: release_prod + # buildspec: AwsEncryptionSDK/codebuild/release/release-prod.yml + # env: + # type: LINUX_CONTAINER + # image: aws/codebuild/standard:6.0 + # depend-on: + # - verify + # - release_staging + #- identifier: test_prod + # buildspec: AwsEncryptionSDK/codebuild/release/test-prod.yml + # env: + # type: LINUX_CONTAINER + # image: aws/codebuild/standard:6.0 + # depend-on: + # - release_prod