diff --git a/.github/actions/polymorph_codegen/action.yml b/.github/actions/polymorph_codegen/action.yml index 4eed3a9c5..89f83d58f 100644 --- a/.github/actions/polymorph_codegen/action.yml +++ b/.github/actions/polymorph_codegen/action.yml @@ -116,11 +116,11 @@ runs: # run: | # make polymorph_rust ${{ steps.dependencies.outputs.PROJECT_DEPENDENCIES }} - - name: Regenerate Go code using smithy-dafny - working-directory: ./${{ inputs.library }} - shell: bash - run: | - make polymorph_go + # - name: Regenerate Go code using smithy-dafny + # working-directory: ./${{ inputs.library }} + # shell: bash + # run: | + # make polymorph_go - name: Check regenerated code against commited code # Composite action inputs seem to not actually support booleans properly for some reason diff --git a/.github/workflows/library_interop_test_vectors.yml b/.github/workflows/library_interop_test_vectors.yml index 338bce5dc..ad276aeb9 100644 --- a/.github/workflows/library_interop_test_vectors.yml +++ b/.github/workflows/library_interop_test_vectors.yml @@ -25,7 +25,7 @@ jobs: ubuntu-22.04, macos-13, ] - language: [java, net, rust, go] + language: [java, net] # https://taskei.amazon.dev/tasks/CrypTool-5284 dotnet-version: ["6.0.x"] runs-on: ${{ matrix.os }} @@ -195,8 +195,8 @@ jobs: ubuntu-22.04, macos-13, ] - encrypting_language: [java, net, rust, go] - decrypting_language: [java, net, rust, go] + encrypting_language: [java, net] + decrypting_language: [java, net] # https://taskei.amazon.dev/tasks/CrypTool-5284 dotnet-version: ["6.0.x"] runs-on: ${{ matrix.os }} diff --git a/.github/workflows/pull.yml b/.github/workflows/pull.yml index f6caa5860..4a4503829 100644 --- a/.github/workflows/pull.yml +++ b/.github/workflows/pull.yml @@ -36,16 +36,16 @@ jobs: uses: ./.github/workflows/library_net_tests.yml with: dafny: ${{needs.getVersion.outputs.version}} - pr-ci-rust: - needs: getVersion - uses: ./.github/workflows/library_rust_tests.yml - with: - dafny: ${{needs.getVersion.outputs.version}} - pr-ci-go: - needs: getVersion - uses: ./.github/workflows/library_go_tests.yml - with: - dafny: ${{needs.getVersion.outputs.version}} + # pr-ci-rust: + # needs: getVersion + # uses: ./.github/workflows/library_rust_tests.yml + # with: + # dafny: ${{needs.getVersion.outputs.version}} + # pr-ci-go: + # needs: getVersion + # uses: ./.github/workflows/library_go_tests.yml + # with: + # dafny: ${{needs.getVersion.outputs.version}} pr-test-vectors: needs: getVersion uses: ./.github/workflows/library_interop_tests.yml @@ -67,7 +67,7 @@ jobs: - pr-ci-codegen - pr-ci-verification - pr-ci-net - - pr-ci-rust + # - pr-ci-rust - pr-test-vectors - pr-dafny-test-vectors - pr-dafny-legacy-test-vectors diff --git a/AwsEncryptionSDK/dafny/AwsEncryptionSdk/test/Fixtures.dfy b/AwsEncryptionSDK/dafny/AwsEncryptionSdk/test/Fixtures.dfy index b0764eb7e..eaed7a76f 100644 --- a/AwsEncryptionSDK/dafny/AwsEncryptionSdk/test/Fixtures.dfy +++ b/AwsEncryptionSDK/dafny/AwsEncryptionSdk/test/Fixtures.dfy @@ -20,7 +20,7 @@ module Fixtures { const branchKeyStoreName := "KeyStoreDdbTable" const logicalKeyStoreName := branchKeyStoreName - const branchKeyId := "75789115-1deb-4fe3-a2ec-be9e885d1945" + const branchKeyId := "3f43a9af-08c5-4317-b694-3d3e883dcaef" // UTF-8 encoded "aws-crypto-" const RESERVED_ENCRYPTION_CONTEXT: UTF8.ValidUTF8Bytes := diff --git a/AwsEncryptionSDK/runtimes/net/CHANGELOG.md b/AwsEncryptionSDK/runtimes/net/CHANGELOG.md index 3a51ab1a7..f4751fab1 100644 --- a/AwsEncryptionSDK/runtimes/net/CHANGELOG.md +++ b/AwsEncryptionSDK/runtimes/net/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 4.1.1 + +### Notes + +Update .csproj files to prevent use of AWS-SDK-NET V4 + ## 4.1.0 ### Notes diff --git a/AwsEncryptionSDK/runtimes/net/ESDK.csproj b/AwsEncryptionSDK/runtimes/net/ESDK.csproj index 0429623a6..81cf2982e 100644 --- a/AwsEncryptionSDK/runtimes/net/ESDK.csproj +++ b/AwsEncryptionSDK/runtimes/net/ESDK.csproj @@ -8,7 +8,7 @@ false true - 4.1.0 + 4.1.1 AWS.Cryptography.EncryptionSDK AWS.Cryptography.EncryptionSDK @@ -30,10 +30,8 @@ - - - - + +