Changes with NuGet package approach

diff --git a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json b/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
index d481c89..481417d 100644 (file)
--- a/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
+++ b/buildpipeline/Dotnet-CoreClr-Trusted-BuildTests.json
@@ -43,7 +43,9 @@
         "failOnStandardError": "false"
       }
     },
-    {
+    {"PB_FeedReadAccessToken": {
+      "value": "$(PB_FeedReadAccessToken)"
+    },
       "environment": {},
       "enabled": true,
       "continueOnError": false,
@@ -90,20 +92,97 @@
       "enabled": true,
       "continueOnError": true,
       "alwaysRun": true,
-      "displayName": "Uninstall SCEP",
+      "displayName": "Create Auth'd NuGet.config",
       "timeoutInMinutes": 0,
-      "condition": "ne(variables['PB_SkipTests'], 'true')",
-      "refName": "Task20",
+      "condition": "succeeded()",
       "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
+        "id": "e213ff0f-5d5c-4791-802d-52ea3e7be1f1",
         "versionSpec": "1.*",
         "definitionType": "task"
       },
       "inputs": {
-        "filename": "scep-ops.cmd",
-        "arguments": "-u",
+        "scriptType": "inlineScript",
+        "scriptName": "",
+        "arguments": "$(Build.StagingDirectory)\\VstsAuthed.NuGet.Config  https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json $(PB_FeedReadAccessToken)",
         "workingFolder": "",
-        "failOnStandardError": "false"
+        "inlineScript": "param($path, $url, $pat)\n\nSet-Content $path @\"\n<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<configuration>\n  <packageSources>\n    <add key=\"vsts-packages\" value=\"$url\" />\n  </packageSources>\n  <packageSourceCredentials>\n    <vsts-packages>\n      <add key=\"Username\" value=\"VssSessionToken\" />\n      <add key=\"ClearTextPassword\" value=\"$pat\" />\n    </vsts-packages>\n  </packageSourceCredentials>\n</configuration>\n\"@",
+        "failOnStandardError": "true"
+      }
+    },
+    {
+      "environment": {},
+      "enabled": true,
+      "continueOnError": true,
+      "alwaysRun": false,
+      "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 vsts-packages -ConfigFile $(Build.StagingDirectory)\\VstsAuthed.NuGet.Config -OutputDirectory $(Build.StagingDirectory) -NonInteractive"
+      }
+    },
+    {
+      "environment": {},
+      "enabled": true,
+      "continueOnError": true,
+      "alwaysRun": false,
+      "displayName": "Uninstall SCEP",
+      "timeoutInMinutes": 0,
+      "refName": "Task52",
+      "task": {
+        "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824",
+        "versionSpec": "1.*",
+        "definitionType": "task"
+      },
+      "inputs": {
+        "solution": "$(Build.StagingDirectory)\\Microsoft.DotNet.Build.Tasks.ScepOps.1.0.0\\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"
       }
     },
     {
@@ -131,21 +210,29 @@
       "environment": {},
       "enabled": true,
       "continueOnError": true,
-      "alwaysRun": true,
+      "alwaysRun": false,
       "displayName": "Install SCEP",
       "timeoutInMinutes": 0,
-      "condition": "ne(variables['PB_SkipTests'], 'true')",
-      "refName": "Task21",
+      "refName": "Task53",
       "task": {
-        "id": "d9bafed4-0b18-4f58-968d-86655b4d2ce9",
+        "id": "c6c4c611-aa2e-4a33-b606-5eaba2196824",
         "versionSpec": "1.*",
         "definitionType": "task"
       },
       "inputs": {
-        "filename": "scep-ops.cmd",
-        "arguments": "-i",
-        "workingFolder": "",
-        "failOnStandardError": "false"
+        "solution": "$(Build.StagingDirectory)\\Microsoft.DotNet.Build.Tasks.ScepOps.1.0.0\\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"
       }
     },
     {
@@ -321,6 +408,9 @@
     "PB_ContainerName": {
       "value": "$(Label)-$(TestContainerSuffix)-test"
     },
+    "PB_FeedReadAccessToken": {
+      "value": "$(PB_FeedReadAccessToken)"
+    },
     "TestContainerSuffix": {
       "value": "linux"
     },