Merge branch 'release/2.1' => 'release/2.2' (#10221)

.azure/pipelines/e2e-tests.yml

@@ -37,7 +37,7 @@ jobs:
     inputs:
       versionSpec: $(Node.Version)
   - powershell: |
-      test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
+      test/Cli.FunctionalTests/run-tests.ps1 -ci -CliManifestName $(CliManifestName) -RestoreSources $(PB_RestoreSource) -AccessTokenSuffix '$(AccessTokenSuffix)' -AssetRootUrl $(PB_AssetRootUrl) -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
 
     condition: ne(variables['PB_SkipTests'], 'true')
     displayName: Run E2E tests
@@ -83,7 +83,7 @@ jobs:
     inputs:
       versionSpec: $(Node.Version)
   - powershell: |
-      test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
+      test/Cli.FunctionalTests/run-tests.ps1 -ci -CliManifestName $(CliManifestName) -RestoreSources $(PB_RestoreSource) -AccessTokenSuffix '$(AccessTokenSuffix)' -AssetRootUrl $(PB_AssetRootUrl) -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
 
     condition: ne(variables['PB_SkipTests'], 'true')
     displayName: Run E2E tests
@@ -129,7 +129,7 @@ jobs:
     inputs:
       versionSpec: $(Node.Version)
   - powershell: |
-      test/Cli.FunctionalTests/run-tests.ps1 -ci -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
+      test/Cli.FunctionalTests/run-tests.ps1 -ci -CliManifestName $(CliManifestName) -RestoreSources $(PB_RestoreSource) -AccessTokenSuffix '$(AccessTokenSuffix)' -AssetRootUrl $(PB_AssetRootUrl) -ProdConManifestUrl $env:PRODCONMANIFESTURL -TestRuntimeIdentifier $(Test.RuntimeIdentifier) -AdditionalRestoreSources $env:ADDITIONALRESTORESOURCES
 
     condition: ne(variables['PB_SkipTests'], 'true')
     displayName: Run E2E tests

test/Cli.FunctionalTests/Cli.FunctionalTests.csproj

@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
     <PackageReference Include="NuGet.Versioning" Version="4.7.0" />
-    <PackageReference Include="NUnit" Version="3.10.1" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
+    <PackageReference Include="NUnit" Version="3.11.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
   </ItemGroup>
 
 </Project>

test/Cli.FunctionalTests/Util/DotNetUtil.cs

@@ -64,8 +64,8 @@ namespace Cli.FunctionalTests.Util
             var runtimeVersionString = Regex.Match(info, runtimeVersionPattern, RegexOptions.RightToLeft).Groups[1].Value;
             var runtimeVersion = SemanticVersion.Parse(runtimeVersionString);
 
-            // Supported version range is [2.1.300,2.2.100] (inclusive)
-            if (sdkVersion >= new SemanticVersion(2, 1, 300) && sdkVersion <= new SemanticVersion(2, 2, 100))
+            // Supported version range is [2.1.300,2.2.210] (inclusive)
+            if (sdkVersion >= new SemanticVersion(2, 1, 300) && sdkVersion <= new SemanticVersion(2, 2, 210))
             {
                 return (sdkVersion, runtimeVersion);
             }

test/Cli.FunctionalTests/run-tests.ps1

@@ -44,6 +44,7 @@ param(
     $HostRid,
     $ProdConManifestUrl,
     $ProdConChannel = 'release/2.2',
+    $CliManifestName = "cli.xml",
     $AdditionalRestoreSources
 )
 
@@ -115,7 +116,7 @@ try {
             Write-Error "Missing required parameter: AssetRootUrl"
         }
         $AssetRootUrl = $AssetRootUrl.TrimEnd('/')
-        $cliMetadataUrl = "$AssetRootUrl/orchestration-metadata/manifests/cli.xml${AccessTokenSuffix}"
+        $cliMetadataUrl = "$AssetRootUrl/orchestration-metadata/manifests/${CliManifestName}${AccessTokenSuffix}"
         Write-Host "CliMetadataUrl:  $cliMetadataUrl"
         [xml] $cli = Invoke-RestMethod $cliMetadataUrl
         $sdkVersion = $cli.Build.ProductVersion
@@ -163,7 +164,7 @@ try {
     [string[]] $filterArgs = @()
 
     if ($TestRuntimeIdentifier) {
-        $filterArgs += '--filter',"rid: $TestRuntimeIdentifier"
+        $filterArgs += '--filter',"Name~rid: $TestRuntimeIdentifier"
     }
 
     Invoke-Block { & $dotnet test `