Change defines for dev-build/release candidate. default build is dev version....

Change defines for dev-build/release candidate. default build is dev version. add solution-wide defines

Build/CommonSettings.targets

+<Project DefaultTargets = "Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
+  <PropertyGroup>
+	<DefineConstants>$(DefineConstants),RELEASE_CANDIDATE</DefineConstants>
+	<!-- <DefineConstants>$(DefineConstants),CERTIFICATION_RELEASE</DefineConstants> -->
+  </PropertyGroup>
+</Project>
\ No newline at end of file

VECTO/VECTO.vbproj

@@ -560,4 +560,5 @@
   -->
   <Import Project="$(SolutionDir)Build\TextPreProcessing.targets" />
   <Import Project="$(SolutionDir)Build\Packaging.targets" />
+  <Import Project="$(SolutionDir)Build\CommonSettings.targets" />
 </Project>
\ No newline at end of file

VectoCommon/VectoCommon/VectoCommon.csproj

@@ -127,4 +127,8 @@
   </Target>
   -->
   <Import Project="$(SolutionDir)Build\TextPreProcessing.targets" />
+  <PropertyGroup Condition="'$(SolutionDir)' == '' or '$(SolutionDir)' == '*undefined*'">
+      <SolutionDir>..\..\</SolutionDir>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)Build\CommonSettings.targets" />
 </Project>
\ No newline at end of file

VectoCore/VectoCore/OutputData/XML/XMLCustomerReport.cs

@@ -207,7 +207,9 @@ namespace TUGraz.VectoCore.OutputData.XML
 		private XElement GetApplicationInfo()
 		{
 			var versionNumber = VectoSimulationCore.VersionNumber;
-#if RELEASE_CANDIDATE
+#if CERTIFICATION_RELEASE
+			// add nothing to version number
+#else
 			versionNumber += " !!NOT FOR CERTIFICATION!!";
 #endif
 			return new XElement(tns + XMLNames.Report_ApplicationInfo_ApplicationInformation,

VectoCore/VectoCore/OutputData/XML/XMLManufacturerReport.cs

@@ -384,7 +384,9 @@ namespace TUGraz.VectoCore.OutputData.XML
 		private XElement GetApplicationInfo()
 		{
 			var versionNumber = VectoSimulationCore.VersionNumber;
-#if RELEASE_CANDIDATE
+#if CERTIFICATION_RELEASE
+// add nothing to version number
+#else
 			versionNumber += " !!NOT FOR CERTIFICATION!!";
 #endif
 			return new XElement(tns + XMLNames.Report_ApplicationInfo_ApplicationInformation,

VectoCore/VectoCore/Utils/VectoVersionCore.cs

@@ -34,16 +34,20 @@ namespace TUGraz.VectoCore.Utils
 	public static class VectoSimulationCore
 	{
 
+#if CERTIFICATION_RELEASE
+		private const string SUFFIX = "";
+#else
 #if RELEASE_CANDIDATE
 		private const string SUFFIX = "-RC";
 #else
-		private const string SUFFIX = "";
+		private const string SUFFIX = "-DEV";
+#endif
 #endif
 
 		public static string VersionNumber
 		{
 			get {
-				return "3.3.0.1433" + SUFFIX;
+				return "3.3.1.1463" + SUFFIX;
 			}
 		}
 

VectoCore/VectoCore/Utils/VectoVersionCore.tt

@@ -37,13 +37,14 @@ namespace TUGraz.VectoCore.Utils
 	public static class VectoSimulationCore
 	{
 
-#if BETA_RELEASE
-		private const string SUFFIX = "-DEV";
+#if CERTIFICATION_RELEASE
+		private const string SUFFIX = "";
 #else
 #if RELEASE_CANDIDATE
 		private const string SUFFIX = "-RC";
+#else
+		private const string SUFFIX = "-DEV";
 #endif
-		private const string SUFFIX = "";
 #endif
 
 		public static string VersionNumber

VectoCore/VectoCore/VectoCore.csproj

@@ -528,4 +528,8 @@
   </Target>
   -->
   <Import Project="$(SolutionDir)Build\TextPreProcessing.targets" />
+  <PropertyGroup Condition="'$(SolutionDir)' == '' or '$(SolutionDir)' == '*undefined*'">
+      <SolutionDir>..\..\</SolutionDir>
+  </PropertyGroup>
+  <Import Project="$(SolutionDir)Build\CommonSettings.targets" />
 </Project>
\ No newline at end of file