Skip to content

Commit dbc7a27

Browse files
eng, sync 7706 (#3147)
* chore(core): update to latest upstream main * sync tests * update Generate script * instruction to use absolute path * Update package dependencies - upgrade @azure-tools/typespec-client-generator-core to 0.57.2 and @azure-tools/azure-http-specs to 0.1.0-alpha.20
1 parent e7c259e commit dbc7a27

21 files changed

+140
-2956
lines changed

.github/copilot-instructions.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
# Update Package for Latest Dependencies
22

3+
Instructions:
4+
* Always use absolute path when change directory.
5+
36
Steps:
47

58
1. In "core" folder, run `git pull upstream main` to fetch latest commit from upstream or origin.
6-
2. Go back to project root (`cd ..`). Commit the change in "core" folder.
9+
2. Go back to project root. Commit the change in "core" folder.
710
3. Run `ncu -u -x @typescript-eslint/eslint-plugin` on "package.json" in both "package.json" from "typespec-extension" and "typespec-tests" folder.
811
4. Update package versions in `peerDependencies` (keep the semver range) in "package.json" from "typespec-extension" folder, according to the corresponding package versions in `devDependencies`.
912
5. Update package versions in `override` (keep the semver range) in "package.json" from "typespec-tests" folder, according to the corresponding package versions in "package.json" from "typespec-extension" folder.

core

Submodule core updated 133 files

typespec-extension/package-lock.json

Lines changed: 106 additions & 93 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

typespec-extension/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"@azure-tools/typespec-azure-core": ">=0.57.0 <1.0.0",
5151
"@azure-tools/typespec-azure-resource-manager": ">=0.57.0 <1.0.0",
5252
"@azure-tools/typespec-azure-rulesets": ">=0.57.0 <1.0.0",
53-
"@azure-tools/typespec-client-generator-core": ">=0.57.1 <1.0.0",
53+
"@azure-tools/typespec-client-generator-core": ">=0.57.2 <1.0.0",
5454
"@azure-tools/typespec-liftr-base": ">=0.8.0 <1.0.0",
5555
"@typespec/compiler": "^1.1.0",
5656
"@typespec/http": "^1.1.0",
@@ -69,13 +69,13 @@
6969
"@azure-tools/typespec-azure-core": "0.57.0",
7070
"@azure-tools/typespec-azure-resource-manager": "0.57.0",
7171
"@azure-tools/typespec-azure-rulesets": "0.57.0",
72-
"@azure-tools/typespec-client-generator-core": "0.57.1",
72+
"@azure-tools/typespec-client-generator-core": "0.57.2",
7373
"@azure-tools/typespec-liftr-base": "0.8.0",
7474
"@types/js-yaml": "~4.0.9",
7575
"@types/lodash": "~4.17.18",
76-
"@types/node": "~24.0.3",
76+
"@types/node": "~24.0.4",
7777
"@typescript-eslint/eslint-plugin": "~8.32.1",
78-
"@typescript-eslint/parser": "~8.34.1",
78+
"@typescript-eslint/parser": "~8.35.0",
7979
"@typespec/compiler": "1.1.0",
8080
"@typespec/http": "1.1.0",
8181
"@typespec/openapi": "1.1.0",
@@ -97,7 +97,7 @@
9797
"prettier": "~3.6.0",
9898
"rimraf": "~6.0.1",
9999
"typescript": "~5.8.3",
100-
"typescript-eslint": "^8.34.1",
100+
"typescript-eslint": "^8.35.0",
101101
"vitest": "^3.2.4"
102102
},
103103
"overrides": {

typespec-tests/Generate.ps1

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,15 @@ Write-Host "Parallelization: $Parallelization"
2020
$generateScript = {
2121
$tspFile = $_
2222

23+
if (($tspFile -match "payload[\\/]pageable[\\/]main\.tsp") -and (-not ($tspFile -match "azure[\\/]payload[\\/]pageable[\\/]main\.tsp"))) {
24+
Write-Host "
25+
SKIPPED
26+
$tspFile
27+
"
28+
# nested pageItems/nextLink/continuationToken is not supported
29+
return
30+
}
31+
2332
$tspClientFile = $tspFile -replace 'main.tsp', 'client.tsp'
2433
if (($tspClientFile -match 'client.tsp$') -and (Test-Path $tspClientFile)) {
2534
$tspFile = $tspClientFile
@@ -97,8 +106,8 @@ $generateScript = {
97106

98107
# Test customization using only JavaParser for one of the TypeSpec definitions - naming-javaparser.tsp
99108
if ($tspFile -match "tsp[\\/]naming-javaparser.tsp$") {
100-
# Add the customization-class option for Java emitter
101-
$tspOptions += " --option ""@typespec/typespec-java.customization-class=../../customization/src/main/java/JavaParserCustomizationTest.java"""
109+
# Add the customization-class option for Java emitter
110+
$tspOptions += " --option ""@typespec/typespec-java.customization-class=../../customization/src/main/java/JavaParserCustomizationTest.java"""
102111
}
103112

104113
$tspTrace = "--trace import-resolution --trace projection --trace typespec-java"

typespec-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"@typespec/sse": "0.71.0",
3232
"@typespec/streams": "0.71.0",
3333
"@azure-tools/typespec-azure-core": "0.57.0",
34-
"@azure-tools/typespec-client-generator-core": "0.57.1",
34+
"@azure-tools/typespec-client-generator-core": "0.57.2",
3535
"@azure-tools/typespec-azure-resource-manager": "0.57.0",
3636
"@azure-tools/typespec-autorest": "0.57.0"
3737
},

0 commit comments

Comments
 (0)