Skip to content

Commit

Permalink
Merge branch 'main' into hotfix/titlelize_fix
Browse files Browse the repository at this point in the history
  • Loading branch information
SimonCropp committed Feb 13, 2024
2 parents 23b4ce1 + efa1d7e commit 4e5e4e7
Show file tree
Hide file tree
Showing 432 changed files with 9,222 additions and 12,337 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Expand Up @@ -60,3 +60,6 @@
*.PDF diff=astextplain
*.rtf diff=astextplain
*.RTF diff=astextplain


*.verified.txt text eol=lf working-tree-encoding=UTF-8
27 changes: 7 additions & 20 deletions azure-pipelines.yml
Expand Up @@ -6,7 +6,7 @@ pr:
- main
- rel/*

variables:
variables:
BuildConfiguration: Release
DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true

Expand All @@ -19,24 +19,11 @@ stages:

steps:
- task: UseDotNet@2
displayName: 'Use .NET Core SDK 6.x'
displayName: 'Use .NET Core SDK 8.x'
inputs:
version: 6.x
includePreviewVersions: true
version: 8.x

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

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

- task: DotNetCoreCLI@2
- task: DotNetCoreCLI@2
inputs:
command: custom
custom: tool
Expand Down Expand Up @@ -72,7 +59,7 @@ stages:
-Properties "version=$($version.NuGetPackageVersion);RepositoryType=git;RepositoryCommit=$($version.GitCommitId);RepositoryUrl=https://github.com/Humanizr/Humanizer"
}
displayName: Create packages
- task: DotNetCoreCLI@2
inputs:
command: test
Expand Down Expand Up @@ -110,7 +97,7 @@ stages:
- deployment: CodeSign
displayName: Code Signing
pool:
vmImage: windows-latest
vmImage: windows-latest
environment: Code Sign
variables:
- group: SignClient Credentials
Expand All @@ -136,7 +123,7 @@ stages:
--description "Humanizer" `
--descriptionUrl "https://github.com/Humanizr/Humanizer"
displayName: Sign packages
- publish: $(Pipeline.Workspace)/BuildPackages
displayName: Publish Signed Packages
artifact: SignedPackages
14 changes: 7 additions & 7 deletions readme.md
Expand Up @@ -1114,18 +1114,18 @@ Humanizer includes methods to change a numeric heading to words. The heading can

```C#
360.ToHeading();
// north
// N
720.ToHeading();
// north
// N
```

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

```C#
180.ToHeading(true);
// S
360.ToHeading(true);
// N
180.ToHeading(HeadingStyle.Full);
// south
360.ToHeading(HeadingStyle.Full);
// north
```

Please note that a textual representation has a maximum deviation of 11.25°.
Expand Down
3 changes: 2 additions & 1 deletion src/Directory.build.props
Expand Up @@ -3,10 +3,11 @@
<LangVersion>latest</LangVersion>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nerdbank.GitVersioning" Version="3.4.255" PrivateAssets="all" />
<PackageReference Include="Nerdbank.GitVersioning" Version="3.6.133" PrivateAssets="all" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
</ItemGroup>

Expand Down
194 changes: 0 additions & 194 deletions src/Humanizer.All.sln

This file was deleted.

5 changes: 1 addition & 4 deletions src/Humanizer.Tests.Shared/ArticlePrefixSortTests.cs
@@ -1,7 +1,4 @@
using System;
using Xunit;

namespace Humanizer.Tests
namespace Humanizer.Tests
{
public class ArticlePrefixSortTests
{
Expand Down
4 changes: 1 addition & 3 deletions src/Humanizer.Tests.Shared/BitFieldEnumHumanizeTests.cs
@@ -1,6 +1,4 @@
using Xunit;

namespace Humanizer.Tests
namespace Humanizer.Tests
{
[UseCulture("en")]
public class BitFieldEnumHumanizeTests
Expand Down
3 changes: 1 addition & 2 deletions src/Humanizer.Tests.Shared/BitFieldEnumUnderTest.cs
@@ -1,5 +1,4 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations;

namespace Humanizer.Tests
{
Expand Down
1 change: 0 additions & 1 deletion src/Humanizer.Tests.Shared/Bytes/ArithmeticTests.cs
@@ -1,5 +1,4 @@
using Humanizer.Bytes;
using Xunit;

namespace Humanizer.Tests.Bytes
{
Expand Down
6 changes: 2 additions & 4 deletions src/Humanizer.Tests.Shared/Bytes/ByteRateTests.cs
@@ -1,7 +1,5 @@
using System;
using Humanizer.Bytes;
using Humanizer.Bytes;
using Humanizer.Localisation;
using Xunit;

namespace Humanizer.Tests.Bytes
{
Expand Down Expand Up @@ -67,7 +65,7 @@ public void FormattedTimeUnitTests(long bytes, int measurementIntervalSeconds, T
[InlineData(TimeUnit.Month)]
[InlineData(TimeUnit.Week)]
[InlineData(TimeUnit.Year)]
public void ThowsOnUnsupportedData(TimeUnit units)
public void ThrowsOnUnsupportedData(TimeUnit units)
{
var dummyRate = ByteSize.FromBits(1).Per(TimeSpan.FromSeconds(1));

Expand Down
@@ -1,6 +1,5 @@
using System.Globalization;
using Humanizer.Bytes;
using Xunit;

namespace Humanizer.Tests.Bytes
{
Expand Down
5 changes: 1 addition & 4 deletions src/Humanizer.Tests.Shared/Bytes/ComparingTests.cs
@@ -1,7 +1,4 @@
using System.Collections.Generic;
using System.Linq;
using Humanizer.Bytes;
using Xunit;
using Humanizer.Bytes;

namespace Humanizer.Tests.Bytes
{
Expand Down
1 change: 0 additions & 1 deletion src/Humanizer.Tests.Shared/Bytes/CreatingTests.cs
Expand Up @@ -21,7 +21,6 @@
//THE SOFTWARE.

using Humanizer.Bytes;
using Xunit;

namespace Humanizer.Tests.Bytes
{
Expand Down
2 changes: 0 additions & 2 deletions src/Humanizer.Tests.Shared/Bytes/ParsingTests.cs
Expand Up @@ -20,10 +20,8 @@
//OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
//THE SOFTWARE.

using System;
using System.Globalization;
using Humanizer.Bytes;
using Xunit;

namespace Humanizer.Tests.Bytes
{
Expand Down
1 change: 0 additions & 1 deletion src/Humanizer.Tests.Shared/Bytes/ToFullWordsTests.cs
Expand Up @@ -21,7 +21,6 @@
//THE SOFTWARE.

using Humanizer.Bytes;
using Xunit;

namespace Humanizer.Tests.Bytes
{
Expand Down

0 comments on commit 4e5e4e7

Please sign in to comment.