Merge branch 'release/2.2'

.azure/pipelines/e2e-tests.yml

@@ -19,10 +19,7 @@ phases:
     inputs:
       versionSpec: 10.x
   - powershell: |
-      test/Cli.FunctionalTests/run-tests.ps1 `
+      test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier)
-        -ci `
-        -ProdConManifestUrl $env:PRODCONMANIFESTURL `
-        -TestRuntimeIdentifier $(Test.RuntimeIdentifier)
     condition: ne(variables['PB_SkipTests'], 'true')
     displayName: Run E2E tests
   - task: PublishTestResults@2

test/Cli.FunctionalTests/run-tests.ps1

@@ -27,7 +27,7 @@ The RID of the platform running the tests. (Determined automatically if possible
 .PARAMETER ProdConManifestUrl
 The prodcon build.xml file
 
-.PARAMETER ProcConChannel
+.PARAMETER ProdConChannel
 The prodcon channel to use if a build.xml file isn't set.
 #>
 
@@ -35,12 +35,12 @@ param(
     [switch]$ci,
     $AssetRootUrl = $env:PB_ASSETROOTURL,
     $AccessTokenSuffix = $env:PB_ACCESSTOKENSUFFIX,
-    $RestoreSources = $env:PB_RESTORESOURCES,
+    $RestoreSources = $env:PB_RESTORESOURCE,
     [ValidateSet('none', 'osx-x64', 'linux-x64', 'win-x64')]
     $TestRuntimeIdentifier,
     $HostRid,
     $ProdConManifestUrl,
-    $ProcConChannel = 'master'
+    $ProdConChannel = 'master'
 )
 
 $ErrorActionPreference = 'Stop'
@@ -49,6 +49,9 @@ Set-StrictMode -Version 1
 $repoRoot = Resolve-Path "$PSScriptRoot/../../"
 Import-Module "$repoRoot/scripts/common.psm1" -Scope Local -Force
 
+# This ID corresponds to the ProdCon build number
+Write-Host "ProductBuildId:  $env:PRODUCTBUILDID"
+
 if (-not $HostRid) {
     if (Test-Path Variable:/IsCoreCLR) {
         $HostRid = if ($IsWindows) { 'win-x64' } `
@@ -86,9 +89,11 @@ try {
 
         if (-not $ProdConManifestUrl) {
             Write-Host -ForegroundColor Magenta "Running tests for the latest ProdCon build"
-            $ProdConManifestUrl = "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/product/cli/$ProcConChannel/build.xml"
+            $ProdConManifestUrl = "https://raw.githubusercontent.com/dotnet/versions/master/build-info/dotnet/product/cli/$ProdConChannel/build.xml"
         }
 
+        Write-Host "ProdConManifestUrl:    $ProdConManifestUrl"
+
         [xml] $prodConManifest = Invoke-RestMethod $ProdConManifestUrl
 
         $RestoreSources = $prodConManifest.OrchestratedBuild.Endpoint `
@@ -106,7 +111,9 @@ try {
             Write-Error "Missing required parameter: AssetRootUrl"
         }
         $AssetRootUrl = $AssetRootUrl.TrimEnd('/')
-        [xml] $cli = Invoke-RestMethod "$AssetRootUrl/orchestration-metadata/manifests/cli.xml${AccessTokenSuffix}"
+        $cliMetadataUrl = "$AssetRootUrl/orchestration-metadata/manifests/cli.xml${AccessTokenSuffix}"
+        Write-Host "CliMetadataUrl:  $cliMetadataUrl"
+        [xml] $cli = Invoke-RestMethod $cliMetadataUrl
         $sdkVersion = $cli.Build.ProductVersion
     }