Merge branch 'master' into feature/windows_service

# Conflicts:
#	Duplicati.sln
#	Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj

1 files changed, 25 insertions, 174 deletions

diff --git a/Duplicati.sln b/Duplicati.sln
index 52d870369..4beb167e8 100644
--- a/Duplicati.sln
+++ b/Duplicati.sln
@@ -1,6 +1,8 @@
 

-Microsoft Visual Studio Solution File, Format Version 11.00

-# Visual Studio 2010

+Microsoft Visual Studio Solution File, Format Version 12.00

+# Visual Studio 2012

+VisualStudioVersion = 14.0.24720.0

+MinimumVisualStudioVersion = 10.0.40219.1

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Utility", "Duplicati\Library\Utility\Duplicati.Library.Utility.csproj", "{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}"

 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Main", "Duplicati\Library\Main\Duplicati.Library.Main.csproj", "{10D2D1B7-C664-41D8-9B3A-00040C3D421B}"

@@ -85,6 +87,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.S
 EndProject

 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WindowsService", "Duplicati\WindowsService\WindowsService.csproj", "{BEF7AF9A-3978-4F90-8592-198BF6EA6C6B}"

 EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.AlternativeFTP", "Duplicati\Library\Backend\AlternativeFTP\Duplicati.Library.Backend.AlternativeFTP.csproj", "{3F47CB0C-CEE1-447F-9C26-7F8E419E3E3F}"

+EndProject

 Global

 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

 		Debug|Any CPU = Debug|Any CPU

@@ -131,6 +135,10 @@ Global
 		{33FD1D24-C28F-4C71-933F-98F1586EA76C}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{33FD1D24-C28F-4C71-933F-98F1586EA76C}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{33FD1D24-C28F-4C71-933F-98F1586EA76C}.Release|Any CPU.Build.0 = Release|Any CPU

