Code development platform for open source projects from the European Union institutions :large_blue_circle: EU Login authentication by SMS has been phased out. To see alternatives please check here

Skip to content
Snippets Groups Projects
Commit ca77bebb authored by Stefanos Doumpoulakis's avatar Stefanos Doumpoulakis
Browse files

a)moved version utility stuff to its own class, b)vs2022 in build config

parent b71cb7da
Branches
Tags
No related merge requests found
......@@ -6,6 +6,6 @@
</ItemGroup>
<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\12.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
<!-- <Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%CommonProgramFiles(x86)%\Microsoft Shared\TextTemplating\14.0\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/> -->
<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Professional\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
<Exec Condition="'@(VersionTemplates)'!=''" Command="&quot;C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\TextTransform.exe&quot; -I $(SolutionDir) &quot;%(VersionTemplates.Identity)&quot;"/>
</Target>
</Project>
\ No newline at end of file
......@@ -975,7 +975,7 @@ namespace TUGraz.VectoCore.InputData.FileIO.JSON
string simToolVersionStr = XMLManufacturerReportReader.ReadElementValue(xmlDoc, "SimulationToolVersion");
string vectoVersionStr = VectoSimulationCore.VersionNumber;
bool xmlVersionNewer = VectoSimulationCore.CompareVersions(simToolVersionStr, vectoVersionStr) > 0;
bool xmlVersionNewer = VersioningUtil.CompareVersions(simToolVersionStr, vectoVersionStr) > 0;
if (xmlVersionNewer) {
throw new VectoException($"Not allowed to run simulation because VECTO version is older than <SimulationToolVersion> in Manufacturer Report ({simToolVersionStr}).");
......
......@@ -29,9 +29,6 @@
* Martin Rexeis, rexeis@ivt.tugraz.at, IVT, Graz University of Technology
*/
using System;
using TUGraz.VectoCommon.Utils;
namespace TUGraz.VectoCore.Utils
{
public static class VectoSimulationCore
......@@ -50,7 +47,7 @@ namespace TUGraz.VectoCore.Utils
public static string VersionNumber
{
get {
return "3.3.12.2800" + SUFFIX;
return "3.3.12.2868" + SUFFIX;
}
}
......@@ -60,34 +57,5 @@ namespace TUGraz.VectoCore.Utils
return string.Format("VectoCore {0}", VersionNumber);
}
}
public enum VersionPart {
Major = 0,
Minor = 1,
Patch = 2,
Build = 3
};
public static int CompareVersions(string a, string b, VersionPart bound = VersionPart.Build)
{
var va = a.Split('-')[0].Split('.');
var vb = b.Split('-')[0].Split('.');
for (int i = 0; (i < va.Length) && (i <= (int)bound); i++) {
string vbPartStr = (i < vb.Length) ? vb[i] : "0";
int vbPart = 0;
int.TryParse(vbPartStr, out vbPart);
int vaPart = 0;
int.TryParse(va[i], out vaPart);
if (vaPart != vbPart) {
return (vaPart > vbPart) ? 1 : -1;
}
}
return 0;
}
}
}
\ No newline at end of file

namespace TUGraz.VectoCore.Utils
{
public static class VersioningUtil
{
public enum VersionPart {
Major = 0,
Minor = 1,
Patch = 2,
Build = 3
};
public static int CompareVersions(string a, string b, VersionPart bound = VersionPart.Build)
{
var va = a.Split('-')[0].Split('.');
var vb = b.Split('-')[0].Split('.');
for (int i = 0; (i < va.Length) && (i <= (int)bound); i++) {
string vbPartStr = (i < vb.Length) ? vb[i] : "0";
int vbPart = 0;
int.TryParse(vbPartStr, out vbPart);
int vaPart = 0;
int.TryParse(va[i], out vaPart);
if (vaPart != vbPart) {
return (vaPart > vbPart) ? 1 : -1;
}
}
return 0;
}
}
}
......@@ -622,6 +622,7 @@
<DesignTime>True</DesignTime>
<DependentUpon>VectoVersionCore.tt</DependentUpon>
</Compile>
<Compile Include="Utils\VersioningUtil.cs" />
<Compile Include="Utils\XMLDefinitions.cs" />
<Compile Include="Utils\XMLHelper.cs" />
<Compile Include="Utils\XmlResourceResolver.cs" />
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment