Skip to content

Commit

Permalink
use latest sdk:
Browse files Browse the repository at this point in the history
  • Loading branch information
clairernovotny committed Apr 23, 2021
1 parent 12cc400 commit 3f909a8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 21 deletions.
15 changes: 7 additions & 8 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,15 @@ stages:

steps:
- task: UseDotNet@2
displayName: 'Use .NET Core SDK 3.x'
displayName: 'Use .NET Core SDK 5.x'
inputs:
version: 3.x
version: 5.x

- task: UseDotNet@2
displayName: 'Use .NET Core Runtime 2.1.x'
displayName: 'Use .NET Core Runtime 3.x'
inputs:
version: 2.1.x
packageType: runtime

version: 3.x
packageType: runtime

- task: DotNetCoreCLI@2
inputs:
Expand Down Expand Up @@ -76,14 +75,14 @@ stages:
arguments: install --tool-path . dotnet-reportgenerator-globaltool
displayName: Install ReportGenerator tool

- script: reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports -reporttypes:"Cobertura"
- script: reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/coverlet/reports -reporttypes:"Cobertura"
displayName: Create reports

- task: PublishCodeCoverageResults@1
displayName: 'Publish code coverage'
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: $(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports/Cobertura.xml
summaryFileLocation: $(Build.SourcesDirectory)/coverlet/reports/Cobertura.xml

- publish: $(Build.ArtifactStagingDirectory)\Packages
displayName: Publish build packages
Expand Down
11 changes: 0 additions & 11 deletions src/Directory.Build.targets

This file was deleted.

4 changes: 2 additions & 2 deletions src/Humanizer.Tests/Humanizer.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;netcoreapp2.1</TargetFrameworks>
<TargetFrameworks>net48;net5.0;netcoreapp3.1</TargetFrameworks>
<Deterministic>false</Deterministic> <!-- Approver doesn't support this yet -->
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' ">
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1' or '$(TargetFramework)' == 'net5.0' ">
<DefineConstants>$(DefineConstants);NETFX_CORE</DefineConstants>
</PropertyGroup>
<ItemGroup>
Expand Down

0 comments on commit 3f909a8

Please sign in to comment.