Skip to content

Commit

Permalink
Merge branch 'master' into moveArmAdvisor
Browse files Browse the repository at this point in the history
  • Loading branch information
kpajdzik authored Apr 9, 2019
2 parents 9d48962 + f66cc92 commit 6ccaf85
Show file tree
Hide file tree
Showing 33 changed files with 1,043 additions and 955 deletions.
2 changes: 1 addition & 1 deletion packages/@azure/arm-servicebus/LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2018 Microsoft
Copyright (c) 2019 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
Expand Down
11 changes: 4 additions & 7 deletions packages/@azure/arm-servicebus/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This package contains an isomorphic SDK for ServiceBusManagementClient.

### How to Install

```
```bash
npm install @azure/arm-servicebus
```

Expand All @@ -19,13 +19,13 @@ npm install @azure/arm-servicebus

##### Install @azure/ms-rest-nodeauth

```
```bash
npm install @azure/ms-rest-nodeauth
```

##### Sample code

```ts
```typescript
import * as msRest from "@azure/ms-rest-js";
import * as msRestAzure from "@azure/ms-rest-azure-js";
import * as msRestNodeAuth from "@azure/ms-rest-nodeauth";
Expand All @@ -47,7 +47,7 @@ msRestNodeAuth.interactiveLogin().then((creds) => {

##### Install @azure/ms-rest-browserauth

```
```bash
npm install @azure/ms-rest-browserauth
```

Expand Down Expand Up @@ -94,6 +94,3 @@ See https://github.com/Azure/ms-rest-browserauth to learn how to authenticate to
## Related projects

- [Microsoft Azure SDK for Javascript](https://github.com/Azure/azure-sdk-for-js)


![Impressions](https://azure-sdk-impressions.azurewebsites.net/api/impressions/azure-sdk-for-js%2Fpackages%2F%40azure%2Farm-servicebus%2FREADME.png)
12 changes: 7 additions & 5 deletions packages/@azure/arm-servicebus/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "@azure/arm-servicebus",
"author": "Microsoft Corporation",
"description": "ServiceBusManagementClient Library with typescript type definitions for node.js and browser.",
"version": "3.1.0",
"version": "3.2.0",
"dependencies": {
"@azure/ms-rest-azure-js": "^1.1.0",
"@azure/ms-rest-js": "^1.1.0",
"@azure/ms-rest-azure-js": "^1.3.2",
"@azure/ms-rest-js": "^1.8.1",
"tslib": "^1.9.3"
},
"keywords": [
Expand All @@ -23,6 +23,7 @@
"typescript": "^3.1.1",
"rollup": "^0.66.2",
"rollup-plugin-node-resolve": "^3.4.0",
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.4.9"
},
"homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/arm-servicebus",
Expand All @@ -42,7 +43,8 @@
"esm/**/*.js.map",
"esm/**/*.d.ts",
"esm/**/*.d.ts.map",
"lib/**/*.ts",
"src/**/*.ts",
"README.md",
"rollup.config.js",
"tsconfig.json"
],
Expand All @@ -52,5 +54,5 @@
"prepack": "npm install && npm run build"
},
"sideEffects": false,
"authPublish": true
"autoPublish": true
}
22 changes: 14 additions & 8 deletions packages/@azure/arm-servicebus/rollup.config.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,16 @@
import rollup from "rollup";
import nodeResolve from "rollup-plugin-node-resolve";
import sourcemaps from "rollup-plugin-sourcemaps";

/**
* @type {import('rollup').RollupFileOptions}
* @type {rollup.RollupFileOptions}
*/
const config = {
input: './esm/serviceBusManagementClient.js',
external: ["@azure/ms-rest-js", "@azure/ms-rest-azure-js"],
input: "./esm/serviceBusManagementClient.js",
external: [
"@azure/ms-rest-js",
"@azure/ms-rest-azure-js"
],
output: {
file: "./dist/arm-servicebus.js",
format: "umd",
Expand All @@ -16,16 +22,16 @@ const config = {
},
banner: `/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/`
},
plugins: [
nodeResolve({ module: true })
nodeResolve({ module: true }),
sourcemaps()
]
};

export default config;
Original file line number Diff line number Diff line change
@@ -1,43 +1,44 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/

export {
AccessKeys,
Action,
ArmDisasterRecovery,
ArmDisasterRecoveryListResult,
BaseResource,
CaptureDescription,
CheckNameAvailability,
CheckNameAvailabilityResult,
CorrelationFilter,
Destination,
ErrorResponse,
ArmDisasterRecoveryListResult,
ArmDisasterRecovery,
Eventhub,
MessageCountDetails,
MigrationConfigProperties,
NetworkRuleSet,
NWRuleSetIpRules,
NWRuleSetVirtualNetworkRules,
PremiumMessagingRegions,
PremiumMessagingRegionsProperties,
Resource,
BaseResource,
SBAuthorizationRuleListResult,
SBAuthorizationRule,
AccessKeys,
TrackedResource,
ResourceNamespacePatch,
Rule,
SBAuthorizationRule,
SBAuthorizationRuleListResult,
SBNamespace,
SBSku,
SBNamespaceUpdateParameters,
SBQueue,
MessageCountDetails,
SBTopic,
SBSku,
SBSubscription,
Rule,
Action,
SBTopic,
SqlFilter,
CorrelationFilter,
SqlRuleAction,
PremiumMessagingRegions,
PremiumMessagingRegionsProperties,
Eventhub,
CaptureDescription,
Destination,
MigrationConfigProperties
Subnet,
TrackedResource
} from "../models/mappers";

Original file line number Diff line number Diff line change
@@ -1,39 +1,40 @@
/*
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for
* license information.
* Licensed under the MIT License. See License.txt in the project root for license information.
*
* Code generated by Microsoft (R) AutoRest Code Generator.
* Changes may cause incorrect behavior and will be lost if the code is
* regenerated.
* Changes may cause incorrect behavior and will be lost if the code is regenerated.
*/

export {
EventHubListResult,
Eventhub,
Resource,
Action,
ArmDisasterRecovery,
BaseResource,
CaptureDescription,
CorrelationFilter,
Destination,
ErrorResponse,
TrackedResource,
Eventhub,
EventHubListResult,
MessageCountDetails,
MigrationConfigProperties,
NetworkRuleSet,
NWRuleSetIpRules,
NWRuleSetVirtualNetworkRules,
PremiumMessagingRegions,
PremiumMessagingRegionsProperties,
Resource,
ResourceNamespacePatch,
Rule,
SBAuthorizationRule,
SBNamespace,
SBSku,
SBNamespaceUpdateParameters,
SBAuthorizationRule,
SBQueue,
MessageCountDetails,
SBTopic,
SBSku,
SBSubscription,
Rule,
Action,
SBTopic,
SqlFilter,
CorrelationFilter,
SqlRuleAction,
PremiumMessagingRegions,
PremiumMessagingRegionsProperties,
ArmDisasterRecovery,
MigrationConfigProperties
Subnet,
TrackedResource
} from "../models/mappers";

Loading

0 comments on commit 6ccaf85

Please sign in to comment.