Skip to content

Commit c623d80

Browse files
committed
fix .NET Core version
1 parent a1ec1e1 commit c623d80

5 files changed

Lines changed: 9 additions & 5 deletions

File tree

Hjson/Properties/AssemblyInfo.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
[assembly: System.Reflection.AssemblyDescription("Hjson.dll")]
33
[assembly: System.Reflection.AssemblyProduct("Hjson - https://github.com/hjson/hjson-cs")]
44
[assembly: System.Reflection.AssemblyCopyright("See LICENSE")]
5-
[assembly: System.Reflection.AssemblyFileVersion("2.1.1.0")]
5+
[assembly: System.Reflection.AssemblyFileVersion("2.1.2.0")]
66
[assembly: System.Reflection.AssemblyTitle("Hjson.dll")]
77
[assembly: System.CLSCompliant(true)]

Hjson/project.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"version": "2.1.2",
23
"buildOptions": {
34
"xmlDoc": true
45
},

build

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,11 @@
22
set -e # exit script on error
33
BASE=`dirname "$(readlink -f "$0")"`
44
cd $BASE
5-
echo $BASE
5+
6+
VERSION=`cat Hjson/project.json | sed -rn 's/.*version": "(.*)".*/\1/p'`
7+
VERSION2=`cat Hjson/Properties/AssemblyInfo.cs | sed -rn 's/.*AssemblyFileVersion\("(.*).0"\).*/\1/p'`
8+
9+
if [[ "$VERSION" != "$VERSION2" ]]; then echo error: version mismatch; exit; fi
610

711
echo ------------------
812
echo build core
@@ -27,5 +31,4 @@ echo ------------------
2731
echo pkg
2832

2933
mkdir -p nuget
30-
VERSION=`cat Hjson/Properties/AssemblyInfo.cs | sed -rn 's/.*AssemblyFileVersion\("(.*).0"\).*/\1/p'`
3134
nuget pack Hjson.nuspec -Version $VERSION -OutputDirectory nuget/

history.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# hjson-cs History
22

3-
- v2.1.1
3+
- v2.1.2
44
- add support for .NET Core
55
- v2.1.0
66
- add DSF (domain specific formats), experimental

legacy/cli/Hjsonc.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<Compile Include="..\..\cli\Program.cs" />
4444
</ItemGroup>
4545
<ItemGroup>
46-
<ProjectReference Include="..\src\Hjson.csproj">
46+
<ProjectReference Include="..\Hjson\Hjson.csproj">
4747
<Project>{ff9e2637-8bd3-4f8d-b563-d105b10d5354}</Project>
4848
<Name>Hjson</Name>
4949
</ProjectReference>

0 commit comments

Comments
 (0)