Skip to content

Commit 9fa72fe

Browse files
authored
ci: use .NET 6.0 for release buildspecs (#602)
1 parent 65cc9a1 commit 9fa72fe

File tree

8 files changed

+22
-10
lines changed

8 files changed

+22
-10
lines changed

aws-encryption-sdk-net/codebuild/release/release-prod.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
phases:
1919
install:
2020
runtime-versions:
21-
dotnet: 5.0
21+
dotnet: 6.0
2222
python: 3.x
2323
commands:
2424
- cd ..
@@ -50,8 +50,8 @@ phases:
5050
# Now validate we can run examples
5151
- sed -i.backup '/Source\/AWSEncryptionSDK.csproj/d' Examples/AWSEncryptionSDKExamples.csproj
5252
- dotnet add Examples/AWSEncryptionSDKExamples.csproj package AWS.EncryptionSDK --version $VERSION
53-
# Target only netcoreapp3.1, because we only support net452 for windows.
53+
# Run examples for just one supported version.
5454
# Since all frameworks and OS's are tested on commit, we mainly want to
5555
# run this as a smoke test and the confirm we can find the dependency,
5656
# rather than a comprehensive test suite.
57-
- dotnet test Examples -f netcoreapp3.1
57+
- dotnet test Examples -f net6.0

aws-encryption-sdk-net/codebuild/release/release-staging.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ env:
1818
phases:
1919
install:
2020
runtime-versions:
21-
dotnet: 5.0
21+
dotnet: 6.0
2222
python: 3.x
2323
commands:
2424
- cd ..
@@ -59,11 +59,11 @@ phases:
5959
# Now validate we can run examples
6060
- sed -i.backup '/Source\/AWSEncryptionSDK.csproj/d' Examples/AWSEncryptionSDKExamples.csproj
6161
- dotnet add Examples/AWSEncryptionSDKExamples.csproj package AWS.EncryptionSDK --version $UNIQUE_VERSION
62-
# Target only netcoreapp3.1, because we only support net452 for windows.
62+
# Run examples for just one supported version.
6363
# Since all frameworks and OS's are tested on commit, we mainly want to
6464
# run this as a smoke test and the confirm we can find the dependency,
6565
# rather than a comprehensive test suite.
66-
- dotnet test Examples -f netcoreapp3.1
66+
- dotnet test Examples -f net6.0
6767
post_build:
6868
commands:
6969
- >-

aws-encryption-sdk-net/codebuild/release/release.yml

+11-2
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,28 @@ batch:
55
build-graph:
66
- identifier: sign
77
buildspec: aws-encryption-sdk-net/codebuild/release/sign.yml
8-
- identifier: verify
8+
env:
9+
type: LINUX_CONTAINER
10+
image: aws/codebuild/standard:6.0
11+
- identifier: verify
912
buildspec: aws-encryption-sdk-net/codebuild/release/verify.yml
1013
env:
1114
type: WINDOWS_SERVER_2019_CONTAINER
12-
image: aws/codebuild/windows-base:2019-1.0
15+
image: aws/codebuild/windows-base:2019-2.0
1316
depend-on:
1417
- sign
1518
- identifier: release_staging
1619
buildspec: aws-encryption-sdk-net/codebuild/release/release-staging.yml
20+
env:
21+
type: LINUX_CONTAINER
22+
image: aws/codebuild/standard:6.0
1723
depend-on:
1824
- sign
1925
- identifier: release_prod
2026
buildspec: aws-encryption-sdk-net/codebuild/release/release-prod.yml
27+
env:
28+
type: LINUX_CONTAINER
29+
image: aws/codebuild/standard:6.0
2130
depend-on:
2231
- verify
2332
- release_staging

aws-encryption-sdk-net/codebuild/release/sign.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 0.2
33
phases:
44
install:
55
runtime-versions:
6-
dotnet: 5.0
6+
dotnet: 6.0
77
python: 3.x
88
commands:
99
- cd ..

aws-encryption-sdk-net/codebuild/release/verify.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
phases:
99
install:
1010
runtime-versions:
11-
dotnet: 5.0
11+
dotnet: 6.0
1212
python: 3.x
1313
build:
1414
commands:

codebuild/dotnet/generate-test-vectors.yml

+1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ env:
77
phases:
88
install:
99
runtime-versions:
10+
# TODO update to .NET 6.0
1011
dotnet: 5.0
1112
nodejs: 14
1213
commands:

codebuild/dotnet/test-vectors.yml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ version: 0.2
33
phases:
44
install:
55
runtime-versions:
6+
# TODO update to .NET 6.0
67
dotnet: 5.0
78
commands:
89
- cd ..

codebuild/dotnet/tests.yml

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ version: 0.2
33
phases:
44
install:
55
runtime-versions:
6+
# TODO update to .NET 6.0
67
dotnet: 5.0
78
commands:
89
- cd ..

0 commit comments

Comments
 (0)