Merge branch 'release/1.1.24'

* release/1.1.24: Update version_check.php Update changelog Update references to System.Reactive (it's been renamed, it seems) Ensure that paths from syncthing config use backslashes Fix version_check.php
canton7 · Jul 27, 2019 · 2f20d1a · 2f20d1a
2 parents 8f51c95 + 872f334
commit 2f20d1a
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 26 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Changelog
 =========
 
+v1.1.24
+-------
+
+ - Fix issues caused by forward slashes in folder paths (#519, #520)
+
 v1.1.23
 -------
 

diff --git a/server/version_check.php b/server/version_check.php
@@ -65,7 +65,7 @@ function get_with_wildcard($src, $value, $default = null)
 }
 
 $versions = [
-   '1.1.23' => [
+   '1.1.24' => [
       'base_url' => 'https://github.com/canton7/SyncTrayzor/releases/download',
       'installed' => [
          'direct_download_url' => [
@@ -82,7 +82,7 @@ function get_with_wildcard($src, $value, $default = null)
       'sha1sum_download_url' => "{base_url}/v{version}/sha1sum.txt.asc",
       'sha512sum_download_url' => "{base_url}/v{version}/sha512sum.txt.asc",
       'release_page_url' => 'https://github.com/canton7/SyncTrayzor/releases/tag/v{version}',
-      'release_notes' => "- Fix some crashes (#443, #463, #468, #471)\n- Show the folder name, not ID, in the file transfers progress tooltip  (#457)\n- Add tray button to rescan all folders (#465)\n- Show change in Syncthing theme without requiring refresh (#472)\n- Allow STTRACE to be set in env vars in settings (#473)\n- Fix slow memory leak (#479)",
+      'release_notes' => "- Fix issues caused by forward slashes in folder paths (#519, #520)",
    ],
    '1.1.21' => [
       'base_url' => 'https://synctrayzor.antonymale.co.uk/download',
@@ -106,6 +106,7 @@ function get_with_wildcard($src, $value, $default = null)
 ];
 
 $upgrades = [
+   // No point in upgrading from 1.1.23 for something so minor
    '1.1.22' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.21' => ['to' => 'latest', 'formatter' => '5'],
    '1.1.20' => ['to' => 'latest', 'formatter' => '5'],

diff --git a/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionViewModel.cs b/src/SyncTrayzor/Pages/ConflictResolution/ConflictResolutionViewModel.cs
@@ -11,8 +11,8 @@
 using SyncTrayzor.Properties;
 using SyncTrayzor.Services;
 using SyncTrayzor.Services.Config;
-using System.Reactive.Linq;
 using System.Windows.Threading;
+using System.Reactive.Linq;
 
 namespace SyncTrayzor.Pages.ConflictResolution
 {

diff --git a/src/SyncTrayzor/Services/Conflicts/ConflictFileManager.cs b/src/SyncTrayzor/Services/Conflicts/ConflictFileManager.cs
@@ -6,9 +6,9 @@
 using System.Threading.Tasks;
 using Pri.LongPath;
 using NLog;
-using System.Reactive.Linq;
 using SyncTrayzor.Syncthing.Devices;
 using SyncTrayzor.Syncthing;
+using System.Reactive.Linq;
 
 namespace SyncTrayzor.Services.Conflicts
 {

diff --git a/src/SyncTrayzor/SyncTrayzor.csproj b/src/SyncTrayzor/SyncTrayzor.csproj
@@ -154,31 +154,27 @@
     <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Reactive.Core, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Core.2.2.5\lib\net45\System.Reactive.Core.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.Core, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Core.3.1.1\lib\net45\System.Reactive.Core.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Interfaces, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Interfaces.2.2.5\lib\net45\System.Reactive.Interfaces.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.Interfaces, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Interfaces.3.1.1\lib\net45\System.Reactive.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Linq, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-Linq.2.2.5\lib\net45\System.Reactive.Linq.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.Linq, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Linq.3.1.1\lib\net45\System.Reactive.Linq.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.PlatformServices, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-PlatformServices.2.2.5\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.PlatformServices, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.PlatformServices.3.1.1\lib\net45\System.Reactive.PlatformServices.dll</HintPath>
     </Reference>
-    <Reference Include="System.Reactive.Windows.Threading, Version=2.2.5.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\Rx-XAML.2.2.5\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
-      <Private>True</Private>
+    <Reference Include="System.Reactive.Windows.Threading, Version=3.0.1000.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.Windows.Threading.3.1.1\lib\net45\System.Reactive.Windows.Threading.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ValueTuple, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\packages\System.ValueTuple.4.3.0\lib\netstandard1.0\System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
+    <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xaml" />

diff --git a/src/SyncTrayzor/Syncthing/Folders/SyncthingFolderManager.cs b/src/SyncTrayzor/Syncthing/Folders/SyncthingFolderManager.cs
@@ -155,6 +155,8 @@ private async Task<IEnumerable<Folder>> FetchFoldersAsync(Config config, string
                     // Strip off UNC prefix, if they're put it on
                     if (path.StartsWith(uncPrefix))
                         path = path.Substring(uncPrefix.Length);
+                    // Change forward slashes to backslashes
+                    path = path.Replace(Path.AltDirectorySeparatorChar, Path.DirectorySeparatorChar);
                     if (path.StartsWith("~"))
                         path = Path.Combine(tilde, path.Substring(1).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar));
 

diff --git a/src/SyncTrayzor/packages.config b/src/SyncTrayzor/packages.config
@@ -15,15 +15,14 @@
   <package id="Pri.LongPath" version="2.0.42" targetFramework="net451" />
   <package id="PropertyChanged.Fody" version="1.52.1" targetFramework="net451" developmentDependency="true" />
   <package id="RestEase" version="1.4.3" targetFramework="net451" />
-  <package id="Rx-Core" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-Interfaces" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-Linq" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-Main" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-PlatformServices" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-WPF" version="2.2.5" targetFramework="net451" />
-  <package id="Rx-XAML" version="2.2.5" targetFramework="net451" />
   <package id="SmartFormat.NET" version="2.0.0.0" targetFramework="net451" />
   <package id="Stylet" version="1.1.19" targetFramework="net451" />
+  <package id="System.Reactive" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.Core" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.Interfaces" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.Linq" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.PlatformServices" version="3.1.1" targetFramework="net451" />
+  <package id="System.Reactive.Windows.Threading" version="3.1.1" targetFramework="net451" />
   <package id="System.ValueTuple" version="4.3.0" targetFramework="net451" />
   <package id="WindowsAPICodePack-Core" version="1.1.2" targetFramework="net451" />
   <package id="WindowsAPICodePack-Shell" version="1.1.1" targetFramework="net451" />