From aa34f3efc4241dd76a02825f1c8054ea6017b684 Mon Sep 17 00:00:00 2001
From: Markus Quaritsch <markus.quaritsch@tugraz.at>
Date: Fri, 28 Sep 2018 09:55:35 +0200
Subject: [PATCH] adding suffix for development branch, start versioning from
0.1
---
HashingTool/Properties/Version.cs | 6 +++---
VECTO/GUI/AboutBox.vb | 4 ++--
VECTO/GUI/MainForm.vb | 6 +++---
VECTO/GUI/WelcomeDialog.vb | 3 ++-
VectoCommon/VectoCommon/Properties/Version.cs | 4 ++--
VectoCommon/VectoHashing/Properties/Version.cs | 4 ++--
VectoConsole/Properties/Version.cs | 6 +++---
VectoCore/VectoCore/Properties/Version.cs | 4 ++--
VectoCore/VectoCore/Utils/VectoCSVFile.cs | 2 +-
VectoCore/VectoCore/Utils/VectoVersionCore.cs | 11 +++++++++--
VectoCore/VectoCore/Utils/VectoVersionCore.tt | 9 ++++++++-
VectoCore/VectoCore/VectoCore.csproj | 1 -
VectoCore/VectoCore/VersionNumber.t4 | 2 +-
13 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/HashingTool/Properties/Version.cs b/HashingTool/Properties/Version.cs
index da2a6ce074..a4302c3d9e 100644
--- a/HashingTool/Properties/Version.cs
+++ b/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")]
diff --git a/VECTO/GUI/AboutBox.vb b/VECTO/GUI/AboutBox.vb
index 80b1e52c96..41667f5a83 100644
--- a/VECTO/GUI/AboutBox.vb
+++ b/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----------------------------------------------------------------
diff --git a/VECTO/GUI/MainForm.vb b/VECTO/GUI/MainForm.vb
index 22c645fda7..58950a23a1 100644
--- a/VECTO/GUI/MainForm.vb
+++ b/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
diff --git a/VECTO/GUI/WelcomeDialog.vb b/VECTO/GUI/WelcomeDialog.vb
index 3da1a92e4c..090979ae59 100644
--- a/VECTO/GUI/WelcomeDialog.vb
+++ b/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
diff --git a/VectoCommon/VectoCommon/Properties/Version.cs b/VectoCommon/VectoCommon/Properties/Version.cs
index 19ad6af946..0207ee044b 100644
--- a/VectoCommon/VectoCommon/Properties/Version.cs
+++ b/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
diff --git a/VectoCommon/VectoHashing/Properties/Version.cs b/VectoCommon/VectoHashing/Properties/Version.cs
index 10c9c5e1ec..1dd7f72a19 100644
--- a/VectoCommon/VectoHashing/Properties/Version.cs
+++ b/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")]
diff --git a/VectoConsole/Properties/Version.cs b/VectoConsole/Properties/Version.cs
index 19ad6af946..4b20a840d6 100644
--- a/VectoConsole/Properties/Version.cs
+++ b/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
diff --git a/VectoCore/VectoCore/Properties/Version.cs b/VectoCore/VectoCore/Properties/Version.cs
index 875fea7840..cea58f5988 100644
--- a/VectoCore/VectoCore/Properties/Version.cs
+++ b/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")]
diff --git a/VectoCore/VectoCore/Utils/VectoCSVFile.cs b/VectoCore/VectoCore/Utils/VectoCSVFile.cs
index a3ced22ecc..b01bd8305a 100644
--- a/VectoCore/VectoCore/Utils/VectoCSVFile.cs
+++ b/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"));
diff --git a/VectoCore/VectoCore/Utils/VectoVersionCore.cs b/VectoCore/VectoCore/Utils/VectoVersionCore.cs
index 9435e8f935..3d8554d72e 100644
--- a/VectoCore/VectoCore/Utils/VectoVersionCore.cs
+++ b/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);
}
}
}
diff --git a/VectoCore/VectoCore/Utils/VectoVersionCore.tt b/VectoCore/VectoCore/Utils/VectoVersionCore.tt
index e8d990bf30..eb204bca95 100644
--- a/VectoCore/VectoCore/Utils/VectoVersionCore.tt
+++ b/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);
}
}
}
diff --git a/VectoCore/VectoCore/VectoCore.csproj b/VectoCore/VectoCore/VectoCore.csproj
index 38cf0238c5..73125bd4ce 100644
--- a/VectoCore/VectoCore/VectoCore.csproj
+++ b/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>
diff --git a/VectoCore/VectoCore/VersionNumber.t4 b/VectoCore/VectoCore/VersionNumber.t4
index 78d4e8ed1d..aed1f8e3e9 100644
--- a/VectoCore/VectoCore/VersionNumber.t4
+++ b/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
--
GitLab