Merge pull request #447 from AArnott/dotnetFTW

Remove build.proj in favor of regular dotnet commands

Author: tonerdo

CONTRIBUTING.md

@@ -2,33 +2,18 @@
 
 Contributions are highly welcome, however, except for very small changes, kindly file an issue and let's have a discussion before you open a pull request.
 
-## Building The Project
+## Building the Project
 
 Clone this repo:
 
-```bash
-git clone https://github.com/tonerdo/coverlet
-```
+    git clone https://github.com/tonerdo/coverlet.git
+    cd coverlet
 
-Change directory to repo root:
+Building, testing, and packing use all the standard dotnet commands:
 
-```bash
-cd coverlet
-```
-
-Execute build script:
-
-```bash
-dotnet msbuild build.proj
-```
-
-This will result in the following:
-
-* Restore all NuGet packages required for building
-* Build and publish all projects. Final binaries are placed into `<repo_root>\build\<Configuration>`
-* Build and run tests
-
-These steps must be followed before you attempt to open the solution in an IDE (e.g. Visual Studio, Rider) for all projects to be loaded successfully.
+    dotnet build
+    dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Include=[coverlet.*]*"
+    dotnet pack
 
 ## Performance testing
 
@@ -48,8 +33,8 @@ For more realistic testing it is recommended to try out any changes to the hit c
 
 Change to the directory of the library and run the msbuild code coverage command:
 
-    dotnet msbuild /t:BuildAndTest /p:Coverage=true
-    
+    dotnet test /p:Coverage=true
+
 To run with a development version of coverlet call `dotnet run` instead of the installed coverlet version, e.g.:
 
-    dotnet msbuild /t:BuildAndTest /p:Coverage=true /p:CoverageExecutablePath="dotnet run -p C:\...\coverlet\src\coverlet.console\coverlet.console.csproj"
+    dotnet test /p:Coverage=true /p:CoverageExecutablePath="dotnet run -p C:\...\coverlet\src\coverlet.console\coverlet.console.csproj"

build.proj

@@ -4,5 +4,18 @@ steps:
     version: 2.2.300
   displayName: Install .NET Core SDK
 
-- script: dotnet msbuild build.proj /p:Configuration=$(buildConfiguration)
-  displayName: 'Run Build'
+- script: dotnet restore
+  displayName: Restore packages
+
+- script: dotnet build -c $(BuildConfiguration) --no-restore
+  displayName: Build
+
+- task: DotNetCoreCLI@2
+  displayName: Test
+  inputs:
+    command: test
+    arguments: -c $(BuildConfiguration) --no-build /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:Include=[coverlet.*]*
+    testRunTitle: $(Agent.JobName)
+
+- script: dotnet pack -c $(BuildConfiguration)
+  displayName: Pack

build.yml

@@ -1,12 +1,12 @@
 pool:
   vmImage: 'windows-2019'
 steps:
-- task: DotNetCoreInstaller@0
+- task: UseDotNet@2
   inputs:
-    version: '2.2.300'
+    version: 2.2.300
 - powershell:
     .\eng\nightly.ps1 -apiKey $env:APIKEY -source $env:SOURCE
-  ignoreLASTEXITCODE: "true"
+  ignoreLASTEXITCODE: true
   env:
     APIKEY: $(apikey)
-    SOURCE: $(source)
+    SOURCE: $(source)

eng/azure-pipelines-nightly.yml

@@ -13,7 +13,7 @@ Write-Host -ForegroundColor Blue Publish with .NET CLI
 & dotnet --info
 
 Write-Host -ForegroundColor Green Create Packages
-& dotnet msbuild "$PSScriptRoot\..\build.proj" /t:CreateNuGetPackage /p:Configuration=Release /p:PublicRelease=false # amend build.proj path if changes
+& dotnet pack -c Release
 
 Write-Host -ForegroundColor Green Upload Packages
-& dotnet nuget push "$PSScriptRoot\..\build\Release\*.nupkg" -k $apiKey -s $source
+& dotnet nuget push "$PSScriptRoot\..\build\Release\*.nupkg" -k $apiKey -s $source

eng/nightly.ps1

@@ -0,0 +1,2 @@
+coverage.json
+coverage.opencover.xml