Use task extensions on SCEP ops

1 files changed, 24 insertions, 81 deletions

diff --git a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
index 6623986fa3..28a263b45b 100644
--- a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
+++ b/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
@@ -89,76 +89,24 @@
       "environment": {},
       "enabled": true,
       "continueOnError": true,
-      "alwaysRun": true,
-      "displayName": "Install Microsoft.DotNet.Build.Tasks.ScepOps",
-      "timeoutInMinutes": 0,
-      "condition": "always()",
-      "task": {
-        "id": "333b11bd-d341-40d9-afcf-b32d5ce6f23b",
-        "versionSpec": "2.*",
-        "definitionType": "task"
-      },
-      "inputs": {
-        "command": "custom",
-        "solution": "**/*.sln",
-        "selectOrConfig": "select",
-        "feedRestore": "",
-        "includeNuGetOrg": "true",
-        "nugetConfigPath": "",
-        "externalEndpoints": "",
-        "noCache": "false",
-        "packagesDirectory": "",
-        "verbosityRestore": "Detailed",
-        "searchPatternPush": "$(Build.ArtifactStagingDirectory)/**/*.nupkg;!$(Build.ArtifactStagingDirectory)/**/*.symbols.nupkg",
-        "nuGetFeedType": "internal",
-        "feedPublish": "",
-        "allowPackageConflicts": "false",
-        "externalEndpoint": "",
-        "verbosityPush": "Detailed",
-        "searchPatternPack": "**/*.csproj",
-        "configurationToPack": "$(BuildConfiguration)",
-        "outputDir": "$(Build.ArtifactStagingDirectory)",
-        "versioningScheme": "off",
-        "includeReferencedProjects": "false",
-        "versionEnvVar": "",
-        "requestedMajorVersion": "1",
-        "requestedMinorVersion": "0",
-        "requestedPatchVersion": "0",
-        "packTimezone": "utc",
-        "includeSymbols": "false",
-        "toolPackage": "false",
-        "buildProperties": "",
-        "verbosityPack": "Detailed",
-        "arguments": "install Microsoft.DotNet.Build.Tasks.ScepOps -source https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json -OutputDirectory $(Build.StagingDirectory)"
-      }
-    },
-    {
-      "environment": {},
-      "enabled": true,
-      "continueOnError": true,
       "alwaysRun": false,
-      "displayName": "Uninstall SCEP",
+      "displayName": "Uninstall SCEP if script exists",
       "timeoutInMinutes": 0,
-      "refName": "Task52",
+      "condition": "succeededOrFailed()",
       "task": {
-        "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824",
-        "versionSpec": "1.*",
+        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+        "versionSpec": "2.*",
         "definitionType": "task"
       },
       "inputs": {
-        "solution": "$(Build.StagingDirectory)\\Microsoft.DotNet.Build.Tasks.ScepOps.1.0.1\\build\\Microsoft.DotNet.Build.Tasks.ScepOps.targets",
-        "msbuildLocationMethod": "version",
-        "msbuildVersion": "14.0",
-        "msbuildArchitecture": "x64",
-        "msbuildLocation": "",
-        "platform": "",
-        "configuration": "",
-        "msbuildArguments": "/t:UninstallSCEP",
-        "clean": "false",
-        "maximumCpuCount": "false",
-        "restoreNugetPackages": "false",
-        "logProjectEvents": "false",
-        "createLogFile": "false"
+        "targetType": "inline",
+        "filePath": "",
+        "arguments": "-Action u -ToolsPath  $(ScepToolsPath)",
+        "script": "if (Test-Path \"$(ScepToolsPath)SCEP_Tools\\scripts\\Microsoft.DotNet.Build.Tasks.Extensions.ps1\") {\n     \"Microsoft.DotNet.Build.Tasks.Extensions.ps1 script found. Executing action...\"\n    & $(ScepToolsPath)SCEP_Tools\\scripts\\Microsoft.DotNet.Build.Tasks.Extensions.ps1 -Action u -ToolsPath $(ScepToolsPath)\n} else {\n   \"Microsoft.DotNet.Build.Tasks.Extensions.ps1 script does not exist. Moving on...\"\n}",
+        "errorActionPreference": "continue",
+        "failOnStderr": "false",
+        "ignoreLASTEXITCODE": "true",
+        "workingDirectory": ""
       }
     },
     {
@@ -187,28 +135,23 @@
       "enabled": true,
       "continueOnError": true,
       "alwaysRun": true,
-      "displayName": "Install SCEP",
+      "displayName": "Install SCEP if script exists",
       "timeoutInMinutes": 0,
-      "refName": "Task53",
+      "condition": "succeededOrFailed()",
       "task": {
-        "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824",
-        "versionSpec": "1.*",
+        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
+        "versionSpec": "2.*",
         "definitionType": "task"
       },
       "inputs": {
-        "solution": "$(Build.StagingDirectory)\\Microsoft.DotNet.Build.Tasks.ScepOps.1.0.1\\build\\Microsoft.DotNet.Build.Tasks.ScepOps.targets",
-        "msbuildLocationMethod": "version",
-        "msbuildVersion": "14.0",
-        "msbuildArchitecture": "x64",
-        "msbuildLocation": "",
-        "platform": "",
-        "configuration": "",
-        "msbuildArguments": "/t:InstallSCEP",
-        "clean": "false",
-        "maximumCpuCount": "false",
-        "restoreNugetPackages": "false",
-        "logProjectEvents": "false",
-        "createLogFile": "false"
+        "targetType": "inline",
+        "filePath": "",
+        "arguments": "-Action i -ToolsPath  $(ScepToolsPath)",
+        "script": "if (Test-Path \"$(ScepToolsPath)SCEP_Tools\\scripts\\Microsoft.DotNet.Build.Tasks.Extensions.ps1\") {\n     \"Microsoft.DotNet.Build.Tasks.Extensions.ps1 script found. Executing action...\"\n    & $(ScepToolsPath)SCEP_Tools\\scripts\\Microsoft.DotNet.Build.Tasks.Extensions.ps1 -Action i -ToolsPath $(ScepToolsPath)\n} else {\n   \"Microsoft.DotNet.Build.Tasks.Extensions.ps1 script does not exist. Moving on...\"\n}",
+        "errorActionPreference": "continue",
+        "failOnStderr": "false",
+        "ignoreLASTEXITCODE": "true",
+        "workingDirectory": ""
       }
     },
     {