From 6459f0350e62fc9901f0434ec084b743a5bb6e20 Mon Sep 17 00:00:00 2001
From: lukeIam <mail2skywalker@gmail.com>
Date: Wed, 30 Sep 2015 20:21:41 +0200
Subject: [PATCH] - Moved unmanaged libs to folder libs/unmanaged - Modified
 loading path - Updated nuget package versions - Changed the way managed
 assemblies are referenced

---
 .../GstreamerSharp/CGstreamerSharpAudio.cs    |   4 +-
 Vocaluxe/Vocaluxe.csproj                      | 114 ++++++------------
 Vocaluxe/packages.config                      |  27 ++---
 .../WebserverInitalConfig.csproj              |  22 ++--
 WebserverInitalConfig/packages.config         |   4 +-
 5 files changed, 66 insertions(+), 105 deletions(-)

diff --git a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
index fceb8227..683e3d75 100644
--- a/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
+++ b/Vocaluxe/Lib/Sound/Playback/GstreamerSharp/CGstreamerSharpAudio.cs
@@ -40,10 +40,10 @@ namespace Vocaluxe.Lib.Sound.Playback.GstreamerSharp
             if (gstreamerEnvVar == null)
             {
 #if ARCH_X86
-                dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "gstreamer86\\bin\\");
+                dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer86\\bin\\");
 #endif
 #if ARCH_X64
