File tree Expand file tree Collapse file tree 4 files changed +73
-5
lines changed
Expand file tree Collapse file tree 4 files changed +73
-5
lines changed Original file line number Diff line number Diff line change @@ -11,6 +11,9 @@ indent_size = 2
1111[* .json ]
1212indent_size = 2
1313
14+ [* .yml ]
15+ indent_size = 2
16+
1417[* .cs ]
1518indent_size = 4
1619
Original file line number Diff line number Diff line change 1+ name : $(Date:yyMMdd).$(Rev:rr)
2+
3+ trigger :
4+ - ' *'
5+
6+ pr :
7+ - ' *'
8+
9+ variables :
10+ - group : AzureKeyVault
11+ - name : DOTNET_SKIP_FIRST_TIME_EXPERIENCE
12+ value : 1
13+
14+ jobs :
15+ - job : Windows
16+ pool :
17+ vmImage : vs2017-win2016
18+ steps :
19+ - task : DotNetCoreInstaller@0
20+ displayName : Install .NET Core 2.2
21+ inputs :
22+ version : ' 2.2.102'
23+ - powershell : ./build.ps1 -ci /p:AzureKeyVaultClientSecret=$(kv-access-token)
24+ displayName : Invoke build.ps1
25+ - task : PublishTestResults@2
26+ displayName : Upload test results
27+ condition : always()
28+ continueOnError : true
29+ inputs :
30+ testRunTitle : Windows
31+ testRunner : vstest
32+ testResultsFiles : ' **/*.trx'
33+ - task : PublishBuildArtifacts@1
34+ displayName : Publish artifacts
35+ inputs :
36+ pathtoPublish : ' artifacts/'
37+ artifactName : ' Packages'
38+ - job : Linux
39+ pool :
40+ vmImage : ' Ubuntu-16.04'
41+ steps :
42+ - task : DotNetCoreInstaller@0
43+ displayName : Install .NET Core 2.2
44+ inputs :
45+ version : ' 2.2.102'
46+ - script : ./build.ps1 -ci
47+ displayName : Invoke build.ps1
48+ - task : PublishTestResults@2
49+ displayName : Upload test results
50+ condition : always()
51+ continueOnError : true
52+ inputs :
53+ testRunTitle : Linux
54+ testRunner : vstest
55+ testResultsFiles : ' **/*.trx'
Original file line number Diff line number Diff line change @@ -32,7 +32,12 @@ if ($ci) {
3232 $MSBuildArgs += ' -p:CI=true'
3333}
3434
35- $CodeSign = $sign -or ($ci -and -not $env: APPVEYOR_PULL_REQUEST_HEAD_COMMIT -and ($IsWindows -or -not $IsCoreCLR ))
35+ $isPr = $env: APPVEYOR_PULL_REQUEST_HEAD_COMMIT -or ($env: BUILD_REASON -eq ' PullRequest' )
36+ if (-not (Test-Path variable:\IsCoreCLR)) {
37+ $IsWindows = $true
38+ }
39+
40+ $CodeSign = $sign -or ($ci -and -not $isPr -and $IsWindows )
3641
3742if ($CodeSign ) {
3843 $toolsDir = " $PSScriptRoot /.build/tools"
@@ -72,6 +77,9 @@ exec dotnet pack --no-restore --no-build --configuration $Configuration -o $arti
7277if ($PSVersionTable.PSEdition -eq ' Core' -and -not $IsWindows ) {
7378 $testArgs += ' --framework' , ' netcoreapp2.1'
7479}
80+ if ($env: TF_BUILD ) {
81+ $testArgs += ' --logger' , ' trx'
82+ }
7583
7684exec dotnet test -- no- restore -- no- build -- configuration $Configuration ' -clp:Summary' `
7785 " $PSScriptRoot /test/CommandLineUtils.Tests/McMaster.Extensions.CommandLineUtils.Tests.csproj" `
Original file line number Diff line number Diff line change 22 <PropertyGroup >
33 <VersionPrefix >2.3.1</VersionPrefix >
44 <VersionSuffix >build</VersionSuffix >
5- <PackageVersion Condition =" '$(APPVEYOR_REPO_TAG)' == 'true' AND '$(VersionSuffix)' != ''" >$(VersionPrefix)-$(VersionSuffix)</PackageVersion >
6- <PackageVersion Condition =" '$(APPVEYOR_REPO_TAG)' == 'true' AND '$(VersionSuffix)' == 'rtm'" >$(VersionPrefix)</PackageVersion >
7-
5+ <IncludePreReleaseLabelInPackageVersion Condition =" '$(IsFinalBuild)' != 'true'" >true</IncludePreReleaseLabelInPackageVersion >
86 <BuildNumber Condition =" '$(BuildNumber)' == '' " >$(APPVEYOR_BUILD_NUMBER)</BuildNumber >
7+ <BuildNumber Condition =" '$(BuildNumber)' == '' " >$(BUILD_BUILDNUMBER)</BuildNumber >
98 <BuildNumber Condition =" '$(BuildNumber)' == '' " >0</BuildNumber >
109 <FileVersion >$(VersionPrefix).$(BuildNumber)</FileVersion >
1110 <VersionSuffix Condition =" '$(VersionSuffix)' != '' " >$(VersionSuffix).$(BuildNumber)</VersionSuffix >
12- <RepositoryCommit >$(APPVEYOR_REPO_COMMIT)</RepositoryCommit >
11+ <RepositoryCommit Condition =" '$(RepositoryCommit)' == ''" >$(APPVEYOR_REPO_COMMIT)</RepositoryCommit >
12+ <RepositoryCommit Condition =" '$(RepositoryCommit)' == ''" >$(BUILD_SOURCEVERSION)</RepositoryCommit >
13+ <PackageVersion >$(VersionPrefix)</PackageVersion >
14+ <PackageVersion Condition =" '$(IncludePreReleaseLabelInPackageVersion)' == 'true'" >$(PackageVersion)-$(VersionSuffix)</PackageVersion >
1315 <InformationalVersion Condition =" '$(RepositoryCommit)' != ''" >$(PackageVersion)+$(RepositoryCommit)</InformationalVersion >
1416 </PropertyGroup >
1517</Project >
You can’t perform that action at this time.
0 commit comments