From b759a885a8d33ae5b486269a3ce661072d827b89 Mon Sep 17 00:00:00 2001
From: martincostello <martin@martincostello.com>
Date: Thu, 18 May 2023 10:27:06 +0100
Subject: [PATCH] .NET 8 preparation

Cherry-pick various changes from #412.
---
 .github/workflows/build.yml |  3 ++-
 .gitignore                  |  1 -
 Directory.Build.props       |  1 -
 Directory.Build.targets     |  3 ++-
 build.ps1                   | 28 ++--------------------------
 5 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index dd4636e8..44724ec2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -50,7 +50,7 @@ jobs:
     - uses: codecov/codecov-action@eaaf4bedf32dbdc6b720b63067d99c4d77d6047d # v3.1.4
       name: Upload coverage to Codecov
       with:
-        file: ./artifacts/coverage.net7.0.cobertura.xml
+        file: ./artifacts/coverage/coverage.net7.0.cobertura.xml
         flags: ${{ matrix.os_name }}
 
     - name: Publish artifacts
@@ -64,6 +64,7 @@ jobs:
       with:
         name: packages-${{ matrix.os_name }}
         path: ./artifacts/packages
+        if-no-files-found: error
 
   validate-packages:
     needs: build
diff --git a/.gitignore b/.gitignore
index 19f97b50..745b367f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-.artifacts/
 .DS_Store
 .dotnetcli
 .idea
diff --git a/Directory.Build.props b/Directory.Build.props
index c584d224..2f0b6da3 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -53,7 +53,6 @@
   </ItemGroup>
   <PropertyGroup Condition=" '$(BuildingInsideVisualStudio)' != 'true' ">
     <CollectCoverage>true</CollectCoverage>
-    <CoverletOutput Condition=" '$(OutputPath)' != '' ">$(OutputPath)/</CoverletOutput>
     <CoverletOutputFormat>cobertura,json</CoverletOutputFormat>
     <Exclude>[SampleApp]*,[xunit.*]*</Exclude>
     <ExcludeByAttribute>System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute</ExcludeByAttribute>
diff --git a/Directory.Build.targets b/Directory.Build.targets
index a6546039..dab2cfe9 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -29,10 +29,11 @@
     </ItemGroup>
   </Target>
   <PropertyGroup Condition=" '$(CollectCoverage)' == 'true' ">
+    <CoverletOutput>$([System.IO.Path]::Combine($(OutputPath), 'coverage', 'coverage'))</CoverletOutput>
     <ReportGeneratorOutputMarkdown Condition=" '$(ReportGeneratorOutputMarkdown)' == '' AND '$(GITHUB_SHA)' != '' ">true</ReportGeneratorOutputMarkdown>
     <ReportGeneratorReportTypes>HTML</ReportGeneratorReportTypes>
     <ReportGeneratorReportTypes Condition=" '$(ReportGeneratorOutputMarkdown)' == 'true' ">$(ReportGeneratorReportTypes);MarkdownSummaryGitHub</ReportGeneratorReportTypes>
-    <ReportGeneratorTargetDirectory>$([System.IO.Path]::Combine($(OutputPath), 'coverage-reports'))</ReportGeneratorTargetDirectory>
+    <ReportGeneratorTargetDirectory>$([System.IO.Path]::Combine($(OutputPath), 'coverage'))</ReportGeneratorTargetDirectory>
     <_MarkdownSummaryPrefix>&lt;details&gt;&lt;summary&gt;:chart_with_upwards_trend: &lt;b&gt;$(AssemblyName) Code Coverage report&lt;/b&gt;&lt;/summary&gt;</_MarkdownSummaryPrefix>
     <_MarkdownSummarySuffix>&lt;/details&gt;</_MarkdownSummarySuffix>
   </PropertyGroup>
diff --git a/build.ps1 b/build.ps1
index d3b293eb..58dd291d 100755
--- a/build.ps1
+++ b/build.ps1
@@ -5,7 +5,6 @@
 
 param(
     [Parameter(Mandatory = $false)][string] $Configuration = "Release",
-    [Parameter(Mandatory = $false)][string] $VersionSuffix = "",
     [Parameter(Mandatory = $false)][string] $OutputPath = "",
     [Parameter(Mandatory = $false)][switch] $SkipTests
 )
@@ -18,7 +17,6 @@ $ErrorActionPreference = "Stop"
 $ProgressPreference = "SilentlyContinue"
 
 $solutionPath = $PSScriptRoot
-$solutionFile = Join-Path $solutionPath "Logging.XUnit.sln"
 $sdkFile = Join-Path $solutionPath "global.json"
 
 $libraryProject = Join-Path $solutionPath "src\Logging.XUnit\MartinCostello.Logging.XUnit.csproj"
@@ -87,31 +85,13 @@ if ($installDotNetSdk -eq $true) {
     $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
 }
 
-function DotNetBuild {
-    param([string]$Project)
-
-    if ($VersionSuffix) {
-        & $dotnet build $Project --configuration $Configuration --version-suffix "$VersionSuffix"
-    }
-    else {
-        & $dotnet build $Project --configuration $Configuration
-    }
-    if ($LASTEXITCODE -ne 0) {
-        throw "dotnet build failed with exit code $LASTEXITCODE"
-    }
-}
-
 function DotNetPack {
     param([string]$Project)
 
     $PackageOutputPath = (Join-Path $OutputPath "packages")
 
-    if ($VersionSuffix) {
-        & $dotnet pack $Project --output $PackageOutputPath --configuration $Configuration --version-suffix "$VersionSuffix" --include-symbols --include-source
-    }
-    else {
-        & $dotnet pack $Project --output $PackageOutputPath --configuration $Configuration --include-symbols --include-source
-    }
+    & $dotnet pack $Project --output $PackageOutputPath --configuration $Configuration --include-symbols --include-source
+
     if ($LASTEXITCODE -ne 0) {
         throw "dotnet pack failed with exit code $LASTEXITCODE"
     }
@@ -134,9 +114,6 @@ function DotNetTest {
     }
 }
 
-Write-Host "Building solution..." -ForegroundColor Green
-DotNetBuild $solutionFile
-
 Write-Host "Packaging library..." -ForegroundColor Green
 DotNetPack $libraryProject
 
@@ -144,4 +121,3 @@ Write-Host "Running tests..." -ForegroundColor Green
 ForEach ($testProject in $testProjects) {
     DotNetTest $testProject
 }
-