Skip to content
This repository was archived by the owner on May 5, 2023. It is now read-only.

Commit 74bd3f2

Browse files
committed
updated license info, package versions, azure.js file and removed apiAppManagement
1 parent 610fbaa commit 74bd3f2

File tree

96 files changed

+931
-6409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

96 files changed

+931
-6409
lines changed

CONTRIBUTORS.txt

-7
This file was deleted.
File renamed without changes.

LICENSE.txt LICENSE.MIT.txt

File renamed without changes.

README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ npm install azure
3434
| [Batch](https://azure.microsoft.com/en-us/services/batch/) | `npm install azure-batch` |
3535
|   | |
3636
| **Azure Resource Management (ARM)** |
37-
| [API Apps](http://azure.microsoft.com/en-us/services/app-service/api/) | `npm install azure-arm-apiapp` |
3837
| [Authorization](https://azure.microsoft.com/en-us/documentation/articles/role-based-access-control-configure/) | `npm install azure-arm-authorization` |
3938
| [CDN](https://azure.microsoft.com/en-us/services/cdn/) | `npm install azure-arm-cdn`|
4039
| [Compute](http://azure.microsoft.com/en-us/services/virtual-machines/) | `npm install azure-arm-compute`|
@@ -80,6 +79,12 @@ npm install azure
8079

8180
* [Azure CLI](http://github.com/azure/azure-xplat-cli)
8281

82+
## License
83+
84+
This project is licensed under MIT and Apache-2.0.
85+
- "MIT" license is usually used for the client libraries generated using [Autorest](https://github.com/Azure/Autorest) that are targeting ARM (V2 version of Azure REST API). The license can be found in "LICENSE.MIT.txt" file in this repository.
86+
- "Apache-2.0" license is usually used for the client libraries generated using an internal code generator that are targeting ASM (V1 version of Azure REST API). The license can be found in "LICENSE.Apache.txt" file in this repository.
87+
8388
## Contribute
8489

8590
* If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.io/guidelines/).

gulpfile.js

+20-10
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,16 @@ var mappings = {
7676
'source': 'arm-iothub/2016-02-03/swagger/iothub.json',
7777
'ft': 1
7878
},
79+
'keyvault': {
80+
'dir': 'keyvault/lib',
81+
'source': 'keyvault/2015-06-01/swagger/keyvault.json',
82+
'ft': 1
83+
},
84+
'keyvaultmanagement': {
85+
'dir': 'keyVaultManagement/lib',
86+
'source': 'arm-keyvault/2015-06-01/swagger/keyvault.json',
87+
'ft': 1
88+
},
7989
'network': {
8090
'dir': 'networkManagement2/lib',
8191
'source': 'arm-network/2016-06-01/swagger/network.json',
@@ -91,16 +101,16 @@ var mappings = {
91101
},
92102
'rediscache': {
93103
'dir': 'rediscachemanagement/lib',
94-
'source': 'arm-redis/2015-08-01/swagger/redis.json',
104+
'source': 'arm-redis/2016-04-01/swagger/redis.json',
95105
'ft': 1
96106
},
97107
'resource': {
98108
'dir': 'resourceManagement/lib/resource',
99-
'source': 'arm-resources/resources/2016-02-01/swagger/resources.json'
109+
'source': 'arm-resources/resources/2016-07-01/swagger/resources.json'
100110
},
101111
'resource.subscription': {
102112
'dir': 'resourceManagement/lib/subscription',
103-
'source': 'arm-resources/subscriptions/2015-11-01/swagger/subscriptions.json'
113+
'source': 'arm-resources/subscriptions/2016-06-01/swagger/subscriptions.json'
104114
},
105115
'resource.lock': {
106116
'dir': 'resourceManagement/lib/lock',
@@ -114,11 +124,6 @@ var mappings = {
114124
'dir': 'resourceManagement/lib/policy',
115125
'source': 'arm-resources/policy/2016-04-01/swagger/policy.json'
116126
},
117-
'storage': {
118-
'dir': 'storageManagement2/lib',
119-
'source': 'arm-storage/2016-01-01/swagger/storage.json',
120-
'ft': 2
121-
},
122127
'servermanagement': {
123128
'dir': 'servermanagement/lib',
124129
'source': 'arm-servermanagement/2015-07-01-preview/servermanagement.json'
@@ -128,6 +133,11 @@ var mappings = {
128133
'source': 'servicefabric/2016-01-28/swagger/servicefabric.json',
129134
'language': 'NodeJS'
130135
},
136+
'storage': {
137+
'dir': 'storageManagement2/lib',
138+
'source': 'arm-storage/2016-01-01/swagger/storage.json',
139+
'ft': 2
140+
},
131141
'traffic':{
132142
'dir': 'trafficManagement2/lib',
133143
'source': 'arm-trafficmanager/2015-11-01/trafficmanager.json',
@@ -140,7 +150,7 @@ var mappings = {
140150
}
141151
};
142152

143-
var defaultAutoRestVersion = '0.17.0-Nightly20160811';
153+
var defaultAutoRestVersion = '0.17.0-Nightly20160831';
144154
var usingAutoRestVersion;
145155
var specRoot = args['spec-root'] || "https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master";
146156
var project = args['project'];
@@ -176,7 +186,7 @@ function codegen(project, cb) {
176186
if (found) {
177187
generateProject(project, specRoot, usingAutoRestVersion);
178188
} else {
179-
var nugetCmd2 = clrCmd(nugetExe) + ' install autorest -Source ' + nugetSource + ' -Version ' + usingAutoRestVersion + ' -o packages';
189+
var nugetCmd2 = clrCmd(nugetExe) + ' install Autorest -Source ' + nugetSource + ' -Version ' + usingAutoRestVersion + ' -o packages';
180190
console.log('Downloading Autorest version: ' + nugetCmd2);
181191
exec(nugetCmd2, function(err, stdout, stderr) {
182192
console.log(stdout);

0 commit comments

Comments
 (0)