Skip to content

Commit

Permalink
Merge pull request #1 from Microsoft/master
Browse files Browse the repository at this point in the history
Merging from upstream repository
  • Loading branch information
salvmd authored Apr 16, 2019
2 parents 716e488 + 22ce8b2 commit 1489fcf
Show file tree
Hide file tree
Showing 1,632 changed files with 60,907 additions and 14,246 deletions.
96 changes: 84 additions & 12 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,11 +1,17 @@

ci/* @damccorm @stephenmichaelf @bryanmacfarlane

Tasks/AndroidSigningV2/* @madhurig

Tasks/AndroidSigningV3/* @madhurig

Tasks/ANTV1/* @madhurig

Tasks/AppCenterDistributeV1/* @DennisPan
Tasks/AppCenterDistributeV1/* @DennisPan @keerthanakumar

Tasks/AppCenterDistributeV2/* @DennisPan @keerthanakumar

Tasks/AppCenterDistributeV3/* @DennisPan @keerthanakumar

Tasks/AppCenterTestV1/* @owenniblock

Expand Down Expand Up @@ -71,10 +77,58 @@ Tasks/ChefKnifeV1/* @kmkumaran

Tasks/CMakeV1/* @daveken

Tasks/CmdLineV2/* bryanmacfarlane
Tasks/CmdLineV2/* @bryanmacfarlane

Tasks/CocoaPodsV0/* @madhurig

Tasks/Common/AzureRmDeploy-common/* @vincentdass @SumiranAgg

Tasks/Common/Deployment/* @bishal-pdMSFT @chshrikh

Tasks/Common/MSBuildHelpers/* @ericsciple @austin-jensen

Tasks/Common/PowershellHelpers/* @bishal-pdMSFT @hiyadav

Tasks/Common/RemoteDeployer/* @arjgupta

Tasks/Common/ServiceFabricHelpers/* @bishal-pdMSFT @tejasd1990

Tasks/Common/TlsHelper_/* @rajatagrawal-dev @arjgupta

Tasks/Common/VstsAzureHelpers_/* @rajatagrawal-dev @vincentdass

Tasks/Common/VstsAzureRestHelpers_/* @Ajay-MS @rajatagrawal-dev

Tasks/Common/azure-arm-rest/* @vincentdass @Ajay-MS

Tasks/Common/azure-blobstorage-artifactProvider/* @omeshp @hiyadav

Tasks/Common/azurestack-common/* @Ajay-MS

Tasks/Common/codeanalysis-common/* @lkillgore

Tasks/Common/codecoverage-tools/* @nigurr @lkillgore

Tasks/Common/docker-common/* @jikuma @vithati

Tasks/Common/find-files-legacy/* @nigurr

Tasks/Common/ios-signing-common/* @madhurig @hashtagchris

Tasks/Common/java-common/* @madhurig @kelliejos

Tasks/Common/kubernetes-common/* @nishubansal @ds-ms

Tasks/Common/packaging-common-old/* @jotaylo

Tasks/Common/packaging-common/* @jotaylo

Tasks/Common/securefiles-common/* @madhurig @hashtagchris

Tasks/Common/utility-common/* @nishubansal @ds-ms

Tasks/Common/webdeployment-common/* @SumiranAgg @vincentdass

Tasks/CondaEnvironmentV0/* @madhurig

Tasks/CondaEnvironmentV1/* @madhurig
Expand All @@ -97,24 +151,30 @@ Tasks/DockerV0/* @bansalaseem

Tasks/DockerV1/* @bansalaseem

Tasks/DockerV2/* @bansalaseem

Tasks/DockerComposeV0/* @bansalaseem

Tasks/DotNetCoreCLIV2/* @sachinma

Tasks/DotNetCoreInstallerV0/* @sachinma

Tasks/DotNetCoreInstallerV1/* @sachinma

Tasks/DownloadBuildArtifactsV0/* @Lovakumar @omeshp

Tasks/DownloadFileshareArtifactsV0/* @Lovakumar @omeshp

Tasks/DownloadGitHubReleasesV0/* @Lovakumar @gykuma

Tasks/DownloadPackageV0/* @zackrun
Tasks/DownloadPackageV0/* @zjrunner

Tasks/DownloadPipelineArtifactV0/* @mihaif

Tasks/DownloadSecureFileV1/* @madhurig

Tasks/DuffleInstallerV0/* @bansalaseem @vithati

Tasks/ExtractFilesV1/* @bryanmacfarlane

Tasks/FtpUploadV1/* @madhurig
Expand All @@ -137,6 +197,8 @@ Tasks/HelmDeployV0/* @bansalaseem

Tasks/HelmInstallerV0/* @bansalaseem

Tasks/HelmInstallerV1/* @bansalaseem

Tasks/IISWebAppDeployment/* @kmkumaran

Tasks/IISWebAppDeploymentOnMachineGroupV0/* @kmkumaran
Expand All @@ -157,10 +219,14 @@ Tasks/JenkinsDownloadArtifactsV1/* @Lovakumar @kasubram

Tasks/JenkinsQueueJobV2/* @madhurig

Tasks/KubectlInstallerV0/* @bansalaseem

Tasks/KubernetesV0/* @bansalaseem

Tasks/KubernetesV1/* @bansalaseem

Tasks/KubernetesManifestV0/* @bansalaseem

Tasks/ManualInterventionV8/* @bansalaseem

Tasks/MavenV2/* @madhurig
Expand All @@ -173,19 +239,19 @@ Tasks/MysqlDeploymentOnMachineGroupV1/* @kmkumaran @RoshanKumarMicrosof

Tasks/NodeToolV0/* @hross

Tasks/NpmV1/* @zackrun
Tasks/NpmV1/* @zjrunner @jotaylo

Tasks/NpmAuthenticateV0/* @zackrun
Tasks/NpmAuthenticateV0/* @zjrunner

Tasks/NuGetV0/* @zackrun
Tasks/NuGetV0/* @zjrunner

Tasks/NuGetCommandV2/* @zackrun
Tasks/NuGetCommandV2/* @zjrunner @jotaylo

Tasks/NuGetPackagerV0/* @zackrun
Tasks/NuGetPackagerV0/* @zjrunner

Tasks/NuGetPublisherV0/* @zackrun
Tasks/NuGetPublisherV0/* @zjrunner

Tasks/NuGetToolInstallerV0/* @zackrun
Tasks/NuGetToolInstallerV0/* @zjrunner

Tasks/PackerBuildV0/* @sachinma

Expand Down Expand Up @@ -243,12 +309,18 @@ Tasks/SqlServerDacpacDeployment/* @kmkumaran

Tasks/SshV0/* @madhurig

Tasks/TwineAuthenticateV0/* @zackrun
Tasks/TwineAuthenticateV0/* @zjrunner

Tasks/UniversalPackagesV0/* @zjrunner

Tasks/UniversalPackagesV0/* @zackrun
Tasks/UseDotNetV2/* @damccorm

Tasks/UseNodeV1/* @damccorm

Tasks/UsePythonVersionV0/* @madhurig

Tasks/UseRubyV1/* @dakale

Tasks/UseRubyVersionV0/* @hross

Tasks/VSBuildV1/* @daveken
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Tasks are simply tool runners. They know how to run MSBuild, VSTest, etc... in

For uploading custom tasks to Azure Pipelines use the [TFS Cross Platform Command Line utility](https://github.com/Microsoft/tfs-cli).

Tasks can also be deployed with an Azure DevOps extension. See [this tutorial](https://docs.microsoft.com/en-us/vsts/extend/develop/add-build-task) for how to package tasks inside an extension.
Tasks can also be deployed with an Azure DevOps extension. See [this tutorial](https://docs.microsoft.com/en-us/vsts/extend/develop/add-build-task) for how to write a custom task and package it inside an extension.

## Contributing

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
"loc.messages.UnsupportedJdkWarning": "JDK 9 and JDK 10 are out of support. Please switch to a later version in your project and pipeline. Attempting to build with JDK 11...",
"loc.messages.FailedToLocateSpecifiedJVM": "Failed to find the specified JDK version. Please ensure the specified JDK version is installed on the agent and the environment variable '%s' exists and is set to the location of a corresponding JDK or use the [Java Tool Installer](https://go.microsoft.com/fwlink/?linkid=875287) task to install the desired JDK.",
"loc.messages.DiscontinueAntCodeCoverage": "We are discontinuing the support of automated code coverage report generation for Ant projects. Please refer to https://go.microsoft.com/fwlink/?linkid=875306 for more details.",
"loc.messages.NoCodeCoverage": "No code coverage results were found to publish."
"loc.messages.NoCodeCoverage": "No code coverage results were found to publish.",
"loc.messages.NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
}
16 changes: 8 additions & 8 deletions Tasks/ANTV1/ThirdPartyNotice.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ This Azure DevOps extension (ANTV1) is based on or incorporates material from th
4. boolbase (git+https://github.com/fb55/boolbase.git)
5. brace-expansion (git://github.com/juliangruber/brace-expansion.git)
6. cheerio (git://github.com/cheeriojs/cheerio.git)
7. codecoverage-tools (git+https://github.com/Microsoft/vsts-tasks.git)
7. codecoverage-tools (git+https://github.com/Microsoft/azure-pipelines-tasks.git)
8. concat-map (git://github.com/substack/node-concat-map.git)
9. core-util-is (git://github.com/isaacs/core-util-is.git)
10. css-select (git://github.com/fb55/css-select.git)
Expand Down Expand Up @@ -527,10 +527,10 @@ 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
Expand Down Expand Up @@ -1304,7 +1304,7 @@ END OF mockery NOTICES, INFORMATION, AND LICENSE
=========================================
The MIT License (MIT)

Copyright (c) 2010-2012 Robert Kieffer
Copyright (c) 2010-2012 Robert Kieffer

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 Expand Up @@ -1633,15 +1633,15 @@ modification, are permitted provided that the following conditions are met:
names of the contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
ARE DISCLAIMED. IN NO EVENT SHALL ARTUR ADIB BE LIABLE FOR ANY
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
=========================================
END OF shelljs NOTICES, INFORMATION, AND LICENSE
Expand Down
2 changes: 1 addition & 1 deletion Tasks/ANTV1/anttask.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function publishTestResults(publishJUnitResults, testResultsFiles: string) {
}

if (!matchingTestResultsFiles || matchingTestResultsFiles.length === 0) {
tl.warning('No test result files matching ' + testResultsFiles + ' were found, so publishing JUnit test results is being skipped.');
console.log(tl.loc('NoTestResults', testResultsFiles));
return 0;
}

Expand Down
8 changes: 5 additions & 3 deletions Tasks/ANTV1/task.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"name": "Ant",
"friendlyName": "Ant",
"description": "Build with Apache Ant",
"helpUrl": "https://go.microsoft.com/fwlink/?LinkID=613718",
"helpMarkDown": "[More Information](https://go.microsoft.com/fwlink/?LinkID=613718)",
"category": "Build",
"visibility": [
Expand All @@ -16,8 +17,8 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 143,
"Patch": 1
"Minor": 149,
"Patch": 0
},
"demands": [
"ant"
Expand Down Expand Up @@ -259,6 +260,7 @@
"UnsupportedJdkWarning": "JDK 9 and JDK 10 are out of support. Please switch to a later version in your project and pipeline. Attempting to build with JDK 11...",
"FailedToLocateSpecifiedJVM": "Failed to find the specified JDK version. Please ensure the specified JDK version is installed on the agent and the environment variable '%s' exists and is set to the location of a corresponding JDK or use the [Java Tool Installer](https://go.microsoft.com/fwlink/?linkid=875287) task to install the desired JDK.",
"DiscontinueAntCodeCoverage": "We are discontinuing the support of automated code coverage report generation for Ant projects. Please refer to https://go.microsoft.com/fwlink/?linkid=875306 for more details.",
"NoCodeCoverage": "No code coverage results were found to publish."
"NoCodeCoverage": "No code coverage results were found to publish.",
"NoTestResults": "No test result files matching %s were found, so publishing JUnit test results is being skipped."
}
}
6 changes: 4 additions & 2 deletions Tasks/ANTV1/task.loc.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"name": "Ant",
"friendlyName": "ms-resource:loc.friendlyName",
"description": "ms-resource:loc.description",
"helpUrl": "https://go.microsoft.com/fwlink/?LinkID=613718",
"helpMarkDown": "ms-resource:loc.helpMarkDown",
"category": "Build",
"visibility": [
Expand All @@ -16,7 +17,7 @@
"author": "Microsoft Corporation",
"version": {
"Major": 1,
"Minor": 143,
"Minor": 149,
"Patch": 0
},
"demands": [
Expand Down Expand Up @@ -259,6 +260,7 @@
"UnsupportedJdkWarning": "ms-resource:loc.messages.UnsupportedJdkWarning",
"FailedToLocateSpecifiedJVM": "ms-resource:loc.messages.FailedToLocateSpecifiedJVM",
"DiscontinueAntCodeCoverage": "ms-resource:loc.messages.DiscontinueAntCodeCoverage",
"NoCodeCoverage": "ms-resource:loc.messages.NoCodeCoverage"
"NoCodeCoverage": "ms-resource:loc.messages.NoCodeCoverage",
"NoTestResults": "ms-resource:loc.messages.NoTestResults"
}
}
2 changes: 1 addition & 1 deletion Tasks/AndroidSigningV2/Tests/L0.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs = require('fs');
import assert = require('assert');
import path = require('path');
import * as ttm from 'vsts-task-lib/mock-test';
import * as ttm from 'azure-pipelines-task-lib/mock-test';

describe('AndroidSigning Suite', function () {
this.timeout(parseInt(process.env.TASK_TEST_TIMEOUT) || 20000);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ma = require('vsts-task-lib/mock-answer');
import tmrm = require('vsts-task-lib/mock-run');
import ma = require('azure-pipelines-task-lib/mock-answer');
import tmrm = require('azure-pipelines-task-lib/mock-run');
import path = require('path');

let taskPath = path.join(__dirname, '..', 'androidsigning.js');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ma = require('vsts-task-lib/mock-answer');
import tmrm = require('vsts-task-lib/mock-run');
import ma = require('azure-pipelines-task-lib/mock-answer');
import tmrm = require('azure-pipelines-task-lib/mock-run');
import path = require('path');

let taskPath = path.join(__dirname, '..', 'androidsigning.js');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ma = require('vsts-task-lib/mock-answer');
import tmrm = require('vsts-task-lib/mock-run');
import ma = require('azure-pipelines-task-lib/mock-answer');
import tmrm = require('azure-pipelines-task-lib/mock-run');
import path = require('path');

let taskPath = path.join(__dirname, '..', 'androidsigning.js');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ma = require('vsts-task-lib/mock-answer');
import tmrm = require('vsts-task-lib/mock-run');
import ma = require('azure-pipelines-task-lib/mock-answer');
import tmrm = require('azure-pipelines-task-lib/mock-run');
import path = require('path');

let taskPath = path.join(__dirname, '..', 'androidsigning.js');
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AndroidSigningV2/Tests/L0AndroidSignAlignNoFileInput.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ma = require('vsts-task-lib/mock-answer');
import tmrm = require('vsts-task-lib/mock-run');
import ma = require('azure-pipelines-task-lib/mock-answer');
import tmrm = require('azure-pipelines-task-lib/mock-run');
import path = require('path');

let taskPath = path.join(__dirname, '..', 'androidsigning.js');
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ma = require('vsts-task-lib/mock-answer');
import tmrm = require('vsts-task-lib/mock-run');
import ma = require('azure-pipelines-task-lib/mock-answer');
import tmrm = require('azure-pipelines-task-lib/mock-run');
import path = require('path');

let taskPath = path.join(__dirname, '..', 'androidsigning.js');
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AndroidSigningV2/Tests/L0AndroidSignSingleFile.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ma = require('vsts-task-lib/mock-answer');
import tmrm = require('vsts-task-lib/mock-run');
import ma = require('azure-pipelines-task-lib/mock-answer');
import tmrm = require('azure-pipelines-task-lib/mock-run');
import path = require('path');

let taskPath = path.join(__dirname, '..', 'androidsigning.js');
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AndroidSigningV2/Tests/L0AndroidSkipSignAlign.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ma = require('vsts-task-lib/mock-answer');
import tmrm = require('vsts-task-lib/mock-run');
import ma = require('azure-pipelines-task-lib/mock-answer');
import tmrm = require('azure-pipelines-task-lib/mock-run');
import path = require('path');

let taskPath = path.join(__dirname, '..', 'androidsigning.js');
Expand Down
4 changes: 2 additions & 2 deletions Tasks/AndroidSigningV2/Tests/L0AndroidZipalignSingleFile.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import ma = require('vsts-task-lib/mock-answer');
import tmrm = require('vsts-task-lib/mock-run');
import ma = require('azure-pipelines-task-lib/mock-answer');
import tmrm = require('azure-pipelines-task-lib/mock-run');
import path = require('path');

let taskPath = path.join(__dirname, '..', 'androidsigning.js');
Expand Down
Loading

0 comments on commit 1489fcf

Please sign in to comment.