dotnet core 2

Author: laktak

Hjson.nuspec

@@ -14,9 +14,9 @@
     <tags>JSON comments config hjson parser serializer</tags>
   </metadata>
   <files>
-    <file src="Hjson/bin/Release/netstandard1.3/Hjson.dll" target="lib/netstandard1.3/Hjson.dll" />
-    <file src="Hjson/bin/Release/netstandard1.3/Hjson.xml" target="lib/netstandard1.3/Hjson.xml" />
+    <file src="Hjson/bin/Release/netstandard2.0/Hjson.dll" target="lib/netstandard2.0/Hjson.dll" />
+    <file src="Hjson/bin/Release/netstandard2.0/Hjson.xml" target="lib/netstandard2.0/Hjson.xml" />
     <file src="legacy/Hjson/bin/Release/Hjson.dll" target="lib/net40/Hjson.dll" />
     <file src="legacy/Hjson/bin/Release/Hjson.xml" target="lib/net40/Hjson.xml" />
   </files>
-</package>
+</package>

Hjson/Hjson.csproj

@@ -1,12 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <VersionPrefix>3.0.0</VersionPrefix>
-    <TargetFramework>netstandard1.3</TargetFramework>
+    <VersionPrefix>3.0.1</VersionPrefix>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Hjson</AssemblyName>
     <PackageId>Hjson</PackageId>
-    <NetStandardImplicitPackageVersion>1.6.1</NetStandardImplicitPackageVersion>
     <GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
@@ -15,8 +14,4 @@
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Portable.Compatibility" Version="1.0.1" />
-  </ItemGroup>
-
 </Project>

Hjson/Properties/AssemblyInfo.cs

@@ -2,6 +2,6 @@
 [assembly: System.Reflection.AssemblyDescription("Hjson.dll")]
 [assembly: System.Reflection.AssemblyProduct("Hjson - https://github.com/hjson/hjson-cs")]
 [assembly: System.Reflection.AssemblyCopyright("See LICENSE")]
-[assembly: System.Reflection.AssemblyFileVersion("3.0.0.0")]
+[assembly: System.Reflection.AssemblyFileVersion("3.0.1.0")]
 [assembly: System.Reflection.AssemblyTitle("Hjson.dll")]
 [assembly: System.CLSCompliant(true)]

build-core

@@ -10,10 +10,10 @@ if [[ "$VERSION" != "$VERSION2" ]]; then echo error: version mismatch $VERSION:$
 echo ------------------
 echo build core
 
-dotnet restore Hjson
-dotnet restore cli
-dotnet restore test
-dotnet restore sample/sample.csproj
+#dotnet restore Hjson
+#dotnet restore cli
+#dotnet restore test
+#dotnet restore sample/sample.csproj
 dotnet build Hjson -c Release
 dotnet build cli -c Release
 dotnet build test -c Release

cli/cli.csproj

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.1</TargetFramework>
-    <AssemblyName>cli</AssemblyName>
     <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <AssemblyName>cli</AssemblyName>
     <PackageId>cli</PackageId>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Hjson\Hjson.csproj" />
+    <ProjectReference Include="../Hjson/Hjson.csproj" />
   </ItemGroup>
 
 </Project>

sample/sample.csproj

@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
-    <AssemblyName>sample</AssemblyName>
     <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <AssemblyName>sample</AssemblyName>
     <PackageId>sample</PackageId>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
-    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
   </PropertyGroup>
 
   <ItemGroup>

test/test.csproj

@@ -1,12 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp1.0</TargetFramework>
-    <AssemblyName>test</AssemblyName>
     <OutputType>Exe</OutputType>
+    <TargetFramework>netcoreapp2.0</TargetFramework>
+    <AssemblyName>test</AssemblyName>
     <PackageId>test</PackageId>
-    <RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
-    <PackageTargetFallback>$(PackageTargetFallback);dnxcore50</PackageTargetFallback>
   </PropertyGroup>
 
   <ItemGroup>