From 08a1e9998a7550b6f2129df6ec50dd73c58c8609 Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Fri, 26 Jul 2019 09:18:16 -0400 Subject: initial upgrade to framework 4.6.2 - no code changes except those noted below - projects upgrade to 4.6.2 - wixinstaller project upgraded automatically by VisualStudio - wixinstaller updated to require 4.6.2 - Library.Encryption changed to Standard2.0 so accommodate update to SharpAesCrypt --- BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj | 16 +++++++++------- BuildTools/AutoUpdateBuilder/app.config | 3 +++ BuildTools/AutoUpdateBuilder/packages.config | 2 +- BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj | 6 +++--- BuildTools/UpdateVersionStamp/app.config | 2 +- 5 files changed, 17 insertions(+), 12 deletions(-) create mode 100644 BuildTools/AutoUpdateBuilder/app.config (limited to 'BuildTools') diff --git a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj index 1685273e7..ac12c5548 100644 --- a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj +++ b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj @@ -1,14 +1,15 @@ - - + + Debug AnyCPU {17E3EB29-87FD-4BE9-A531-8DAD8B295494} Exe - False + False AutoUpdateBuilder AutoUpdateBuilder - v4.5 + v4.6.2 + true @@ -29,10 +30,10 @@ false - - - packages\Newtonsoft.Json.10.0.2\lib\net45\Newtonsoft.Json.dll + + packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll + @@ -70,6 +71,7 @@ + \ No newline at end of file diff --git a/BuildTools/AutoUpdateBuilder/app.config b/BuildTools/AutoUpdateBuilder/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/BuildTools/AutoUpdateBuilder/app.config @@ -0,0 +1,3 @@ + + + diff --git a/BuildTools/AutoUpdateBuilder/packages.config b/BuildTools/AutoUpdateBuilder/packages.config index a272c64df..1812e5207 100644 --- a/BuildTools/AutoUpdateBuilder/packages.config +++ b/BuildTools/AutoUpdateBuilder/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj index 463888901..a3585ee30 100644 --- a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj +++ b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU @@ -7,10 +7,10 @@ 2.0 {1920C3B0-98A0-410F-8972-9C19FA616FE5} Exe - False + False UpdateVersionStamp UpdateVersionStamp - v4.5 + v4.6.2 diff --git a/BuildTools/UpdateVersionStamp/app.config b/BuildTools/UpdateVersionStamp/app.config index 51278a456..2a0024f75 100644 --- a/BuildTools/UpdateVersionStamp/app.config +++ b/BuildTools/UpdateVersionStamp/app.config @@ -1,3 +1,3 @@ - + -- cgit v1.2.3 From 3303c45bbee54ba56d9ec4ff0edc2d4016894a22 Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Tue, 30 Jul 2019 10:13:24 -0400 Subject: update DependencyFinder nuget package and to net to 4.6.2 --- .../DependencyFinder/DependencyFinder.csproj | 28 ++++++++++++---------- BuildTools/DependencyFinder/app.config | 3 +++ BuildTools/DependencyFinder/packages.config | 2 +- 3 files changed, 19 insertions(+), 14 deletions(-) create mode 100644 BuildTools/DependencyFinder/app.config (limited to 'BuildTools') diff --git a/BuildTools/DependencyFinder/DependencyFinder.csproj b/BuildTools/DependencyFinder/DependencyFinder.csproj index 42a948ebf..6cab24f88 100644 --- a/BuildTools/DependencyFinder/DependencyFinder.csproj +++ b/BuildTools/DependencyFinder/DependencyFinder.csproj @@ -1,14 +1,15 @@ - - + + Debug x86 {3E891818-579A-4C06-8066-4C702BFA5921} Exe - False + False DependencyFinder DependencyFinder - v4.5 + v4.6.2 + true @@ -32,19 +33,19 @@ x86 - - - packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll + + packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.dll - - packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Mdb.dll + + packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Mdb.dll - - packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Pdb.dll + + packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Pdb.dll - - packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.Rocks.dll + + packages\Mono.Cecil.0.9.6.4\lib\net45\Mono.Cecil.Rocks.dll + @@ -52,6 +53,7 @@ + \ No newline at end of file diff --git a/BuildTools/DependencyFinder/app.config b/BuildTools/DependencyFinder/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/BuildTools/DependencyFinder/app.config @@ -0,0 +1,3 @@ + + + diff --git a/BuildTools/DependencyFinder/packages.config b/BuildTools/DependencyFinder/packages.config index e304cab94..f64d1c69f 100644 --- a/BuildTools/DependencyFinder/packages.config +++ b/BuildTools/DependencyFinder/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file -- cgit v1.2.3 From bcd8880ac0dac206343ffc78c2ac8b7d0b5d5906 Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Tue, 30 Jul 2019 10:43:50 -0400 Subject: migrate GnupgSigningTool to 4.6.2 to keep consistent --- BuildTools/GnupgSigningTool/GnupgSigningTool.csproj | 19 +++++++++++++++---- BuildTools/GnupgSigningTool/GnupgSigningTool.sln | 21 ++++++++++++++------- BuildTools/GnupgSigningTool/app.config | 3 +++ 3 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 BuildTools/GnupgSigningTool/app.config (limited to 'BuildTools') diff --git a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj index 138186e07..0e73f743e 100644 --- a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj +++ b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj @@ -1,4 +1,4 @@ - + Debug @@ -7,7 +7,8 @@ Exe GnupgSigningTool GnupgSigningTool - v4.7 + v4.6.2 + true @@ -26,12 +27,19 @@ 4 x86 + + true + + + + + - {94484FDB-2EFA-4CF0-9BE6-A561157B4F87} + {2cf2d90e-c25b-47ad-91e0-98451bab8058} Duplicati.Library.Encryption @@ -46,5 +54,8 @@ + + + - + \ No newline at end of file diff --git a/BuildTools/GnupgSigningTool/GnupgSigningTool.sln b/BuildTools/GnupgSigningTool/GnupgSigningTool.sln index 591add2a6..488ebd3d4 100644 --- a/BuildTools/GnupgSigningTool/GnupgSigningTool.sln +++ b/BuildTools/GnupgSigningTool/GnupgSigningTool.sln @@ -1,11 +1,12 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29123.88 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GnupgSigningTool", "GnupgSigningTool.csproj", "{72B910F2-8E80-4955-A0D6-ED4C35CEE665}" EndProject 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.Encryption", "..\..\Duplicati\Library\Encryption\Duplicati.Library.Encryption.csproj", "{94484FDB-2EFA-4CF0-9BE6-A561157B4F87}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Encryption", "..\..\Duplicati\Library\Encryption\Duplicati.Library.Encryption.csproj", "{2CF2D90E-C25B-47AD-91E0-98451BAB8058}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Interface", "..\..\Duplicati\Library\Interface\Duplicati.Library.Interface.csproj", "{C5899F45-B0FF-483C-9D38-24A9FCAAB237}" EndProject @@ -23,13 +24,19 @@ Global {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Debug|x86.Build.0 = Debug|Any CPU {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|x86.ActiveCfg = Release|Any CPU {DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}.Release|x86.Build.0 = Release|Any CPU - {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Debug|x86.ActiveCfg = Debug|Any CPU - {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Debug|x86.Build.0 = Debug|Any CPU - {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Release|x86.ActiveCfg = Release|Any CPU - {94484FDB-2EFA-4CF0-9BE6-A561157B4F87}.Release|x86.Build.0 = Release|Any CPU + {2CF2D90E-C25B-47AD-91E0-98451BAB8058}.Debug|x86.ActiveCfg = Debug|Any CPU + {2CF2D90E-C25B-47AD-91E0-98451BAB8058}.Debug|x86.Build.0 = Debug|Any CPU + {2CF2D90E-C25B-47AD-91E0-98451BAB8058}.Release|x86.ActiveCfg = Release|Any CPU + {2CF2D90E-C25B-47AD-91E0-98451BAB8058}.Release|x86.Build.0 = Release|Any CPU {C5899F45-B0FF-483C-9D38-24A9FCAAB237}.Debug|x86.ActiveCfg = Debug|Any CPU {C5899F45-B0FF-483C-9D38-24A9FCAAB237}.Debug|x86.Build.0 = Debug|Any CPU {C5899F45-B0FF-483C-9D38-24A9FCAAB237}.Release|x86.ActiveCfg = Release|Any CPU {C5899F45-B0FF-483C-9D38-24A9FCAAB237}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {71CC6B1F-7F52-4059-8761-30B3D0501ECC} + EndGlobalSection EndGlobal diff --git a/BuildTools/GnupgSigningTool/app.config b/BuildTools/GnupgSigningTool/app.config new file mode 100644 index 000000000..2a0024f75 --- /dev/null +++ b/BuildTools/GnupgSigningTool/app.config @@ -0,0 +1,3 @@ + + + -- cgit v1.2.3 From 815e30b63b134705eaab4cde5fe33716fb902e40 Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Wed, 31 Jul 2019 13:20:03 -0400 Subject: update csproj toolverion and nuget packages --- BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj | 2 +- BuildTools/DependencyFinder/DependencyFinder.csproj | 4 ++-- BuildTools/GnupgSigningTool/GnupgSigningTool.csproj | 2 +- BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'BuildTools') diff --git a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj index ac12c5548..05a1fd349 100644 --- a/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj +++ b/BuildTools/AutoUpdateBuilder/AutoUpdateBuilder.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU diff --git a/BuildTools/DependencyFinder/DependencyFinder.csproj b/BuildTools/DependencyFinder/DependencyFinder.csproj index 6cab24f88..118f79adb 100644 --- a/BuildTools/DependencyFinder/DependencyFinder.csproj +++ b/BuildTools/DependencyFinder/DependencyFinder.csproj @@ -1,5 +1,5 @@ - - + + Debug x86 diff --git a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj index 0e73f743e..b52512f5f 100644 --- a/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj +++ b/BuildTools/GnupgSigningTool/GnupgSigningTool.csproj @@ -1,4 +1,4 @@ - + Debug diff --git a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj index a3585ee30..fe0b7e17b 100644 --- a/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj +++ b/BuildTools/UpdateVersionStamp/UpdateVersionStamp.csproj @@ -1,5 +1,5 @@  - + Debug AnyCPU -- cgit v1.2.3