+		{3F47CB0C-CEE1-447F-9C26-7F8E419E3E3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{3F47CB0C-CEE1-447F-9C26-7F8E419E3E3F}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{3F47CB0C-CEE1-447F-9C26-7F8E419E3E3F}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{3F47CB0C-CEE1-447F-9C26-7F8E419E3E3F}.Release|Any CPU.Build.0 = Release|Any CPU

 		{3FF7DD0B-5284-4BF9-97D9-1E4417FDABB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{3FF7DD0B-5284-4BF9-97D9-1E4417FDABB2}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{3FF7DD0B-5284-4BF9-97D9-1E4417FDABB2}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -151,6 +159,10 @@ Global
 		{5489181D-950C-44AF-873C-45EB0A3B6BD2}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{5489181D-950C-44AF-873C-45EB0A3B6BD2}.Release|Any CPU.ActiveCfg = Release|Any CPU

 		{5489181D-950C-44AF-873C-45EB0A3B6BD2}.Release|Any CPU.Build.0 = Release|Any CPU

+		{59C8BBC5-6E42-46FB-AB3E-6C183A82459A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

+		{59C8BBC5-6E42-46FB-AB3E-6C183A82459A}.Debug|Any CPU.Build.0 = Debug|Any CPU

+		{59C8BBC5-6E42-46FB-AB3E-6C183A82459A}.Release|Any CPU.ActiveCfg = Release|Any CPU

+		{59C8BBC5-6E42-46FB-AB3E-6C183A82459A}.Release|Any CPU.Build.0 = Release|Any CPU

 		{61C43D61-4368-4942-84A3-1EB623F4EF2A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{61C43D61-4368-4942-84A3-1EB623F4EF2A}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{61C43D61-4368-4942-84A3-1EB623F4EF2A}.Release|Any CPU.ActiveCfg = Release|Any CPU

@@ -269,178 +281,17 @@ Global
 		$2.DirectoryNamespaceAssociation = PrefixedHierarchical

 		$2.ResourceNamePolicy = FileFormatDefault

 		$0.TextStylePolicy = $3

-		$3.inheritsSet = null

-		$3.scope = text/x-csharp

-		$0.CSharpFormattingPolicy = $4

-		$4.IndentSwitchBody = True

-		$4.AnonymousMethodBraceStyle = NextLine

-		$4.PropertyBraceStyle = NextLine

-		$4.PropertyGetBraceStyle = NextLine

-		$4.PropertySetBraceStyle = NextLine

-		$4.EventBraceStyle = NextLine

-		$4.EventAddBraceStyle = NextLine

-		$4.EventRemoveBraceStyle = NextLine

-		$4.StatementBraceStyle = NextLine

-		$4.ElseNewLinePlacement = NewLine

-		$4.CatchNewLinePlacement = NewLine

-		$4.FinallyNewLinePlacement = NewLine

-		$4.BeforeMethodDeclarationParentheses = False

-		$4.BeforeMethodCallParentheses = False

-		$4.BeforeConstructorDeclarationParentheses = False

-		$4.BeforeIndexerDeclarationBracket = False

-		$4.BeforeDelegateDeclarationParentheses = False

-		$4.NewParentheses = False

-		$4.ForParentheses = False

-		$4.ForeachParentheses = False

-		$4.LockParentheses = False

-		$4.UsingParentheses = False

-		$4.SpacesBeforeBrackets = False

-		$4.inheritsSet = Mono

-		$4.inheritsScope = text/x-csharp

-		$4.scope = text/x-csharp

-		$0.TextStylePolicy = $5

-		$5.FileWidth = 120

-		$5.EolMarker = Windows

-		$5.inheritsSet = VisualStudio

-		$5.inheritsScope = text/plain

-		$5.scope = text/plain

-		$0.NameConventionPolicy = $6

-		$6.Rules = $7

-		$7.NamingRule = $8

-		$8.Name = Namespaces

-		$8.AffectedEntity = Namespace

-		$8.VisibilityMask = VisibilityMask

-		$8.NamingStyle = PascalCase

-		$8.IncludeInstanceMembers = True

-		$8.IncludeStaticEntities = True

-		$7.NamingRule = $9

-		$9.Name = Types

-		$9.AffectedEntity = Class, Struct, Enum, Delegate

-		$9.VisibilityMask = Public

-		$9.NamingStyle = PascalCase

-		$9.IncludeInstanceMembers = True

-		$9.IncludeStaticEntities = True

-		$7.NamingRule = $10

-		$10.Name = Interfaces

-		$10.RequiredPrefixes = $11

-		$11.String = I

-		$10.AffectedEntity = Interface

-		$10.VisibilityMask = Public

-		$10.NamingStyle = PascalCase

-		$10.IncludeInstanceMembers = True

-		$10.IncludeStaticEntities = True

-		$7.NamingRule = $12

-		$12.Name = Attributes

-		$12.RequiredSuffixes = $13

-		$13.String = Attribute

-		$12.AffectedEntity = CustomAttributes

-		$12.VisibilityMask = Public

-		$12.NamingStyle = PascalCase

-		$12.IncludeInstanceMembers = True

-		$12.IncludeStaticEntities = True

-		$7.NamingRule = $14

-		$14.Name = Event Arguments

-		$14.RequiredSuffixes = $15

-		$15.String = EventArgs

-		$14.AffectedEntity = CustomEventArgs

-		$14.VisibilityMask = Public

-		$14.NamingStyle = PascalCase

-		$14.IncludeInstanceMembers = True

-		$14.IncludeStaticEntities = True

-		$7.NamingRule = $16

-		$16.Name = Exceptions

-		$16.RequiredSuffixes = $17

-		$17.String = Exception

-		$16.AffectedEntity = CustomExceptions

-		$16.VisibilityMask = VisibilityMask

-		$16.NamingStyle = PascalCase

-		$16.IncludeInstanceMembers = True

-		$16.IncludeStaticEntities = True

-		$7.NamingRule = $18

-		$18.Name = Methods

-		$18.AffectedEntity = Methods

-		$18.VisibilityMask = Protected, Public

-		$18.NamingStyle = PascalCase

-		$18.IncludeInstanceMembers = True

-		$18.IncludeStaticEntities = True

-		$7.NamingRule = $19

-		$19.Name = Static Readonly Fields

-		$19.AffectedEntity = ReadonlyField

-		$19.VisibilityMask = Protected, Public

-		$19.NamingStyle = PascalCase

-		$19.IncludeInstanceMembers = False

-		$19.IncludeStaticEntities = True

-		$7.NamingRule = $20

-		$20.Name = Fields

-		$20.AffectedEntity = Field

-		$20.VisibilityMask = Protected, Public

-		$20.NamingStyle = PascalCase

-		$20.IncludeInstanceMembers = True

-		$20.IncludeStaticEntities = True

-		$7.NamingRule = $21

-		$21.Name = ReadOnly Fields

-		$21.AffectedEntity = ReadonlyField

-		$21.VisibilityMask = Protected, Public

-		$21.NamingStyle = PascalCase

-		$21.IncludeInstanceMembers = True

-		$21.IncludeStaticEntities = False

-		$7.NamingRule = $22

-		$22.Name = Constant Fields

-		$22.AffectedEntity = ConstantField

-		$22.VisibilityMask = Protected, Public

-		$22.NamingStyle = PascalCase

-		$22.IncludeInstanceMembers = True

-		$22.IncludeStaticEntities = True

-		$7.NamingRule = $23

-		$23.Name = Properties

-		$23.AffectedEntity = Property

-		$23.VisibilityMask = Protected, Public

-		$23.NamingStyle = PascalCase

-		$23.IncludeInstanceMembers = True

-		$23.IncludeStaticEntities = True

-		$7.NamingRule = $24

-		$24.Name = Events

-		$24.AffectedEntity = Event

-		$24.VisibilityMask = Protected, Public

-		$24.NamingStyle = PascalCase

-		$24.IncludeInstanceMembers = True

-		$24.IncludeStaticEntities = True

-		$7.NamingRule = $25

-		$25.Name = Enum Members

-		$25.AffectedEntity = EnumMember

-		$25.VisibilityMask = VisibilityMask

-		$25.NamingStyle = PascalCase

-		$25.IncludeInstanceMembers = True

-		$25.IncludeStaticEntities = True

-		$7.NamingRule = $26

-		$26.Name = Parameters

-		$26.AffectedEntity = Parameter

-		$26.VisibilityMask = VisibilityMask

-		$26.NamingStyle = CamelCase

-		$26.IncludeInstanceMembers = True

-		$26.IncludeStaticEntities = True

-		$7.NamingRule = $27

-		$27.Name = Type Parameters

-		$27.RequiredPrefixes = $28

-		$28.String = T

-		$27.AffectedEntity = TypeParameter

-		$27.VisibilityMask = VisibilityMask

-		$27.NamingStyle = PascalCase

-		$27.IncludeInstanceMembers = True

-		$27.IncludeStaticEntities = True

-		$0.TextStylePolicy = $29

-		$29.inheritsSet = null

-		$29.scope = application/config+xml

-		$0.XmlFormattingPolicy = $30

-		$30.inheritsSet = null

-		$30.scope = application/config+xml

-		$0.VersionControlPolicy = $31

-		$31.inheritsSet = Mono

-		$0.ChangeLogPolicy = $32

-		$32.UpdateMode = None

-		$32.MessageStyle = $33

-		$33.LineAlign = 0

-		$32.inheritsSet = Mono

+		$3.FileWidth = 120

+		$3.TabsToSpaces = False

+		$3.inheritsSet = VisualStudio

+		$3.inheritsScope = text/plain

+		$0.TextStylePolicy = $4

+		$4.FileWidth = 120

+		$4.TabsToSpaces = False

+		$4.EolMarker = Windows

+		$4.inheritsSet = VisualStudio

+		$4.inheritsScope = text/plain

+		$4.scope = text/plain

 	EndGlobalSection

 	GlobalSection(SolutionProperties) = preSolution

 		HideSolutionNode = FALSE