Misc commit from desktop. Must have forgotten to commit after working on it last time.

Branch_1.5.0
Nathan Crawford 2009-08-01 15:23:30 +00:00
rodzic 3ead10d669
commit 4a7ea34011
8 zmienionych plików z 19 dodań i 13 usunięć

Wyświetl plik

@ -55,5 +55,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyVersion("1.1.0.1")]
[assembly: AssemblyFileVersion("1.1.0.1")]

Wyświetl plik

@ -54,5 +54,5 @@ using System.Runtime.InteropServices;
// Build Number
// Revision
//
[assembly: AssemblyVersion("1.4.0.5")]
[assembly: AssemblyFileVersion("1.4.0.5")]
[assembly: AssemblyVersion("1.4.0.7")]
[assembly: AssemblyFileVersion("1.4.0.7")]

Wyświetl plik

@ -249,9 +249,13 @@ namespace embroideryReader
{
MessageBox.Show("Cannot check for update because the 'update location'" + Environment.NewLine + "setting has been removed from the settings file.");
}
else if (updater.GetLastError() != "")
{
MessageBox.Show("Encountered an error while checking for updates: " + updater.GetLastError());
}
else if (updater.IsUpdateAvailable())
{
if (MessageBox.Show("Version " + updater.VersionAvailable() + " was released on " + updater.getReleaseDate().ToStringShortDate() + "." + Environment.NewLine + "You have version " + currentVersion() + ". Would you like to go to the Embroidery Reader website to download or find out more about the new version?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
if (MessageBox.Show("Version " + updater.VersionAvailable() + " was released on " + updater.getReleaseDate().ToShortDateString() + "." + Environment.NewLine + "You have version " + currentVersion() + ". Would you like to go to the Embroidery Reader website to download or find out more about the new version?", "New version available", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
{
try
{
@ -271,10 +275,6 @@ namespace embroideryReader
//}
}
}
else if (updater.GetLastError() != "")
{
MessageBox.Show("Encountered an error while checking for updates: " + updater.GetLastError());
}
else
{
MessageBox.Show("No updates are available right now." + Environment.NewLine + "(Latest version is " + updater.VersionAvailable() + ", you have version " + currentVersion() + ")");

Plik binarny nie jest wyświetlany.

Wyświetl plik

@ -1,4 +1,4 @@
using System.Reflection;
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.0.0.2")]
[assembly: AssemblyFileVersion("1.0.0.2")]

Wyświetl plik

@ -54,4 +54,8 @@
<Target Name="AfterBuild">
</Target>
-->
<PropertyGroup>
<PreBuildEvent>"$(ProjectDir)\IncrementVersionNumber.exe" --prebuild</PreBuildEvent>
<PostBuildEvent>"$(ProjectDir)\IncrementVersionNumber.exe" --postbuild</PostBuildEvent>
</PropertyGroup>
</Project>

Wyświetl plik

@ -52,6 +52,7 @@ Section "Embroidery Reader ${VERSION} (required)"
File "nc_settings.dll"
File "PesFile.dll"
File "nc_Updater.dll"
File "embroideryThumbs.dll"
; Write the installation path into the registry
WriteRegStr HKLM "SOFTWARE\Embroidery Reader" "Install_Dir" "$INSTDIR"
@ -161,6 +162,7 @@ Section "Uninstall"
Delete $INSTDIR\embroideryreader.ini
Delete $INSTDIR\PesFile.dll
Delete $INSTDIR\nc_Updater.dll
Delete $INSTDIR\embroideryThumbs.dll
; Remove obsolete files from previous versions, if they exist
Delete $INSTDIR\UpdateInstaller.exe

Wyświetl plik

@ -1 +1 @@
version=1.4.0.0
version=1.4.0.5