Skip to content
This repository has been archived by the owner on May 6, 2020. It is now read-only.

Commit

Permalink
remove unused nuget packages and some code clean up
Browse files Browse the repository at this point in the history
  • Loading branch information
@fredericoregateiro
fredericoregateiro committed Aug 1, 2018
1 parent 87d4520 commit 5a12ccc
Show file tree
Hide file tree
Showing 36 changed files with 16,430 additions and 569 deletions.
21 changes: 2 additions & 19 deletions src/SolRIA.SaftAnalyser.Installer/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,41 +18,24 @@ static void Main(string[] args)
new File(System.IO.Path.Combine(baseFolderPath, "SolRIA.SaftAnalyser.exe"),
new FileShortcut("SolRIA SAFT Analyser", @"%ProgramMenu%\SolRIA\SolRIA SAFT"),
new FileShortcut("SolRIA SAFT Analyser", @"%Desktop%")),
new File(System.IO.Path.Combine(baseFolderPath, "CommonServiceLocator.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Dragablz.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "EntityFramework.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "EntityFramework.SqlServer.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "EPPlus.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "MaterialDesignColors.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "MaterialDesignThemes.Wpf.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Microsoft.Practices.Unity.Configuration.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Microsoft.Practices.Unity.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Microsoft.Practices.Unity.RegistrationByConvention.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "NLog.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Prism.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Prism.Unity.Wpf.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Prism.Wpf.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "SolRIA.SaftAnalyser.Logic.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Syncfusion.Data.WPF.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Syncfusion.SfGrid.WPF.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Syncfusion.SfSkinManager.WPF.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Syncfusion.Shared.WPF.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "Syncfusion.Themes.Blend.WPF.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "sqlite3.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "System.Data.SQLite.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "System.Data.SQLite.EF6.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "System.Data.SQLite.Linq.dll")),
new File(System.IO.Path.Combine(baseFolderPath, "System.Windows.Interactivity.dll"))),
new Dir("x64",
new File(System.IO.Path.Combine(baseFolderPath, "x64", "SQLite.Interop.dll"))),
new Dir("x86",
new File(System.IO.Path.Combine(baseFolderPath, "x86", "SQLite.Interop.dll"))));
new File(System.IO.Path.Combine(baseFolderPath, "System.Data.SQLite.dll"))));

project.ResolveWildCards();
project.OutFileName = "SolRIA.SaftAnalyser";
project.ProductId = Guid.NewGuid();
project.UpgradeCode = new Guid("{9ADF9E4F-BEC5-4875-8E93-6287751C0503}");
project.Version = Version.Parse("17.10.14.0");
project.Version = Version.Parse("18.08.01");
project.LicenceFile = System.IO.Path.Combine(baseFolderPath, "license.rtf");

project.MajorUpgradeStrategy = MajorUpgradeStrategy.Default;
Expand Down
25 changes: 15 additions & 10 deletions src/SolRIA.SaftAnalyser.Installer/SolRIA.SaftAnalyser.Installer.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,10 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="BootstrapperCore, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.4.9.0\lib\BootstrapperCore.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\WixSharp.bin.1.8.0\lib\BootstrapperCore.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Deployment.WindowsInstaller, Version=3.0.0.0, Culture=neutral, PublicKeyToken=ce35f76fcda82bad, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.4.9.0\lib\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\WixSharp.bin.1.8.0\lib\Microsoft.Deployment.WindowsInstaller.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand All @@ -54,14 +52,14 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WixSharp, Version=1.4.9.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.4.9.0\lib\WixSharp.dll</HintPath>
<Reference Include="WixSharp, Version=1.8.0.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.8.0\lib\WixSharp.dll</HintPath>
</Reference>
<Reference Include="WixSharp.Msi, Version=1.4.9.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.4.9.0\lib\WixSharp.Msi.dll</HintPath>
<Reference Include="WixSharp.Msi, Version=1.8.0.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.8.0\lib\WixSharp.Msi.dll</HintPath>
</Reference>
<Reference Include="WixSharp.UI, Version=1.4.9.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.4.9.0\lib\WixSharp.UI.dll</HintPath>
<Reference Include="WixSharp.UI, Version=1.8.0.0, Culture=neutral, PublicKeyToken=3775edd25acc43c2, processorArchitecture=MSIL">
<HintPath>..\packages\WixSharp.bin.1.8.0\lib\WixSharp.UI.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -94,4 +92,11 @@
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<UsingTask AssemblyFile="$(SolutionDir)packages\WixSharp.1.4.9.0\build\SetEnvVar.dll" TaskName="SetEnvVar" />
<Import Project="..\packages\WixSharp.bin.1.8.0\build\WixSharp.bin.targets" Condition="Exists('..\packages\WixSharp.bin.1.8.0\build\WixSharp.bin.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\WixSharp.bin.1.8.0\build\WixSharp.bin.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WixSharp.bin.1.8.0\build\WixSharp.bin.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion src/SolRIA.SaftAnalyser.Installer/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WixSharp.bin" version="1.4.9.0" targetFramework="net452" />
<package id="WixSharp.bin" version="1.8.0" targetFramework="net452" />
</packages>
9 changes: 2 additions & 7 deletions src/SolRIA.SaftAnalyser.Logic/App.config
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<configSections>
<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->

