Skip to content

Commit

Permalink
Merge branch 'users/anatolybolshakov/fix14255_vsbuild_default_logger'…
Browse files Browse the repository at this point in the history 
… of https://github.com/microsoft/azure-pipelines-tasks into users/anatolybolshakov/fix14255_vsbuild_default_logger
  • Loading branch information
Anatolii Bolshakov (Akvelon INC) committed Feb 11, 2021
2 parents c19f1b1 + e482596 commit 12e5968
Show file tree
Hide file tree
Showing 62 changed files with 4,105 additions and 428 deletions.
4 changes: 2 additions & 2 deletions Tasks/AzureMonitorV1/task.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
"version": {
"Major": 1,
"Minor": 175,
"Minor": 183,
"Patch": 0
},
"instanceNameFormat": "Query Azure Monitor alerts",
Expand Down Expand Up @@ -195,7 +195,7 @@
"HttpRequest": {
"Execute": {
"EndpointId": "$(connectedServiceNameARM)",
"EndpointUrl": "$(endpoint.url)/subscriptions/{{subscriptionId}}/providers/Microsoft.AlertsManagement/alerts?api-version=2019-03-01{{#if ResourceGroupName}}&targetResourceGroup=$(ResourceGroupName){{/if}}{{#if monitorCondition}}&monitorCondition=$(monitorCondition){{#if timeRange}}&timeRange=$(timeRange){{/if}}{{#if alertState}}&alertState=$(alertState){{/if}}{{#if severity}}&severity=$(severity){{/if}}{{#equals '$(filterType)' 'resource' 1}}{{#if resource}}&targetResource=/subscriptions/{{subscriptionId}}/resourcegroups/{{ResourceGroupName}}/providers/{{resource}}{{/if}}{{/equals}}{{#equals '$(filterType)' 'alertrule' 1}}{{#if alertRule}}&alertRule=/subscriptions/{{subscriptionId}}/resourceGroups/{{ResourceGroupName}}/providers/Microsoft.Insights/{{alertRule}}{{/if}}{{/equals}}",
"EndpointUrl": "$(endpoint.url)/subscriptions/{{subscriptionId}}/providers/Microsoft.AlertsManagement/alerts?api-version=2019-03-01{{#if ResourceGroupName}}&targetResourceGroup=$(ResourceGroupName){{/if}}{{#if monitorCondition}}&monitorCondition=$(monitorCondition){{#if timeRange}}&timeRange=$(timeRange){{/if}}{{#if alertState}}&alertState=$(alertState){{/if}}{{#if severity}}&severity=$(severity){{/if}}{{#equals '$(filterType)' 'resource' 1}}{{#if resource}}&targetResource=/subscriptions/{{subscriptionId}}/resourcegroups/{{ResourceGroupName}}/providers/{{resource}}{{/if}}{{/equals}}{{#equals '$(filterType)' 'alertrule' 1}}{{#if alertRule}}&alertRule=/subscriptions/{{subscriptionId}}/resourceGroups/{{ResourceGroupName}}/providers/microsoft.insights/{{alertRule}}{{/if}}{{/equals}}",
"Method": "GET",
"Body": "",
"Headers": "",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureMonitorV1/task.loc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
],
"version": {
"Major": 1,
"Minor": 175,
"Minor": 183,
"Patch": 0
},
"instanceNameFormat": "ms-resource:loc.instanceNameFormat",
Expand Down Expand Up @@ -195,7 +195,7 @@
"HttpRequest": {
"Execute": {
"EndpointId": "$(connectedServiceNameARM)",
"EndpointUrl": "$(endpoint.url)/subscriptions/{{subscriptionId}}/providers/Microsoft.AlertsManagement/alerts?api-version=2019-03-01{{#if ResourceGroupName}}&targetResourceGroup=$(ResourceGroupName){{/if}}{{#if monitorCondition}}&monitorCondition=$(monitorCondition){{#if timeRange}}&timeRange=$(timeRange){{/if}}{{#if alertState}}&alertState=$(alertState){{/if}}{{#if severity}}&severity=$(severity){{/if}}{{#equals '$(filterType)' 'resource' 1}}{{#if resource}}&targetResource=/subscriptions/{{subscriptionId}}/resourcegroups/{{ResourceGroupName}}/providers/{{resource}}{{/if}}{{/equals}}{{#equals '$(filterType)' 'alertrule' 1}}{{#if alertRule}}&alertRule=/subscriptions/{{subscriptionId}}/resourceGroups/{{ResourceGroupName}}/providers/Microsoft.Insights/{{alertRule}}{{/if}}{{/equals}}",
"EndpointUrl": "$(endpoint.url)/subscriptions/{{subscriptionId}}/providers/Microsoft.AlertsManagement/alerts?api-version=2019-03-01{{#if ResourceGroupName}}&targetResourceGroup=$(ResourceGroupName){{/if}}{{#if monitorCondition}}&monitorCondition=$(monitorCondition){{#if timeRange}}&timeRange=$(timeRange){{/if}}{{#if alertState}}&alertState=$(alertState){{/if}}{{#if severity}}&severity=$(severity){{/if}}{{#equals '$(filterType)' 'resource' 1}}{{#if resource}}&targetResource=/subscriptions/{{subscriptionId}}/resourcegroups/{{ResourceGroupName}}/providers/{{resource}}{{/if}}{{/equals}}{{#equals '$(filterType)' 'alertrule' 1}}{{#if alertRule}}&alertRule=/subscriptions/{{subscriptionId}}/resourceGroups/{{ResourceGroupName}}/providers/microsoft.insights/{{alertRule}}{{/if}}{{/equals}}",
"Method": "GET",
"Body": "",
"Headers": "",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureMysqlDeploymentV1/sql/MysqlClient.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export class MysqlClient implements ISqlClient {
fileSourceArgument = " -e" + '"' + this._azureMysqlTaskParameter.getSqlInline() + '"';
}
else {
fileSourceArgument = ` -e "source ${packageUtility.PackageUtility.getPackagePath(this._azureMysqlTaskParameter.getSqlFile())};"`;
fileSourceArgument = ` -e "source ${packageUtility.PackageUtility.getPackagePath(this._azureMysqlTaskParameter.getSqlFile()).replace(/\\/g, '/')};"`;
}

return fileSourceArgument;
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureMysqlDeploymentV1/task.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 182,
"Patch": 1
"Minor": 183,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "1.100.0",
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureMysqlDeploymentV1/task.loc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 182,
"Patch": 1
"Minor": 183,
"Patch": 0
},
"demands": [],
"minimumAgentVersion": "1.100.0",
Expand Down
2 changes: 1 addition & 1 deletion Tasks/AzureResourceGroupDeploymentV2/operations/ResourceGroup.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ export class ResourceGroup {
if (result && result["properties"] && result["properties"]["outputs"] && utils.isNonEmpty(this.taskParameters.deploymentOutputs)) {
const setVariablesInObject = (path: string, obj: any) => {
for (var key of Object.keys(obj)) {
if (typeof(obj[key]) === "object") {
if (obj[key] && typeof(obj[key]) === "object") {
setVariablesInObject(`${path}.${key}`, obj[key]);
}
else {
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureResourceGroupDeploymentV2/task.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 181,
"Minor": 182,
"Patch": 0
},
"demands": [],
Expand Down Expand Up @@ -488,4 +488,4 @@
"DeploymentGroupConfigurationFailedOnVM": "Failure for Virtual Machine '%s': %s",
"TroubleshootingGuide": "Check out the troubleshooting guide to see if your issue is addressed: https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/deploy/azure-resource-group-deployment?view=azure-devops#troubleshooting"
}
}
}
4 changes: 2 additions & 2 deletions Tasks/AzureResourceGroupDeploymentV2/task.loc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 2,
"Minor": 181,
"Minor": 182,
"Patch": 0
},
"demands": [],
Expand Down Expand Up @@ -488,4 +488,4 @@
"DeploymentGroupConfigurationFailedOnVM": "ms-resource:loc.messages.DeploymentGroupConfigurationFailedOnVM",
"TroubleshootingGuide": "ms-resource:loc.messages.TroubleshootingGuide"
}
}
}
2 changes: 1 addition & 1 deletion Tasks/AzureResourceManagerTemplateDeploymentV3/operations/DeploymentScopeBase.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class DeploymentScopeBase {
if (result && result["properties"] && result["properties"]["outputs"] && utils.isNonEmpty(this.taskParameters.deploymentOutputs)) {
const setVariablesInObject = (path: string, obj: any) => {
for (var key of Object.keys(obj)) {
if (typeof(obj[key]) === "object") {
if (obj[key] && typeof(obj[key]) === "object") {
setVariablesInObject(`${path}.${key}`, obj[key]);
}
else {
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AzureResourceManagerTemplateDeploymentV3/task.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 3,
"Minor": 181,
"Minor": 182,
"Patch": 0
},
"demands": [],
Expand Down Expand Up @@ -311,4 +311,4 @@
"TemplateValidationFailure": "Validation errors were found in the Azure Resource Manager template. This can potentially cause template deployment to fail. %s. Please follow https://docs.microsoft.com/en-us/azure/azure-resource-manager/templates/template-syntax",
"TroubleshootingGuide": "Check out the troubleshooting guide to see if your issue is addressed: https://docs.microsoft.com/en-us/azure/devops/pipelines/tasks/deploy/azure-resource-group-deployment?view=azure-devops#troubleshooting"
}
}
}
4 changes: 2 additions & 2 deletions Tasks/AzureResourceManagerTemplateDeploymentV3/task.loc.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 3,
"Minor": 181,
"Minor": 182,
"Patch": 0
},
"demands": [],
Expand Down Expand Up @@ -311,4 +311,4 @@
"TemplateValidationFailure": "ms-resource:loc.messages.TemplateValidationFailure",
"TroubleshootingGuide": "ms-resource:loc.messages.TroubleshootingGuide"
}
}
}
10 changes: 9 additions & 1 deletion Tasks/DownloadPackageV0/Tests/package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Tasks/DownloadPackageV0/download.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ export async function unzip(zipLocation: string, unzipLocation: string): Promise
});

unzipper.extract({
path: unzipLocation
path: path.normalize(unzipLocation)
});
});
}
Expand Down
Loading

0 comments on commit 12e5968

Please sign in to comment.