Skip to content
Closed
Show file tree
Hide file tree
Changes from 6 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what will reference this new file?

"version": 1,
"isRoot": true,
"tools": {
"coverlet.console": {
"version": "1.5.51-ged9195d73b",
"commands": [
"coverlet"
]
},
"dotnet-reportgenerator-globaltool": {
"version": "4.1.6",
"commands": [
"reportgenerator"
]
}
}
}
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,7 @@
<clear />
<add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="test" value="https://www.myget.org/F/2c042c750fe047a1b5ed74bbd75bcd89/api/v3/index.json" />
<add key="coverlet-dev" value="https://www.myget.org/F/coverlet-dev/api/v3/index.json" />
</packageSources>
</configuration>
22 changes: 10 additions & 12 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,20 +108,9 @@ stages:
arguments: 'locals all -clear'
- script: eng\common\cibuild.cmd -configuration $(_BuildConfig) -prepareMachine $(_BuildArgs)
displayName: Build and Publish
- script: eng\scripts\ci-flaky-tests.cmd -configuration $(_BuildConfig)
displayName: Run Flaky Tests
continueOnError: true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This doesn't look right. Why are you removing the flaky test run?

- powershell: eng\scripts\KillProcesses.ps1
displayName: Kill processes
condition: always()
- task: PublishTestResults@2
displayName: Publish Flaky Test Results
inputs:
testResultsFormat: 'xUnit'
testResultsFiles: '*.xml'
searchFolder: '$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Flaky'
continueOnError: true
condition: always()
- task: PublishBuildArtifacts@1
displayName: Upload TestResults
condition: always()
Expand All @@ -131,6 +120,15 @@ stages:
artifactName: $(Agent.Os)_$(Agent.JobName) TestResults
artifactType: Container
parallel: true
- task: PublishBuildArtifacts@1
displayName: Upload Code Coverage results
condition: always()
continueOnError: true
inputs:
pathtoPublish: artifacts/log/$(_BuildConfig)/codecoverage/
artifactName: $(Agent.Os)_$(Agent.JobName) CodeCoverage
artifactType: Container
parallel: true

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Aren't these files included when all of artifacts/log is uploaded?

- task: PublishBuildArtifacts@1
displayName: Upload package artifacts
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false), eq(variables['_BuildConfig'], 'Release'))
Expand Down Expand Up @@ -308,4 +306,4 @@ stages:
parameters:
# Symbol validation isn't being very reliable lately. This should be enabled back
# once this issue is resolved: https://github.com/dotnet/arcade/issues/2871
enableSymbolValidation: false
enableSymbolValidation: false
2 changes: 1 addition & 1 deletion eng/common/CIBuild.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
@echo off
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -test -sign -pack -publish -ci %*"
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0Build.ps1""" -restore -build -codeCoverage -ci %*"
2 changes: 2 additions & 0 deletions eng/common/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Param(
[switch] $rebuild,
[switch] $deploy,
[switch][Alias('t')]$test,
[switch] $codeCoverage,

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI I think you can just pass /p:CodeCoverage=true directly in CIBuild.cmd. This script is auto-updated by arcade and isn't meant to be edited.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was planning for this to be a target rather than a property. I do have some changes for Arcade, I'll work with them to figure out the right pattern.

[switch] $integrationTest,
[switch] $performanceTest,
[switch] $sign,
Expand Down Expand Up @@ -104,6 +105,7 @@ function Build {
/p:Rebuild=$rebuild `
/p:Deploy=$deploy `
/p:Test=$test `
/p:CodeCoverage=$codeCoverage `
/p:Pack=$pack `
/p:IntegrationTest=$integrationTest `
/p:PerformanceTest=$performanceTest `
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19458.2",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19458.2"
"Microsoft.DotNet.Arcade.Sdk": "4.0.0-dev",
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19454.31"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do not change this portion of the file directly. Need to update the dependencies from Arcade i.e. get darc to change Versions.props and Version.Details.xml as well.

In your branch, execute

darc update-dependencies --source-repo arcade  --channel '.NET Tools - Latest'

or

darc update-dependencies --source-repo arcade  --channel '.NET 3 Tools'

}
}