Resolve merge conflicts with master

Author: AArnott

.gitignore

@@ -24,6 +24,7 @@ bld/
 [Bb]in/
 [Oo]bj/
 [Ll]og/
+msbuild.binlog
 
 # Visual Studio 2015 cache/options directory
 .vs/
@@ -295,4 +296,4 @@ __pycache__/
 .vscode
 
 # OSX
-.DS_Store
+.DS_Store

azure-pipelines.yml

@@ -1,3 +1,9 @@
+trigger:
+  branches:
+    include: ["master"]
+  paths:
+    exclude: [".github", "doc", "*.md"]
+
 jobs:
 - job: Windows
   displayName: Windows
@@ -12,6 +18,19 @@ jobs:
     vmImage: 'windows-2019'
   steps:
   - template: build.yml
+  - task: CopyFiles@2
+    displayName: Collect packages
+    inputs:
+      SourceFolder: build\$(BuildConfiguration)
+      Contents: '*.nupkg'
+      TargetFolder: $(Build.ArtifactStagingDirectory)\Packages
+  - task: PublishBuildArtifacts@1
+    displayName: Publish packages as build artifacts
+    inputs:
+      PathtoPublish: $(Build.ArtifactStagingDirectory)\Packages
+      ArtifactName: Packages
+      publishLocation: Container
+    condition: eq(variables['BuildConfiguration'], 'Release')
 
 - job: macOS
   displayName: macOS

build.proj

@@ -31,9 +31,7 @@
   </Target>
 
   <Target Name="CreateNuGetPackage" AfterTargets="RunTests" Condition="$(Configuration) == 'Release'">
-    <Exec Command="dotnet pack &quot;$(MSBuildThisFileDirectory)src\coverlet.msbuild.tasks\coverlet.msbuild.tasks.csproj&quot; -c $(Configuration) -o $(OutputPath) /p:PublicRelease=$(PublicRelease)"  />
-    <Exec Command="dotnet pack &quot;$(MSBuildThisFileDirectory)src\coverlet.console\coverlet.console.csproj&quot; -c $(Configuration) -o $(OutputPath) /p:PublicRelease=$(PublicRelease)" />
-    <Exec Command="dotnet pack &quot;$(MSBuildThisFileDirectory)src\coverlet.collector\coverlet.collector.csproj&quot; -c $(Configuration) -o $(OutputPath) /p:PublicRelease=$(PublicRelease)" />
+    <Exec Command="dotnet pack coverlet.sln -c $(Configuration) /p:PublicRelease=$(PublicRelease)"  />
   </Target>
 
 </Project>

build.yml

@@ -1,7 +1,8 @@
 steps:
-- task: DotNetCoreInstaller@0
+- task: UseDotNet@2
   inputs:
-    version: '2.2.300'
-  displayName: 'Install .NET Core SDK'
+    version: 2.2.300
+  displayName: Install .NET Core SDK
+
 - script: dotnet msbuild build.proj /p:Configuration=$(buildConfiguration)
   displayName: 'Run Build'

src/coverlet.core/coverlet.core.csproj

@@ -4,6 +4,7 @@
     <OutputType>Library</OutputType>
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyVersion>5.1.0</AssemblyVersion>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>

test/Directory.Build.props

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+</Project>

test/coverlet.testsubject/coverlet.testsubject.csproj

@@ -2,6 +2,8 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <IsTestProject>false</IsTestProject>
   </PropertyGroup>
 
 </Project>