Update some packages + move Winfwk to Nuget

(test)
fremag · Feb 4, 2017 · 39fa05f · 39fa05f
1 parent 56665e7
commit 39fa05f
Show file tree

Hide file tree

Showing 6 changed files with 85 additions and 44 deletions.
diff --git a/MemoScope.Net.sln b/MemoScope.Net.sln
@@ -1,12 +1,10 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MemoScope", "MemoScope\MemoScope.csproj", "{D6AD45CF-3691-4A6F-8AA0-28FEA3B87BFB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFwk", "WinFwk\WinFwk.csproj", "{B421F218-4883-4FF6-A186-719DD0A30A1E}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MemoDummy", "MemoDummy\MemoDummy.csproj", "{79528DEC-4446-4C3C-9431-02348CF43C67}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MemoScopeApi", "MemoScopeApi\MemoScopeApi.csproj", "{8363C100-7197-474E-A951-1402AB9E4D03}"
@@ -35,18 +33,6 @@ Global
 		{D6AD45CF-3691-4A6F-8AA0-28FEA3B87BFB}.Release|x64.Build.0 = Release|x64
 		{D6AD45CF-3691-4A6F-8AA0-28FEA3B87BFB}.Release|x86.ActiveCfg = Release|x86
 		{D6AD45CF-3691-4A6F-8AA0-28FEA3B87BFB}.Release|x86.Build.0 = Release|x86
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Debug|x64.ActiveCfg = Debug|x64
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Debug|x64.Build.0 = Debug|x64
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Debug|x86.ActiveCfg = Debug|x86
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Debug|x86.Build.0 = Debug|x86
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Release|x64.ActiveCfg = Release|x64
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Release|x64.Build.0 = Release|x64
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Release|x86.ActiveCfg = Release|x86
-		{B421F218-4883-4FF6-A186-719DD0A30A1E}.Release|x86.Build.0 = Release|x86
 		{79528DEC-4446-4C3C-9431-02348CF43C67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{79528DEC-4446-4C3C-9431-02348CF43C67}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{79528DEC-4446-4C3C-9431-02348CF43C67}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/MemoScope/App.config b/MemoScope/App.config
@@ -38,10 +38,10 @@
       <logger name="MemoScope.Modules.RootPath.RootPathAnalysis" minlevel="Info" writeTo="Debug, File"></logger>
     </rules>
   </nlog>
-  <system.data>
+
+<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>
+  </system.data></configuration>
diff --git a/MemoScope/MemoScope.csproj b/MemoScope/MemoScope.csproj
@@ -133,16 +133,16 @@
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite">
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.103\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Data.SQLite, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.104.0\lib\net46\System.Data.SQLite.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Data.SQLite.EF6">
-      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.103\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
+    <Reference Include="System.Data.SQLite.EF6, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.104.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.103.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.103\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
+    <Reference Include="System.Data.SQLite.Linq, Version=1.0.104.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.104.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System.ServiceModel" />
@@ -156,8 +156,12 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
-    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.11.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
-      <HintPath>..\packages\DockPanelSuite.2.12.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
+    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.13.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
+      <HintPath>..\packages\DockPanelSuite.2.13.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="WinFwk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\fremag.WinFwk.1.0.0\lib\net461\WinFwk.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
@@ -645,7 +649,9 @@
     <EmbeddedResource Include="Tools\RegexFilter\RegexFilterControl.resx">
       <DependentUpon>RegexFilterControl.cs</DependentUpon>
     </EmbeddedResource>
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -657,19 +663,23 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MemoScopeApi\MemoScopeApi.csproj">
       <Project>{8363c100-7197-474e-a951-1402ab9e4d03}</Project>
       <Name>MemoScopeApi</Name>
     </ProjectReference>
-    <ProjectReference Include="..\WinFwk\WinFwk.csproj">
-      <Project>{b421f218-4883-4ff6-a186-719dd0a30a1e}</Project>
-      <Name>WinFwk</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Icons\cross.png" />
+    <Content Include="Icons\disk.png" />
+    <Content Include="Icons\file_extension_log.png" />
+    <Content Include="Icons\gear_in.png" />
+    <Content Include="Icons\globe_place.png" />
+    <Content Include="Icons\help.png" />
     <Content Include="Icons\Large\action_log.png" />
     <Content Include="Icons\Large\attributes_display.png" />
     <Content Include="Icons\Large\award_star_add.png" />
@@ -773,6 +783,8 @@
     <Content Include="Icons\New\tubes.png" />
     <Content Include="Icons\New\vbox.png" />
     <Content Include="Icons\New\viewstack.png" />
+    <Content Include="Icons\open_folder.png" />
+    <Content Include="Icons\page_copy.png" />
     <Content Include="Icons\Small\accept_button.png" />
     <Content Include="Icons\Small\action_log.png" />
     <Content Include="Icons\Small\anchor.png" />
@@ -829,10 +841,17 @@
     <Content Include="Icons\Small\save_data.png" />
     <Content Include="Icons\Small\scroll_pane_list.png" />
     <Content Include="Icons\Small\help.png" />
+    <Content Include="Icons\Small\small_file_extension_log.png" />
+    <Content Include="Icons\Small\small_folder_vertical_open.png" />
+    <Content Include="Icons\Small\small_gear_in.png" />
+    <Content Include="Icons\Small\small_help.png" />
     <Content Include="Icons\Small\subtotal.png" />
     <Content Include="Icons\Small\table_lightning.png" />
     <Content Include="Icons\Small\text_rotate.png" />
     <Content Include="Icons\Small\text_uppercase.png" />
+    <Content Include="Icons\Small\update_contact_info.png" />
+    <Content Include="Icons\text_exports.png" />
+    <Content Include="Icons\update_contact_info.png" />
     <Content Include="libs\_x64\dbghelp.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -863,12 +882,12 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.103\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net46\System.Data.SQLite.Core.targets')" />
+  <Import Project="..\packages\System.Data.SQLite.Core.1.0.104.0\build\net46\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.104.0\build\net46\System.Data.SQLite.Core.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.103\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.103\build\net46\System.Data.SQLite.Core.targets'))" />
+    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.104.0\build\net46\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.104.0\build\net46\System.Data.SQLite.Core.targets'))" />
   </Target>
   <!-- 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.

diff --git a/MemoScope/packages.config b/MemoScope/packages.config
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.5.0.2" targetFramework="net46" />
-  <package id="DockPanelSuite" version="2.12.0" targetFramework="net461" />
+  <package id="DockPanelSuite" version="2.13.0" targetFramework="net461" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net46" />
   <package id="ExpressionEvaluator" version="2.0.4.0" targetFramework="net46" />
+  <package id="fremag.WinFwk" version="1.0.0" targetFramework="net461" />
   <package id="jacobslusser.ScintillaNET" version="3.5.10" targetFramework="net461" />
   <package id="Microsoft.Diagnostics.Runtime" version="0.8.31-beta" targetFramework="net46" />
   <package id="NLog" version="4.4.1" targetFramework="net461" />
   <package id="ObjectListView.Official" version="2.9.1" targetFramework="net461" />
   <package id="ParallelExtensionsExtras" version="1.2.0.0" targetFramework="net46" />
-  <package id="System.Data.SQLite" version="1.0.103" targetFramework="net461" />
-  <package id="System.Data.SQLite.Core" version="1.0.103" targetFramework="net461" />
-  <package id="System.Data.SQLite.EF6" version="1.0.103" targetFramework="net461" />
-  <package id="System.Data.SQLite.Linq" version="1.0.103" targetFramework="net461" />
-  <package id="System.Diagnostics.Debug" version="4.0.11-beta-23409" targetFramework="net46" />
+  <package id="System.Data.SQLite" version="1.0.104.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Core" version="1.0.104.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.EF6" version="1.0.104.0" targetFramework="net461" />
+  <package id="System.Data.SQLite.Linq" version="1.0.104.0" targetFramework="net461" />
+  <package id="System.Diagnostics.Debug" version="4.3.0" targetFramework="net461" />
 </packages>
diff --git a/UnitTestProject/UnitTestProject.csproj b/UnitTestProject/UnitTestProject.csproj
@@ -77,12 +77,29 @@
       <HintPath>..\packages\Microsoft.Diagnostics.Runtime.0.8.31-beta\lib\net40\Microsoft.Diagnostics.Runtime.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.4.4.1\lib\net45\NLog.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <HintPath>..\packages\NUnit.3.2.0\lib\net45\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="ObjectListView, Version=2.9.1.1072, Culture=neutral, PublicKeyToken=b1c5bf581481bcd4, processorArchitecture=MSIL">
+      <HintPath>..\packages\ObjectListView.Official.2.9.1\lib\net20\ObjectListView.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="WeifenLuo.WinFormsUI.Docking, Version=2.13.0.0, Culture=neutral, PublicKeyToken=5cded1a1a0a7b481, processorArchitecture=MSIL">
+      <HintPath>..\packages\DockPanelSuite.2.13.0\lib\net40\WeifenLuo.WinFormsUI.Docking.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="WinFwk, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\fremag.WinFwk.1.0.0\lib\net461\WinFwk.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
   </ItemGroup>
   <Choose>
     <When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
@@ -113,16 +130,30 @@
       <Project>{d6ad45cf-3691-4a6f-8aa0-28fea3b87bfb}</Project>
       <Name>MemoScope</Name>
     </ProjectReference>
-    <ProjectReference Include="..\WinFwk\WinFwk.csproj">
-      <Project>{b421f218-4883-4ff6-a186-719dd0a30a1e}</Project>
-      <Name>WinFwk</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />
     <None Include="README.md" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Icons\cross.png" />
+    <Content Include="Icons\disk.png" />
+    <Content Include="Icons\file_extension_log.png" />
+    <Content Include="Icons\gear_in.png" />
+    <Content Include="Icons\globe_place.png" />
+    <Content Include="Icons\help.png" />
+    <Content Include="Icons\open_folder.png" />
+    <Content Include="Icons\page_copy.png" />
+    <Content Include="Icons\Small\cancel.png" />
+    <Content Include="Icons\Small\small_file_extension_log.png" />
+    <Content Include="Icons\Small\small_folder_vertical_open.png" />
+    <Content Include="Icons\Small\small_gear_in.png" />
+    <Content Include="Icons\Small\small_help.png" />
+    <Content Include="Icons\Small\update_contact_info.png" />
+    <Content Include="Icons\text_exports.png" />
+    <Content Include="Icons\update_contact_info.png" />
+  </ItemGroup>
   <Choose>
     <When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
       <ItemGroup>

diff --git a/UnitTestProject/packages.config b/UnitTestProject/packages.config
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="DockPanelSuite" version="2.13.0" targetFramework="net461" />
+  <package id="fremag.WinFwk" version="1.0.0" targetFramework="net461" />
   <package id="Microsoft.Diagnostics.Runtime" version="0.8.31-beta" targetFramework="net46" />
+  <package id="NLog" version="4.4.1" targetFramework="net461" />
   <package id="NUnit" version="3.2.0" targetFramework="net46" />
+  <package id="ObjectListView.Official" version="2.9.1" targetFramework="net461" />
 </packages>