v1.1.2 Minor code adaptations with library FileControlUtility v1.0.0

user413 · Jan 29, 2022 · dd84fe3 · dd84fe3
1 parent 40ede33
commit dd84fe3
Show file tree

Hide file tree

Showing 25 changed files with 937 additions and 1,243 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,6 @@
 /packages
 
-### Ignore Visual Studio temporary files, build results, and
+## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

diff --git a/BackupHelper.sln b/BackupHelper.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 16.0.30413.136
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BackupHelper", "BackupHelper\BackupHelper.csproj", "{960576ED-78BD-460D-9C5E-3E422329FA1B}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FileControlUtility", "..\..\Library\FileControlUtility\FileControlUtility\FileControlUtility.csproj", "{6284BB33-ABEB-40CF-BB97-2FCBB0085215}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -15,6 +17,10 @@ Global
  {960576ED-78BD-460D-9C5E-3E422329FA1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {960576ED-78BD-460D-9C5E-3E422329FA1B}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {960576ED-78BD-460D-9C5E-3E422329FA1B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {6284BB33-ABEB-40CF-BB97-2FCBB0085215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {6284BB33-ABEB-40CF-BB97-2FCBB0085215}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {6284BB33-ABEB-40CF-BB97-2FCBB0085215}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {6284BB33-ABEB-40CF-BB97-2FCBB0085215}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE

diff --git a/BackupHelper/BackupHelper.csproj b/BackupHelper/BackupHelper.csproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="..\packages\SQLite.3.13.0\build\net45\SQLite.props" Condition="Exists('..\packages\SQLite.3.13.0\build\net45\SQLite.props')" />
  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
  <PropertyGroup>
  <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -9,14 +8,14 @@
  <OutputType>WinExe</OutputType>
  <RootNamespace>BackupHelper</RootNamespace>
  <AssemblyName>BackupHelper</AssemblyName>
- <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
  <FileAlignment>512</FileAlignment>
  <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
  <Deterministic>true</Deterministic>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
  <NuGetPackageImportStamp>
  </NuGetPackageImportStamp>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <PublishUrl>C:\Users\Nobody\Desktop\BackupHelper\</PublishUrl>
+ <PublishUrl>publish\</PublishUrl>
  <Install>true</Install>
  <InstallFrom>Disk</InstallFrom>
  <UpdateEnabled>false</UpdateEnabled>
@@ -26,16 +25,15 @@
  <UpdatePeriodically>false</UpdatePeriodically>
  <UpdateRequired>false</UpdateRequired>
  <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>2</ApplicationRevision>
+ <ApplicationRevision>0</ApplicationRevision>
  <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
  <UseApplicationTrust>false</UseApplicationTrust>
- <PublishWizardCompleted>true</PublishWizardCompleted>
  <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
  <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
+ <DebugSymbols>false</DebugSymbols>
+ <DebugType>none</DebugType>
  <Optimize>false</Optimize>
  <OutputPath>bin\Debug\</OutputPath>
  <DefineConstants>DEBUG;TRACE</DefineConstants>
@@ -44,35 +42,29 @@
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
  <PlatformTarget>AnyCPU</PlatformTarget>
- <DebugType>pdbonly</DebugType>
+ <DebugType>none</DebugType>
  <Optimize>true</Optimize>
  <OutputPath>bin\Release\</OutputPath>
  <DefineConstants>TRACE</DefineConstants>
  <ErrorReport>prompt</ErrorReport>
  <WarningLevel>4</WarningLevel>
  </PropertyGroup>
- <PropertyGroup>
- <StartupObject />
- </PropertyGroup>
- <PropertyGroup>
- <GenerateManifests>true</GenerateManifests>
- </PropertyGroup>
- <PropertyGroup>
- <SignManifests>false</SignManifests>
- </PropertyGroup>
  <PropertyGroup>
  <ApplicationIcon>Resources\backup_helper_icon.ico</ApplicationIcon>
  </PropertyGroup>
  <PropertyGroup>
  <NoWin32Manifest>true</NoWin32Manifest>
  </PropertyGroup>
  <ItemGroup>
+ <Reference Include="FileControlUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\Library\FileControlUtility\FileControlUtility\bin\Debug\netstandard2.0\FileControlUtility.dll</HintPath>
+ </Reference>
  <Reference Include="System" />
  <Reference Include="System.Core" />
- <Reference Include="System.Data.SQLite, Version=1.0.109.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
- <HintPath>..\packages\System.Data.SQLite.Core.1.0.109.2\lib\net46\System.Data.SQLite.dll</HintPath>
+ <Reference Include="System.Data.SQLite, Version=1.0.113.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+ <HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net46\System.Data.SQLite.dll</HintPath>
  </Reference>
- <Reference Include="System.DirectoryServices" />
  <Reference Include="System.Xml.Linq" />
  <Reference Include="System.Data.DataSetExtensions" />
  <Reference Include="Microsoft.CSharp" />
@@ -86,8 +78,6 @@
  <ItemGroup>
  <Compile Include="FileControlConsoleImpl.cs" />
  <Compile Include="FileControlImpl.cs" />
- <Compile Include="FileControl\FileControl.cs" />
- <Compile Include="FileControl\TransferSettings.cs" />
  <Compile Include="FormCancelExecution.cs">
  <SubType>Form</SubType>
  </Compile>
@@ -133,47 +123,21 @@
  <Compile Include="LogManager.cs" />
  <Compile Include="model\Option.cs" />
  <Compile Include="model\Profile.cs" />
- <Compile Include="FileControl\Report.cs" />
  <Compile Include="Program.cs" />
  <Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Properties\Resources.Designer.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Resources.resx</DependentUpon>
- </Compile>
  <Compile Include="SQLiteAccess.cs" />
- <EmbeddedResource Include="FormCancelExecution.resx">
- <DependentUpon>FormCancelExecution.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="FormEditOption.resx">
- <DependentUpon>FormEditOption.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="FormEditProfile.resx">
- <DependentUpon>FormEditProfile.cs</DependentUpon>
- <SubType>Designer</SubType>
- </EmbeddedResource>
- <EmbeddedResource Include="FormErrorDialog.resx">
- <DependentUpon>FormErrorDialog.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="FormOptionsMenu.resx">
- <DependentUpon>FormOptionsMenu.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="FormProfileMenu.resx">
- <DependentUpon>FormProfileMenu.cs</DependentUpon>
- </EmbeddedResource>
- <EmbeddedResource Include="FormReport.resx">
- <DependentUpon>FormReport.cs</DependentUpon>
- </EmbeddedResource>
  <EmbeddedResource Include="Properties\Resources.resx">
  <Generator>ResXFileCodeGenerator</Generator>
- <SubType>Designer</SubType>
  <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+ <SubType>Designer</SubType>
  </EmbeddedResource>
+ <Compile Include="Properties\Resources.Designer.cs">
+ <AutoGen>True</AutoGen>
+ <DependentUpon>Resources.resx</DependentUpon>
+ <DesignTime>True</DesignTime>
+ </Compile>
  <None Include="database\backup_helper.db" />
  <None Include="packages.config" />
- <None Include="pentaho-transformation\backup_helper_transf.ktr" />
  <None Include="Properties\Settings.settings">
  <Generator>SettingsSingleFileGenerator</Generator>
  <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -188,9 +152,13 @@
  <None Include="App.config" />
  </ItemGroup>
  <ItemGroup>
- <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+ <Content Include="database\schema.sql" />
+ <Content Include="Resources\backup_helper_icon.ico" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
  <Visible>False</Visible>
- <ProductName>Microsoft .NET Framework 4.6.1 %28x86 and x64%29</ProductName>
+ <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
  <Install>true</Install>
  </BootstrapperPackage>
  <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
@@ -199,18 +167,12 @@
  <Install>false</Install>
  </BootstrapperPackage>
  </ItemGroup>
- <ItemGroup>
- <Content Include="backup-helper-icon.ico" />
- <None Include="Resources\backup_helper_icon.ico" />
- <None Include="database\schema.sql" />
- </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets" Condition="Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" />
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
  <PropertyGroup>
  <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
  </PropertyGroup>
- <Error Condition="!Exists('..\packages\SQLite.3.13.0\build\net45\SQLite.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SQLite.3.13.0\build\net45\SQLite.props'))" />
- <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets'))" />
+ <Error Condition="!Exists('..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\build\net46\Stub.System.Data.SQLite.Core.NetFramework.targets'))" />
  </Target>
- <Import Project="..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.109.2\build\net46\System.Data.SQLite.Core.targets')" />
 </Project>