From 1896545e0c713a5a4f7ba52f026b5288c8cc95d4 Mon Sep 17 00:00:00 2001 From: Glatzemann Date: Tue, 22 Nov 2011 11:59:35 +0000 Subject: [PATCH] extended msi installer fixed CurveKey operator == and != --- ANX.Framework/CurveKey.cs | 20 ++++ ANX.Framework/Properties/AssemblyInfo.cs | 4 +- Installer/anx.wxs | 127 ++++++++++++----------- build/ANX.Framework.build | 1 + 4 files changed, 92 insertions(+), 60 deletions(-) diff --git a/ANX.Framework/CurveKey.cs b/ANX.Framework/CurveKey.cs index bd0548dc..ddbd3804 100644 --- a/ANX.Framework/CurveKey.cs +++ b/ANX.Framework/CurveKey.cs @@ -151,6 +151,16 @@ namespace ANX.Framework #region Equality public static bool operator ==(CurveKey a, CurveKey b) { + if (null == a as Object) + { + return null == b as Object; + } + + if (null == b as Object) + { + return null == a as Object; + } + return a.Position == b.Position && a.Value == b.Value && a.TangentIn == b.TangentIn && @@ -162,6 +172,16 @@ namespace ANX.Framework #region Inequality public static bool operator !=(CurveKey a, CurveKey b) { + if (null == a as Object) + { + return null != b as Object; + } + + if (null == b as Object) + { + return null != a as Object; + } + return a.Position != b.Position || a.Value != b.Value || a.TangentIn != b.TangentIn || diff --git a/ANX.Framework/Properties/AssemblyInfo.cs b/ANX.Framework/Properties/AssemblyInfo.cs index 81926bdd..b373e597 100644 --- a/ANX.Framework/Properties/AssemblyInfo.cs +++ b/ANX.Framework/Properties/AssemblyInfo.cs @@ -31,8 +31,8 @@ using System.Runtime.InteropServices; // // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern // übernehmen, indem Sie "*" eingeben: -[assembly: AssemblyVersion("0.4.22.*")] -[assembly: AssemblyFileVersion("0.4.22.0")] +[assembly: AssemblyVersion("0.4.23.*")] +[assembly: AssemblyFileVersion("0.4.23.0")] [assembly:InternalsVisibleTo("ANX.Framework.Windows.DX10")] [assembly:InternalsVisibleTo("ANX.Framework.Windows.DX11.1")] diff --git a/Installer/anx.wxs b/Installer/anx.wxs index 501cdcb1..d54b97a2 100644 --- a/Installer/anx.wxs +++ b/Installer/anx.wxs @@ -1,60 +1,71 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/ANX.Framework.build b/build/ANX.Framework.build index 9041c3b9..a2859ded 100644 --- a/build/ANX.Framework.build +++ b/build/ANX.Framework.build @@ -39,6 +39,7 @@ +