Merge pull request #174 from martincostello/Update-SDK

Update SDK and some NuGet packages
justeattakeaway · Apr 8, 2019 · 4026912 · 4026912
2 parents d72b96c + e0c4959
commit 4026912
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -49,7 +49,7 @@ if ($installDotNetSdk -eq $true) {
     }
 
     $env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
-    $dotnet = "$env:DOTNET_INSTALL_DIR\dotnet"
+    $dotnet = "$env:DOTNET_INSTALL_DIR\dotnet.exe"
 }
 else {
     $dotnet = "dotnet"
@@ -82,7 +82,7 @@ function DotNetTest {
         $openCoverVersion = "4.7.922"
         $openCoverPath = Join-Path $nugetPath "OpenCover\$openCoverVersion\tools\OpenCover.Console.exe"
 
-        $reportGeneratorVersion = "4.0.11"
+        $reportGeneratorVersion = "4.1.0"
         $reportGeneratorPath = Join-Path $nugetPath "ReportGenerator\$reportGeneratorVersion\tools\netcoreapp2.0\ReportGenerator.dll"
 
         $coverageOutput = Join-Path $OutputPath "code-coverage.xml"
@@ -91,22 +91,25 @@ function DotNetTest {
         & $openCoverPath `
             `"-target:$dotnetPath`" `
             `"-targetargs:test $Project --output $OutputPath`" `
-            -output:$coverageOutput `
-            `"-excludebyattribute:System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage*`" `
-            -hideskipped:All `
+            `"-output:$coverageOutput`" `
+            `"-excludebyattribute:*.ExcludeFromCodeCoverage*`" `
+            `"-hideskipped:All`" `
             -mergebyhash `
             -mergeoutput `
             -oldstyle `
-            -register:user `
+            `"-register:user`" `
+            -returntargetcode `
             -skipautoprops `
             `"-filter:+[JustEat.StatsD]* -[*Test*]*`"
 
-        & $dotnet `
-            $reportGeneratorPath `
-            `"-reports:$coverageOutput`" `
-            `"-targetdir:$reportOutput`" `
-            -reporttypes:HTML`;Cobertura `
-            -verbosity:Warning
+        if ($LASTEXITCODE -eq 0) {
+            & $dotnet `
+                $reportGeneratorPath `
+                `"-reports:$coverageOutput`" `
+                `"-targetdir:$reportOutput`" `
+                -reporttypes:HTML`;Cobertura `
+                -verbosity:Warning
+        }
     }
 
     if ($LASTEXITCODE -ne 0) {

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -6,7 +6,7 @@
     <PackageReference Include="Microsoft.CodeQuality.Analyzers" Version="2.9.1" PrivateAssets="All" />
     <PackageReference Include="Microsoft.NetCore.Analyzers" Version="2.9.1" PrivateAssets="All" />
     <PackageReference Include="OpenCover" Version="4.7.922" PrivateAssets="All" />
-    <PackageReference Include="ReportGenerator" Version="4.0.11" PrivateAssets="All" />
+    <PackageReference Include="ReportGenerator" Version="4.1.0" PrivateAssets="All" />
   </ItemGroup>
   <PropertyGroup>
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "2.2.103"
+    "version": "2.2.202"
   }
 }
diff --git a/tests/Benchmark/Benchmark.csproj b/tests/Benchmark/Benchmark.csproj
@@ -6,7 +6,7 @@
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BenchmarkDotNet" Version="0.11.4" />
+    <PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\JustEat.StatsD\JustEat.StatsD.csproj" />