<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
</configSections>
<entityFramework>
Expand All @@ -15,10 +15,5 @@
<provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
</providers>
</entityFramework>
<system.data>
<DbProviderFactories>
<remove invariant="System.Data.SQLite.EF6" />
<add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
<remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
</system.data>

</configuration>
60 changes: 14 additions & 46 deletions src/SolRIA.SaftAnalyser.Logic/SolRIA.SaftAnalyser.Logic.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,64 +33,32 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Dragablz, Version=0.0.3.186, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dragablz.0.0.3.186\lib\net45\Dragablz.dll</HintPath>
</Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.SqlServer.dll</HintPath>
<Reference Include="Dragablz, Version=0.0.3.203, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dragablz.0.0.3.203\lib\net45\Dragablz.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignColors, Version=1.1.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignColors.1.1.3\lib\net45\MaterialDesignColors.dll</HintPath>
</Reference>
<Reference Include="MaterialDesignThemes.Wpf, Version=2.3.0.823, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignThemes.2.3.0.823\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.ServiceLocation, Version=1.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Unity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Unity.Configuration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.Configuration.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Practices.Unity.RegistrationByConvention, Version=4.0.0.0, Culture=neutral, PublicKeyToken=6d32ff45e0ccc69f, processorArchitecture=MSIL">
<HintPath>..\packages\Unity.4.0.1\lib\net45\Microsoft.Practices.Unity.RegistrationByConvention.dll</HintPath>
<Reference Include="MaterialDesignThemes.Wpf, Version=2.4.1.1101, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MaterialDesignThemes.2.4.1.1101\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.4.5\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.5.7\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Prism, Version=6.3.0.0, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Core.6.3.0\lib\net45\Prism.dll</HintPath>
</Reference>
<Reference Include="Prism.Unity.Wpf, Version=6.3.0.0, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Unity.6.3.0\lib\net45\Prism.Unity.Wpf.dll</HintPath>
</Reference>
<Reference Include="Prism.Wpf, Version=6.3.0.0, Culture=neutral, PublicKeyToken=40ee6c3a2184dc59, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Wpf.6.3.0\lib\net45\Prism.Wpf.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Data.SQLite, Version=1.0.105.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Core.1.0.105.0\lib\net451\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Data.SQLite.EF6, Version=1.0.105.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.EF6.1.0.105.0\lib\net451\System.Data.SQLite.EF6.dll</HintPath>
</Reference>
<Reference Include="System.Data.SQLite.Linq, Version=1.0.105.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Linq.1.0.105.0\lib\net451\System.Data.SQLite.Linq.dll</HintPath>
<Reference Include="System.Data.SQLite, Version=1.0.108.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
<HintPath>..\packages\System.Data.SQLite.Core.1.0.108.0\lib\net451\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression" />
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.ServiceModel" />
<Reference Include="System.Transactions" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Prism.Wpf.6.3.0\lib\net45\System.Windows.Interactivity.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
Expand Down Expand Up @@ -156,11 +124,11 @@
</EmbeddedResource>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\System.Data.SQLite.Core.1.0.105.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.105.0\build\net451\System.Data.SQLite.Core.targets')" />
<Import Project="..\packages\System.Data.SQLite.Core.1.0.108.0\build\net451\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net451\System.Data.SQLite.Core.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\System.Data.SQLite.Core.1.0.105.0\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.105.0\build\net451\System.Data.SQLite.Core.targets'))" />
<Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.108.0\build\net451\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.108.0\build\net451\System.Data.SQLite.Core.targets'))" />
</Target>
</Project>
2 changes: 1 addition & 1 deletion src/SolRIA.SaftAnalyser.Logic/XmlSerializer.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public static async Task<T> Deserialize<T>(string xmlFileName)
return config;
});
}
catch (Exception ex)
catch (Exception)
{
return default(T);
}
Expand Down
17 changes: 4 additions & 13 deletions src/SolRIA.SaftAnalyser.Logic/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="CommonServiceLocator" version="1.3" targetFramework="net452" />
<package id="Dragablz" version="0.0.3.186" targetFramework="net452" />
<package id="EntityFramework" version="6.1.3" targetFramework="net452" />
<package id="Dragablz" version="0.0.3.203" targetFramework="net452" />
<package id="MaterialDesignColors" version="1.1.3" targetFramework="net452" />
<package id="MaterialDesignThemes" version="2.3.0.823" targetFramework="net452" />
<package id="NLog" version="4.4.5" targetFramework="net452" />
<package id="Prism.Core" version="6.3.0" targetFramework="net452" />
<package id="Prism.Unity" version="6.3.0" targetFramework="net452" />
<package id="Prism.Wpf" version="6.3.0" targetFramework="net452" />
<package id="System.Data.SQLite" version="1.0.105.0" targetFramework="net452" />
<package id="System.Data.SQLite.Core" version="1.0.105.0" targetFramework="net452" />
<package id="System.Data.SQLite.EF6" version="1.0.105.0" targetFramework="net452" />
<package id="System.Data.SQLite.Linq" version="1.0.105.0" targetFramework="net452" />
<package id="Unity" version="4.0.1" targetFramework="net452" />
<package id="MaterialDesignThemes" version="2.4.1.1101" targetFramework="net452" />
<package id="NLog" version="4.5.7" targetFramework="net452" />
<package id="System.Data.SQLite.Core" version="1.0.108.0" targetFramework="net452" />
</packages>
Loading

0 comments on commit 5a12ccc

Please sign in to comment.