Skip to content

Commit ae335ed

Browse files
feat(dotnet): update TargetFramework to net6.0 (#3957)
BREAKING CHANGE: The runtime library for .NET & generated .NET bindings will no longer support netcoreapp3.1 after this release. Users are advised to upgrade their apps to use net6.0 or net7.0 instead. Related: aws/aws-cdk#23926 Related: aws/aws-cdk#23921 Co-authored-by: 🧑🏻‍💻 Romain Marcadier <rmuller@amazon.com>
1 parent 9346702 commit ae335ed

File tree

24 files changed

+230
-212
lines changed

24 files changed

+230
-212
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1523,6 +1523,15 @@
15231523
"bug"
15241524
]
15251525
},
1526+
{
1527+
"login": "berviantoleo",
1528+
"name": "Bervianto Leo Pratama",
1529+
"avatar_url": "https://avatars.githubusercontent.com/u/15927349?v=4",
1530+
"profile": "https://berviantoleo.my.id/",
1531+
"contributions": [
1532+
"maintenance"
1533+
]
1534+
},
15261535
{
15271536
"login": "dastbe",
15281537
"name": "David Bell",

.github/workflows/main.yml

Lines changed: 50 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -185,74 +185,100 @@ jobs:
185185
test:
186186
permissions:
187187
contents: none
188-
name: Test (${{ matrix.os }} / dotnet ${{ matrix.dotnet }} / go ${{ matrix.go }} / java ${{ matrix.java }} / node ${{ matrix.node }} / python ${{ matrix.python }})
188+
name: Test (${{ matrix.title }})
189189
needs: build
190190
strategy:
191191
fail-fast: false
192192
matrix:
193-
# All currently supported node versions (Maintenance LTS, Active LTS, Current)
194-
dotnet: ['3.1.x']
193+
title: ['baseline']
194+
dotnet: ['6.0.x']
195195
go: ['1.18']
196196
java: ['8']
197-
node:
198-
- '14' # EOL 2023-04-30
199-
- '16' # EOL 2023-09-11
200-
- '18' # EOL 2025-04-30
201-
- '19' # EOL 2023-06-01
197+
node: ['14'] # EOL 2023-04-30
202198
os: [ubuntu-latest]
203199
python: ['3.7']
204200
# Add specific combinations to be tested against "node 14" (to restrict cardinality)
205201
include:
206202
# Test using Windows
207-
- os: windows-latest
208-
dotnet: '3.1.x'
203+
- title: 'Windows'
204+
os: windows-latest
205+
dotnet: '6.0.x'
209206
go: '1.18'
210207
java: '8'
211208
node: '14'
212209
python: '3.7'
213210
# Test using macOS
214-
- os: macos-latest
215-
dotnet: '3.1.x'
211+
- title: 'macOS'
212+
os: macos-latest
213+
dotnet: '6.0.x'
216214
go: '1.18'
217215
java: '8'
218216
node: '14'
219217
python: '3.7'
220-
# Test alternate .NETs
221-
- java: '8'
218+
# Test alternate Nodes
219+
- title: 'Node 16'
220+
java: '8'
222221
dotnet: '6.0.x'
223222
go: '1.18'
223+
node: '16' # EOL 2023-09-11
224+
os: ubuntu-latest
225+
python: '3.7'
226+
- title: 'Node 18'
227+
java: '8'
228+
dotnet: '6.0.x'
229+
go: '1.18'
230+
node: '18' # EOL 2025-04-30
231+
os: ubuntu-latest
232+
python: '3.7'
233+
- title: 'Node 19'
234+
java: '8'
235+
dotnet: '6.0.x'
236+
go: '1.18'
237+
node: '19' # EOL 2023-06-01
238+
os: ubuntu-latest
239+
python: '3.7'
240+
# Test alternate .NETs
241+
- title: '.NET 7.0'
242+
java: '8'
243+
dotnet: '7.0.x'
244+
go: '1.18'
224245
node: '14'
225246
os: ubuntu-latest
226247
python: '3.7'
227248
# Test alternate Gos
228-
- java: '8'
229-
dotnet: '3.1.x'
249+
- title: 'Go 1.19'
250+
java: '8'
251+
dotnet: '6.0.x'
230252
go: '1.19'
231253
node: '14'
232254
os: ubuntu-latest
233255
python: '3.7'
234256
# Test alternate Javas
235-
- java: '11'
236-
dotnet: '3.1.x'
257+
- title: 'Java 11'
258+
java: '11'
259+
dotnet: '6.0.x'
237260
go: '1.18'
238261
node: '14'
239262
os: ubuntu-latest
240263
python: '3.7'
241264
# Test alternate Pythons
242-
- python: '3.8'
243-
dotnet: '3.1.x'
265+
- title: 'Python 3.8'
266+
python: '3.8'
267+
dotnet: '6.0.x'
244268
go: '1.18'
245269
java: '8'
246270
node: '14'
247271
os: ubuntu-latest
248-
- python: '3.9'
249-
dotnet: '3.1.x'
272+
- title: 'Python 3.9'
273+
python: '3.9'
274+
dotnet: '6.0.x'
250275
go: '1.18'
251276
java: '8'
252277
node: '14'
253278
os: ubuntu-latest
254-
- python: '3.10'
255-
dotnet: '3.1.x'
279+
- title: 'Python 3.10'
280+
python: '3.10'
281+
dotnet: '6.0.x'
256282
go: '1.18'
257283
java: '8'
258284
node: '14'

.mergify/config.yml

Lines changed: 72 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,25 @@ queue_rules:
33
- name: default
44
conditions:
55
- status-success~=^jsii/superchain
6+
# The baseline (Ubuntu + Min-supported SDKs and runtimes)
7+
- status-success=Test (baseline)
68
# One test for each OS
7-
- status-success~=^Test \(ubuntu-.*$
8-
- status-success~=^Test \(macos-.*$
9-
- status-success~=^Test \(windows-.*$
10-
# One test for each supported nodejs version
11-
- status-success~=^Test \(.* node 14 .*$
12-
- status-success~=^Test \(.* node 16 .*$
13-
- status-success~=^Test \(.* node 18 .*$
14-
- status-success~=^Test \(.* node 19 .*$
15-
# One test for each supported dotnet version
16-
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
17-
- status-success~=^Test \(.* dotnet 6\.0\.x .*$
18-
# One test for each supported go version
19-
- status-success~=^Test \(.* go 1.18 .*$
20-
- status-success~=^Test \(.* go 1.19 .*$
21-
# One test for Java 8 and 11
22-
- status-success~=^Test \(.* java 8 .*$
23-
- status-success~=^Test \(.* java 11 .*$
24-
# One test for Python 3.7 through 3.10
25-
- status-success~=^Test \(.* python 3\.7[ )].*$
26-
- status-success~=^Test \(.* python 3\.8[ )].*$
27-
- status-success~=^Test \(.* python 3\.9[ )].*$
28-
- status-success~=^Test \(.* python 3\.10[ )].*$
9+
- status-success=Test (macOS)
10+
- status-success=Test (Windows)
11+
# One test for each alternate nodejs version
12+
- status-success=Test (Node 16)
13+
- status-success=Test (Node 18)
14+
- status-success=Test (Node 19)
15+
# One test for each alternate .NET version
16+
- status-success=Test (.NET 7.0)
17+
# One test for each alternate go version
18+
- status-success=Test (Go 1.19)
19+
# One test for each alternate Java version
20+
- status-success=Test (Java 11)
21+
# One test for each alternate Python version
22+
- status-success=Test (Python 3.8)
23+
- status-success=Test (Python 3.9)
24+
- status-success=Test (Python 3.10)
2925

3026
pull_request_rules:
3127
- name: label core
@@ -56,29 +52,25 @@ pull_request_rules:
5652
- status-success=Validate PR Title
5753
# Docker image validation
5854
- status-success~=^jsii/superchain
55+
# The baseline (Ubuntu + Min-supported SDKs and runtimes)
56+
- status-success=Test (baseline)
5957
# One test for each OS
60-
- status-success~=^Test \(ubuntu-.*$
61-
- status-success~=^Test \(macos-.*$
62-
- status-success~=^Test \(windows-.*$
63-
# One test for each supported nodejs version
64-
- status-success~=^Test \(.* node 14 .*$
65-
- status-success~=^Test \(.* node 16 .*$
66-
- status-success~=^Test \(.* node 18 .*$
67-
- status-success~=^Test \(.* node 19 .*$
68-
# One test for each supported dotnet version
69-
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
70-
- status-success~=^Test \(.* dotnet 6\.0\.x .*$
71-
# One test for each supported go version
72-
- status-success~=^Test \(.* go 1.18 .*$
73-
- status-success~=^Test \(.* go 1.19 .*$
74-
# One test for Java 8 and 11
75-
- status-success~=^Test \(.* java 8 .*$
76-
- status-success~=^Test \(.* java 11 .*$
77-
# One test for Python 3.7 through 3.10
78-
- status-success~=^Test \(.* python 3\.7[ )].*$
79-
- status-success~=^Test \(.* python 3\.8[ )].*$
80-
- status-success~=^Test \(.* python 3\.9[ )].*$
81-
- status-success~=^Test \(.* python 3\.10[ )].*$
58+
- status-success=Test (macOS)
59+
- status-success=Test (Windows)
60+
# One test for each alternate nodejs version
61+
- status-success=Test (Node 16)
62+
- status-success=Test (Node 18)
63+
- status-success=Test (Node 19)
64+
# One test for each alternate .NET version
65+
- status-success=Test (.NET 7.0)
66+
# One test for each alternate go version
67+
- status-success=Test (Go 1.19)
68+
# One test for each alternate Java version
69+
- status-success=Test (Java 11)
70+
# One test for each alternate Python version
71+
- status-success=Test (Python 3.8)
72+
- status-success=Test (Python 3.9)
73+
- status-success=Test (Python 3.10)
8274

8375
- name: Synchronize that PR to upstream and merge it (squash)
8476
actions:
@@ -109,29 +101,25 @@ pull_request_rules:
109101
- status-success=Validate PR Title
110102
# Docker image validation
111103
- status-success~=^jsii/superchain
104+
# The baseline (Ubuntu + Min-supported SDKs and runtimes)
105+
- status-success=Test (baseline)
112106
# One test for each OS
113-
- status-success~=^Test \(ubuntu-.*$
114-
- status-success~=^Test \(macos-.*$
115-
- status-success~=^Test \(windows-.*$
116-
# One test for each supported nodejs version
117-
- status-success~=^Test \(.* node 14 .*$
118-
- status-success~=^Test \(.* node 16 .*$
119-
- status-success~=^Test \(.* node 18 .*$
120-
- status-success~=^Test \(.* node 19 .*$
121-
# One test for each supported dotnet version
122-
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
123-
- status-success~=^Test \(.* dotnet 6\.0\.x .*$
124-
# One test for each supported go version
125-
- status-success~=^Test \(.* go 1.18 .*$
126-
- status-success~=^Test \(.* go 1.19 .*$
127-
# One test for Java 8 and 11
128-
- status-success~=^Test \(.* java 8 .*$
129-
- status-success~=^Test \(.* java 11 .*$
130-
# One test for Python 3.7 through 3.10
131-
- status-success~=^Test \(.* python 3\.7[ )].*$
132-
- status-success~=^Test \(.* python 3\.8[ )].*$
133-
- status-success~=^Test \(.* python 3\.9[ )].*$
134-
- status-success~=^Test \(.* python 3\.10[ )].*$
107+
- status-success=Test (macOS)
108+
- status-success=Test (Windows)
109+
# One test for each alternate nodejs version
110+
- status-success=Test (Node 16)
111+
- status-success=Test (Node 18)
112+
- status-success=Test (Node 19)
113+
# One test for each alternate .NET version
114+
- status-success=Test (.NET 7.0)
115+
# One test for each alternate go version
116+
- status-success=Test (Go 1.19)
117+
# One test for each alternate Java version
118+
- status-success=Test (Java 11)
119+
# One test for each alternate Python version
120+
- status-success=Test (Python 3.8)
121+
- status-success=Test (Python 3.9)
122+
- status-success=Test (Python 3.10)
135123

136124
- name: Synchronize that PR to upstream and merge it (no-squash)
137125
actions:
@@ -162,29 +150,25 @@ pull_request_rules:
162150
- status-success=Validate PR Title
163151
# Docker image validation
164152
- status-success~=^jsii/superchain
153+
# The baseline (Ubuntu + Min-supported SDKs and runtimes)
154+
- status-success=Test (baseline)
165155
# One test for each OS
166-
- status-success~=^Test \(ubuntu-.*$
167-
- status-success~=^Test \(macos-.*$
168-
- status-success~=^Test \(windows-.*$
169-
# One test for each supported nodejs version
170-
- status-success~=^Test \(.* node 14 .*$
171-
- status-success~=^Test \(.* node 16 .*$
172-
- status-success~=^Test \(.* node 18 .*$
173-
- status-success~=^Test \(.* node 19 .*$
174-
# One test for each supported dotnet version
175-
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
176-
- status-success~=^Test \(.* dotnet 6\.0\.x .*$
177-
# One test for each supported go version
178-
- status-success~=^Test \(.* go 1.18 .*$
179-
- status-success~=^Test \(.* go 1.19 .*$
180-
# One test for Java 8 and 11
181-
- status-success~=^Test \(.* java 8 .*$
182-
- status-success~=^Test \(.* java 11 .*$
183-
# One test for Python 3.7 through 3.10
184-
- status-success~=^Test \(.* python 3\.7[ )].*$
185-
- status-success~=^Test \(.* python 3\.8[ )].*$
186-
- status-success~=^Test \(.* python 3\.9[ )].*$
187-
- status-success~=^Test \(.* python 3\.10[ )].*$
156+
- status-success=Test (macOS)
157+
- status-success=Test (Windows)
158+
# One test for each alternate nodejs version
159+
- status-success=Test (Node 16)
160+
- status-success=Test (Node 18)
161+
- status-success=Test (Node 19)
162+
# One test for each alternate .NET version
163+
- status-success=Test (.NET 7.0)
164+
# One test for each alternate go version
165+
- status-success=Test (Go 1.19)
166+
# One test for each alternate Java version
167+
- status-success=Test (Java 11)
168+
# One test for each alternate Python version
169+
- status-success=Test (Python 3.8)
170+
- status-success=Test (Python 3.9)
171+
- status-success=Test (Python 3.10)
188172

189173
- name: Clean branch up
190174
actions:

CONTRIBUTING.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ in your development environment.
4343
- [Yarn `1.19.1`] or later
4444
- An OpenJDK-8 distribution (e.g: [Oracle's OpenJDK8], [Amazon Corretto 8])
4545
+ [`maven >= 3.0.5`](https://maven.apache.org)
46-
- [.NET Core `3.1`] or later
47-
+ *Recommended:* [`mono >= 5`](https://www.mono-project.com)
46+
- [.NET `6.0`] or later
47+
+ *Recommended:* [`mono >= 6`](https://www.mono-project.com)
4848
- [Python `3.7.3`] or later
4949
+ [`pip`](https://pip.pypa.io/en/stable/installing/)
5050
+ [`setuptools >= 38.6.0`](https://pypi.org/project/setuptools/)
@@ -56,7 +56,7 @@ in your development environment.
5656
[Yarn `1.19.1`]: https://yarnpkg.com/en/docs/install
5757
[Oracle's OpenJDK8]: http://openjdk.java.net/install/
5858
[Amazon Corretto 8]: https://aws.amazon.com/corretto/
59-
[.NET Core `3.1`]: https://www.microsoft.com/net/download
59+
[.NET `6.0`]: https://www.microsoft.com/net/download
6060
[Python `3.7.3`]: https://www.python.org/downloads/release/python-373/
6161
[Go]: https://go.dev/dl/
6262

0 commit comments

Comments
 (0)