Merge branch 'release/1.0.21'

CHANGELOG.txt

@@ -1,6 +1,11 @@
 Changelog
 =========
 
+v1.0.21
+-------
+
+ - Fix version bump script, which was causing incorrect assembly version to be written
+
 v1.0.20
 -------
 

Rakefile

@@ -224,8 +224,8 @@ task :version, [:version] do |t, args|
   version = parts.join('.')
   ASSEMBLY_INFOS.each do |info|
     content = IO.read(info)
-    content[/\[assembly: AssemblyVersion\(\"(.+?)\"\)\]/, 1] = version
-    content[/\[assembly: AssemblyFileVersion\(\"(.+?)\"\)\]/, 1] = version
+    content[/^\[assembly: AssemblyVersion\(\"(.+?)\"\)\]/, 1] = version
+    content[/^\[assembly: AssemblyFileVersion\(\"(.+?)\"\)\]/, 1] = version
     File.open(info, 'w'){ |f| f.write(content) }
   end
 end

server/version_check.php

@@ -65,19 +65,20 @@ function get_with_wildcard($src, $value, $default = null)
 }
 
 $versions = [
-   '1.0.20' => [
+   '1.0.21' => [
       'installed' => [
          'direct_download_url' => [
-            'x64' => 'https://github.com/canton7/SyncTrayzor/releases/download/v1.0.20/SyncTrayzorSetup-x64.exe',
-            'x86' => 'https://github.com/canton7/SyncTrayzor/releases/download/v1.0.20/SyncTrayzorSetup-x86.exe',
+            'x64' => 'https://github.com/canton7/SyncTrayzor/releases/download/v1.0.21/SyncTrayzorSetup-x64.exe',
+            'x86' => 'https://github.com/canton7/SyncTrayzor/releases/download/v1.0.21/SyncTrayzorSetup-x86.exe',
          ],
       ],
-      'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v1.0.20',
+      'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v1.0.21',
       'release_notes' => "- Add Dropbox-style window with current file transfers. Single-click the icon to view (#18)\n- Remember Syncthing langauge selection (#87)\n- Reword 'use custom home for Syncthing' option in Settings to be clearer (#88)\n- Don't show main window outside of desktop on very small screens (#84)\n- Don't crash if watched folder is a symlink (#89)\n- Improve error message if Syncthing cannot start (#90)\n- Fix possible crash if computer locale is changed (#91)\n- Allow custom Syncthing paths (by hand-editing config file, useful for edge case setups) (#86)\n- Add context menu to web browser (cut/copy/paste) (#85)\n- Allow multiple SyncTrayzor installations (portable and installed) to co-exist (#81)\n- Ignore system proxy settings when connecting to Syncthing (#80)\n- Update translations:\n - Updates to all languages\n - New languages: Catalan (Valencian), Portuguese (Brazil)",
    ]
 ];
 
 $upgrades = [
+   '1.0.20' => ['to' => 'latest', 'formatter' => '2', 'overrides' => ['release_notes' => "- Fix issue where SyncTrayzor thought it was older than it was"]],
    // 1.0.19 was never actually released, so no need to represent it
    '1.0.18' => ['to' => 'latest', 'formatter' => '2'],
    '1.0.17' => ['to' => 'latest', 'formatter' => '2'],

src/ProcessRunner/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // 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.20.0")]
-[assembly: AssemblyVersion("1.0.18.0")]
-[assembly: AssemblyFileVersion("1.0.20.0")]
+[assembly: AssemblyVersion("1.0.21.0")]
+[assembly: AssemblyFileVersion("1.0.21.0")]

src/SyncTrayzor/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@
 // 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.20.0")]
-[assembly: AssemblyVersion("1.0.18.0")]
-[assembly: AssemblyFileVersion("1.0.20.0")]
+[assembly: AssemblyVersion("1.0.21.0")]
+[assembly: AssemblyFileVersion("1.0.21.0")]