Skip to content

Commit 4e5e4e7

Browse files
authored
Merge branch 'main' into hotfix/titlelize_fix
2 parents 23b4ce1 + efa1d7e commit 4e5e4e7

File tree

432 files changed

+9222
-12337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

432 files changed

+9222
-12337
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,3 +60,6 @@
6060
*.PDF diff=astextplain
6161
*.rtf diff=astextplain
6262
*.RTF diff=astextplain
63+
64+
65+
*.verified.txt text eol=lf working-tree-encoding=UTF-8

azure-pipelines.yml

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ pr:
66
- main
77
- rel/*
88

9-
variables:
9+
variables:
1010
BuildConfiguration: Release
1111
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
1212

@@ -19,24 +19,11 @@ stages:
1919

2020
steps:
2121
- task: UseDotNet@2
22-
displayName: 'Use .NET Core SDK 6.x'
22+
displayName: 'Use .NET Core SDK 8.x'
2323
inputs:
24-
version: 6.x
25-
includePreviewVersions: true
24+
version: 8.x
2625

27-
- task: UseDotNet@2
28-
displayName: 'Use .NET Core Runtime 5.x'
29-
inputs:
30-
version: 5.x
31-
packageType: runtime
32-
33-
- task: UseDotNet@2
34-
displayName: 'Use .NET Core Runtime 3.x'
35-
inputs:
36-
version: 3.x
37-
packageType: runtime
38-
39-
- task: DotNetCoreCLI@2
26+
- task: DotNetCoreCLI@2
4027
inputs:
4128
command: custom
4229
custom: tool
@@ -72,7 +59,7 @@ stages:
7259
-Properties "version=$($version.NuGetPackageVersion);RepositoryType=git;RepositoryCommit=$($version.GitCommitId);RepositoryUrl=https://github.com/Humanizr/Humanizer"
7360
}
7461
displayName: Create packages
75-
62+
7663
- task: DotNetCoreCLI@2
7764
inputs:
7865
command: test
@@ -110,7 +97,7 @@ stages:
11097
- deployment: CodeSign
11198
displayName: Code Signing
11299
pool:
113-
vmImage: windows-latest
100+
vmImage: windows-latest
114101
environment: Code Sign
115102
variables:
116103
- group: SignClient Credentials
@@ -136,7 +123,7 @@ stages:
136123
--description "Humanizer" `
137124
--descriptionUrl "https://github.com/Humanizr/Humanizer"
138125
displayName: Sign packages
139-
126+
140127
- publish: $(Pipeline.Workspace)/BuildPackages
141128
displayName: Publish Signed Packages
142129
artifact: SignedPackages

readme.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,18 +1114,18 @@ Humanizer includes methods to change a numeric heading to words. The heading can
11141114

11151115
```C#
11161116
360.ToHeading();
1117-
// north
1117+
// N
11181118
720.ToHeading();
1119-
// north
1119+
// N
11201120
```
11211121

1122-
In order to retrieve a short version of the heading you can use the following call:
1122+
In order to retrieve a full version of the heading, use the following call:
11231123

11241124
```C#
1125-
180.ToHeading(true);
1126-
// S
1127-
360.ToHeading(true);
1128-
// N
1125+
180.ToHeading(HeadingStyle.Full);
1126+
// south
1127+
360.ToHeading(HeadingStyle.Full);
1128+
// north
11291129
```
11301130

11311131
Please note that a textual representation has a maximum deviation of 11.25°.

src/Directory.build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@
33
<LangVersion>latest</LangVersion>
44
<PublishRepositoryUrl>true</PublishRepositoryUrl>
55
<EmbedUntrackedSources>true</EmbedUntrackedSources>
6+
<ImplicitUsings>enable</ImplicitUsings>
67
</PropertyGroup>
78

89
<ItemGroup>
9-
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="all" />
10+
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
1011
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
1112
</ItemGroup>
1213

src/Humanizer.All.sln

Lines changed: 0 additions & 194 deletions
This file was deleted.

src/Humanizer.Tests.Shared/ArticlePrefixSortTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using System;
2-
using Xunit;
3-
4-
namespace Humanizer.Tests
1+
namespace Humanizer.Tests
52
{
63
public class ArticlePrefixSortTests
74
{

src/Humanizer.Tests.Shared/BitFieldEnumHumanizeTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using Xunit;
2-
3-
namespace Humanizer.Tests
1+
namespace Humanizer.Tests
42
{
53
[UseCulture("en")]
64
public class BitFieldEnumHumanizeTests

src/Humanizer.Tests.Shared/BitFieldEnumUnderTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using System;
2-
using System.ComponentModel.DataAnnotations;
1+
using System.ComponentModel.DataAnnotations;
32

43
namespace Humanizer.Tests
54
{

src/Humanizer.Tests.Shared/Bytes/ArithmeticTests.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using Humanizer.Bytes;
2-
using Xunit;
32

43
namespace Humanizer.Tests.Bytes
54
{

src/Humanizer.Tests.Shared/Bytes/ByteRateTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
1-
using System;
2-
using Humanizer.Bytes;
1+
using Humanizer.Bytes;
32
using Humanizer.Localisation;
4-
using Xunit;
53

64
namespace Humanizer.Tests.Bytes
75
{
@@ -67,7 +65,7 @@ public void FormattedTimeUnitTests(long bytes, int measurementIntervalSeconds, T
6765
[InlineData(TimeUnit.Month)]
6866
[InlineData(TimeUnit.Week)]
6967
[InlineData(TimeUnit.Year)]
70-
public void ThowsOnUnsupportedData(TimeUnit units)
68+
public void ThrowsOnUnsupportedData(TimeUnit units)
7169
{
7270
var dummyRate = ByteSize.FromBits(1).Per(TimeSpan.FromSeconds(1));
7371

0 commit comments

Comments
 (0)