diff --git a/README.md b/README.md index 0b30d82..d6c4e09 100644 --- a/README.md +++ b/README.md @@ -1,27 +1,27 @@ -WinSshFS 4every1 edition +[![Build status](https://ci.appveyor.com/api/projects/status/bhqp9ib4bkv951w4?svg=true)](https://ci.appveyor.com/project/dimov-cz/win-sshfs) +| +[![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=winsshfs%40gmail%2ecom&lc=GB&item_name=WinSSHFS%20support%20donation&item_number=WinSSHFS¤cy_code=USD&bn=PP%2dDonationsBF%3abtn_donate_SM%2egif%3aNonHosted) +[![Donate](https://img.shields.io/badge/donate-bitcoin-green.svg)](bitcoin:129dWbvuc11dy4PRBM8e2aEcL2bAunYokG?&message=WinSSHFS donation&label=WinSSHFS) +| +[![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/Foreveryone-cz/win-sshfs.svg)](http://isitmaintained.com/project/Foreveryone-cz/win-sshfs "Average time to resolve an issue") +[![Percentage of issues still open](http://isitmaintained.com/badge/open/Foreveryone-cz/win-sshfs.svg)](http://isitmaintained.com/project/Foreveryone-cz/win-sshfs "Percentage of issues still open") +WinSshFS Foreveryone ======================== - -I decided to share my clone of win-sshfs based on -I did some improvments for my needs. Current devel branch version seems to be very stable. -Download [latest release here](https://github.com/Foreveryone-cz/win-sshfs/releases). - -![img](https://cloud.githubusercontent.com/assets/1085397/10747956/3f684d3a-7c18-11e5-8ca6-0f37a60426e4.jpg "UI") - -There are several changes, main differences: +Download [latest release here](https://github.com/Foreveryone-cz/win-sshfs/releases). +Main features: * Windows 10 Support -* Support for Android hosts (tested with CyanogenMod 11 [Android 4.4], requires busybox to be installed) -* current Renci SSH (2014.4.6beta) -* solved few bugs like payload, 2 hosts and others * Puttyant (Pageant) support -* settings files location is in fixed place (%localappdata%\WinSshFS) -* "spooldrive" - all remote hosts can by mount as mountpoint dir in one virtual drive +* Support for Android hosts (tested with CyanogenMod 11 [Android 4.4], requires busybox to be installed) +* Spooldrive - remote hosts can by mounted as directories on same virtual drive * archive flag of file in windows represents and controls permission for group: * ON => group have same rights as owner * OFF => same rights as others) * Ability to use Proxy for connections * Send Keepalive packets. (Not configurable, each 60sec hardcoded) -* I use different versioning: 1.5.12.5 = version.subversion.release.build -And probably others , see logs for details. +![img](https://cloud.githubusercontent.com/assets/1085397/10747956/3f684d3a-7c18-11e5-8ca6-0f37a60426e4.jpg "UI") + +Development version: + [![Build status](https://ci.appveyor.com/api/projects/status/bhqp9ib4bkv951w4/branch/devel?svg=true)](https://ci.appveyor.com/project/dimov-cz/win-sshfs/branch/devel) diff --git a/Sshfs/Sshfs.sln b/Sshfs/Sshfs.sln index c05007d..6ef8b40 100644 --- a/Sshfs/Sshfs.sln +++ b/Sshfs/Sshfs.sln @@ -9,6 +9,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSTester", "FSTester\FSTest EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Renci.SshNet", "..\SSH.NET\src\Renci.SshNet\Renci.SshNet.csproj", "{2F5F8C90-0BD1-424F-997C-7BC6280919D1}" EndProject +Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WinSshFs Installer", "WinSSHFS-setup\WinSshFs Installer.wixproj", "{9552311D-F6B4-43F6-8859-7C3B41A4311D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -122,6 +124,34 @@ Global {2F5F8C90-0BD1-424F-997C-7BC6280919D1}.ReleaseFW2|x64.Build.0 = Release|Any CPU {2F5F8C90-0BD1-424F-997C-7BC6280919D1}.ReleaseFW2|x86.ActiveCfg = Release|Any CPU {2F5F8C90-0BD1-424F-997C-7BC6280919D1}.ReleaseFW2|x86.Build.0 = Release|Any CPU + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Debug|Any CPU.ActiveCfg = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Debug|Mixed Platforms.ActiveCfg = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Debug|Mixed Platforms.Build.0 = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Debug|x64.ActiveCfg = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Debug|x86.ActiveCfg = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Debug|x86.Build.0 = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.DebugNoTimeout|Any CPU.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.DebugNoTimeout|Any CPU.Build.0 = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.DebugNoTimeout|Mixed Platforms.ActiveCfg = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.DebugNoTimeout|Mixed Platforms.Build.0 = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.DebugNoTimeout|x64.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.DebugNoTimeout|x64.Build.0 = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.DebugNoTimeout|x86.ActiveCfg = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.DebugNoTimeout|x86.Build.0 = Debug|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Release|Any CPU.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Release|Mixed Platforms.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Release|Mixed Platforms.Build.0 = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Release|x64.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Release|x86.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.Release|x86.Build.0 = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.ReleaseFW2|Any CPU.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.ReleaseFW2|Any CPU.Build.0 = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.ReleaseFW2|Mixed Platforms.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.ReleaseFW2|Mixed Platforms.Build.0 = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.ReleaseFW2|x64.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.ReleaseFW2|x64.Build.0 = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.ReleaseFW2|x86.ActiveCfg = Release|x86 + {9552311D-F6B4-43F6-8859-7C3B41A4311D}.ReleaseFW2|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Sshfs/Sshfs/Properties/AssemblyInfo.cs b/Sshfs/Sshfs/Properties/AssemblyInfo.cs index 614d5f3..ecfac52 100644 --- a/Sshfs/Sshfs/Properties/AssemblyInfo.cs +++ b/Sshfs/Sshfs/Properties/AssemblyInfo.cs @@ -5,12 +5,12 @@ // 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. -[assembly: AssemblyTitle("WinSshFS 4every1 edition")] -[assembly: AssemblyDescription("SFTP Filesystem for Windows ™")] +[assembly: AssemblyTitle("WinSshFS Foreveryone")] +[assembly: AssemblyDescription("SFTP Filesystem for Windows")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("4every1 s.r.o.")] -[assembly: AssemblyProduct("WinSshFS Foreveryone edition 1.6.0.9-devel")] -[assembly: AssemblyCopyright("Copyright © 4every1 s.r.o.")] +[assembly: AssemblyCompany("Foreveryone")] +[assembly: AssemblyProduct("WinSshFS Foreveryone 1.6.1.0-devel")] +[assembly: AssemblyCopyright("")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -31,6 +31,6 @@ // // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: -// [assembly: AssemblyVersion("1.6.0.9")] -[assembly: AssemblyVersion("1.6.0.9")] -[assembly: AssemblyFileVersion("1.6.0.9")] +// [assembly: AssemblyVersion("1.6.1.0")] +[assembly: AssemblyVersion("1.6.1.0")] +[assembly: AssemblyFileVersion("1.6.1.0")] diff --git a/Sshfs/Sshfs/Sshfs.csproj b/Sshfs/Sshfs/Sshfs.csproj index 68b76dd..3fe8cb2 100644 --- a/Sshfs/Sshfs/Sshfs.csproj +++ b/Sshfs/Sshfs/Sshfs.csproj @@ -82,7 +82,7 @@ LocalIntranet - true + false true diff --git a/Sshfs/Sshfs/app.manifest b/Sshfs/Sshfs/app.manifest index cfe0b89..2c2409a 100644 --- a/Sshfs/Sshfs/app.manifest +++ b/Sshfs/Sshfs/app.manifest @@ -1,9 +1,9 @@ - - - - - - + + + + + + - - - - - - - - - - - + --> + + + + + + + + + + + - - - - - - - - - + Windows will automatically select the most compatible environment.--> + + + + + + + + + + --> \ No newline at end of file diff --git a/Sshfs/WinSSHFS-setup/Product.wxs b/Sshfs/WinSSHFS-setup/Product.wxs new file mode 100644 index 0000000..c7edb66 --- /dev/null +++ b/Sshfs/WinSSHFS-setup/Product.wxs @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Sshfs/WinSSHFS-setup/WinSshFs Installer.wixproj b/Sshfs/WinSSHFS-setup/WinSshFs Installer.wixproj new file mode 100644 index 0000000..c32b40d --- /dev/null +++ b/Sshfs/WinSSHFS-setup/WinSshFs Installer.wixproj @@ -0,0 +1,46 @@ + + + + Debug + x86 + 3.10 + 9552311d-f6b4-43f6-8859-7c3b41a4311d + 2.0 + WinSSHFS-setup + Package + $(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets + $(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets + WinSshFs Installer + + + bin\$(Configuration)\ + obj\$(Configuration)\ + Debug + + + bin\$(Configuration)\ + obj\$(Configuration)\ + + + + + + + Sshfs + {ff4fc8bb-91a3-45ff-8449-650647610394} + True + True + Binaries;Content + INSTALLFOLDER + + + + + \ No newline at end of file