-                dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "gstreamer64\\bin\\");
+                dllDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libs\\unmanaged\\gstreamer64\\bin\\");
 #endif
                 if (!Directory.Exists(dllDirectory))
                 {
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 9b3e35b5..54bc01de 100644
--- a/Vocaluxe/Vocaluxe.csproj
+++ b/Vocaluxe/Vocaluxe.csproj
@@ -31,7 +31,7 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>c1942c0f</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>3d91144f</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -144,66 +144,25 @@
     <DefineConstants>WIN;ARCH_X64;INSTALLER</DefineConstants>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="AForge.Video, Version=2.2.5.0, Culture=neutral, PublicKeyToken=cbfb6e07d173c401, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.aforgevideo.1.0.0\lib\net40\AForge.Video.dll</HintPath>
-    </Reference>
-    <Reference Include="AForge.Video.DirectShow, Version=2.2.5.0, Culture=neutral, PublicKeyToken=61ea4348d43881b7, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.aforgevideo.1.0.0\lib\net40\AForge.Video.DirectShow.dll</HintPath>
-    </Reference>
-    <Reference Include="Community.CsharpSqlite, Version=3.7.7.1, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.csharpsqlite.1.0.0\lib\net40\Community.CsharpSqlite.dll</HintPath>
-    </Reference>
-    <Reference Include="glib-sharp, Version=3.0.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.gstreamersharp.1.0.0\lib\net40\glib-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="gstreamer-sharp, Version=1.39.91.0, Culture=neutral, PublicKeyToken=5cbf79803e97ff61, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.gstreamersharp.1.0.0\lib\net40\gstreamer-sharp.dll</HintPath>
-    </Reference>
-    <Reference Include="Mono.Data.Sqlite, Version=2.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\lib\net4\Mono.Data.Sqlite.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenTK, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.opentk.1.0.0\lib\net40\OpenTK.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenTK.Compatibility, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.opentk.1.0.0\lib\net40\OpenTK.Compatibility.dll</HintPath>
-    </Reference>
-    <Reference Include="OpenTK.GLControl, Version=1.1.0.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.opentk.1.0.0\lib\net40\OpenTK.GLControl.dll</HintPath>
-    </Reference>
-    <Reference Include="PortAudioSharp, Version=0.19.3.29235, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.portaudiosharp.1.0.0\lib\net40\PortAudioSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="QRCoder, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.qrcoder.1.0.0\lib\net40\QRCoder.dll</HintPath>
-    </Reference>
+  <ItemGroup>    
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Data.Portable, Version=4.0.0.0, Culture=neutral, PublicKeyToken=59e704a76bc4613a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\lib\net4\System.Data.Portable.dll</HintPath>
+      <HintPath>..\packages\vocaluxe.dependencies.sqlite.1.0.1\lib\net40\System.Data.Portable.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite, Version=1.0.97.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+    <Reference Include="System.Data.SQLite, Version=1.0.98.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.97.0\lib\net40\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\packages\vocaluxe.dependencies.sqlite.1.0.1\lib\net40\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.ServiceModel.Web" />
     <Reference Include="System.Transactions" />
+    <Reference Include="System.Transactions.Portable">
+      <HintPath>..\packages\vocaluxe.dependencies.sqlite.1.0.1\lib\net40\System.Transactions.Portable.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.XML" />
   </ItemGroup>
@@ -302,9 +261,7 @@
     <Compile Include="GameModes\IGameMode.cs" />
     <Compile Include="SongQueue\ISongQueue.cs" />
     <Compile Include="GlobalSuppressions.cs" />
-    <Compile Include="Lib\Draw\CDirect3D.cs" Condition=" ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'InstallerWin')">
-      <SubType>Form</SubType>
-    </Compile>
+    <Compile Include="Lib\Draw\CDirect3D.cs" Condition=" ('$(Configuration)' == 'DebugWin' Or '$(Configuration)' == 'ReleaseWin' Or '$(Configuration)' == 'InstallerWin')" />
     <Compile Include="Lib\Draw\CDrawWinForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -556,37 +513,40 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
       $(PostBuildEventDependsOn);
       PostBuildMacros;
     </PostBuildEventDependsOn>
-  </PropertyGroup>
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.97.0\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.97.0\build\net40\System.Data.SQLite.Core.targets')" />
+  </PropertyGroup>  
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Rebuild for automatic package restore. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.97.0\build\net40\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.97.0\build\net40\System.Data.SQLite.Core.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.0\build\vocaluxe.dependencies.sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.sqlite.1.0.0\build\vocaluxe.dependencies.sqlite.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.0\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.0\build\vocaluxe.dependencies.acinerella.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.0\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.0\build\vocaluxe.dependencies.ffmpeg.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.0\build\vocaluxe.dependencies.gstreamersharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamersharp.1.0.0\build\vocaluxe.dependencies.gstreamersharp.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.0\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.0\build\vocaluxe.dependencies.hidapi.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.pitchtracker.1.0.0\build\vocaluxe.dependencies.pitchtracker.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.pitchtracker.1.0.0\build\vocaluxe.dependencies.pitchtracker.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.0\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.0\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.1\build\vocaluxe.dependencies.ffmpeg.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.ffmpeg.1.0.1\build\vocaluxe.dependencies.ffmpeg.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.1\build\vocaluxe.dependencies.hidapi.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.hidapi.1.0.1\build\vocaluxe.dependencies.hidapi.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.pitchtracker.1.0.1\build\vocaluxe.dependencies.pitchtracker.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.pitchtracker.1.0.1\build\vocaluxe.dependencies.pitchtracker.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.themes.ambient.1.0.0\build\vocaluxe.themes.ambient.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.themes.ambient.1.0.0\build\vocaluxe.themes.ambient.targets'))" />
     <Error Condition="!Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets'))" />
-    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.3\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.3\build\vocaluxe.dependencies.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.1.0.4\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.4\build\vocaluxe.dependencies.targets'))" />
   </Target>
-  <Import Project="..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\tools\Mono.Data.Sqlite.Portable.targets" Condition="Exists('..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\tools\Mono.Data.Sqlite.Portable.targets')" />
-  <Target Name="EnsureMonoDataSqlitePortableImported" BeforeTargets="BeforeBuild" Condition="'$(MonoDataSqlitePortableImported)' == ''">
-    <Error Condition="!Exists('..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\tools\Mono.Data.Sqlite.Portable.targets')" Text="This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them." />
-    <Error Condition="Exists('..\packages\Mono.Data.Sqlite.Portable.1.0.3.5\tools\Mono.Data.Sqlite.Portable.targets')" Text="The build restored NuGet packages. Build the project again to include these packages in the build." />
-  </Target>
-  <Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.0\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.0\build\vocaluxe.dependencies.sqlite.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.0\build\vocaluxe.dependencies.acinerella.targets" Condition="Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.0\build\vocaluxe.dependencies.acinerella.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.0\build\vocaluxe.dependencies.ffmpeg.targets" Condition="Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.0\build\vocaluxe.dependencies.ffmpeg.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.gstreamersharp.1.0.0\build\vocaluxe.dependencies.gstreamersharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.0\build\vocaluxe.dependencies.gstreamersharp.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.0\build\vocaluxe.dependencies.hidapi.targets" Condition="Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.0\build\vocaluxe.dependencies.hidapi.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.pitchtracker.1.0.0\build\vocaluxe.dependencies.pitchtracker.targets" Condition="Exists('..\packages\vocaluxe.dependencies.pitchtracker.1.0.0\build\vocaluxe.dependencies.pitchtracker.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.0\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.0\build\vocaluxe.dependencies.portaudiosharp.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets" Condition="Exists('..\packages\vocaluxe.dependencies.acinerella.1.0.1\build\vocaluxe.dependencies.acinerella.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets" Condition="Exists('..\packages\vocaluxe.dependencies.aforgevideo.1.0.1\build\vocaluxe.dependencies.aforgevideo.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.csharpsqlite.1.0.1\build\vocaluxe.dependencies.csharpsqlite.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.ffmpeg.1.0.1\build\vocaluxe.dependencies.ffmpeg.targets" Condition="Exists('..\packages\vocaluxe.dependencies.ffmpeg.1.0.1\build\vocaluxe.dependencies.ffmpeg.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamersharp.1.0.1\build\vocaluxe.dependencies.gstreamersharp.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.hidapi.1.0.1\build\vocaluxe.dependencies.hidapi.targets" Condition="Exists('..\packages\vocaluxe.dependencies.hidapi.1.0.1\build\vocaluxe.dependencies.hidapi.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets" Condition="Exists('..\packages\vocaluxe.dependencies.opentk.1.0.1\build\vocaluxe.dependencies.opentk.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.pitchtracker.1.0.1\build\vocaluxe.dependencies.pitchtracker.targets" Condition="Exists('..\packages\vocaluxe.dependencies.pitchtracker.1.0.1\build\vocaluxe.dependencies.pitchtracker.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets" Condition="Exists('..\packages\vocaluxe.dependencies.portaudiosharp.1.0.1\build\vocaluxe.dependencies.portaudiosharp.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets" Condition="Exists('..\packages\vocaluxe.dependencies.qrcoder.1.0.1\build\vocaluxe.dependencies.qrcoder.targets')" />
   <Import Project="..\packages\vocaluxe.themes.ambient.1.0.0\build\vocaluxe.themes.ambient.targets" Condition="Exists('..\packages\vocaluxe.themes.ambient.1.0.0\build\vocaluxe.themes.ambient.targets')" />
   <Import Project="..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets" Condition="Exists('..\packages\vocaluxe.dependencies.slimdx.1.0.1\build\vocaluxe.dependencies.slimdx.targets')" />
-  <Import Project="..\packages\vocaluxe.dependencies.1.0.3\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.3\build\vocaluxe.dependencies.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets" Condition="Exists('..\packages\vocaluxe.dependencies.sqlite.1.0.1\build\vocaluxe.dependencies.sqlite.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.1\build\vocaluxe.dependencies.gstreamer.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.1.0.4\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.4\build\vocaluxe.dependencies.targets')" />
 </Project>
\ No newline at end of file
diff --git a/Vocaluxe/packages.config b/Vocaluxe/packages.config
index 636b5f64..cd5a1138 100644
--- a/Vocaluxe/packages.config
+++ b/Vocaluxe/packages.config
@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Mono.Data.Sqlite.Portable" version="1.0.3.5" targetFramework="net40" />
-  <package id="System.Data.SQLite.Core" version="1.0.97.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies" version="1.0.3" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.acinerella" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.aforgevideo" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.csharpsqlite" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.ffmpeg" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.gstreamersharp" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.hidapi" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.opentk" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.pitchtracker" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.portaudiosharp" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.qrcoder" version="1.0.0" targetFramework="net40" />
+  <package id="vocaluxe.dependencies" version="1.0.4" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.acinerella" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.aforgevideo" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.csharpsqlite" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.ffmpeg" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.gstreamer" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.gstreamersharp" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.hidapi" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.opentk" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.pitchtracker" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.portaudiosharp" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.qrcoder" version="1.0.1" targetFramework="net40" />
   <package id="vocaluxe.dependencies.slimdx" version="1.0.1" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.sqlite" version="1.0.0" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.sqlite" version="1.0.1" targetFramework="net40" />
   <package id="vocaluxe.themes.ambient" version="1.0.0" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/WebserverInitalConfig/WebserverInitalConfig.csproj b/WebserverInitalConfig/WebserverInitalConfig.csproj
index 09908ebc..e19a2407 100644
--- a/WebserverInitalConfig/WebserverInitalConfig.csproj
+++ b/WebserverInitalConfig/WebserverInitalConfig.csproj
@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>2127e8d4</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -35,15 +36,7 @@
   <PropertyGroup>
     <ApplicationIcon>Vocaluxe.ico</ApplicationIcon>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Interop.NetFwTypeLib">
-      <HintPath>..\packages\vocaluxe.dependencies.netfwtypelib.1.0.0\lib\net40\Interop.NetFwTypeLib.dll</HintPath>
-      <EmbedInteropTypes>True</EmbedInteropTypes>
-    </Reference>
-    <Reference Include="Security.Cryptography, Version=1.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\vocaluxe.dependencies.securitycryptography.1.0.0\lib\net40\Security.Cryptography.dll</HintPath>
-    </Reference>
+  <ItemGroup>    
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Windows.Forms" />
@@ -73,7 +66,16 @@
   <PropertyGroup>
     <PostBuildEvent>
     </PostBuildEvent>
-  </PropertyGroup>
+  </PropertyGroup>  
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Rebuild for automatic package restore. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.netfwtypelib.1.0.1\build\vocaluxe.dependencies.netfwtypelib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.netfwtypelib.1.0.1\build\vocaluxe.dependencies.netfwtypelib.targets'))" />
+    <Error Condition="!Exists('..\packages\vocaluxe.dependencies.securitycryptography.1.0.1\build\vocaluxe.dependencies.securitycryptography.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.securitycryptography.1.0.1\build\vocaluxe.dependencies.securitycryptography.targets'))" />
+  </Target>
+  <Import Project="..\packages\vocaluxe.dependencies.netfwtypelib.1.0.1\build\vocaluxe.dependencies.netfwtypelib.targets" Condition="Exists('..\packages\vocaluxe.dependencies.netfwtypelib.1.0.1\build\vocaluxe.dependencies.netfwtypelib.targets')" />
+  <Import Project="..\packages\vocaluxe.dependencies.securitycryptography.1.0.1\build\vocaluxe.dependencies.securitycryptography.targets" Condition="Exists('..\packages\vocaluxe.dependencies.securitycryptography.1.0.1\build\vocaluxe.dependencies.securitycryptography.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">
diff --git a/WebserverInitalConfig/packages.config b/WebserverInitalConfig/packages.config
index d1fd36d0..57753fae 100644
--- a/WebserverInitalConfig/packages.config
+++ b/WebserverInitalConfig/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="vocaluxe.dependencies.netfwtypelib" version="1.0.0" targetFramework="net40" />
-  <package id="vocaluxe.dependencies.securitycryptography" version="1.0.0" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.netfwtypelib" version="1.0.1" targetFramework="net40" />
+  <package id="vocaluxe.dependencies.securitycryptography" version="1.0.1" targetFramework="net40" />
 </packages>
\ No newline at end of file