Cleaner packaging

Topten.JsonKit/Topten.JsonKit.csproj

@@ -1,4 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
+  <Import Project="../version.props" />
+
   <PropertyGroup>
     <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
     <Configurations>Debug;Release</Configurations>
@@ -18,6 +21,7 @@
     <PackageProjectUrl>https://github.com/toptensoftware/jsonkit</PackageProjectUrl>
     <PackageTags>JSON, Serialization</PackageTags>
     <Description>Lightweight JSON Serialization Library</Description>
+    <RepositoryUrl>https://github.com/toptensoftware/jsonkit</RepositoryUrl>
   </PropertyGroup>
 
   <ItemGroup>

build.js

@@ -11,33 +11,22 @@ if (bt.options.official)
     // Clock version
     bt.clock_version();
 
-    // Run Tests
-    bt.dntest("Release", "Topten.JsonKit.Test");
-
-    // Force clean
-    bt.options.clean = true;
-    bt.clean("./Build");
+    // Clean build directory
+    bt.cli("rm -rf ./Build");
 }
 
 // Build
-bt.dnbuild("Release", "Topten.JsonKit");
-
-// Build NuGet Package?
-if (bt.options.official || bt.options.nuget)
-{
-	bt.signfile([
-        "Build\\Release\\Topten.JsonKit\\netcoreapp2.0\\Topten.JsonKit.dll",
-        "Build\\Release\\Topten.JsonKit\\net46\\Topten.JsonKit.dll",
-    ], "JsonKit JSON Serialization Library");
-
-    bt.nupack("Topten.JsonKit.nuspec", "./Build");
-}
+bt.cli("dotnet build Topten.JsonKit -c Release")
 
 if (bt.options.official)
 {
+    bt.cli("dotnet test Topten.JsonKit.Test -c Release");
+
     // Tag and commit
     bt.git_tag();
 
     // Push nuget package
-    bt.nupush(`./build/*.${bt.options.version.build}.nupkg`, "http://nuget.toptensoftware.com/v3/index.json");
+    bt.cli(`dotnet nuget push`,
+           `./Build/Release/Topten.JsonKit/*.${bt.options.version.build}.nupkg`,
+           `--source "Topten GitHub"`);
 }

version.cs

@@ -2,14 +2,14 @@
 // Generated by build tool, do not edit
 using System;
 using System.Reflection;
-[assembly: AssemblyCopyright("Copyright © 2014-2019 Topten Software. All Rights Reserved")]
-[assembly: AssemblyVersion("1.1.115")]
-[assembly: AssemblyFileVersion("1.1.115")]
-[assembly: AssemblyCompany("Topten Software")]
+[assembly: AssemblyCopyright("Copyright © 2014-2020 undefined. All Rights Reserved")]
+[assembly: AssemblyVersion("1.1.116")]
+[assembly: AssemblyFileVersion("1.1.116")]
+[assembly: AssemblyCompany("undefined")]
 [assembly: AssemblyProduct("JsonKit")]
 
 static class BuildInfo
 {
-	public static DateTime Date = new DateTime(2019, 6, 20, 5, 42, 28, DateTimeKind.Utc);
+	public static DateTime Date = new DateTime(2020, 6, 22, 5, 49, 21, DateTimeKind.Utc);
 }
 	

version.h

@@ -1,7 +1,7 @@
 
 #define VER_A		1
 #define VER_B		1
-#define VER_C		115
+#define VER_C		116
 #define VER_D		0
-#define COPYRIGHT_STRING "Copyright © 2014-2019 Topten Software. All Rights Reserved\0"
+#define COPYRIGHT_STRING "Copyright © 2014-2020 undefined. All Rights Reserved\0"
 	

version.json

@@ -1,7 +1,7 @@
 {
     "major": 1,
     "minor": 1,
-    "build": 115,
+    "build": 116,
     "copyrightYear": 2014,
     "productName": "JsonKit"
 }

version.props

@@ -2,7 +2,7 @@
 <!-- Generated by build tool, do not edit -->
 <Project>
   <PropertyGroup>
-  	<Version Condition="'$(Variable)' == ''">1.1.115</Version>
+  	<Version Condition="'$(Variable)' == ''">1.1.116</Version>
   </PropertyGroup>
 </Project>