Merge pull request #2 in VECTO/vecto-dev from ~EMQUARIMA/vecto-dev:master to master

* commit 'aa34f3ef':
  adding suffix for development branch, start versioning from 0.1

HashingTool/Properties/Version.cs

@@ -11,7 +11,7 @@
 * by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use VECTO except in compliance with the Licence.
 * You may obtain a copy of the Licence at:
-*
+*	
 * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
 *
 * Unless required by applicable law or agreed to in writing, VECTO
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("0.2.0.1250")]
-[assembly: AssemblyFileVersion("0.2.0.1250")]
+[assembly: AssemblyVersion("0.2.0.1366")]
+[assembly: AssemblyFileVersion("0.2.0.1366")]

VECTO/GUI/AboutBox.vb

@@ -8,7 +8,7 @@
 '   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 '
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
-
+Imports TUGraz.VectoCore.Utils
 
 ''' <summary>
 ''' About Dialog. Shows Licence and contact/support information
@@ -17,7 +17,7 @@
 Public Class AboutBox
 	'Initialize
 	Private Sub F10_AboutBox_Load(ByVal sender As Object, ByVal e As EventArgs) Handles MyBase.Load
-		Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers
+		Text = "VECTO " & VECTOvers & " / VectoCore" & VectoSimulationCore.BranchSuffix & " " & COREvers
 	End Sub
 
 	'e-mail links----------------------------------------------------------------

VECTO/GUI/MainForm.vb

@@ -230,7 +230,7 @@ Imports TUGraz.VectoCore.Utils
 
         FB_Initialize()
 
-        Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers
+        Text = "VECTO" & VECTOvers & " / VectoCore" & VectoSimulationCore.BranchSuffix & " " & COREvers
 
 
         'FileLists
@@ -278,10 +278,10 @@ Imports TUGraz.VectoCore.Utils
     Private Sub DeclOnOff()
 
         If Cfg.DeclMode Then
-            Text = "VECTO " & COREvers & " - Declaration Mode"
+            Text = "VECTO" & VectoSimulationCore.BranchSuffix & " " & COREvers & " - Declaration Mode"
             Cfg.DeclInit()
         Else
-            Text = "VECTO " & COREvers
+            Text = "VECTO" & VectoSimulationCore.BranchSuffix & " " & COREvers
         End If
 
         If Cfg.DeclMode Then

VECTO/GUI/WelcomeDialog.vb

@@ -10,6 +10,7 @@
 ' See the LICENSE.txt for the specific language governing permissions and limitations.
 Imports System.IO
 Imports TUGraz.VectoCommon.Utils
+Imports TUGraz.VectoCore.Utils
 
 ''' <summary>
 ''' Welcome screen. Shows only on the first time application start
@@ -24,7 +25,7 @@ Public Class WelcomeDialog
 
 	'Init
 	Private Sub F_Welcome_Load(sender As Object, e As EventArgs) Handles Me.Load
-		Text = "VECTO " & VECTOvers & " / VectoCore " & COREvers
+		Text = "VECTO " & VECTOvers & " / VectoCore" & VectoSimulationCore.BranchSuffix & " " & COREvers
 	End Sub
 
 	'Open Release Notes

VectoCommon/VectoCommon/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.0.1250")]
-[assembly: AssemblyFileVersion("3.3.0.1250")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.1.0.1366")]
+[assembly: AssemblyFileVersion("0.1.0.1366")]
\ No newline at end of file

VectoCommon/VectoHashing/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("1.2.0.1250")]
-[assembly: AssemblyFileVersion("1.2.0.1250")]
+[assembly: AssemblyVersion("1.2.0.1366")]
+[assembly: AssemblyFileVersion("1.2.0.1366")]

VectoConsole/Properties/Version.cs

@@ -11,7 +11,7 @@
 * by the European Commission - subsequent versions of the EUPL (the "Licence");
 * You may not use VECTO except in compliance with the Licence.
 * You may obtain a copy of the Licence at:
-*
+*	
 * https://joinup.ec.europa.eu/community/eupl/og_page/eupl
 *
 * Unless required by applicable law or agreed to in writing, VECTO
@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.0.1250")]
-[assembly: AssemblyFileVersion("3.3.0.1250")]
\ No newline at end of file
+[assembly: AssemblyVersion("0.1.0.1366")]
+[assembly: AssemblyFileVersion("0.1.0.1366")]
\ No newline at end of file

VectoCore/VectoCore/Properties/Version.cs

@@ -30,5 +30,5 @@
 */
 
 using System.Reflection;
-[assembly: AssemblyVersion("3.3.0.1250")]
-[assembly: AssemblyFileVersion("3.3.0.1250")]
+[assembly: AssemblyVersion("0.1.0.1366")]
+[assembly: AssemblyFileVersion("0.1.0.1366")]

VectoCore/VectoCore/Utils/VectoCSVFile.cs

@@ -197,7 +197,7 @@ namespace TUGraz.VectoCore.Utils
 			}
 			if (addVersionHeader) {
 				try {
-					writer.WriteLine("# VECTO {0} - {1}", VectoSimulationCore.VersionNumber,
+					writer.WriteLine("# VECTO{0} {1} - {2}", VectoSimulationCore.BranchSuffix, VectoSimulationCore.VersionNumber,
 						DateTime.Now.ToString("dd.MM.yyyy HH:mm"));
 				} catch (Exception) {
 					writer.WriteLine("# VECTO {0} - {1}", "Unknown", DateTime.Now.ToString("dd.MM.yyyy HH:mm"));

VectoCore/VectoCore/Utils/VectoVersionCore.cs

@@ -36,14 +36,21 @@ namespace TUGraz.VectoCore.Utils
 		public static string VersionNumber
 		{
 			get {
-				return "3.3.0.1250";
+				return "0.1.0.1366";
+			}
+		}
+
+		public static string BranchSuffix
+		{
+			get {
+				return "-DEV";
 			}
 		}
 
 		public static string FullVersion
 		{
 			get {
-				return string.Format("VectoCore {0}", VersionNumber);
+				return string.Format("VectoCore{1} {0}", VersionNumber, BranchSuffix);
 			}
 		}
 	}

VectoCore/VectoCore/Utils/VectoVersionCore.tt

@@ -43,10 +43,17 @@ namespace TUGraz.VectoCore.Utils
 			}
 		}
 
+		public static string BranchSuffix
+		{
+			get {
+				return "-DEV";
+			}
+		}
+
 		public static string FullVersion
 		{
 			get {
-				return string.Format("VectoCore {0}", VersionNumber);
+				return string.Format("VectoCore{1} {0}", VersionNumber, BranchSuffix);
 			}
 		}
 	}

VectoCore/VectoCore/VectoCore.csproj

@@ -84,7 +84,6 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DocumentFormat.OpenXml, Version=2.5.5631.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="Microsoft.VisualBasic" />
     <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

VectoCore/VectoCore/VersionNumber.t4

@@ -6,6 +6,6 @@ int GetBuildNumber()
 
 string GetVectoCoreVersionNumber()
 {
-	return "3.3.0." + GetBuildNumber();
+	return "0.1.0." + GetBuildNumber();
 }
 #>
\ No newline at end of file