Move ConfigurationImporter project files to reflect namespace.

This places the files in a location that is more consistent with the
other command line tools.

8 files changed, 111 insertions, 142 deletions

diff --git a/Duplicati.sln b/Duplicati.sln
index 11feb4e99..fbf68a1ad 100644
--- a/Duplicati.sln
+++ b/Duplicati.sln
@@ -101,7 +101,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Backend.R
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.Library.Common", "Duplicati\Library\Common\Duplicati.Library.Common.csproj", "{D63E53E4-A458-4C2F-914D-92F715F58ACF}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConfigurationImporter", "Duplicati\ConfigurationImporter\ConfigurationImporter.csproj", "{864B98B9-1B56-40D9-9733-9002E5B9B9D5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Duplicati.CommandLine.ConfigurationImporter", "Duplicati\CommandLine\ConfigurationImporter\Duplicati.CommandLine.ConfigurationImporter.csproj", "{B93E3BF0-DAA7-49B7-B07D-0559C5816735}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -305,10 +305,10 @@ Global
 		{D63E53E4-A458-4C2F-914D-92F715F58ACF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D63E53E4-A458-4C2F-914D-92F715F58ACF}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D63E53E4-A458-4C2F-914D-92F715F58ACF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{864B98B9-1B56-40D9-9733-9002E5B9B9D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{864B98B9-1B56-40D9-9733-9002E5B9B9D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{864B98B9-1B56-40D9-9733-9002E5B9B9D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{864B98B9-1B56-40D9-9733-9002E5B9B9D5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B93E3BF0-DAA7-49B7-B07D-0559C5816735}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B93E3BF0-DAA7-49B7-B07D-0559C5816735}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B93E3BF0-DAA7-49B7-B07D-0559C5816735}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B93E3BF0-DAA7-49B7-B07D-0559C5816735}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
new file mode 100644
index 000000000..fac24af54
--- /dev/null
+++ b/Duplicati/CommandLine/ConfigurationImporter/Duplicati.CommandLine.ConfigurationImporter.csproj
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{B93E3BF0-DAA7-49B7-B07D-0559C5816735}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Duplicati.CommandLine.ConfigurationImporter</RootNamespace>
+    <AssemblyName>Duplicati.CommandLine.ConfigurationImporter</AssemblyName>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\Library\Utility\Duplicati.Library.Utility.csproj">
+      <Project>{de3e5d4c-51ab-4e5e-bee8-e636cebfba65}</Project>
+      <Name>Duplicati.Library.Utility</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Server\Duplicati.Server.csproj">
+      <Project>{19e661d2-c5da-4f35-b3ee-7586e5734b5f}</Project>
+      <Name>Duplicati.Server</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+         Other similar extension points exist, see Microsoft.Common.targets.
+    <Target Name="BeforeBuild">
+    </Target>
+    <Target Name="AfterBuild">
+    </Target>
+    -->
+</Project>
\ No newline at end of file
diff --git a/Duplicati/ConfigurationImporter/Program.cs b/Duplicati/CommandLine/ConfigurationImporter/Program.cs
index 5854f2dda..ef11440f1 100644
--- a/Duplicati/ConfigurationImporter/Program.cs
+++ b/Duplicati/CommandLine/ConfigurationImporter/Program.cs
@@ -20,13 +20,13 @@ using System;
 using System.Collections.Generic;

 using System.Linq;

 

-namespace Duplicati.CommandLine.ConfigurationImporter
+namespace Duplicati.CommandLine.ConfigurationImporter

 {

-    public class ConfigurationImporter
+    public class ConfigurationImporter

     {

         private static readonly string usageString = $"Usage: {nameof(ConfigurationImporter)}.exe <configuration-file> --import-metadata=(true | false) --server-datafolder=<folder containing Duplicati-server.sqlite>";

 

-        public static void Main(string[] args)
+        public static void Main(string[] args)

         {

             if (args.Length != 3)

             {

@@ -86,4 +86,4 @@ namespace Duplicati.CommandLine.ConfigurationImporter
             return password;

         }

     }

-}
+}

diff --git a/Duplicati/CommandLine/ConfigurationImporter/Properties/AssemblyInfo.cs b/Duplicati/CommandLine/ConfigurationImporter/Properties/AssemblyInfo.cs
new file mode 100644
index 000000000..259100343
--- /dev/null
+++ b/Duplicati/CommandLine/ConfigurationImporter/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// 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("Duplicati.CommandLine.ConfigurationImporter")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("Duplicati.CommandLine.ConfigurationImporter")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("B93E3BF0-DAA7-49B7-B07D-0559C5816735")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("2.0.0.7")]
+[assembly: AssemblyFileVersion("2.0.0.7")]
diff --git a/Duplicati/ConfigurationImporter/ConfigurationImporter.csproj b/Duplicati/ConfigurationImporter/ConfigurationImporter.csproj
deleted file mode 100644
index ee8e79697..000000000
--- a/Duplicati/ConfigurationImporter/ConfigurationImporter.csproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

-  <PropertyGroup>

-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

-    <ProjectGuid>{864B98B9-1B56-40D9-9733-9002E5B9B9D5}</ProjectGuid>

-    <OutputType>Exe</OutputType>

-    <RootNamespace>ConfigurationImporter</RootNamespace>

-    <AssemblyName>ConfigurationImporter</AssemblyName>

-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">

-    <DebugSymbols>true</DebugSymbols>

-    <DebugType>full</DebugType>

-    <Optimize>false</Optimize>

-    <OutputPath>bin\Debug</OutputPath>

-    <DefineConstants>DEBUG;</DefineConstants>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <ExternalConsole>true</ExternalConsole>

-  </PropertyGroup>

-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

-    <Optimize>true</Optimize>

-    <OutputPath>bin\Release</OutputPath>

-    <ErrorReport>prompt</ErrorReport>

-    <WarningLevel>4</WarningLevel>

-    <ExternalConsole>true</ExternalConsole>

-  </PropertyGroup>

-  <ItemGroup>

-    <Reference Include="System" />

-    <Reference Include="System.Data" />

-  </ItemGroup>

-  <ItemGroup>

-    <Compile Include="Program.cs" />

-    <Compile Include="Properties\AssemblyInfo.cs" />

-  </ItemGroup>

-  <ItemGroup>

-    <ProjectReference Include="..\Server\Duplicati.Server.csproj">

-      <Project>{19E661D2-C5DA-4F35-B3EE-7586E5734B5F}</Project>

-      <Name>Duplicati.Server</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Library\Utility\Duplicati.Library.Utility.csproj">

-      <Project>{DE3E5D4C-51AB-4E5E-BEE8-E636CEBFBA65}</Project>

-      <Name>Duplicati.Library.Utility</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Server\Duplicati.Server.Serialization\Duplicati.Server.Serialization.csproj">

-      <Project>{33FD1D24-C28F-4C71-933F-98F1586EA76C}</Project>

-      <Name>Duplicati.Server.Serialization</Name>

-    </ProjectReference>

-    <ProjectReference Include="..\Library\SQLiteHelper\Duplicati.Library.SQLiteHelper.csproj">

-      <Project>{2C838169-B187-4B09-8768-1C24C2521C8D}</Project>

-      <Name>Duplicati.Library.SQLiteHelper</Name>

-    </ProjectReference>

-  </ItemGroup>

-  <ItemGroup>

-    <None Include="app.config" />

-  </ItemGroup>

-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

-</Project>
\ No newline at end of file
diff --git a/Duplicati/ConfigurationImporter/Properties/AssemblyInfo.cs b/Duplicati/ConfigurationImporter/Properties/AssemblyInfo.cs
deleted file mode 100644
index 0727d2783..000000000
--- a/Duplicati/ConfigurationImporter/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,42 +0,0 @@
-//  Copyright (C) 2019, The Duplicati Team

-//  http://www.duplicati.com, info@duplicati.com

-//

-//  This library is free software; you can redistribute it and/or modify

-//  it under the terms of the GNU Lesser General Public License as

-//  published by the Free Software Foundation; either version 2.1 of the

-//  License, or (at your option) any later version.

-//

-//  This library is distributed in the hope that it will be useful, but

-//  WITHOUT ANY WARRANTY; without even the implied warranty of

-//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

-//  Lesser General Public License for more details.

-//

-//  You should have received a copy of the GNU Lesser General Public

-//  License along with this library; if not, write to the Free Software

-//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA

-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("ConfigurationImporter")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("")]
-[assembly: AssemblyCopyright("")]
-[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/Duplicati/ConfigurationImporter/app.config b/Duplicati/ConfigurationImporter/app.config
deleted file mode 100644
index f171dd7bb..000000000
--- a/Duplicati/ConfigurationImporter/app.config
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>

-<configuration>

-  <runtime>

-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Services.Client" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.OData" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Data.Edm" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-5.8.3.0" newVersion="5.8.3.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Microsoft.Azure.KeyVault.Core" publicKeyToken="31bf3856ad364e35" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />

-      </dependentAssembly>

-      <dependentAssembly>

-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

-        <bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />

-      </dependentAssembly>

-    </assemblyBinding>

-  </runtime>

-</configuration>
\ No newline at end of file
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
index 4e9d81a70..719de37c4 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
@@ -156,6 +156,10 @@
     <None Include="packages.config" />

   </ItemGroup>

   <ItemGroup>

+    <ProjectReference Include="..\..\CommandLine\ConfigurationImporter\Duplicati.CommandLine.ConfigurationImporter.csproj">

+      <Project>{7b1c019b-c4aa-4480-a259-790e125b36ce}</Project>

+      <Name>Duplicati.CommandLine.ConfigurationImporter</Name>

+    </ProjectReference>

     <ProjectReference Include="..\..\Library\Backend\CloudFiles\Duplicati.Library.Backend.CloudFiles.csproj">

       <Project>{1BFAE226-8364-4086-825C-BB83F6F3EE4C}</Project>

       <Name>Duplicati.Library.Backend.CloudFiles</Name>

@@ -344,10 +348,6 @@
       <Project>{D63E53E4-A458-4C2F-914D-92F715F58ACF}</Project>

       <Name>Duplicati.Library.Common</Name>

     </ProjectReference>

-    <ProjectReference Include="..\..\ConfigurationImporter\ConfigurationImporter.csproj">

-      <Project>{864B98B9-1B56-40D9-9733-9002E5B9B9D5}</Project>

-      <Name>ConfigurationImporter</Name>

-    </ProjectReference>

   </ItemGroup>

   <ItemGroup>

     <BootstrapperPackage Include=".NETFramework,Version=v4.0">

@@ -430,4 +430,4 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

   </ItemGroup>

-</Project>
\ No newline at end of file
+</Project>