Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .scripts/gulp.ts
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export async function regenerate(branchName: string, packageName: string, azureS
_logger.log(`Checked out ${branchName} branch`);

const localBranch = remoteBranch.convertTo(BranchLocation.Local);
await rebaseBranch(azureSdkForJsRepository, localBranch);
await mergeMasterIntoBranch(azureSdkForJsRepository, localBranch);
_logger.log(`Merged master into ${localBranch.shorthand()} successfully`);

if (skipVersionBump) {
Expand Down
6 changes: 3 additions & 3 deletions packages/@azure/arm-features/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "FeatureClient Library with typescript type definitions for node.js and browser.",
"version": "1.0.0",
"dependencies": {
"ms-rest-azure-js": "^1.0.172",
"ms-rest-js": "^1.0.443",
"ms-rest-azure-js": "^1.0.176",
"ms-rest-js": "^1.0.455",
"tslib": "^1.9.3"
},
"keywords": [
Expand All @@ -25,7 +25,7 @@
"rollup-plugin-node-resolve": "^3.4.0",
"uglify-js": "^3.4.9"
},
"homepage": "https://github.com/azure/azure-sdk-for-js",
"homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/arm-features",
"repository": {
"type": "git",
"url": "https://github.com/azure/azure-sdk-for-js.git"
Expand Down
6 changes: 3 additions & 3 deletions packages/@azure/arm-links/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "ManagementLinkClient Library with typescript type definitions for node.js and browser.",
"version": "1.0.0",
"dependencies": {
"ms-rest-azure-js": "^1.0.172",
"ms-rest-js": "^1.0.443",
"ms-rest-azure-js": "^1.0.176",
"ms-rest-js": "^1.0.455",
"tslib": "^1.9.3"
},
"keywords": [
Expand All @@ -25,7 +25,7 @@
"rollup-plugin-node-resolve": "^3.4.0",
"uglify-js": "^3.4.9"
},
"homepage": "https://github.com/azure/azure-sdk-for-js",
"homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/arm-links",
"repository": {
"type": "git",
"url": "https://github.com/azure/azure-sdk-for-js.git"
Expand Down
26 changes: 0 additions & 26 deletions packages/@azure/arm-locks/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,32 +27,6 @@ export interface ManagementLockOwner {
applicationId?: string;
}

/**
* @interface
* An interface representing ManagementLockProperties.
* The lock properties.
*
*/
export interface ManagementLockProperties {
/**
* @member {LockLevel} level The level of the lock. Possible values are:
* NotSpecified, CanNotDelete, ReadOnly. CanNotDelete means authorized users
* are able to read and modify the resources, but not delete. ReadOnly means
* authorized users can only read from a resource, but they can't modify or
* delete it. Possible values include: 'NotSpecified', 'CanNotDelete',
* 'ReadOnly'
*/
level: LockLevel;
/**
* @member {string} [notes] Notes about the lock. Maximum of 512 characters.
*/
notes?: string;
/**
* @member {ManagementLockOwner[]} [owners] The owners of the lock.
*/
owners?: ManagementLockOwner[];
}

/**
* @interface
* An interface representing ManagementLockObject.
Expand Down
35 changes: 0 additions & 35 deletions packages/@azure/arm-locks/lib/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,41 +30,6 @@ export const ManagementLockOwner: msRest.CompositeMapper = {
}
};

export const ManagementLockProperties: msRest.CompositeMapper = {
serializedName: "ManagementLockProperties",
type: {
name: "Composite",
className: "ManagementLockProperties",
modelProperties: {
level: {
required: true,
serializedName: "level",
type: {
name: "String"
}
},
notes: {
serializedName: "notes",
type: {
name: "String"
}
},
owners: {
serializedName: "owners",
type: {
name: "Sequence",
element: {
type: {
name: "Composite",
className: "ManagementLockOwner"
}
}
}
}
}
}
};

export const ManagementLockObject: msRest.CompositeMapper = {
serializedName: "ManagementLockObject",
type: {
Expand Down
6 changes: 3 additions & 3 deletions packages/@azure/arm-locks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"description": "ManagementLockClient Library with typescript type definitions for node.js and browser.",
"version": "1.0.0",
"dependencies": {
"ms-rest-azure-js": "^1.0.172",
"ms-rest-js": "^1.0.443",
"ms-rest-azure-js": "^1.0.176",
"ms-rest-js": "^1.0.455",
"tslib": "^1.9.3"
},
"keywords": [
Expand All @@ -25,7 +25,7 @@
"rollup-plugin-node-resolve": "^3.4.0",
"uglify-js": "^3.4.9"
},
"homepage": "https://github.com/azure/azure-sdk-for-js",
"homepage": "https://github.com/azure/azure-sdk-for-js/tree/master/packages/@azure/arm-locks",
"repository": {
"type": "git",
"url": "https://github.com/azure/azure-sdk-for-js.git"
Expand Down
126 changes: 0 additions & 126 deletions packages/@azure/arm-managedapplications/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,50 +14,6 @@ import * as msRest from "ms-rest-js";
export { BaseResource, CloudError };


/**
* @interface
* An interface representing ApplianceProperties.
* The appliance properties.
*
*/
export interface ApplianceProperties {
/**
* @member {string} managedResourceGroupId The managed resource group Id.
*/
managedResourceGroupId: string;
/**
* @member {string} [applianceDefinitionId] The fully qualified path of
* appliance definition Id.
*/
applianceDefinitionId?: string;
/**
* @member {any} [parameters] Name and value pairs that define the appliance
* parameters. It can be a JObject or a well formed JSON string.
*/
parameters?: any;
/**
* @member {any} [outputs] Name and value pairs that define the appliance
* outputs.
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
readonly outputs?: any;
/**
* @member {ProvisioningState} [provisioningState] The appliance provisioning
* state. Possible values include: 'Accepted', 'Running', 'Ready',
* 'Creating', 'Created', 'Deleting', 'Deleted', 'Canceled', 'Failed',
* 'Succeeded', 'Updating'
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
readonly provisioningState?: ProvisioningState;
/**
* @member {string} [uiDefinitionUri] The blob URI where the UI definition
* file is located.
*/
uiDefinitionUri?: string;
}

/**
* @interface
* An interface representing Plan.
Expand Down Expand Up @@ -200,50 +156,6 @@ export interface Appliance extends GenericResource {
kind?: string;
}

/**
* @interface
* An interface representing AppliancePropertiesPatchable.
* The appliance properties.
*
*/
export interface AppliancePropertiesPatchable {
/**
* @member {string} [managedResourceGroupId] The managed resource group Id.
*/
managedResourceGroupId?: string;
/**
* @member {string} [applianceDefinitionId] The fully qualified path of
* appliance definition Id.
*/
applianceDefinitionId?: string;
/**
* @member {any} [parameters] Name and value pairs that define the appliance
* parameters. It can be a JObject or a well formed JSON string.
*/
parameters?: any;
/**
* @member {any} [outputs] Name and value pairs that define the appliance
* outputs.
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
readonly outputs?: any;
/**
* @member {ProvisioningState} [provisioningState] The appliance provisioning
* state. Possible values include: 'Accepted', 'Running', 'Ready',
* 'Creating', 'Created', 'Deleting', 'Deleted', 'Canceled', 'Failed',
* 'Succeeded', 'Updating'
* **NOTE: This property will not be serialized. It can only be populated by
* the server.**
*/
readonly provisioningState?: ProvisioningState;
/**
* @member {string} [uiDefinitionUri] The blob URI where the UI definition
* file is located.
*/
uiDefinitionUri?: string;
}

/**
* @interface
* An interface representing PlanPatchable.
Expand Down Expand Up @@ -371,44 +283,6 @@ export interface ApplianceArtifact {
type?: ApplianceArtifactType;
}

/**
* @interface
* An interface representing ApplianceDefinitionProperties.
* The appliance definition properties.
*
*/
export interface ApplianceDefinitionProperties {
/**
* @member {ApplianceLockLevel} lockLevel The appliance lock level. Possible
* values include: 'CanNotDelete', 'ReadOnly', 'None'
*/
lockLevel: ApplianceLockLevel;
/**
* @member {string} [displayName] The appliance definition display name.
*/
displayName?: string;
/**
* @member {ApplianceProviderAuthorization[]} authorizations The appliance
* provider authorizations.
*/
authorizations: ApplianceProviderAuthorization[];
/**
* @member {ApplianceArtifact[]} [artifacts] The collection of appliance
* artifacts. The portal will use the files specified as artifacts to
* construct the user experience of creating an appliance from an appliance
* definition.
*/
artifacts?: ApplianceArtifact[];
/**
* @member {string} [description] The appliance definition description.
*/
description?: string;
/**
* @member {string} packageFileUri The appliance definition package file Uri.
*/
packageFileUri: string;
}

/**
* @interface
* An interface representing ApplianceDefinition.
Expand Down
Loading