Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into c8-9.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
jeremymeng committed Apr 18, 2024
2 parents ee3e919 + 623d7bd commit 8c7b7af
Show file tree
Hide file tree
Showing 12 changed files with 74 additions and 35 deletions.
2 changes: 1 addition & 1 deletion .scripts/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Use Node 18"
- script: |
npm install -g @microsoft/rush
Expand Down
20 changes: 10 additions & 10 deletions .scripts/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,11 @@ stages:
macOS_Node18:
Pool:
OSVmImage: "macOS-latest"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Linux_Node18:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Windows_Latest:
Pool:
OSVmImage: "Windows-latest"
Expand All @@ -134,11 +134,11 @@ stages:
macOS_Node18:
Pool:
OSVmImage: "macOS-latest"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Linux_Node18:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Windows_Latest:
Pool:
OSVmImage: "Windows-latest"
Expand Down Expand Up @@ -169,11 +169,11 @@ stages:
macOS_Node18:
Pool:
OSVmImage: "macOS-latest"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Linux_Node18:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
pool:
name: $[coalesce(variables['Pool'], '')]
vmImage: $[coalesce(variables['OSVmImage'], '')]
Expand Down Expand Up @@ -231,11 +231,11 @@ stages:
macOS_Node18:
Pool:
OSVmImage: "macOS-latest"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Linux_Node18:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Windows_Latest:
Pool:
OSVmImage: "Windows-latest"
Expand All @@ -261,11 +261,11 @@ stages:
macOS_Node18:
Pool:
OSVmImage: "macOS-latest"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Linux_Node18:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
# Windows_Latest:
# Pool:
# OSVmImage: "Windows-latest"
Expand Down
24 changes: 12 additions & 12 deletions .scripts/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
Expand All @@ -59,7 +59,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
cd $(Pipeline.Workspace)/packages
Expand Down Expand Up @@ -90,7 +90,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
Expand All @@ -113,7 +113,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
cd $(Pipeline.Workspace)/packages
Expand Down Expand Up @@ -145,7 +145,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
Expand All @@ -168,7 +168,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
cd $(Pipeline.Workspace)/packages
Expand Down Expand Up @@ -196,7 +196,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
Expand All @@ -221,7 +221,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
Expand All @@ -246,7 +246,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
tar zxvf $(Pipeline.Workspace)/packages/$(TAR_NAME)
Expand All @@ -270,7 +270,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
cd $(Pipeline.Workspace)/packages
Expand All @@ -293,7 +293,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
cd $(Pipeline.Workspace)/packages
Expand All @@ -316,7 +316,7 @@ stages:
steps:
- task: NodeTool@0
inputs:
versionSpec: "18.x"
versionSpec: "18.19.x"
displayName: "Install Node.js"
- script: |
cd $(Pipeline.Workspace)/packages
Expand Down
4 changes: 2 additions & 2 deletions .scripts/smoke-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ jobs:
macOS_Node18:
Pool:
OSVmImage: "macOS-latest"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Linux_Node18:
Pool: ${{ parameters.LinuxPool }}
OSVmImage: "ubuntu-20.04"
NodeTestVersion: "18.x"
NodeTestVersion: "18.19.x"
Windows_Latest:
Pool:
OSVmImage: "Windows-latest"
Expand Down
11 changes: 7 additions & 4 deletions common/config/rush/pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions packages/autorest.typescript/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## 6.0.21 (2024-04-18)

