From 0d9b2fabb7b6fae8b3f50c26bf4d0deb9e17170a Mon Sep 17 00:00:00 2001
From: Andy Jewell <ajewell@amazon.com>
Date: Tue, 7 Oct 2025 11:05:44 -0400
Subject: [PATCH 1/7] chore(dotnet): prepare for 4.1.1 release

---
 AwsEncryptionSDK/runtimes/net/CHANGELOG.md | 6 ++++++
 AwsEncryptionSDK/runtimes/net/ESDK.csproj  | 8 +++-----
 mpl                                        | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

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 @@
       <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
       <IsPackable>true</IsPackable>
       
-      <Version>4.1.0</Version>
+      <Version>4.1.1</Version>
 
       <AssemblyName>AWS.Cryptography.EncryptionSDK</AssemblyName>
       <PackageId>AWS.Cryptography.EncryptionSDK</PackageId>
@@ -30,10 +30,8 @@
 
   <ItemGroup>
       <!-- TODO: manually upgraded to match the latest from MPL, is that reasonable? -->
-      <PackageReference Include="AWSSDK.Core" Version="3.7.*" />
-      <PackageReference Include="DafnyRuntime" Version="4.9.0" />
-      <PackageReference Include="BouncyCastle.Cryptography" Version="2.3.1" />
-      <ProjectReference Include="../../../mpl/AwsCryptographicMaterialProviders/runtimes/net/MPL.csproj" />
+      <PackageReference Include="DafnyRuntime" Version="[4.9.0]" />
+      <PackageReference Include="AWS.Cryptography.MaterialProviders" Version="[1.7.6]" />
       <!--
         System.Collections.Immutable can be removed once dafny.msbuild is updated with
         https://github.com/dafny-lang/dafny.msbuild/pull/10 and versioned
diff --git a/mpl b/mpl
index 70e580991..df37a708c 160000
--- a/mpl
+++ b/mpl
@@ -1 +1 @@
-Subproject commit 70e580991678387ce897a286c4f7f449aa616785
+Subproject commit df37a708cae023ae88a7d0dd0f3ecb59753be5f5

From 9eeaac821788e00f230895583a1989f8581d4c9e Mon Sep 17 00:00:00 2001
From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com>
Date: Fri, 10 Oct 2025 12:16:16 -0700
Subject: [PATCH 2/7] chore(dafny): update branch key id for test

---
 AwsEncryptionSDK/dafny/AwsEncryptionSdk/test/Fixtures.dfy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 :=

From 377308e93ce289a262b5b3ffcd4199623d13bb2a Mon Sep 17 00:00:00 2001
From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com>
Date: Sun, 12 Oct 2025 22:40:37 -0700
Subject: [PATCH 3/7] remove rust and go

---
 .../library_interop_test_vectors.yml          |  6 ++---
 .github/workflows/pull.yml                    | 22 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

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

From cacf02f577c121872e1c1b76f206680cffbc8422 Mon Sep 17 00:00:00 2001
From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com>
Date: Sun, 12 Oct 2025 22:45:57 -0700
Subject: [PATCH 4/7] polymorph

---
 .github/actions/polymorph_codegen/action.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

From be95e1c8c4f2237da358f16bd1544ed7bc952ae7 Mon Sep 17 00:00:00 2001
From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com>
Date: Mon, 13 Oct 2025 10:17:50 -0700
Subject: [PATCH 5/7] restore mpl

---
 mpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mpl b/mpl
index df37a708c..70e580991 160000
--- a/mpl
+++ b/mpl
@@ -1 +1 @@
-Subproject commit df37a708cae023ae88a7d0dd0f3ecb59753be5f5
+Subproject commit 70e580991678387ce897a286c4f7f449aa616785

From 03e40c2b91974b32a434ec56aa06fdf3d5710d8b Mon Sep 17 00:00:00 2001
From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com>
Date: Mon, 13 Oct 2025 12:18:38 -0700
Subject: [PATCH 6/7] fix ci

---
 TestVectors/runtimes/java/settings.gradle.kts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/TestVectors/runtimes/java/settings.gradle.kts b/TestVectors/runtimes/java/settings.gradle.kts
index 55f998b34..46a30d372 100644
--- a/TestVectors/runtimes/java/settings.gradle.kts
+++ b/TestVectors/runtimes/java/settings.gradle.kts
@@ -8,4 +8,3 @@
  */
 
 rootProject.name = "TestVectors"
-include("lib")

From 07369344b96c39ff67b853ef315c04c38030ef49 Mon Sep 17 00:00:00 2001
From: Darwin Chowdary <39110935+imabhichow@users.noreply.github.com>
Date: Tue, 14 Oct 2025 12:48:18 -0700
Subject: [PATCH 7/7] fix dotnet release script

---
 AwsEncryptionSDK/codebuild/release/release-staging.yml | 3 +++
 AwsEncryptionSDK/codebuild/release/test-prod.yml       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/AwsEncryptionSDK/codebuild/release/release-staging.yml b/AwsEncryptionSDK/codebuild/release/release-staging.yml
index 882c68bcf..31eb6da9b 100644
--- a/AwsEncryptionSDK/codebuild/release/release-staging.yml
+++ b/AwsEncryptionSDK/codebuild/release/release-staging.yml
@@ -82,6 +82,9 @@ phases:
       - aws sts get-caller-identity
       - make test_net
 
+      # Also transpile MPL test vectors which are needed for ESDK tests
+      - cd ../mpl/TestVectorsAwsCryptographicMaterialProviders && make transpile_implementation_net && cd ../../AwsEncryptionSDK
+
       # add staged artifact to testvectors
       - sed -i.backup  "/\<ProjectReference Include=\"..\/..\/ESDK.csproj\" \/>/d" runtimes/net/TestVectorsNative/TestVectorLib/AWSEncryptionSDKTestVectorLib.csproj
       - dotnet add runtimes/net/TestVectorsNative/TestVectorLib/AWSEncryptionSDKTestVectorLib.csproj package AWS.Cryptography.EncryptionSDK --version $VERSION
diff --git a/AwsEncryptionSDK/codebuild/release/test-prod.yml b/AwsEncryptionSDK/codebuild/release/test-prod.yml
index 901cba5a6..d50d63f48 100644
--- a/AwsEncryptionSDK/codebuild/release/test-prod.yml
+++ b/AwsEncryptionSDK/codebuild/release/test-prod.yml
@@ -43,6 +43,9 @@ phases:
       - aws sts get-caller-identity
       - make test_net
 
+      # Also transpile MPL test vectors which are needed for ESDK tests
+      - cd ../mpl/TestVectorsAwsCryptographicMaterialProviders && make transpile_implementation_net && cd ../../AwsEncryptionSDK
+
       # add released artifact to testvectors
       - sed -i.backup  "/\<ProjectReference Include=\"..\/..\/ESDK.csproj\" \/>/d" runtimes/net/TestVectorsNative/TestVectorLib/AWSEncryptionSDKTestVectorLib.csproj
       - dotnet add runtimes/net/TestVectorsNative/TestVectorLib/AWSEncryptionSDKTestVectorLib.csproj package AWS.Cryptography.EncryptionSDK --version $VERSION