From 517d9c31b820c72e8d6e139681ee8d9cf9f27a07 Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Mon, 22 Sep 2025 11:47:59 -0700 Subject: [PATCH 1/6] auto commit --- .gitmodules | 3 +++ submodules/s3ec-dotnet | 1 + test-server/net-v2-v3-server/NetV2V3Server.csproj | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 160000 submodules/s3ec-dotnet diff --git a/.gitmodules b/.gitmodules index b2b112a0..eb3ea129 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "test-server/ruby-v3-server/local-ruby-sdk"] path = test-server/ruby-v3-server/local-ruby-sdk url = git@github.com:aws/aws-sdk-ruby-staging.git +[submodule "submodules/s3ec-dotnet"] + path = submodules/s3ec-dotnet + url = https://github.com/aws/private-amazon-s3-encryption-client-dotnet-staging.git diff --git a/submodules/s3ec-dotnet b/submodules/s3ec-dotnet new file mode 160000 index 00000000..4834f4d5 --- /dev/null +++ b/submodules/s3ec-dotnet @@ -0,0 +1 @@ +Subproject commit 4834f4d5f01b30494aae4ddc7938e8186342acf3 diff --git a/test-server/net-v2-v3-server/NetV2V3Server.csproj b/test-server/net-v2-v3-server/NetV2V3Server.csproj index a803a838..e4f177f1 100644 --- a/test-server/net-v2-v3-server/NetV2V3Server.csproj +++ b/test-server/net-v2-v3-server/NetV2V3Server.csproj @@ -23,7 +23,7 @@ - + From 7138ec83dcf54639e5efd03c730012b789f222bd Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Mon, 13 Oct 2025 20:12:22 -0700 Subject: [PATCH 2/6] auto commit --- .github/workflows/test.yml | 16 ++++++++++++++++ .gitmodules | 8 ++++++++ submodules/s3ec-dotnet | 1 - test-server/net-v2-v3-server/s3ec-net-v2 | 1 + test-server/net-v2-v3-server/s3ec-net-v3 | 1 + 5 files changed, 26 insertions(+), 1 deletion(-) delete mode 160000 submodules/s3ec-dotnet create mode 160000 test-server/net-v2-v3-server/s3ec-net-v2 create mode 160000 test-server/net-v2-v3-server/s3ec-net-v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bc8e2f45..9a55ff0c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -36,6 +36,22 @@ jobs: ref: fire-egg-dev path: test-server/cpp-v2-transition-server/aws-sdk-cpp/ + - name: Checkout .NET V2 code + uses: actions/checkout@v5 + with: + token: ${{ secrets.PAT_FOR_DOTNET }} + repository: aws/private-amazon-s3-encryption-client-dotnet-staging + ref: v3sdk-development + path: test-server/net-v2-v3-server/s3ec-net-v2/ + + - name: Checkout .NET V3 code + uses: actions/checkout@v5 + with: + token: ${{ secrets.PAT_FOR_DOTNET }} + repository: aws/private-amazon-s3-encryption-client-dotnet-staging + ref: s3ec-v3 + path: test-server/net-v2-v3-server/s3ec-net-v3 + - name: Set up Python uses: actions/setup-python@v5 with: diff --git a/.gitmodules b/.gitmodules index 659db28b..0bf186eb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,11 @@ path = test-server/php-v2-transition-server/local-php-sdk url = git@github.com:aws/private-aws-sdk-php-staging.git branch = s3ec/transitional +[submodule "test-server/net-v2-v3-server/s3ec-net-v2"] + path = test-server/net-v2-v3-server/s3ec-net-v2 + url = https://github.com/aws/private-amazon-s3-encryption-client-dotnet-staging.git + branch = v3sdk-development +[submodule "test-server/net-v2-v3-server/s3ec-net-v3"] + path = test-server/net-v2-v3-server/s3ec-net-v3 + url = https://github.com/aws/private-amazon-s3-encryption-client-dotnet-staging.git + branch = s3ec-v3 diff --git a/submodules/s3ec-dotnet b/submodules/s3ec-dotnet deleted file mode 160000 index 4834f4d5..00000000 --- a/submodules/s3ec-dotnet +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4834f4d5f01b30494aae4ddc7938e8186342acf3 diff --git a/test-server/net-v2-v3-server/s3ec-net-v2 b/test-server/net-v2-v3-server/s3ec-net-v2 new file mode 160000 index 00000000..ba85c07e --- /dev/null +++ b/test-server/net-v2-v3-server/s3ec-net-v2 @@ -0,0 +1 @@ +Subproject commit ba85c07e0706bae8df242fb7bbfa7e53a264bafa diff --git a/test-server/net-v2-v3-server/s3ec-net-v3 b/test-server/net-v2-v3-server/s3ec-net-v3 new file mode 160000 index 00000000..cc942cb5 --- /dev/null +++ b/test-server/net-v2-v3-server/s3ec-net-v3 @@ -0,0 +1 @@ +Subproject commit cc942cb541a733a4340f46bd3e4a1d29a9cbb9a3 From aee243c8fceb0915ee49cae1ed0816b4b501f330 Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Mon, 13 Oct 2025 20:29:05 -0700 Subject: [PATCH 3/6] auto commit --- test-server/net-v2-v3-server/NetV2V3Server.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-server/net-v2-v3-server/NetV2V3Server.csproj b/test-server/net-v2-v3-server/NetV2V3Server.csproj index e4f177f1..02eb6552 100644 --- a/test-server/net-v2-v3-server/NetV2V3Server.csproj +++ b/test-server/net-v2-v3-server/NetV2V3Server.csproj @@ -19,11 +19,11 @@ - + - + From d9069e0041e490493dc95af857455ec8adb2ef8d Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Mon, 13 Oct 2025 20:32:24 -0700 Subject: [PATCH 4/6] auto commit --- .github/workflows/test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9a55ff0c..e5fc970d 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,8 @@ jobs: with: token: ${{ secrets.PAT_FOR_DOTNET }} repository: aws/private-amazon-s3-encryption-client-dotnet-staging - ref: v3sdk-development + # This is the branch for S3EC V2 + ref: v3sdk-development path: test-server/net-v2-v3-server/s3ec-net-v2/ - name: Checkout .NET V3 code @@ -49,6 +50,7 @@ jobs: with: token: ${{ secrets.PAT_FOR_DOTNET }} repository: aws/private-amazon-s3-encryption-client-dotnet-staging + # This is the branch for S3EC V3 ref: s3ec-v3 path: test-server/net-v2-v3-server/s3ec-net-v3 From 9c1b8062a6450e6680c6c114decb00dbec76d4cf Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Mon, 13 Oct 2025 20:33:16 -0700 Subject: [PATCH 5/6] auto commit --- .github/workflows/test.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e5fc970d..263ced29 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -41,7 +41,7 @@ jobs: with: token: ${{ secrets.PAT_FOR_DOTNET }} repository: aws/private-amazon-s3-encryption-client-dotnet-staging - # This is the branch for S3EC V2 + # This is the branch for S3EC .NET V2 ref: v3sdk-development path: test-server/net-v2-v3-server/s3ec-net-v2/ @@ -50,7 +50,7 @@ jobs: with: token: ${{ secrets.PAT_FOR_DOTNET }} repository: aws/private-amazon-s3-encryption-client-dotnet-staging - # This is the branch for S3EC V3 + # This is the branch for S3EC .NET V3 ref: s3ec-v3 path: test-server/net-v2-v3-server/s3ec-net-v3 From 0d9da6c68b89ac8eaca1cbab90929af78195354b Mon Sep 17 00:00:00 2001 From: rishav-karanjit Date: Mon, 13 Oct 2025 21:11:12 -0700 Subject: [PATCH 6/6] auto commit --- test-server/net-v2-v3-server/NetV2V3Server.csproj | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/test-server/net-v2-v3-server/NetV2V3Server.csproj b/test-server/net-v2-v3-server/NetV2V3Server.csproj index 02eb6552..8d664eff 100644 --- a/test-server/net-v2-v3-server/NetV2V3Server.csproj +++ b/test-server/net-v2-v3-server/NetV2V3Server.csproj @@ -4,6 +4,7 @@ net8.0 enable enable + false @@ -26,6 +27,10 @@ + + + +