Skip to content

Commit 21a7b07

Browse files
AarononthewebAaronontheweb
authored
Merge pull request #188 from akkadotnet/dev
v1.3.1 Release
2 parents f287a0f + 415228a commit 21a7b07

File tree

88 files changed

+4421
-4028
lines changed

Some content is hidden

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

88 files changed

+4421
-4028
lines changed

‎Hocon.sln.DotSettings‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
2+
<s:String x:Key="/Default/CodeStyle/FileHeader/FileHeaderText/@EntryValue">-----------------------------------------------------------------------&#xD;
3+
&lt;copyright file="$FILENAME$" company="Akka.NET Project"&gt;&#xD;
4+
Copyright (C) 2013 - $CURRENT_YEAR$ .NET Foundation &lt;https://github.com/akkadotnet/hocon&gt;&#xD;
5+
&lt;/copyright&gt;&#xD;
6+
-----------------------------------------------------------------------</s:String></wpf:ResourceDictionary>

‎README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,15 @@
22

33
C# implementation of Typesafe's HOCON (Human-Optimized Object Configuration Notation)
44

5-
[![Build Status](https://travis-ci.org/akkadotnet/HOCON.svg)](https://travis-ci.org/akkadotnet/HOCON)
5+
## Installation
6+
To install [HOCON via NuGet](https://www.nuget.org/packages/Hocon.Configuration/):
7+
8+
```
9+
PS> Install-Package Hocon.Configuration
10+
```
11+
12+
### Nightly Build Access
13+
If you need access to nightly HOCON builds, you can [get them via the Akka.NET nightly build NuGet feed](https://getakka.net/community/getting-access-to-nightly-builds.html).
614

715
# Spec
816

‎RELEASE_NOTES.md‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
1-
#### 1.3.0 January 14 2020 ####
2-
HOCON 1.3.0 contains some significant API changes:
1+
#### 1.3.1 January 22 2020 ####
2+
**Bugfix release for HOCON v1.3.0**
33

4-
* [API parity with pre-existing Akka.NET HOCON implementation](https://github.com/akkadotnet/HOCON/issues/157)
5-
* Added `HoconType.String`, `HoconType.Number`, `HoconType.Bool`, and removed `HoconType.Literal` - now it's possible to discover data types more easily while inspecting individual HOCON objects.
6-
* [Fixed: Need to be able to include Config fallback values to string representation](https://github.com/akkadotnet/HOCON/issues/161)
7-
* [Added SourceLink.Github support](https://github.com/akkadotnet/HOCON/pull/166)
8-
9-
For a set of complete bug fixes and changes, please see [the HOCON v1.3.0 milestone on Github](https://github.com/akkadotnet/HOCON/milestone/3).
4+
You can [see the full set of changes in the HOCON v1.3.1 milestone](https://github.com/akkadotnet/HOCON/milestone/4).

‎build-system/nightly-builds.yaml‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Release task for PbLib projects
2+
# See https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for reference
3+
4+
pool:
5+
vmImage: vs2017-win2016
6+
demands: Cmd
7+
8+
trigger: none
9+
pr: none
10+
11+
schedules:
12+
- cron: "0 0 * * *"
13+
displayName: Daily midnight build
14+
branches:
15+
include:
16+
- dev
17+
18+
variables:
19+
- group: nugetKeys #create this group with SECRET variables `nugetKey`
20+
21+
steps:
22+
- task: BatchScript@1
23+
displayName: 'FAKE Build'
24+
inputs:
25+
filename: build.cmd
26+
arguments: 'Nuget nugetprerelease=dev nugetpublishurl=$(nightlyUrl) nugetkey=$(nightlyKey)'

‎src/HOCON.Tests/Extensions/IsStringTests.cs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Text;
5-
using System.Threading.Tasks;
1+
// -----------------------------------------------------------------------
2+
// <copyright file="IsStringTests.cs" company="Akka.NET Project">
3+
// Copyright (C) 2013 - 2020 .NET Foundation <https://github.com/akkadotnet/hocon>
4+
// </copyright>
5+
// -----------------------------------------------------------------------
6+
67
using FluentAssertions;
7-
using Hocon.Extensions;
88
using Xunit;
99

1010
namespace Hocon.Tests.Extensions
@@ -35,4 +35,4 @@ public void IsString_should_detect_String_literals()
3535
values["bar"].Type.Should().Be(HoconType.String);
3636
}
3737
}
38-
}
38+
}

‎src/Hocon.Benchmarks/Configs/HoconBenchmarkConfig.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
#region copyright
1+
// -----------------------------------------------------------------------
2+
// <copyright file="HoconBenchmarkConfig.cs" company="Akka.NET Project">
3+
// Copyright (C) 2013 - 2020 .NET Foundation <https://github.com/akkadotnet/hocon>
4+
// </copyright>
25
// -----------------------------------------------------------------------
3-
// <copyright file="HoconBenchmarkConfig.cs" company="Hocon Project">
4-
// Copyright (C) 2009-2018 Lightbend Inc. <http://www.lightbend.com>
5-
// Copyright (C) 2013-2018 .NET Foundation <https://github.com/akkadotnet/hocon>
6-
// </copyright>
7-
// -----------------------------------------------------------------------
8-
#endregion
96

107
using BenchmarkDotNet.Configs;
118
using BenchmarkDotNet.Diagnosers;

‎src/Hocon.Benchmarks/Configs/TestConfigStrings.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
#region copyright
1+
// -----------------------------------------------------------------------
2+
// <copyright file="TestConfigStrings.cs" company="Akka.NET Project">
3+
// Copyright (C) 2013 - 2020 .NET Foundation <https://github.com/akkadotnet/hocon>
4+
// </copyright>
25
// -----------------------------------------------------------------------
3-
// <copyright file="TestConfigStrings.cs" company="Hocon Project">
4-
// Copyright (C) 2009-2018 Lightbend Inc. <http://www.lightbend.com>
5-
// Copyright (C) 2013-2018 .NET Foundation <https://github.com/akkadotnet/hocon>
6-
// </copyright>
7-
// -----------------------------------------------------------------------
8-
#endregion
96

107
using System.IO;
118
using System.Reflection;

‎src/Hocon.Benchmarks/LookupBenchmark.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
#region copyright
1+
// -----------------------------------------------------------------------
2+
// <copyright file="LookupBenchmark.cs" company="Akka.NET Project">
3+
// Copyright (C) 2013 - 2020 .NET Foundation <https://github.com/akkadotnet/hocon>
4+
// </copyright>
25
// -----------------------------------------------------------------------
3-
// <copyright file="LookupBenchmark.cs" company="Hocon Project">
4-
// Copyright (C) 2009-2018 Lightbend Inc. <http://www.lightbend.com>
5-
// Copyright (C) 2013-2018 .NET Foundation <https://github.com/akkadotnet/hocon>
6-
// </copyright>
7-
// -----------------------------------------------------------------------
8-
#endregion
96

107
using System;
118
using BenchmarkDotNet.Attributes;

‎src/Hocon.Benchmarks/ParserBenchmark.cs‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
#region copyright
1+
// -----------------------------------------------------------------------
2+
// <copyright file="ParserBenchmark.cs" company="Akka.NET Project">
3+
// Copyright (C) 2013 - 2020 .NET Foundation <https://github.com/akkadotnet/hocon>
4+
// </copyright>
25
// -----------------------------------------------------------------------
3-
// <copyright file="ParserBenchmark.cs" company="Hocon Project">
4-
// Copyright (C) 2009-2018 Lightbend Inc. <http://www.lightbend.com>
5-
// Copyright (C) 2013-2018 .NET Foundation <https://github.com/akkadotnet/hocon>
6-
// </copyright>
7-
// -----------------------------------------------------------------------
8-
#endregion
96

107
using BenchmarkDotNet.Attributes;
118
using Hocon.Benchmarks.Configs;

‎src/Hocon.Benchmarks/Program.cs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
#region copyright
1+
// -----------------------------------------------------------------------
2+
// <copyright file="Program.cs" company="Akka.NET Project">
3+
// Copyright (C) 2013 - 2020 .NET Foundation <https://github.com/akkadotnet/hocon>
4+
// </copyright>
25
// -----------------------------------------------------------------------
3-
// <copyright file="Program.cs" company="Hocon Project">
4-
// Copyright (C) 2009-2018 Lightbend Inc. <http://www.lightbend.com>
5-
// Copyright (C) 2013-2018 .NET Foundation <https://github.com/akkadotnet/hocon>
6-
// </copyright>
7-
// -----------------------------------------------------------------------
8-
#endregion
96

10-
using System;
117
using System.Reflection;
128
using BenchmarkDotNet.Running;
139

1410
namespace Hocon.Benchmarks
1511
{
16-
class Program
12+
internal class Program
1713
{
18-
static void Main(string[] args)
14+
private static void Main(string[] args)
1915
{
2016
BenchmarkSwitcher.FromAssembly(Assembly.GetExecutingAssembly()).RunAll();
2117
}
2218
}
23-
}
19+
}

0 commit comments

Comments
 (0)