From 478d4565af14477a7f202970bc39bce0977bf37b Mon Sep 17 00:00:00 2001 From: Max Date: Sun, 9 Sep 2018 16:25:52 +0200 Subject: [PATCH] DependencyFinder converted --- .../DependencyFinder/DependencyFinder.csproj | 64 ++++--------------- .../DependencyFinder/DependencyFinder.sln | 18 ++++-- BuildTools/DependencyFinder/Program.cs | 2 +- .../Properties/AssemblyInfo.cs | 27 -------- BuildTools/DependencyFinder/packages.config | 4 -- 5 files changed, 27 insertions(+), 88 deletions(-) delete mode 100644 BuildTools/DependencyFinder/Properties/AssemblyInfo.cs delete mode 100644 BuildTools/DependencyFinder/packages.config diff --git a/BuildTools/DependencyFinder/DependencyFinder.csproj b/BuildTools/DependencyFinder/DependencyFinder.csproj index 01266941a..4d5104e7b 100644 --- a/BuildTools/DependencyFinder/DependencyFinder.csproj +++ b/BuildTools/DependencyFinder/DependencyFinder.csproj @@ -1,57 +1,19 @@ - - + + - Debug - x86 - {3E891818-579A-4C06-8066-4C702BFA5921} Exe - False - DependencyFinder - DependencyFinder - v4.6.2 - - - true - full - false - bin\Debug - DEBUG; - prompt - 4 - x86 - false - ../../../../Duplicati/GUI/Duplicati.GUI.TrayIcon/bin/Debug - - - full - true - bin\Release - prompt - 4 - true - x86 + netcoreapp2.0 + + 2.0.0.7 + LGPL, Copyright © Duplicati Team 2015 + Duplicati.BuildTools.DependencyFinder + Duplicati Team + Duplicati Team + DependencyFinder + - - - packages\Mono.Cecil.0.9.6.1\lib\net45\Mono.Cecil.dll - - - packages\Mono.Cecil.0.9.6.1\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.1\lib\net45\Mono.Cecil.Rocks.dll - - - - - - - - - + + \ No newline at end of file diff --git a/BuildTools/DependencyFinder/DependencyFinder.sln b/BuildTools/DependencyFinder/DependencyFinder.sln index cd8aea67c..557afc15c 100644 --- a/BuildTools/DependencyFinder/DependencyFinder.sln +++ b/BuildTools/DependencyFinder/DependencyFinder.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 15 +VisualStudioVersion = 15.0.28010.2016 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DependencyFinder", "DependencyFinder.csproj", "{3E891818-579A-4C06-8066-4C702BFA5921}" EndProject Global @@ -9,9 +11,15 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3E891818-579A-4C06-8066-4C702BFA5921}.Debug|x86.ActiveCfg = Debug|x86 - {3E891818-579A-4C06-8066-4C702BFA5921}.Debug|x86.Build.0 = Debug|x86 - {3E891818-579A-4C06-8066-4C702BFA5921}.Release|x86.ActiveCfg = Release|x86 - {3E891818-579A-4C06-8066-4C702BFA5921}.Release|x86.Build.0 = Release|x86 + {3E891818-579A-4C06-8066-4C702BFA5921}.Debug|x86.ActiveCfg = Debug|Any CPU + {3E891818-579A-4C06-8066-4C702BFA5921}.Debug|x86.Build.0 = Debug|Any CPU + {3E891818-579A-4C06-8066-4C702BFA5921}.Release|x86.ActiveCfg = Release|Any CPU + {3E891818-579A-4C06-8066-4C702BFA5921}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {EF24197C-68CD-4852-BBC3-859DA05B8DA1} EndGlobalSection EndGlobal diff --git a/BuildTools/DependencyFinder/Program.cs b/BuildTools/DependencyFinder/Program.cs index e819cac0b..45e9ffa9a 100644 --- a/BuildTools/DependencyFinder/Program.cs +++ b/BuildTools/DependencyFinder/Program.cs @@ -39,7 +39,7 @@ namespace DependencyFinder //Console.WriteLine("Probing for {0}", dllname); try { return AssemblyDefinition.ReadAssembly(dllname); } catch { } - try { return resolver.Resolve(asm.FullName); } + try { return resolver.Resolve(asm); } catch { } return null; diff --git a/BuildTools/DependencyFinder/Properties/AssemblyInfo.cs b/BuildTools/DependencyFinder/Properties/AssemblyInfo.cs deleted file mode 100644 index 334f017e8..000000000 --- a/BuildTools/DependencyFinder/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; - -// Information about this assembly is defined by the following attributes. -// Change them to the values specific to your project. - -[assembly: AssemblyTitle("DependencyFinder")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("")] -[assembly: AssemblyCopyright("kenneth")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}". -// The form "{Major}.{Minor}.*" will automatically update the build and revision, -// and "{Major}.{Minor}.{Build}.*" will update just the revision. - -[assembly: AssemblyVersion("2.0.0.7")] - -// The following attributes are used to specify the signing key for the assembly, -// if desired. See the Mono documentation for more information about signing. - -//[assembly: AssemblyDelaySign(false)] -//[assembly: AssemblyKeyFile("")] - diff --git a/BuildTools/DependencyFinder/packages.config b/BuildTools/DependencyFinder/packages.config deleted file mode 100644 index e304cab94..000000000 --- a/BuildTools/DependencyFinder/packages.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file