Changes to NetSparkle forms

diff --git a/trunk/NetSparkle/NetSparkle.cs b/trunk/NetSparkle/NetSparkle.cs
index 9be1464..b621e81 100644 (file)
--- a/trunk/NetSparkle/NetSparkle.cs
+++ b/trunk/NetSparkle/NetSparkle.cs
@@ -1,18 +1,13 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using System.ComponentModel;
+using System.Reflection;
 using System.Threading;
 using System.Net;
-using System.Windows;
 using System.Windows.Forms;
 using System.Drawing;
-using System.Runtime.InteropServices;
-using System.Management;
-using System.Diagnostics;
 using System.Security.Cryptography.X509Certificates;
 using System.Net.Security;
+using log4net;
 using Point = System.Drawing.Point;
 
 namespace AppLimit.NetSparkle
@@ -52,6 +47,8 @@ namespace AppLimit.NetSparkle
 
     public class Sparkle : IDisposable
     {
+        private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+
         private BackgroundWorker _worker = new BackgroundWorker();
 
         private String _AppCastUrl;
@@ -474,6 +471,7 @@ namespace AppLimit.NetSparkle
         /// <param name="message"></param>
         public void ReportDiagnosticMessage(String message)
         {
+            Log.Info(message);
             if (_DiagnosticWindow.InvokeRequired)
             {
                 _DiagnosticWindow.Invoke(new Action<String>(ReportDiagnosticMessage), message);                

diff --git a/trunk/NetSparkle/NetSparkleDownloadProgress.Designer.cs b/trunk/NetSparkle/NetSparkleDownloadProgress.Designer.cs
index f4b75be..f9c8207 100644 (file)
--- a/trunk/NetSparkle/NetSparkleDownloadProgress.Designer.cs
+++ b/trunk/NetSparkle/NetSparkleDownloadProgress.Designer.cs
@@ -39,64 +39,43 @@
             // 
             // lblHeader
             // 
-            this.lblHeader.AccessibleDescription = null;
-            this.lblHeader.AccessibleName = null;
             resources.ApplyResources(this.lblHeader, "lblHeader");
             this.lblHeader.Name = "lblHeader";
             // 
             // progressDownload
             // 
-            this.progressDownload.AccessibleDescription = null;
-            this.progressDownload.AccessibleName = null;
             resources.ApplyResources(this.progressDownload, "progressDownload");
-            this.progressDownload.BackgroundImage = null;
-            this.progressDownload.Font = null;
             this.progressDownload.Name = "progressDownload";
             // 
             // btnInstallAndReLaunch
             // 
-            this.btnInstallAndReLaunch.AccessibleDescription = null;
-            this.btnInstallAndReLaunch.AccessibleName = null;
             resources.ApplyResources(this.btnInstallAndReLaunch, "btnInstallAndReLaunch");
-            this.btnInstallAndReLaunch.BackgroundImage = null;
-            this.btnInstallAndReLaunch.Font = null;
             this.btnInstallAndReLaunch.Name = "btnInstallAndReLaunch";
             this.btnInstallAndReLaunch.UseVisualStyleBackColor = true;
             this.btnInstallAndReLaunch.Click += new System.EventHandler(this.btnInstallAndReLaunch_Click);
             // 
             // lblSecurityHint
             // 
-            this.lblSecurityHint.AccessibleDescription = null;
-            this.lblSecurityHint.AccessibleName = null;
             resources.ApplyResources(this.lblSecurityHint, "lblSecurityHint");
             this.lblSecurityHint.Name = "lblSecurityHint";
             // 
             // imgAppIcon
             // 
-            this.imgAppIcon.AccessibleDescription = null;
-            this.imgAppIcon.AccessibleName = null;
-            resources.ApplyResources(this.imgAppIcon, "imgAppIcon");
-            this.imgAppIcon.BackgroundImage = null;
-            this.imgAppIcon.Font = null;
             this.imgAppIcon.Image = global::AppLimit.NetSparkle.Properties.Resources.software_update_available1;
-            this.imgAppIcon.ImageLocation = null;
+            resources.ApplyResources(this.imgAppIcon, "imgAppIcon");
             this.imgAppIcon.Name = "imgAppIcon";
             this.imgAppIcon.TabStop = false;
             // 
             // NetSparkleDownloadProgress
             // 
-            this.AccessibleDescription = null;
-            this.AccessibleName = null;
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Control;
-            this.BackgroundImage = null;
             this.Controls.Add(this.lblSecurityHint);
             this.Controls.Add(this.btnInstallAndReLaunch);
             this.Controls.Add(this.progressDownload);
             this.Controls.Add(this.lblHeader);
             this.Controls.Add(this.imgAppIcon);
-            this.Font = null;
             this.Name = "NetSparkleDownloadProgress";
             this.ShowInTaskbar = false;
             this.TopMost = true;

diff --git a/trunk/NetSparkle/NetSparkleDownloadProgress.cs b/trunk/NetSparkle/NetSparkleDownloadProgress.cs
index ed9398e..393d8cd 100644 (file)
--- a/trunk/NetSparkle/NetSparkleDownloadProgress.cs
+++ b/trunk/NetSparkle/NetSparkleDownloadProgress.cs
@@ -79,7 +79,7 @@ namespace AppLimit.NetSparkle
             {
                 _sparkle.ReportDiagnosticMessage("No DSA check needed");
             }
-            else
+            /*else
             {
                 Boolean bDSAOk = false;
 
@@ -115,7 +115,7 @@ namespace AppLimit.NetSparkle
                 lblSecurityHint.Visible = true;
                 BackColor = Color.Tomato;
         }
-            }
+            }*/
                
             // Check the unattended mode
             if (_unattend)
@@ -134,45 +134,45 @@ namespace AppLimit.NetSparkle
             String workingDir = Environment.CurrentDirectory;
 
             // generate the batch file path
+            
             String cmd = Environment.ExpandEnvironmentVariables("%temp%\\" + Guid.NewGuid() + ".cmd");
             String installerCMD;
 
             // get the file type
-            if (Path.GetExtension(_tempName).ToLower().Equals(".exe"))
-            {
-                // build the command line 
-                installerCMD = _tempName;
-            }
-            else if (Path.GetExtension(_tempName).ToLower().Equals(".msi"))
-            {                
-                // buid the command line
-                installerCMD = "msiexec /i \"" + _tempName + "\"";                
-            }
-            else
+            var extension = Path.GetExtension(_tempName).ToLower();
+            switch (extension)
             {
-                MessageBox.Show("Updater not supported, please execute " + _tempName + " manually", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                Environment.Exit(-1);
-                return;
+                case ".exe":
+                    installerCMD = _tempName;
+                    break;
+                case ".msi":
+                    installerCMD = String.Format("msiexec /i \"{0}\"",_tempName);
+                    break;
+                default:
+                    MessageBox.Show("Updater not supported, please execute " + _tempName + " manually", "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    Environment.Exit(-1);
+                    return;
             }
 
             // generate the batch file                
             _sparkle.ReportDiagnosticMessage("Generating MSI batch in " + Path.GetFullPath(cmd));
 
-            StreamWriter write = new StreamWriter(cmd);
-            write.WriteLine(installerCMD);
-            write.WriteLine("cd " + workingDir);
-            write.WriteLine(cmdLine);
-            write.Close();
+            using (var write = new StreamWriter(cmd))
+            {
+                write.WriteLine(installerCMD);
+                write.WriteLine("cd " + workingDir);
+                write.WriteLine(cmdLine);
+                write.Close();
+            }
 
             // report
             _sparkle.ReportDiagnosticMessage("Going to execute batch: " + cmd);
 
             // start the installer helper
-            Process process = new Process();
+            var process = new Process();
             process.StartInfo.FileName = cmd;
-            process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
-            process.Start();
-            
+            process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;                        
+            process.Start();                        
 
             // quit the app
             Environment.Exit(0);

diff --git a/trunk/NetSparkle/NetSparkleDownloadProgress.resx b/trunk/NetSparkle/NetSparkleDownloadProgress.resx
index d382b64..62374d5 100644 (file)
--- a/trunk/NetSparkle/NetSparkleDownloadProgress.resx
+++ b/trunk/NetSparkle/NetSparkleDownloadProgress.resx
@@ -112,70 +112,154 @@
     <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>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.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>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="lblSecurityHint.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="lblHeader.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
   </data>
-  <data name="progressDownload.Size" type="System.Drawing.Size, System.Drawing">
-    <value>287, 23</value>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="lblHeader.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9.75pt, style=Bold</value>
+  </data>
+  <data name="lblHeader.Location" type="System.Drawing.Point, System.Drawing">
+    <value>66, 12</value>
   </data>
   <data name="lblHeader.Size" type="System.Drawing.Size, System.Drawing">
-    <value>301, 22</value>
+    <value>432, 22</value>
   </data>
-  <data name="&gt;&gt;imgAppIcon.Name" xml:space="preserve">
-    <value>imgAppIcon</value>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="lblHeader.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
   </data>
-  <data name="lblSecurityHint.Size" type="System.Drawing.Size, System.Drawing">
-    <value>290, 34</value>
+  <data name="lblHeader.Text" xml:space="preserve">
+    <value>Downloading APP</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="imgAppIcon.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
-    <value>AutoSize</value>
+  <data name="&gt;&gt;lblHeader.Name" xml:space="preserve">
+    <value>lblHeader</value>
   </data>
   <data name="&gt;&gt;lblHeader.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lblHeader.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;lblHeader.ZOrder" xml:space="preserve">
+    <value>3</value>
   </data>
   <data name="progressDownload.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Left, Right</value>
   </data>
-  <data name="&gt;&gt;btnInstallAndReLaunch.Parent" xml:space="preserve">
+  <data name="progressDownload.Location" type="System.Drawing.Point, System.Drawing">
+    <value>69, 37</value>
+  </data>
+  <data name="progressDownload.Size" type="System.Drawing.Size, System.Drawing">
+    <value>418, 23</value>
+  </data>
+  <data name="progressDownload.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="&gt;&gt;progressDownload.Name" xml:space="preserve">
+    <value>progressDownload</value>
+  </data>
+  <data name="&gt;&gt;progressDownload.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;progressDownload.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Software Download</value>
+  <data name="&gt;&gt;progressDownload.ZOrder" xml:space="preserve">
+    <value>2</value>
   </data>
-  <data name="&gt;&gt;imgAppIcon.Parent" xml:space="preserve">
+  <data name="btnInstallAndReLaunch.Location" type="System.Drawing.Point, System.Drawing">
+    <value>199, 37</value>
+  </data>
+  <data name="btnInstallAndReLaunch.Size" type="System.Drawing.Size, System.Drawing">
+    <value>155, 23</value>
+  </data>
+  <data name="btnInstallAndReLaunch.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="btnInstallAndReLaunch.Text" xml:space="preserve">
+    <value>Install and Relaunch</value>
+  </data>
+  <data name="&gt;&gt;btnInstallAndReLaunch.Name" xml:space="preserve">
+    <value>btnInstallAndReLaunch</value>
+  </data>
+  <data name="&gt;&gt;btnInstallAndReLaunch.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnInstallAndReLaunch.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
+  <data name="&gt;&gt;btnInstallAndReLaunch.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="lblSecurityHint.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
+  </data>
+  <data name="lblSecurityHint.Location" type="System.Drawing.Point, System.Drawing">
+    <value>66, 63</value>
+  </data>
+  <data name="lblSecurityHint.Size" type="System.Drawing.Size, System.Drawing">
+    <value>421, 34</value>
+  </data>
+  <data name="lblSecurityHint.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="lblSecurityHint.Text" xml:space="preserve">
+    <value>The update was affected by not verified changes, it could be unsafe to install it!</value>
+  </data>
+  <data name="lblSecurityHint.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleCenter</value>
+  </data>
+  <data name="&gt;&gt;lblSecurityHint.Name" xml:space="preserve">
+    <value>lblSecurityHint</value>
+  </data>
+  <data name="&gt;&gt;lblSecurityHint.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;lblSecurityHint.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;lblHeader.Name" xml:space="preserve">
-    <value>lblHeader</value>
+  <data name="&gt;&gt;lblSecurityHint.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
   <data name="imgAppIcon.Location" type="System.Drawing.Point, System.Drawing">
     <value>12, 12</value>
   </data>
+  <data name="imgAppIcon.Size" type="System.Drawing.Size, System.Drawing">
+    <value>48, 48</value>
+  </data>
+  <data name="imgAppIcon.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>AutoSize</value>
+  </data>
+  <data name="imgAppIcon.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;imgAppIcon.Name" xml:space="preserve">
+    <value>imgAppIcon</value>
+  </data>
   <data name="&gt;&gt;imgAppIcon.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="lblHeader.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+  <data name="&gt;&gt;imgAppIcon.Parent" xml:space="preserve">
+    <value>$this</value>
   </data>
-  <data name="&gt;&gt;btnInstallAndReLaunch.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;imgAppIcon.ZOrder" xml:space="preserve">
+    <value>4</value>
   </data>
-  <data name="&gt;&gt;progressDownload.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ProgressBar, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
   </data>
-  <data name="&gt;&gt;btnInstallAndReLaunch.Name" xml:space="preserve">
-    <value>btnInstallAndReLaunch</value>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>499, 99</value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -362,100 +446,16 @@
         /////wAA
 </value>
   </data>
-  <data name="&gt;&gt;progressDownload.Name" xml:space="preserve">
-    <value>progressDownload</value>
-  </data>
-  <data name="&gt;&gt;imgAppIcon.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="progressDownload.Location" type="System.Drawing.Point, System.Drawing">
-    <value>69, 37</value>
-  </data>
-  <data name="&gt;&gt;btnInstallAndReLaunch.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;lblHeader.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>368, 99</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="btnInstallAndReLaunch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>155, 23</value>
-  </data>
-  <data name="&gt;&gt;progressDownload.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;progressDownload.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="lblHeader.Location" type="System.Drawing.Point, System.Drawing">
-    <value>66, 12</value>
-  </data>
-  <data name="&gt;&gt;lblSecurityHint.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="btnInstallAndReLaunch.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="&gt;&gt;lblHeader.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="progressDownload.TabIndex" type="System.Int32, mscorlib">
-    <value>9</value>
-  </data>
-  <data name="&gt;&gt;lblSecurityHint.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="imgAppIcon.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="lblHeader.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt, style=Bold</value>
-  </data>
-  <data name="lblSecurityHint.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleCenter</value>
-  </data>
-  <data name="&gt;&gt;lblSecurityHint.Name" xml:space="preserve">
-    <value>lblSecurityHint</value>
-  </data>
-  <data name="lblHeader.Text" xml:space="preserve">
-    <value>Downloading APP</value>
-  </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
   </data>
-  <data name="lblSecurityHint.Location" type="System.Drawing.Point, System.Drawing">
-    <value>66, 63</value>
-  </data>
-  <data name="lblHeader.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="btnInstallAndReLaunch.Location" type="System.Drawing.Point, System.Drawing">
-    <value>131, 37</value>
-  </data>
-  <data name="lblSecurityHint.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Software Download</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>NetSparkleDownloadProgress</value>
   </data>
-  <data name="lblSecurityHint.Text" xml:space="preserve">
-    <value>The update was affected by not verified changes, it could be unsafe to install it!</value>
-  </data>
-  <data name="imgAppIcon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>48, 48</value>
-  </data>
-  <data name="btnInstallAndReLaunch.Text" xml:space="preserve">
-    <value>Install and Relaunch</value>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>
\ No newline at end of file

diff --git a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
index 5ae6b34..c99192f 100644 (file)
--- a/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
+++ b/trunk/Pithos.Client.WPF/Properties/AssemblyInfo.cs
@@ -93,5 +93,5 @@ using System.Windows;
 // 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.7.20306.0")]
-[assembly: AssemblyFileVersionAttribute("0.7.20306.0")]
+[assembly: AssemblyVersion("0.7.20305.1")]
+[assembly: AssemblyFileVersionAttribute("0.7.20305.1")]