Skip to content

Commit 6a4ddb5

Browse files
v-jiaodiv-jiaodi
authored
Merge branch 'main' into copilot/fix-emitter-output-references
2 parents d76ebc8 + 95a82c6 commit 6a4ddb5

34 files changed

Lines changed: 827 additions & 178 deletions

File tree

‎.scripts/build.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
steps:
22
- task: NodeTool@0
33
inputs:
4-
versionSpec: "20.x"
5-
displayName: "Use Node 20"
4+
versionSpec: "22.x"
5+
displayName: "Use Node 22"
66
- script: |
77
npm install -g pnpm
88
displayName: "Install Pnpm"

‎.scripts/ci.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ stages:
127127
- template: globals.yml
128128
strategy:
129129
matrix:
130-
Linux_Node20:
130+
Linux_Node22:
131131
Pool: ${{ parameters.LinuxPool }}
132132
OSVmImage: ${{ parameters.OSVmImage }}
133-
NodeTestVersion: "20.x"
133+
NodeTestVersion: "22.x"
134134
pool:
135135
name: $[coalesce(variables['Pool'], '')]
136136
demands: ImageOverride -equals $(OSVmImage)
@@ -149,10 +149,10 @@ stages:
149149
- template: globals.yml
150150
strategy:
151151
matrix:
152-
Linux_Node20:
152+
Linux_Node22:
153153
Pool: ${{ parameters.LinuxPool }}
154154
OSVmImage: ${{ parameters.OSVmImage }}
155-
NodeTestVersion: "20.x"
155+
NodeTestVersion: "22.x"
156156
pool:
157157
name: $[coalesce(variables['Pool'], '')]
158158
demands: ImageOverride -equals $(OSVmImage)
@@ -176,14 +176,14 @@ stages:
176176
- template: globals.yml
177177
strategy:
178178
matrix:
179-
macOS_Node20:
179+
macOS_Node22:
180180
Pool: ${{ parameters.MacPool }}
181181
OSVmImage: "macOS-latest"
182-
NodeTestVersion: "20.x"
183-
Linux_Node20:
182+
NodeTestVersion: "22.x"
183+
Linux_Node22:
184184
Pool: ${{ parameters.LinuxPool }}
185185
OSVmImage: ${{ parameters.OSVmImage }}
186-
NodeTestVersion: "20.x"
186+
NodeTestVersion: "22.x"
187187
pool:
188188
name: $[coalesce(variables['Pool'], '')]
189189
vmImage: $[coalesce(variables['OSVmImage'], '')]
@@ -235,10 +235,10 @@ stages:
235235
- template: globals.yml
236236
strategy:
237237
matrix:
238-
Linux_Node20:
238+
Linux_Node22:
239239
Pool: ${{ parameters.LinuxPool }}
240240
OSVmImage: ${{ parameters.OSVmImage }}
241-
NodeTestVersion: "20.x"
241+
NodeTestVersion: "22.x"
242242
pool:
243243
name: $[coalesce(variables['Pool'], '')]
244244
demands: ImageOverride -equals $(OSVmImage)
@@ -260,11 +260,11 @@ stages:
260260
Windows_Latest:
261261
Pool: ${{ parameters.WindowsPool }}
262262
OSVmImage: ${{ parameters.Windows_Latest }}
263-
NodeTestVersion: "20.x"
263+
NodeTestVersion: "22.x"
264264
macOS_Latest:
265265
Pool: ${{ parameters.MacPool }}
266266
OSVmImage: ${{ parameters.macOS_Latest }}
267-
NodeTestVersion: "20.x"
267+
NodeTestVersion: "22.x"
268268
pool:
269269
name: $[coalesce(variables['Pool'], '')]
270270
vmImage: $[coalesce(variables['OSVmImage'], '')]
@@ -280,10 +280,10 @@ stages:
280280
- template: globals.yml
281281
strategy:
282282
matrix:
283-
Linux_Node20:
283+
Linux_Node22:
284284
Pool: ${{ parameters.LinuxPool }}
285285
OSVmImage: ${{ parameters.OSVmImage }}
286-
NodeTestVersion: "20.x"
286+
NodeTestVersion: "22.x"
287287
pool:
288288
name: $[coalesce(variables['Pool'], '')]
289289
vmImage: $[coalesce(variables['OSVmImage'], '')]
@@ -348,10 +348,10 @@ stages:
348348
- template: globals.yml
349349
strategy:
350350
matrix:
351-
Linux_Node20:
351+
Linux_Node22:
352352
Pool: ${{ parameters.LinuxPool }}
353353
OSVmImage: ${{ parameters.OSVmImage }}
354-
NodeTestVersion: "20.x"
354+
NodeTestVersion: "22.x"
355355
pool:
356356
name: $[coalesce(variables['Pool'], '')]
357357
vmImage: $[coalesce(variables['OSVmImage'], '')]

‎.scripts/nightly-prepare.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
steps:
2+
- task: NodeTool@0
3+
inputs:
4+
versionSpec: "22.x"
5+
displayName: "Use Node 22"
26
- script: npm install -g @typespec/compiler@next
37
displayName: Install @typespec/compiler@next
48
- script: npm run update-typespec

