Merge pull request #44 from bijington/release-v1.4.0

Release of version 1.4.0
bijington · Mar 23, 2019 · 6a32aea · 6a32aea
2 parents e1be39f + 9420b8d
commit 6a32aea
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 11 deletions.
diff --git a/Source/CSharp/Expressive/Expressive.Standard/Expressive.Standard.csproj b/Source/CSharp/Expressive/Expressive.Standard/Expressive.Standard.csproj
@@ -4,20 +4,20 @@
     <TargetFramework>netstandard1.4</TargetFramework>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <PackageId>Expressive.Standard</PackageId>
-    <Version>1.3.1</Version>
+    <Version>1.4.0</Version>
     <Authors>Shaun Lawrence</Authors>
     <Company>Shaun Lawrence</Company>
     <PackageLicenseUrl>https://opensource.org/licenses/mit</PackageLicenseUrl>
     <PackageProjectUrl>https://github.com/bijington/expressive</PackageProjectUrl>
     <PackageTags>Expression Parser Evaluator</PackageTags>
-    <Copyright>Copyright(c) 2018 Shaun Lawrence</Copyright>
+    <Copyright>Copyright(c) 2019 Shaun Lawrence</Copyright>
     <PackageReleaseNotes></PackageReleaseNotes>
-    <Description>[DEPRECATED] Use ExpressiveParser.
-
-A multi-platform expression parsing and evaluating framework.</Description>
+    <Description>A multi-platform expression parsing and evaluating framework.</Description>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\ExpressiveStrongName.snk</AssemblyOriginatorKeyFile>
     <DelaySign>false</DelaySign>
+    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <FileVersion>1.4.0.0</FileVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/Source/CSharp/Expressive/Expressive.nuspec b/Source/CSharp/Expressive/Expressive.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>ExpressiveParser</id>
 	<title>Expressive Parser</title>
-    <version>1.3.1</version>
+    <version>1.4.0</version>
     <authors>Shaun Lawrence</authors>
     <owners>Shaun Lawrence</owners>
     <licenseUrl>https://opensource.org/licenses/mit</licenseUrl>
@@ -12,11 +12,13 @@
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>A multi-platform expression parsing and evaluating framework.</description>
     <releaseNotes> Version 1.3.1 includes
+	Improvements:
+	* GH-28: Enhance Max/Min functions to support more than just number types.
+	* GH-30: Strong named signing.
 	Bug fixes:	
-	* GH-23: Constant values in expressions now abide by the case sensitivity option.
-	* GH-24: Integers are now used as a known type when comparing numbers.
+	* GH-39: Improvements to parsing decimals in non UK/US locales.
 	</releaseNotes>
-    <copyright>Copyright(c) 2018 Shaun Lawrence</copyright>
+    <copyright>Copyright(c) 2019 Shaun Lawrence</copyright>
     <tags>Expression Parser Evaluator Cross-Platform Xamarin.Forms</tags>
   </metadata>
   <files>

diff --git a/Source/CSharp/Expressive/Expressive/Properties/AssemblyInfo.cs b/Source/CSharp/Expressive/Expressive/Properties/AssemblyInfo.cs
@@ -32,7 +32,7 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0")]
+[assembly: AssemblyVersion("1.4.0")]
+[assembly: AssemblyFileVersion("1.4.0")]
 
 [assembly: InternalsVisibleTo("Expressive.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100495afe3ea98fd0459102e8a5201f106f053d747699b49c82f4c08ae2617ffd1ab133db21560cc1d1721e7f193c472fbbe6d576b4a7690a897083fa55ae41c3d105f36c2063699095eba800c78448af0796cfd6e887308a2bf5a745aeb595450b5aa96c9f5d511d61d9f5c67faa6aa8e56bb6ddd641c38abcec30b714e89f2bbc")]