From 1150967b5892f944c3029fe3f4698814259d19e6 Mon Sep 17 00:00:00 2001 From: Amar Zavery Date: Wed, 11 May 2016 12:42:15 -0700 Subject: [PATCH] updated node.js clientruntime version to 1.13.0 & 1.3.1 for ms-rest-azure & ms-rest resp. (#1026) * Enhancement to x-ms-parameterized-host extension * positionInOperation defaults to first * fixed setting default value for a complex object containing constant properties. * result of executing gulp regenerate:expected * Fixed fxcop warnings * remove null check validation for unixtime as they are treated as long in java * unixTime in node.js * modification * UnixTime tests * FxCop warnings * Redesigned the structure of AzureEnvironment and updated the environments with more values. * getting rid of underscore.js as a dependency from ms-rest-azure * updated node.js clientruntime version to 1.13.0 & 1.3.1 for ms-rest-azure and ms-rest resp. --- .../Azure.NodeJS/AzureNodeJSCodeGenerator.cs | 2 +- .../NodeJS/NodeJS/NodeJSCodeGenerator.cs | 2 +- ClientRuntimes/NodeJS/ms-rest-azure/LICENSE | 22 +++++++++++++++++++ .../NodeJS/ms-rest-azure/package.json | 13 ++++------- ClientRuntimes/NodeJS/ms-rest/LICENSE | 22 +++++++++++++++++++ ClientRuntimes/NodeJS/ms-rest/package.json | 11 +++------- 6 files changed, 53 insertions(+), 19 deletions(-) create mode 100644 ClientRuntimes/NodeJS/ms-rest-azure/LICENSE create mode 100644 ClientRuntimes/NodeJS/ms-rest/LICENSE diff --git a/AutoRest/Generators/NodeJS/Azure.NodeJS/AzureNodeJSCodeGenerator.cs b/AutoRest/Generators/NodeJS/Azure.NodeJS/AzureNodeJSCodeGenerator.cs index ac8eea6fb028a..06bdbd84874fc 100644 --- a/AutoRest/Generators/NodeJS/Azure.NodeJS/AzureNodeJSCodeGenerator.cs +++ b/AutoRest/Generators/NodeJS/Azure.NodeJS/AzureNodeJSCodeGenerator.cs @@ -18,7 +18,7 @@ namespace Microsoft.Rest.Generator.Azure.NodeJS { public class AzureNodeJSCodeGenerator : NodeJSCodeGenerator { - private const string ClientRuntimePackage = "ms-rest-azure version 1.12.0"; + private const string ClientRuntimePackage = "ms-rest-azure version 1.13.0"; // List of models with paging extensions. private IList pageModels; diff --git a/AutoRest/Generators/NodeJS/NodeJS/NodeJSCodeGenerator.cs b/AutoRest/Generators/NodeJS/NodeJS/NodeJSCodeGenerator.cs index 04bacdaeb59b0..2e59314d876df 100644 --- a/AutoRest/Generators/NodeJS/NodeJS/NodeJSCodeGenerator.cs +++ b/AutoRest/Generators/NodeJS/NodeJS/NodeJSCodeGenerator.cs @@ -16,7 +16,7 @@ namespace Microsoft.Rest.Generator.NodeJS { public class NodeJSCodeGenerator : CodeGenerator { - private const string ClientRuntimePackage = "ms-rest version 1.12.0"; + private const string ClientRuntimePackage = "ms-rest version 1.13.1"; public NodeJsCodeNamer Namer { get; private set; } diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/LICENSE b/ClientRuntimes/NodeJS/ms-rest-azure/LICENSE new file mode 100644 index 0000000000000..b8b569d7746d9 --- /dev/null +++ b/ClientRuntimes/NodeJS/ms-rest-azure/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 Microsoft + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/ClientRuntimes/NodeJS/ms-rest-azure/package.json b/ClientRuntimes/NodeJS/ms-rest-azure/package.json index 9ca0985902e48..1002e12f3eaa6 100644 --- a/ClientRuntimes/NodeJS/ms-rest-azure/package.json +++ b/ClientRuntimes/NodeJS/ms-rest-azure/package.json @@ -5,7 +5,7 @@ "email": "azsdkteam@microsoft.com", "url": "https://github.com/Azure/AutoRest" }, - "version": "1.12.0", + "version": "1.13.0", "description": "Client Runtime for Node.js Azure client libraries generated using AutoRest", "tags": [ "node", "microsoft", "autorest", "azure", "clientruntime" ], "keywords": [ "node", "microsoft", "autorest", "azure", "clientruntime" ], @@ -13,23 +13,18 @@ "engines": { "node": ">= 0.10.0" }, - "licenses": [ - { - "type": "MIT", - "url": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE" - } - ], + "license": "MIT", "dependencies": { "async": "0.2.7", "uuid": "2.0.1", "adal-node": "0.1.17", - "ms-rest": "^1.12.0", + "ms-rest": "^1.13.1", "moment": "^2.6.0" }, "devDependencies": { "jshint": "2.6.3", "xunit-file": "0.0.5", - "mocha": "2.2.5", + "mocha": "2.4.5", "should": "5.2.0" }, "homepage": "https://github.com/Azure/AutoRest", diff --git a/ClientRuntimes/NodeJS/ms-rest/LICENSE b/ClientRuntimes/NodeJS/ms-rest/LICENSE new file mode 100644 index 0000000000000..b8b569d7746d9 --- /dev/null +++ b/ClientRuntimes/NodeJS/ms-rest/LICENSE @@ -0,0 +1,22 @@ +The MIT License (MIT) + +Copyright (c) 2015 Microsoft + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + diff --git a/ClientRuntimes/NodeJS/ms-rest/package.json b/ClientRuntimes/NodeJS/ms-rest/package.json index b21efcee2df2c..656299783e9f9 100644 --- a/ClientRuntimes/NodeJS/ms-rest/package.json +++ b/ClientRuntimes/NodeJS/ms-rest/package.json @@ -5,7 +5,7 @@ "email": "azsdkteam@microsoft.com", "url": "https://github.com/Azure/AutoRest" }, - "version": "1.12.0", + "version": "1.13.1", "description": "Client Runtime for Node.js client libraries generated using AutoRest", "tags": ["node", "microsoft", "autorest", "clientruntime"], "keywords": ["node", "microsoft", "autorest", "clientruntime"], @@ -14,12 +14,7 @@ "engines": { "node": ">= 0.10.0" }, - "licenses": [ - { - "type": "MIT", - "url": "https://raw.githubusercontent.com/Microsoft/dotnet/master/LICENSE" - } - ], + "license": "MIT", "dependencies": { "underscore": "^1.4.0", "tunnel": "~0.0.2", @@ -31,7 +26,7 @@ "devDependencies": { "jshint": "2.6.3", "xunit-file": "0.0.5", - "mocha": "2.2.5", + "mocha": "2.4.5", "should": "5.2.0", "node-uuid": "*" },