Permalink
Browse files

Fix the available update message not leaving the main menu after upda…

…ting winapp2.ini

Fix some cases where broken/missing version strings in winapp2.ini would cause unexpected behavior
  • Loading branch information...
MoscaDotTo committed Dec 10, 2018
1 parent 976dd4c commit a8737d9a09f7885be5771cd09d14e3ff64b649a9
Showing with 4,273 additions and 8 deletions.
  1. +9 −0 .vs/VSWorkspaceState.json
  2. BIN .vs/slnx.sqlite
  3. BIN .vs/winapp2/v16/.suo
  4. BIN Tools/beta/.vs/winapp2ool/v15/.suo
  5. 0 Tools/beta/.vs/winapp2ool/v15/Server/sqlite3/db.lock
  6. BIN Tools/beta/.vs/winapp2ool/v15/Server/sqlite3/storage.ide
  7. BIN Tools/beta/.vs/winapp2ool/v15/Server/sqlite3/storage.ide-shm
  8. BIN Tools/beta/.vs/winapp2ool/v15/Server/sqlite3/storage.ide-wal
  9. BIN Tools/beta/.vs/winapp2ool/v16/.suo
  10. +7 −0 Tools/beta/GlobalSuppressions.vb
  11. +13 −0 Tools/beta/My Project/Application.Designer.vb
  12. +10 −0 Tools/beta/My Project/Application.myapp
  13. +37 −0 Tools/beta/My Project/AssemblyInfo.vb
  14. +63 −0 Tools/beta/My Project/Resources.Designer.vb
  15. +117 −0 Tools/beta/My Project/Resources.resx
  16. +73 −0 Tools/beta/My Project/Settings.Designer.vb
  17. +7 −0 Tools/beta/My Project/Settings.settings
  18. +70 −0 Tools/beta/My Project/app.manifest
  19. +3 −6 Tools/beta/Winapp2ool.vb
  20. +23 −0 Tools/beta/app.config
  21. +5 −0 Tools/beta/bin/Debug/winapp2.ini
  22. BIN Tools/beta/bin/Debug/winapp2ool.exe
  23. +23 −0 Tools/beta/bin/Debug/winapp2ool.exe.config
  24. BIN Tools/beta/bin/Debug/winapp2ool.pdb
  25. +1,761 −0 Tools/beta/bin/Debug/winapp2ool.xml
  26. +6 −0 Tools/beta/components/.vs/VSWorkspaceState.json
  27. BIN Tools/beta/components/.vs/components/v16/.suo
  28. BIN Tools/beta/components/.vs/slnx.sqlite
  29. +0 −1 Tools/beta/components/WinappDebug.vb
  30. +63 −0 Tools/beta/components/exceptionHandler.vb
  31. +2 −1 Tools/beta/components/winapp2handler.vb
  32. BIN Tools/beta/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
  33. BIN Tools/beta/obj/Debug/winapp2ool.Resources.resources
  34. BIN Tools/beta/obj/Debug/winapp2ool.exe
  35. BIN Tools/beta/obj/Debug/winapp2ool.pdb
  36. +1 −0 Tools/beta/obj/Debug/winapp2ool.vbproj.CoreCompileInputs.cache
  37. +11 −0 Tools/beta/obj/Debug/winapp2ool.vbproj.FileListAbsolute.txt
  38. BIN Tools/beta/obj/Debug/winapp2ool.vbproj.GenerateResource.cache
  39. BIN Tools/beta/obj/Debug/winapp2ool.vbprojAssemblyReference.cache
  40. +1,761 −0 Tools/beta/obj/Debug/winapp2ool.xml
  41. +25 −0 Tools/beta/winapp2ool.sln
  42. +183 −0 Tools/beta/winapp2ool.vbproj
@@ -0,0 +1,9 @@
{
"ExpandedNodes": [
"",
"\\Tools",
"\\Tools\\beta"
],
"SelectedNode": "\\Tools\\beta\\winapp2ool.exe",
"PreviewInSolutionExplorer": false
}
BIN +124 KB .vs/slnx.sqlite
Binary file not shown.
BIN +29.5 KB .vs/winapp2/v16/.suo
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,7 @@

' This file is used by Code Analysis to maintain SuppressMessage
' attributes that are applied to this project.
' Project-level suppressions either have no target or are given
' a specific target and scoped to a namespace, type, member, etc.

<Assembly: System.Diagnostics.CodeAnalysis.SuppressMessage("Style", "IDE1006:Naming Styles", Justification:="<Pending>", Scope:="member", Target:="~M:winapp2ool.WinappDebug.remoteDebug(winapp2ool.iniFileHandler.IFileHandlr@,winapp2ool.iniFileHandler.IFileHandlr,System.Boolean)")>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<MySubMain>false</MySubMain>
<SingleInstance>false</SingleInstance>
<ShutdownMode>0</ShutdownMode>
<EnableVisualStyles>true</EnableVisualStyles>
<AuthenticationMode>0</AuthenticationMode>
<ApplicationType>2</ApplicationType>
<SaveMySettingsOnExit>true</SaveMySettingsOnExit>
</MyApplicationData>
@@ -0,0 +1,37 @@
Imports System.Resources
Imports System
Imports System.Reflection
Imports System.Runtime.InteropServices

' General Information about an assembly is controlled through the following
' set of attributes. Change these attribute values to modify the information
' associated with an assembly.

' Review the values of the assembly attributes

<Assembly: AssemblyTitle("winapp2ool.exe")>
<Assembly: AssemblyDescription("A multitool for use with winapp2.ini")>
<Assembly: AssemblyCompany("https://github.com/MoscaDotTo/Winapp2")>
<Assembly: AssemblyProduct("winapp2ool")>
<Assembly: AssemblyCopyright("Copyright © 2018")>
<Assembly: AssemblyTrademark("")>

<Assembly: ComVisible(False)>

'The following GUID is for the ID of the typelib if this project is exposed to COM
<Assembly: Guid("423f2ad5-779a-42b7-bb89-ee962eb6eb67")>

' Version information for an assembly consists of the following four values:
'
' Major Version
' Minor Version
' Build Number
' Revision
'
' You can specify all the values or you can default the Build and Revision Numbers
' by using the '*' as shown below:
' <Assembly: AssemblyVersion("1.0.*")>

<Assembly: AssemblyVersion("0.9.0")>
<Assembly: AssemblyFileVersion("0.9.0")>
<Assembly: NeutralResourcesLanguage("")>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,117 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -0,0 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
<Profiles>
<Profile Name="(Default)" />
</Profiles>
<Settings />
</SettingsFile>
Oops, something went wrong.

0 comments on commit a8737d9

Please sign in to comment.