huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
Doug Bunting 2019-05-14 11:11:41 -07:00 committed by GitHub
parent 782a3f8f5e 9b3bf98389
commit 659474a7ab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.azure/pipelines/e2e-tests.yml
View File

@ -37,7 +37,7 @@ jobs:
inputs: inputs:
versionSpec: $(Node.Version) versionSpec: $(Node.Version)
- powershell: | - 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') condition: ne(variables['PB_SkipTests'], 'true')
displayName: Run E2E tests displayName: Run E2E tests
@ -83,7 +83,7 @@ jobs:
inputs: inputs:
versionSpec: $(Node.Version) versionSpec: $(Node.Version)
- powershell: | - 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') condition: ne(variables['PB_SkipTests'], 'true')
displayName: Run E2E tests displayName: Run E2E tests
@ -129,7 +129,7 @@ jobs:
inputs: inputs:
versionSpec: $(Node.Version) versionSpec: $(Node.Version)
- powershell: | - 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') condition: ne(variables['PB_SkipTests'], 'true')
displayName: Run E2E tests displayName: Run E2E tests

6
test/Cli.FunctionalTests/Cli.FunctionalTests.csproj
View File

@ -10,11 +10,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <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="Newtonsoft.Json" Version="11.0.2" />
<PackageReference Include="NuGet.Versioning" Version="4.7.0" /> <PackageReference Include="NuGet.Versioning" Version="4.7.0" />
<PackageReference Include="NUnit" Version="3.10.1" /> <PackageReference Include="NUnit" Version="3.11.0" />
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" /> <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
test/Cli.FunctionalTests/Util/DotNetUtil.cs
View File

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

5
test/Cli.FunctionalTests/run-tests.ps1
View File

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