From 9f0e6d6e7282cb7b3f417709793f09e2df205fb2 Mon Sep 17 00:00:00 2001 From: Jianye Xi Date: Wed, 8 Jun 2022 16:24:32 +0800 Subject: [PATCH 1/4] bump autorest --- package-lock.json | 22 +++++++++++----------- package.json | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 04adc138..230a5e82 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,14 +16,14 @@ "@ts-common/source-map": "^0.5.0", "@ts-common/string-map": "^0.3.0", "acorn": "^5.7.4", - "autorest": "^2.0.4407", + "autorest": "^3.6.1", "glob": "^7.1.3", "js-yaml": "^3.13.1", - "json-pointer": "^0.6.0", + "json-pointer": "^0.6.2", "json-refs": "^3.0.13", "kind-of": "^6.0.3", "lodash": "^4.17.20", - "minimist": "^1.2.3", + "minimist": "^1.2.6", "request": "^2.88.0", "set-value": "^4.0.1", "source-map": "^0.7.3", @@ -1792,15 +1792,15 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "node_modules/autorest": { - "version": "2.0.4413", - "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4413.tgz", - "integrity": "sha512-Ttx/O6Yag5q8fpJDvllgf/joLuVPBySkbAqDF7+9jAmscCPQplYjA9H/N12bwkhh+6YR3ugWZHQq3NTN33hkAg==", + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/autorest/-/autorest-3.6.1.tgz", + "integrity": "sha512-tTOnfQq+LAyqnxFrOOnyCEaErXnjRTgduUN7a8LUv2u5deqDlI0zoJllHeIEYDZS2o2Kr1s8pDj2NxaFPOWldg==", "hasInstallScript": true, "bin": { - "autorest": "dist/app.js" + "autorest": "entrypoints/app.js" }, "engines": { - "node": ">=10.12.0" + "node": ">=12.0.0" } }, "node_modules/aws-sign2": { @@ -8850,9 +8850,9 @@ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, "autorest": { - "version": "2.0.4413", - "resolved": "https://registry.npmjs.org/autorest/-/autorest-2.0.4413.tgz", - "integrity": "sha512-Ttx/O6Yag5q8fpJDvllgf/joLuVPBySkbAqDF7+9jAmscCPQplYjA9H/N12bwkhh+6YR3ugWZHQq3NTN33hkAg==" + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/autorest/-/autorest-3.6.1.tgz", + "integrity": "sha512-tTOnfQq+LAyqnxFrOOnyCEaErXnjRTgduUN7a8LUv2u5deqDlI0zoJllHeIEYDZS2o2Kr1s8pDj2NxaFPOWldg==" }, "aws-sign2": { "version": "0.7.0", diff --git a/package.json b/package.json index 85c86462..2608fcc1 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@ts-common/source-map": "^0.5.0", "@ts-common/string-map": "^0.3.0", "acorn": "^5.7.4", - "autorest": "^2.0.4407", + "autorest": "^3.6.1", "glob": "^7.1.3", "js-yaml": "^3.13.1", "json-pointer": "^0.6.2", From 5a7743108c2435c5156ddb7986ec4361b50e16ef Mon Sep 17 00:00:00 2001 From: Jianye Xi Date: Wed, 8 Jun 2022 16:31:15 +0800 Subject: [PATCH 2/4] change log --- CHANGELOG.md | 4 ++++ package.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1bb65b6..9bb3baba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## 0.9.6 Released on 2022-06-09 + +- using autorest v3.6.1'. + ## 0.9.3 Released on 2022-02-09 - bugfix for 'ConstraintIsStronger'. diff --git a/package.json b/package.json index 2608fcc1..53a15e68 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@azure/oad", - "version": "0.9.5", + "version": "0.9.6", "author": { "name": "Microsoft Corporation", "email": "azsdkteam@microsoft.com", From bd6887fc45a4852343756bfe5bdabbc019b31443 Mon Sep 17 00:00:00 2001 From: Jianye Xi Date: Wed, 8 Jun 2022 16:50:04 +0800 Subject: [PATCH 3/4] update pipeline --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7d74fc05..be1c9531 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,8 +1,8 @@ trigger: -- master +- main pool: - vmImage: 'vs2017-win2016' + vmImage: 'windows-latest' steps: - script: npm install From 3ed4d5af5bc678f47924349b1cc8e2a249119a82 Mon Sep 17 00:00:00 2001 From: Jianye Xi Date: Wed, 8 Jun 2022 17:44:01 +0800 Subject: [PATCH 4/4] use dotnet core 3.1 in test --- .../AutoRest.Swagger.Tests/AutoRest.Swagger.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openapi-diff/src/modeler/AutoRest.Swagger.Tests/AutoRest.Swagger.Tests.csproj b/openapi-diff/src/modeler/AutoRest.Swagger.Tests/AutoRest.Swagger.Tests.csproj index f16976d5..27206d13 100644 --- a/openapi-diff/src/modeler/AutoRest.Swagger.Tests/AutoRest.Swagger.Tests.csproj +++ b/openapi-diff/src/modeler/AutoRest.Swagger.Tests/AutoRest.Swagger.Tests.csproj @@ -4,7 +4,7 @@ - netcoreapp2.0 + netcoreapp3.1 7.1