Skip to content

Commit 580316b

Browse files
Merge branch 'eng_cfs' into eng_cfs+esrp
2 parents 70b32d5 + 7324fe2 commit 580316b

5 files changed

Lines changed: 2 additions & 9 deletions

File tree

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Steps:
3636

3737
1. In "core" folder, run `git pull upstream main` to fetch latest commit from upstream or origin.
3838
2. Go back to project root. Commit the change in "core" folder.
39-
3. Run `ncu -u -x prettier` on "package.json" in both "package.json" from "typespec-extension" and "typespec-tests" folder.
39+
3. Run `ncu -u` on "package.json" in both "package.json" from "typespec-extension" and "typespec-tests" folder.
4040
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`.
4141
5. Update version of "@azure-tools/openai-typespec" lib in "package.json" from "typespec-extension" folder, set it to the same semantic version used in https://raw.githubusercontent.com/Azure/azure-rest-api-specs/refs/heads/main/package.json
4242
6. 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.

Generate-TypeSpec.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ Push-Location ./typespec-tests
3535
try {
3636
Write-Host "Generating code ('Generate.ps1' in './typespec-tests')"
3737
& ./Generate.ps1 -Parallelization $Parallelization
38-
if ($LASTEXITCODE -ne 0) {
39-
exit $LASTEXITCODE
40-
}
4138

4239
# Write-Host "Checking format of generated code ('npm run check-format')"
4340
# invokeExpressionAndCaptureOutput("npm run check-format")

eng/pipelines/templates/stages/1es-redirect.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ extends:
2121
parameters:
2222
settings:
2323
skipBuildTagsForGitHubPullRequests: true
24-
networkIsolationPolicy: Permissive,CFSClean,CFSClean2
2524
sdl:
2625
sourceAnalysisPool:
2726
name: azsdk-pool

typespec-tests/Setup.ps1

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ Set-Location $PSScriptRoot
88
Push-Location ../
99
try {
1010
./Build-TypeSpec.ps1
11-
if ($LASTEXITCODE -ne 0) {
12-
exit $LASTEXITCODE
13-
}
1411
} finally {
1512
Pop-Location
1613
}

typespec-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
"devDependencies": {
1919
"@typespec/prettier-plugin-typespec": "^1.11.0",
2020
"prettier-plugin-organize-imports": "^4.3.0",
21-
"prettier": ">=2.0"
21+
"prettier": "^3.8.3"
2222
},
2323
"overrides": {
2424
"@typespec/compiler": "1.11.0",

0 commit comments

Comments
 (0)