Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,24 @@ 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
# This is the branch for S3EC .NET V2
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
# This is the branch for S3EC .NET V3
ref: s3ec-v3
path: test-server/net-v2-v3-server/s3ec-net-v3

- name: Set up Python
uses: actions/setup-python@v5
with:
Expand Down
8 changes: 8 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 7 additions & 2 deletions test-server/net-v2-v3-server/NetV2V3Server.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -19,11 +20,15 @@
</PropertyGroup>

<ItemGroup Condition="'$(S3EncryptionVersion)' == 'v2'">
<PackageReference Include="Amazon.Extensions.S3.Encryption" Version="2.2.1"/>
<ProjectReference Include="s3ec-net-v2/src/Amazon.Extensions.S3.Encryption.csproj"/>
</ItemGroup>

<ItemGroup Condition="'$(S3EncryptionVersion)' == 'v3'">
<PackageReference Include="Amazon.Extensions.S3.Encryption" Version="3.0.0"/>
<ProjectReference Include="s3ec-net-v3/src/Amazon.Extensions.S3.Encryption.csproj"/>
</ItemGroup>

<ItemGroup>
<Compile Include="**/*.cs" Exclude="s3ec-net-*/**/*.cs" />
</ItemGroup>

<ItemGroup>
Expand Down
1 change: 1 addition & 0 deletions test-server/net-v2-v3-server/s3ec-net-v2
Submodule s3ec-net-v2 added at ba85c0
1 change: 1 addition & 0 deletions test-server/net-v2-v3-server/s3ec-net-v3
Submodule s3ec-net-v3 added at cc942c
Loading