- [Feature] Support server parameter in modular. Please refer to [#2424](https://github.com/Azure/autorest.typescript/pull/2424).
- [Feature] Support special words. Please refer to [#2387](https://github.com/Azure/autorest.typescript/pull/2387).
- [Feature] Support additional properties full cases in RLC. Please refer to [#2445](https://github.com/Azure/autorest.typescript/pull/2445).
- [Feature] Support the change for union and enums in modular and RLC. Please refer to [#2380](https://github.com/Azure/autorest.typescript/pull/2380).
- [Feature] Upgrade typespec compiler to 0.55.0. Please refer to [#2380](https://github.com/Azure/autorest.typescript/pull/2380).
- [Feature] Bump typescript version to typescript@~5.4.5. Please refer to [#2442](https://github.com/Azure/autorest.typescript/pull/2442).
- [Feature] Update @azure-rest/core-client to 1.4.0.. Please refer to [#2441](https://github.com/Azure/autorest.typescript/pull/2441).
- [Feature] Upgrade mkdirp to ^3.0.1. Please refer to [#2436](https://github.com/Azure/autorest.typescript/pull/2436).
- [Bugfix] Fix missing `pack` scripts in package.json. Please refer to [#2426](https://github.com/Azure/autorest.typescript/pull/2426).

## 6.0.20 (2024-04-04)

- [Bugfix] Fix missing scripts in package.json file. Please refer to [#2402](https://github.com/Azure/autorest.typescript/pull/2402).
Expand Down
4 changes: 2 additions & 2 deletions packages/autorest.typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@autorest/typescript",
"version": "6.0.20",
"version": "6.0.21",
"scripts": {
"build": "tsc -p . && npm run copyFiles",
"build:test:browser": "tsc -p tsconfig.browser-test.json && webpack --config webpack.config.test.js",
Expand Down Expand Up @@ -75,7 +75,7 @@
"source-map-support": "^0.5.16",
"ts-morph": "^15.1.0",
"@azure/core-auth": "^1.6.0",
"@azure-tools/rlc-common": "workspace:^0.26.1"
"@azure-tools/rlc-common": "workspace:^0.27.0"
},
"devDependencies": {
"@azure-tools/test-recorder": "^3.0.0",
Expand Down
12 changes: 12 additions & 0 deletions packages/rlc-common/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## 0.27.0 (2024-04-18)

- [Feature] Support server parameter in modular. Please refer to [#2424](https://github.com/Azure/autorest.typescript/pull/2424).
- [Feature] Support special words. Please refer to [#2387](https://github.com/Azure/autorest.typescript/pull/2387).
- [Feature] Support additional properties full cases in RLC. Please refer to [#2445](https://github.com/Azure/autorest.typescript/pull/2445).
- [Feature] Support the change for union and enums in modular and RLC. Please refer to [#2380](https://github.com/Azure/autorest.typescript/pull/2380).
- [Feature] Upgrade typespec compiler to 0.55.0. Please refer to [#2380](https://github.com/Azure/autorest.typescript/pull/2380).
- [Feature] Bump typescript version to typescript@~5.4.5. Please refer to [#2442](https://github.com/Azure/autorest.typescript/pull/2442).
- [Feature] Update @azure-rest/core-client to 1.4.0.. Please refer to [#2441](https://github.com/Azure/autorest.typescript/pull/2441).
- [Feature] Upgrade mkdirp to ^3.0.1. Please refer to [#2436](https://github.com/Azure/autorest.typescript/pull/2436).
- [Bugfix] Fix missing `pack` scripts in package.json. Please refer to [#2426](https://github.com/Azure/autorest.typescript/pull/2426).

## 0.26.1 (2024-04-04)

- [Bugfix] Fix missing scripts in package.json file. Please refer to [#2402](https://github.com/Azure/autorest.typescript/pull/2402).
Expand Down
2 changes: 1 addition & 1 deletion packages/rlc-common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@azure-tools/rlc-common",
"version": "0.26.1",
"version": "0.27.0",
"description": "",
"type": "module",
"main": "dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/typespec-test/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "1.0.0",
"type": "module",
"dependencies": {
"@azure-tools/typespec-ts": "workspace:^0.26.1",
"@azure-tools/typespec-ts": "workspace:^0.27.0",
"@typespec/openapi": ">=0.55.0 <1.0.0",
"@azure-tools/typespec-autorest": ">=0.41.0 <1.0.0",
"@typespec/openapi3": ">=0.55.0 <1.0.0",
Expand Down
12 changes: 12 additions & 0 deletions packages/typespec-ts/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
## 0.27.0 (2024-04-18)

- [Feature] Support server parameter in modular. Please refer to [#2424](https://github.com/Azure/autorest.typescript/pull/2424).
- [Feature] Support special words. Please refer to [#2387](https://github.com/Azure/autorest.typescript/pull/2387).
- [Feature] Support additional properties full cases in RLC. Please refer to [#2445](https://github.com/Azure/autorest.typescript/pull/2445).
- [Feature] Support the change for union and enums in modular and RLC. Please refer to [#2380](https://github.com/Azure/autorest.typescript/pull/2380).
- [Feature] Upgrade typespec compiler to 0.55.0. Please refer to [#2380](https://github.com/Azure/autorest.typescript/pull/2380).
- [Feature] Bump typescript version to typescript@~5.4.5. Please refer to [#2442](https://github.com/Azure/autorest.typescript/pull/2442).
- [Feature] Update @azure-rest/core-client to 1.4.0.. Please refer to [#2441](https://github.com/Azure/autorest.typescript/pull/2441).
- [Feature] Upgrade mkdirp to ^3.0.1. Please refer to [#2436](https://github.com/Azure/autorest.typescript/pull/2436).
- [Bugfix] Fix missing `pack` scripts in package.json. Please refer to [#2426](https://github.com/Azure/autorest.typescript/pull/2426).

## 0.26.1 (2024-04-04)

- [Bugfix] Fix missing scripts in package.json file. Please refer to [#2402](https://github.com/Azure/autorest.typescript/pull/2402).
Expand Down
4 changes: 2 additions & 2 deletions packages/typespec-ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@azure-tools/typespec-ts",
"version": "0.26.1",
"version": "0.27.0",
"description": "An experimental TypeSpec emitter for TypeScript RLC",
"main": "dist/src/index.js",
"type": "module",
Expand Down Expand Up @@ -93,7 +93,7 @@
"dependencies": {
"prettier": "^3.1.0",
"tslib": "^2.3.1",
"@azure-tools/rlc-common": "workspace:^0.26.1",
"@azure-tools/rlc-common": "workspace:^0.27.0",
"ts-morph": "^15.1.0",
"fs-extra": "^11.1.0"
},
Expand Down

0 comments on commit 8c7b7af

Please sign in to comment.