diff --git a/.github/workflows/extension.yml b/.github/workflows/extension.yml index 38872471..50ee1f33 100644 --- a/.github/workflows/extension.yml +++ b/.github/workflows/extension.yml @@ -83,12 +83,12 @@ jobs: - name: Update version numbers in task.json run: | - echo "`jq '.version.Major=1' extension/tasks/dependabot/dependabotV1/task.json`" > extension/tasks/dependabot/dependabotV1/task.json - echo "`jq '.version.Minor=34' extension/tasks/dependabot/dependabotV1/task.json`" > extension/tasks/dependabot/dependabotV1/task.json - echo "`jq '.version.Patch=${{ github.run_number }}' extension/tasks/dependabot/dependabotV1/task.json`" > extension/tasks/dependabot/dependabotV1/task.json - echo "`jq '.version.Major=${{ steps.gitversion.outputs.major }}' extension/tasks/dependabot/dependabotV2/task.json`" > extension/tasks/dependabot/dependabotV2/task.json - echo "`jq '.version.Minor=${{ steps.gitversion.outputs.minor }}' extension/tasks/dependabot/dependabotV2/task.json`" > extension/tasks/dependabot/dependabotV2/task.json - echo "`jq '.version.Patch=${{ github.run_number }}' extension/tasks/dependabot/dependabotV2/task.json`" > extension/tasks/dependabot/dependabotV2/task.json + echo "`jq '.version.Major=1' extension/tasks/dependabotV1/task.json`" > extension/tasks/dependabotV1/task.json + echo "`jq '.version.Minor=34' extension/tasks/dependabotV1/task.json`" > extension/tasks/dependabotV1/task.json + echo "`jq '.version.Patch=${{ github.run_number }}' extension/tasks/dependabotV1/task.json`" > extension/tasks/dependabotV1/task.json + echo "`jq '.version.Major=${{ steps.gitversion.outputs.major }}' extension/tasks/dependabotV2/task.json`" > extension/tasks/dependabotV2/task.json + echo "`jq '.version.Minor=${{ steps.gitversion.outputs.minor }}' extension/tasks/dependabotV2/task.json`" > extension/tasks/dependabotV2/task.json + echo "`jq '.version.Patch=${{ github.run_number }}' extension/tasks/dependabotV2/task.json`" > extension/tasks/dependabotV2/task.json - name: Create Extension (dev) run: > diff --git a/extension/package.json b/extension/package.json index 32d7ac09..b5a36374 100644 --- a/extension/package.json +++ b/extension/package.json @@ -4,11 +4,11 @@ "description": "Dependabot Azure DevOps task", "main": "''", "scripts": { - "postdependencies": "cp -r node_modules tasks/dependabot/dependabotV1/node_modules && cp -r node_modules tasks/dependabot/dependabotV2/node_modules", + "postdependencies": "cp -r node_modules tasks/dependabotV1/node_modules && cp -r node_modules tasks/dependabotV2/node_modules", "build": "tsc -p .", "start": "npm run start:V2", - "start:V1": "node tasks/dependabot/dependabotV1/index.js", - "start:V2": "node tasks/dependabot/dependabotV2/index.js", + "start:V1": "node tasks/dependabotV1/index.js", + "start:V2": "node tasks/dependabotV2/index.js", "test": "jest", "package": "npx tfx-cli extension create --json5" }, diff --git a/extension/tasks/dependabot/dependabotV1/icon.png b/extension/tasks/dependabotV1/icon.png similarity index 100% rename from extension/tasks/dependabot/dependabotV1/icon.png rename to extension/tasks/dependabotV1/icon.png diff --git a/extension/tasks/dependabot/dependabotV1/index.ts b/extension/tasks/dependabotV1/index.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/index.ts rename to extension/tasks/dependabotV1/index.ts diff --git a/extension/tasks/dependabot/dependabotV1/task.json b/extension/tasks/dependabotV1/task.json similarity index 100% rename from extension/tasks/dependabot/dependabotV1/task.json rename to extension/tasks/dependabotV1/task.json diff --git a/extension/tasks/dependabot/dependabotV1/utils/IDependabotConfig.ts b/extension/tasks/dependabotV1/utils/IDependabotConfig.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/IDependabotConfig.ts rename to extension/tasks/dependabotV1/utils/IDependabotConfig.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/convertPlaceholder.test.ts b/extension/tasks/dependabotV1/utils/convertPlaceholder.test.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/convertPlaceholder.test.ts rename to extension/tasks/dependabotV1/utils/convertPlaceholder.test.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/convertPlaceholder.ts b/extension/tasks/dependabotV1/utils/convertPlaceholder.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/convertPlaceholder.ts rename to extension/tasks/dependabotV1/utils/convertPlaceholder.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/extractHostname.test.ts b/extension/tasks/dependabotV1/utils/extractHostname.test.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/extractHostname.test.ts rename to extension/tasks/dependabotV1/utils/extractHostname.test.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/extractHostname.ts b/extension/tasks/dependabotV1/utils/extractHostname.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/extractHostname.ts rename to extension/tasks/dependabotV1/utils/extractHostname.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/extractOrganization.test.ts b/extension/tasks/dependabotV1/utils/extractOrganization.test.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/extractOrganization.test.ts rename to extension/tasks/dependabotV1/utils/extractOrganization.test.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/extractOrganization.ts b/extension/tasks/dependabotV1/utils/extractOrganization.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/extractOrganization.ts rename to extension/tasks/dependabotV1/utils/extractOrganization.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/extractVirtualDirectory.test.ts b/extension/tasks/dependabotV1/utils/extractVirtualDirectory.test.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/extractVirtualDirectory.test.ts rename to extension/tasks/dependabotV1/utils/extractVirtualDirectory.test.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/extractVirtualDirectory.ts b/extension/tasks/dependabotV1/utils/extractVirtualDirectory.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/extractVirtualDirectory.ts rename to extension/tasks/dependabotV1/utils/extractVirtualDirectory.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/getAzureDevOpsAccessToken.ts b/extension/tasks/dependabotV1/utils/getAzureDevOpsAccessToken.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/getAzureDevOpsAccessToken.ts rename to extension/tasks/dependabotV1/utils/getAzureDevOpsAccessToken.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/getDockerImageTag.ts b/extension/tasks/dependabotV1/utils/getDockerImageTag.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/getDockerImageTag.ts rename to extension/tasks/dependabotV1/utils/getDockerImageTag.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/getGithubAccessToken.ts b/extension/tasks/dependabotV1/utils/getGithubAccessToken.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/getGithubAccessToken.ts rename to extension/tasks/dependabotV1/utils/getGithubAccessToken.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/getSharedVariables.ts b/extension/tasks/dependabotV1/utils/getSharedVariables.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/getSharedVariables.ts rename to extension/tasks/dependabotV1/utils/getSharedVariables.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/parseConfigFile.test.ts b/extension/tasks/dependabotV1/utils/parseConfigFile.test.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/parseConfigFile.test.ts rename to extension/tasks/dependabotV1/utils/parseConfigFile.test.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/parseConfigFile.ts b/extension/tasks/dependabotV1/utils/parseConfigFile.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/parseConfigFile.ts rename to extension/tasks/dependabotV1/utils/parseConfigFile.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/resolveAzureDevOpsIdentities.test.ts b/extension/tasks/dependabotV1/utils/resolveAzureDevOpsIdentities.test.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/resolveAzureDevOpsIdentities.test.ts rename to extension/tasks/dependabotV1/utils/resolveAzureDevOpsIdentities.test.ts diff --git a/extension/tasks/dependabot/dependabotV1/utils/resolveAzureDevOpsIdentities.ts b/extension/tasks/dependabotV1/utils/resolveAzureDevOpsIdentities.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV1/utils/resolveAzureDevOpsIdentities.ts rename to extension/tasks/dependabotV1/utils/resolveAzureDevOpsIdentities.ts diff --git a/extension/tasks/dependabot/dependabotV2/icon.png b/extension/tasks/dependabotV2/icon.png similarity index 100% rename from extension/tasks/dependabot/dependabotV2/icon.png rename to extension/tasks/dependabotV2/icon.png diff --git a/extension/tasks/dependabot/dependabotV2/index.ts b/extension/tasks/dependabotV2/index.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/index.ts rename to extension/tasks/dependabotV2/index.ts diff --git a/extension/tasks/dependabot/dependabotV2/task.json b/extension/tasks/dependabotV2/task.json similarity index 100% rename from extension/tasks/dependabot/dependabotV2/task.json rename to extension/tasks/dependabotV2/task.json diff --git a/extension/tasks/dependabot/dependabotV2/utils/azure-devops/AzureDevOpsWebApiClient.ts b/extension/tasks/dependabotV2/utils/azure-devops/AzureDevOpsWebApiClient.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/azure-devops/AzureDevOpsWebApiClient.ts rename to extension/tasks/dependabotV2/utils/azure-devops/AzureDevOpsWebApiClient.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/azure-devops/interfaces/IFileChange.ts b/extension/tasks/dependabotV2/utils/azure-devops/interfaces/IFileChange.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/azure-devops/interfaces/IFileChange.ts rename to extension/tasks/dependabotV2/utils/azure-devops/interfaces/IFileChange.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/azure-devops/interfaces/IPullRequest.ts b/extension/tasks/dependabotV2/utils/azure-devops/interfaces/IPullRequest.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/azure-devops/interfaces/IPullRequest.ts rename to extension/tasks/dependabotV2/utils/azure-devops/interfaces/IPullRequest.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/azure-devops/interfaces/IPullRequestProperties.ts b/extension/tasks/dependabotV2/utils/azure-devops/interfaces/IPullRequestProperties.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/azure-devops/interfaces/IPullRequestProperties.ts rename to extension/tasks/dependabotV2/utils/azure-devops/interfaces/IPullRequestProperties.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/azure-devops/resolveAzureDevOpsIdentities.ts b/extension/tasks/dependabotV2/utils/azure-devops/resolveAzureDevOpsIdentities.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/azure-devops/resolveAzureDevOpsIdentities.ts rename to extension/tasks/dependabotV2/utils/azure-devops/resolveAzureDevOpsIdentities.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/convertPlaceholder.ts b/extension/tasks/dependabotV2/utils/convertPlaceholder.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/convertPlaceholder.ts rename to extension/tasks/dependabotV2/utils/convertPlaceholder.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/DependabotCli.ts b/extension/tasks/dependabotV2/utils/dependabot-cli/DependabotCli.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/DependabotCli.ts rename to extension/tasks/dependabotV2/utils/dependabot-cli/DependabotCli.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/DependabotJobBuilder.ts b/extension/tasks/dependabotV2/utils/dependabot-cli/DependabotJobBuilder.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/DependabotJobBuilder.ts rename to extension/tasks/dependabotV2/utils/dependabot-cli/DependabotJobBuilder.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/DependabotOutputProcessor.ts b/extension/tasks/dependabotV2/utils/dependabot-cli/DependabotOutputProcessor.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/DependabotOutputProcessor.ts rename to extension/tasks/dependabotV2/utils/dependabot-cli/DependabotOutputProcessor.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateJobConfig.ts b/extension/tasks/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateJobConfig.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateJobConfig.ts rename to extension/tasks/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateJobConfig.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOperation.ts b/extension/tasks/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOperation.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOperation.ts rename to extension/tasks/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOperation.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOperationResult.ts b/extension/tasks/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOperationResult.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOperationResult.ts rename to extension/tasks/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOperationResult.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOutputProcessor.ts b/extension/tasks/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOutputProcessor.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOutputProcessor.ts rename to extension/tasks/dependabotV2/utils/dependabot-cli/interfaces/IDependabotUpdateOutputProcessor.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/dependabot/interfaces/IDependabotConfig.ts b/extension/tasks/dependabotV2/utils/dependabot/interfaces/IDependabotConfig.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/dependabot/interfaces/IDependabotConfig.ts rename to extension/tasks/dependabotV2/utils/dependabot/interfaces/IDependabotConfig.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/dependabot/parseConfigFile.ts b/extension/tasks/dependabotV2/utils/dependabot/parseConfigFile.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/dependabot/parseConfigFile.ts rename to extension/tasks/dependabotV2/utils/dependabot/parseConfigFile.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/extractHostname.ts b/extension/tasks/dependabotV2/utils/extractHostname.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/extractHostname.ts rename to extension/tasks/dependabotV2/utils/extractHostname.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/extractOrganization.ts b/extension/tasks/dependabotV2/utils/extractOrganization.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/extractOrganization.ts rename to extension/tasks/dependabotV2/utils/extractOrganization.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/extractVirtualDirectory.ts b/extension/tasks/dependabotV2/utils/extractVirtualDirectory.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/extractVirtualDirectory.ts rename to extension/tasks/dependabotV2/utils/extractVirtualDirectory.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/getAzureDevOpsAccessToken.ts b/extension/tasks/dependabotV2/utils/getAzureDevOpsAccessToken.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/getAzureDevOpsAccessToken.ts rename to extension/tasks/dependabotV2/utils/getAzureDevOpsAccessToken.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/getGithubAccessToken.ts b/extension/tasks/dependabotV2/utils/getGithubAccessToken.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/getGithubAccessToken.ts rename to extension/tasks/dependabotV2/utils/getGithubAccessToken.ts diff --git a/extension/tasks/dependabot/dependabotV2/utils/getSharedVariables.ts b/extension/tasks/dependabotV2/utils/getSharedVariables.ts similarity index 100% rename from extension/tasks/dependabot/dependabotV2/utils/getSharedVariables.ts rename to extension/tasks/dependabotV2/utils/getSharedVariables.ts diff --git a/extension/vss-extension.json b/extension/vss-extension.json index 3a2c2bc6..2f4c8707 100644 --- a/extension/vss-extension.json +++ b/extension/vss-extension.json @@ -45,7 +45,7 @@ "type": "ms.vss-distributed-task.task", "targets": ["ms.vss-distributed-task.tasks"], "properties": { - "name": "tasks/dependabot" + "name": "tasks" } } ]