‎.scripts/release.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ stages:
3636
steps:
3737
- task: NodeTool@0
3838
inputs:
39-
versionSpec: "20.x"
39+
versionSpec: "22.x"
4040
displayName: "Install Node.js"
4141
- script: |
4242
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
@@ -59,7 +59,7 @@ stages:
5959
steps:
6060
- task: NodeTool@0
6161
inputs:
62-
versionSpec: "20.x"
62+
versionSpec: "22.x"
6363
displayName: "Install Node.js"
6464
- script: |
6565
cd $(Pipeline.Workspace)/packages
@@ -90,7 +90,7 @@ stages:
9090
steps:
9191
- task: NodeTool@0
9292
inputs:
93-
versionSpec: "20.x"
93+
versionSpec: "22.x"
9494
displayName: "Install Node.js"
9595
- script: |
9696
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
@@ -113,7 +113,7 @@ stages:
113113
steps:
114114
- task: NodeTool@0
115115
inputs:
116-
versionSpec: "20.x"
116+
versionSpec: "22.x"
117117
displayName: "Install Node.js"
118118
- script: |
119119
cd $(Pipeline.Workspace)/packages
@@ -145,7 +145,7 @@ stages:
145145
steps:
146146
- task: NodeTool@0
147147
inputs:
148-
versionSpec: "20.x"
148+
versionSpec: "22.x"
149149
displayName: "Install Node.js"
150150
- script: |
151151
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
@@ -168,7 +168,7 @@ stages:
168168
steps:
169169
- task: NodeTool@0
170170
inputs:
171-
versionSpec: "20.x"
171+
versionSpec: "22.x"
172172
displayName: "Install Node.js"
173173
- script: |
174174
cd $(Pipeline.Workspace)/packages
@@ -196,7 +196,7 @@ stages:
196196
steps:
197197
- task: NodeTool@0
198198
inputs:
199-
versionSpec: "20.x"
199+
versionSpec: "22.x"
200200
displayName: "Install Node.js"
201201
- script: |
202202
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
@@ -224,7 +224,7 @@ stages:
224224
steps:
225225
- task: NodeTool@0
226226
inputs:
227-
versionSpec: "20.x"
227+
versionSpec: "22.x"
228228
displayName: "Install Node.js"
229229
- script: |
230230
tar zxvf $(Pipeline.Workspace)/packages/$(RLC_TAR_NAME)
@@ -250,7 +250,7 @@ stages:
250250
steps:
251251
- task: NodeTool@0
252252
inputs:
253-
versionSpec: "20.x"
253+
versionSpec: "22.x"
254254
displayName: "Install Node.js"
255255
- script: |
256256
cd $(Pipeline.Workspace)/packages
@@ -273,7 +273,7 @@ stages:
273273
steps:
274274
- task: NodeTool@0
275275
inputs:
276-
versionSpec: "20.x"
276+
versionSpec: "22.x"
277277
displayName: "Install Node.js"
278278
- script: |
279279
cd $(Pipeline.Workspace)/packages
@@ -296,7 +296,7 @@ stages:
296296
steps:
297297
- task: NodeTool@0
298298
inputs:
299-
versionSpec: "20.x"
299+
versionSpec: "22.x"
300300
displayName: "Install Node.js"
301301
- script: |
302302
cd $(Pipeline.Workspace)/packages

‎.scripts/smoke-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ jobs:
88
- template: globals.yml
99
strategy:
1010
matrix:
11-
Linux_Node20:
11+
Linux_Node22:
1212
Pool: azsdk-pool
1313
OSVmImage: "ubuntu-24.04"
14-
NodeTestVersion: "20.x"
14+
NodeTestVersion: "22.x"
1515
pool:
1616
name: $[coalesce(variables['Pool'], '')]
1717
demands: ImageOverride -equals $(OSVmImage)

