Skip to content

Commit 457bd8f

Browse files
AarononthewebAaronontheweb
authored
Merge pull request #118 from akkadotnet/dev
v1.2.0 HOCON Release
2 parents 4c44f51 + 1f88a68 commit 457bd8f

25 files changed

+3240
-50
lines changed

‎Hocon.sln

+12
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hocon.Extensions.Configurat
2929
EndProject
3030
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hocon.Extensions.Configuration.Tests", "src\Hocon.Extensions.Configuration.Tests\Hocon.Extensions.Configuration.Tests.csproj", "{F7862234-3330-43DE-86BB-D6E67F2146BC}"
3131
EndProject
32+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hocon.Immutable", "src\Hocon.Immutable\Hocon.Immutable.csproj", "{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}"
33+
EndProject
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Hocon.Immutable.Tests", "src\Hocon.Immutable.Tests\Hocon.Immutable.Tests.csproj", "{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}"
35+
EndProject
3236
Global
3337
GlobalSection(SolutionConfigurationPlatforms) = preSolution
3438
Debug|Any CPU = Debug|Any CPU
@@ -83,6 +87,14 @@ Global
8387
{F7862234-3330-43DE-86BB-D6E67F2146BC}.Debug|Any CPU.Build.0 = Debug|Any CPU
8488
{F7862234-3330-43DE-86BB-D6E67F2146BC}.Release|Any CPU.ActiveCfg = Release|Any CPU
8589
{F7862234-3330-43DE-86BB-D6E67F2146BC}.Release|Any CPU.Build.0 = Release|Any CPU
90+
{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
91+
{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}.Debug|Any CPU.Build.0 = Debug|Any CPU
92+
{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}.Release|Any CPU.ActiveCfg = Release|Any CPU
93+
{FB439177-CA10-4BA8-993D-A51D1BEE2A0E}.Release|Any CPU.Build.0 = Release|Any CPU
94+
{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
95+
{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}.Debug|Any CPU.Build.0 = Debug|Any CPU
96+
{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}.Release|Any CPU.ActiveCfg = Release|Any CPU
97+
{FEEC6F6B-2511-4BEC-9568-4E6AE6C1D275}.Release|Any CPU.Build.0 = Release|Any CPU
8698
EndGlobalSection
8799
GlobalSection(SolutionProperties) = preSolution
88100
HideSolutionNode = FALSE

‎RELEASE_NOTES.md

+2-31
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,2 @@
1-
#### 1.1.0 July 29 2019 ####
2-
HOCON 1.1.0 contains a large number of bug fixes and improvements over HOCON 1.0.0, including:
3-
4-
* [Fix: fully qualified type name with assembly cant be used as property name ](https://github.com/akkadotnet/HOCON/issues/79)
5-
* [Fix: unable to use include keyword at root level](https://github.com/akkadotnet/HOCON/pull/69)
6-
* [Fix. Child field path was not concatenated with its parent path](https://github.com/akkadotnet/HOCON/pull/96)
7-
* [Fix: bug when getting a string with a substitution as an array element](https://github.com/akkadotnet/HOCON/pull/88)
8-
* [Fix: Object fields containing objects may not return proper object value in certain circumstances. ](https://github.com/akkadotnet/HOCON/pull/93)
9-
* [Fix: Improper value instantiation and parenting during parsing caused a disconnected tree nodes.](https://github.com/akkadotnet/HOCON/pull/99)
10-
* [Fix: HoconValue.Undefined is inconsistent](https://github.com/akkadotnet/HOCON/pull/101)
11-
12-
#### 1.0.0 November 14th 2018 ####
13-
HOCON 1.0.0 is a complete and total rewrite of the HOCON parsing engine, designed to work with both the .NET Framework (4.5 and later) and .NET Standard 1.3.
14-
15-
The performance has significantly improved, as have the range of features supported by this library, including:
16-
* Built-in enviroment variable substitution;
17-
* [Support for better byte and time formats](https://github.com/akkadotnet/akka.net/pull/3600);
18-
* [Improved object substitution and merging](https://github.com/akkadotnet/HOCON/pull/55);
19-
* and many more features.
20-
21-
This library will be developed and released independently from Akka.NET itself, but beginning with Akka.NET v1.4 it will be taken as a dependency by the core Akka libraries.
22-
23-
HOCON ships as two NuGet packages:
24-
* `Hocon` - includes all core parser, substitution, tokenization, and other functionality;
25-
* `Hocon.Configuration` - adds `App.config` and `System.Configuration` integration to HOCON.
26-
* `Hocon.Extensions.Configuration` - adds HOCON support for the popular `Microsoft.Extensions.Configuration` library used in ASP.NET Core and other parts of the new .NET Core runtime.
27-
28-
#### 0.1.0 November 9th 2017 ####
29-
* .NET Standard 1.2 and .NET 4.5 dual support for core HOCON library.
30-
* Dropped dependency on JSON.NET.
31-
* Separated HOCON from Akka conceptually and in terms of namespaces.
1+
#### 1.2.0 October 05 2019 ####
2+
HOCON 1.2.0 contains an entirely new model for working with HOCON, via the `Hocon.Immutable` NuGet package.

‎build-system/azure-pipeline.template.yaml

+15
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
parameters:
22
name: ''
3+
displayName: ''
34
vmImage: ''
45
scriptFileName: ''
56
scriptArgs: 'all'
7+
artifactName: 'akkaBuild'
8+
outputDirectory: ''
69
timeoutInMinutes: 120
710

811
jobs:
912
- job: ${{ parameters.name }}
13+
displayName: ${{ parameters.displayName }}
1014
timeoutInMinutes: ${{ parameters.timeoutInMinutes }}
1115
pool:
1216
vmImage: ${{ parameters.vmImage }}
@@ -37,6 +41,17 @@ jobs:
3741
testResultsFiles: '**/*.trx' #TestResults folder usually
3842
testRunTitle: ${{ parameters.name }}
3943
mergeTestResults: true
44+
- task: CopyFiles@2
45+
displayName: 'Copy Build Output'
46+
inputs:
47+
sourceFolder: ${{ parameters.outputDirectory }}
48+
contents: '**\*'
49+
targetFolder: $(Build.ArtifactStagingDirectory)
50+
continueOnError: boolean # 'true' if future steps should run even if this step fails; defaults to 'false'
51+
- task: PublishBuildArtifacts@1
52+
inputs:
53+
pathtoPublish: '$(Build.ArtifactStagingDirectory)'
54+
artifactName: ${{ parameters.artifactName }}
4055
- script: 'echo 1>&2'
4156
failOnStderr: true
4257
displayName: 'If above is partially succeeded, then fail'

‎build-system/linux-pr-validation.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ jobs:
1919
name: Ubuntu
2020
vmImage: 'ubuntu-16.04'
2121
scriptFileName: ./build.sh
22-
scriptArgs: all
22+
scriptArgs: all
23+
outputDirectory: 'bin/nuget'
24+
artifactName: 'nuget_pack-$(Build.BuildId)'

‎build-system/windows-pr-validation.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,6 @@ jobs:
1919
name: Windows
2020
vmImage: 'vs2017-win2016'
2121
scriptFileName: build.cmd
22-
scriptArgs: all
22+
scriptArgs: all
23+
outputDirectory: 'bin/nuget'
24+
artifactName: 'nuget_pack-$(Build.BuildId)'

‎src/Hocon.Benchmarks/Hocon.Benchmarks.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp2.0</TargetFramework>
5+
<TargetFramework>netcoreapp2.1</TargetFramework>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
24+
<PackageReference Include="BenchmarkDotNet" Version="0.11.5" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

‎src/Hocon.Configuration.Test/Hocon.Configuration.Tests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Import Project="..\common.props" />
33

44
<PropertyGroup>
5-
<TargetFrameworks>net461;netcoreapp2.0</TargetFrameworks>
5+
<TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
66
</PropertyGroup>
77

88
<ItemGroup>

‎src/Hocon.Configuration/Hocon.Configuration.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
2020
<PackageReference Include="System.Configuration.ConfigurationManager">
21-
<Version>4.5.0</Version>
21+
<Version>4.6.0</Version>
2222
</PackageReference>
2323
</ItemGroup>
2424

‎src/Hocon.Extensions.Configuration/Hocon.Extensions.Configuration.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="2.1.1" />
11-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.1.1" />
12-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="2.1.1" />
10+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="3.0.0" />
11+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="3.0.0" />
12+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="3.0.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

0 commit comments

Comments
 (0)