Skip to content

Commit

Permalink
Actually fixed version checking for real this time
Browse files Browse the repository at this point in the history
  • Loading branch information
Iridium-IO committed Nov 18, 2017
1 parent a8bcdaf commit 9aace1d
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion WindowsApp1/Compact.vb
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Imports System.Management


Public Class Compact
Shared version = "2.3.2"
Shared version = "2.3.3"
Private WithEvents MyProcess As Process
Private Delegate Sub AppendOutputTextDelegate(ByVal text As String)

Expand Down
4 changes: 2 additions & 2 deletions WindowsApp1/My Project/AssemblyInfo.vb
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ Imports System.Runtime.InteropServices
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("2.3.2.0")>
<Assembly: AssemblyFileVersion("2.3.2.0")>
<Assembly: AssemblyVersion("2.3.3.0")>
<Assembly: AssemblyFileVersion("2.3.3.0")>
<Assembly: NeutralResourcesLanguage("en")>
4 changes: 2 additions & 2 deletions WindowsApp1/VersionCheck.vb
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ Public Class VersionCheck
Shared Function XMLParse(versionDoc As XDocument, version As String)
Dim info As XElement = versionDoc.Root

xml_MajorVer = Single.Parse(info.Element("VersionMajor").Value, CultureInfo.CurrentUICulture)
xml_MajorVer = Single.Parse(info.Element("VersionMajor").Value, CultureInfo.InvariantCulture)
xml_MinorVer = info.Element("VersionMinor").Value
xml_VersionStr = info.Element("VersionStr").Value
xml_ChocoVStr = info.Element("ChocolateyVStr").Value
xml_IsPrerelease = info.Element("IsPrerelease").Value
xml_Changes = info.Element("Changes").Value.Split("|")
xml_Fixes = info.Element("Fixes").Value.Split("|")

Dim exe_MajorVer As Single = Single.Parse(version.Substring(0, version.LastIndexOf(".")), CultureInfo.CurrentUICulture)
Dim exe_MajorVer As Single = Single.Parse(version.Substring(0, version.LastIndexOf(".")), CultureInfo.InvariantCulture)
Dim exe_MinorVer As Integer = CInt(version.Substring(version.LastIndexOf(".") + 1))

If xml_MajorVer > exe_MajorVer Then
Expand Down

0 comments on commit 9aace1d

Please sign in to comment.