‎packages/autorest.typescript/CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
## 6.0.68 (2026-04-16)
2+
3+
- [Feature] Add devcontainer config with GitHub Copilot extensions. Please refer to [#3815](https://github.com/Azure/autorest.typescript/pull/3815)
4+
- [Bugfix] Fix arm resource model property filtering for specific cases. Please refer to [#3911](https://github.com/Azure/autorest.typescript/pull/3911)
5+
- [Feature] Add spector integration tests for 16 not-yet-covered scenario groups. Please refer to [#3909](https://github.com/Azure/autorest.typescript/pull/3909)
6+
- [Feature] Bump TypeSpec dependencies to latest stable. Please refer to [#3914](https://github.com/Azure/autorest.typescript/pull/3914)
7+
18
## 6.0.67 (2026-04-09)
29

310
- [Bugfix] Fix normalize issue for optional operation parameter name. Please refer to [#3877](https://github.com/Azure/autorest.typescript/pull/3877)

‎packages/autorest.typescript/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@autorest/typescript",
3-
"version": "6.0.67",
3+
"version": "6.0.68",
44
"scripts": {
55
"build": "tsc -p . && npm run copyFiles",
66
"build:test:browser:rlc": "tsc -p tsconfig.browser-test.json && tsx test/commands/prepare-deps.ts --browser && webpack --config webpack.config.test.js --env mode=rlc",
@@ -77,7 +77,7 @@
7777
"source-map-support": "^0.5.16",
7878
"ts-morph": "^23.0.0",
7979
"@azure/core-auth": "^1.6.0",
80-
"@azure-tools/rlc-common": "workspace:^0.52.1"
80+
"@azure-tools/rlc-common": "workspace:^0.52.2"
8181
},
8282
"devDependencies": {
8383
"@azure-tools/test-recorder": "^3.0.0",

‎packages/autorest.typescript/test/integration/bodyComplex.spec.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,10 @@ const clientOptions = {
173173
assert.deepEqual(result.field, new Date("0001-01-01"));
174174
assert.deepEqual(result.leap, new Date("2016-02-29"));
175175

176-
const complexBody = <DateWrapper>{
176+
const complexBody = {
177177
field: new Date("0001-01-01"),
178178
leap: new Date("2016-02-29")
179-
};
179+
} as DateWrapper;
180180

181181
await testClient.primitive.putDate(
182182
complexBody,
@@ -660,57 +660,57 @@ const clientOptions = {
660660
species: "king",
661661
length: 1,
662662
siblings: [
663-
<Shark>{
663+
{
664664
fishtype: "shark",
665665
age: 6,
666666
birthday: new Date("2012-01-05T01:00:00Z"),
667667
species: "predator",
668668
length: 20,
669669
siblings: [
670-
<Salmon>{
670+
{
671671
fishtype: "salmon",
672672
location: "atlantic",
673673
iswild: true,
674674
species: "coho",
675675
length: 2,
676676
siblings: [
677-
<Shark>{
677+
{
678678
fishtype: "shark",
679679
age: 6,
680680
birthday: new Date("2012-01-05T01:00:00Z"),
681681
species: "predator",
682682
length: 20
683-
},
684-
<Sawshark>{
683+
} as Shark,
684+
{
685685
fishtype: "sawshark",
686686
age: 105,
687687
birthday: new Date("1900-01-05T01:00:00Z"),
688688
picture: new Uint8Array([255, 255, 255, 255, 254]),
689689
species: "dangerous",
690690
length: 10
691-
}
691+
} as Sawshark
692692
]
693-
},
694-
<Sawshark>{
693+
} as Salmon,
694+
{
695695
fishtype: "sawshark",
696696
age: 105,
697697
birthday: new Date("1900-01-05T01:00:00Z"),
698698
picture: new Uint8Array([255, 255, 255, 255, 254]),
699699
species: "dangerous",
700700
length: 10,
701701
siblings: []
702-
}
702+
} as Sawshark
703703
]
704-
},
705-
<Sawshark>{
704+
} as Shark,
705+
{
706706
fishtype: "sawshark",
707707
age: 105,
708708
birthday: new Date("1900-01-05T01:00:00Z"),
709709
picture: new Uint8Array([255, 255, 255, 255, 254]),
710710
species: "dangerous",
711711
length: 10,
712712
siblings: []
713-
}
713+
} as Sawshark
714714
]
715715
});
716716
let testClient: BodyComplexClient | BodyComplexWithTracing;

‎packages/autorest.typescript/test/integration/url.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ describe("Integration tests for Url", () => {
7575

7676
it("should work when path has enum", async function() {
7777
try {
78-
await client.paths.enumValid(<UriColor>"");
78+
await client.paths.enumValid("" as UriColor);
7979
assert.fail("Expected to throw");
8080
} catch (error) {
8181
assert.equal(
@@ -251,7 +251,7 @@ describe("Integration tests for Url", () => {
251251

252252
it("should work when query has enum values", async function() {
253253
await shouldThrow(() =>
254-
client.queries.enumValid({ enumQuery: <UriColor>"" })
254+
client.queries.enumValid({ enumQuery: "" as UriColor })
255255
);
256256
await client.queries.enumNull({ enumQuery: null as any });
257257
await client.queries.enumValid({ enumQuery: "green color" });

‎packages/autorest.typescript/test/rlcIntegration/urlRest.spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ describe("Integration tests for UrlRest", () => {
115115
it("should work when path has enum", async function() {
116116
try {
117117
await client
118-
.path("/paths/enum/green%20color/{enumPath}", <UriColor>"")
118+
.path("/paths/enum/green%20color/{enumPath}", "" as UriColor)
119119
.get();
120120
} catch (error) {
121121
assert.equal(
@@ -426,7 +426,7 @@ describe("Integration tests for UrlRest", () => {
426426
try {
427427
await client.path("/queries/enum/green%20color").get({
428428
queryParameters: {
429-
enumQuery: <UriColor>""
429+
enumQuery: "" as UriColor
430430
}
431431
});
432432
} catch (error) {

0 commit comments

Comments
 (0)