From b302184de366bbb80fb83186dcddb0cce9e8a148 Mon Sep 17 00:00:00 2001
From: lukeIam <mail2skywalker@gmail.com>
Date: Sat, 12 Sep 2015 12:25:11 +0200
Subject: [PATCH] Disabled nuget.org package source.

Cleanup and
Revert "Removed unused ref "System.Transactions" "System.Transactions.Portable""
as "System.Transactions" is needed for the mono sqlite nuget package.

This reverts commit 48d11d026e8aee55b6127c02a96a27c4e26f653b.

# Conflicts:
#	Vocaluxe/Vocaluxe.csproj
---
 NuGet.Config             |  8 +++++++-
 Vocaluxe/Vocaluxe.csproj | 39 ++++++++++++++++++---------------------
 Vocaluxe/packages.config |  7 ++-----
 3 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/NuGet.Config b/NuGet.Config
index 68339bc4..ec2f39ad 100644
--- a/NuGet.Config
+++ b/NuGet.Config
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <packageSources>
-    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />    
+    <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
     <add key="Vocaluxe" value="https://www.myget.org/F/vocaluxe/api/v2" />
   </packageSources>
+  <activePackageSource>
+    <add key="Vocaluxe" value="https://www.myget.org/F/vocaluxe/api/v2" />    
+  </activePackageSource> 
+  <disabledPackageSources>
+	<add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+  </disabledPackageSources>
 </configuration>
\ No newline at end of file
diff --git a/Vocaluxe/Vocaluxe.csproj b/Vocaluxe/Vocaluxe.csproj
index 7b875ea4..9b3e35b5 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>e721eb4f</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>c1942c0f</NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'DebugWin|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -165,7 +165,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\vocaluxe.dependencies.gstreamersharp.1.0.0\lib\net40\gstreamer-sharp.dll</HintPath>
     </Reference>
-    <Reference Include="Mono.Data.Sqlite">
+    <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">
@@ -190,17 +191,19 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Data.Portable">
+    <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>
     </Reference>
-    <Reference Include="System.Data.SQLite, Version=1.0.98.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
+    <Reference Include="System.Data.SQLite, Version=1.0.97.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\System.Data.SQLite.Core.1.0.98.1\lib\net40\System.Data.SQLite.dll</HintPath>
+      <HintPath>..\packages\System.Data.SQLite.Core.1.0.97.0\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.Windows.Forms" />
     <Reference Include="System.XML" />
   </ItemGroup>
@@ -385,9 +388,7 @@
     <Content Include="Website\locales\tr.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Doc\Roadmap.txt" />
@@ -556,40 +557,36 @@ powershell -command "(Get-Content -Encoding UTF8 '$(ProjectDir)Properties\Assemb
       PostBuildMacros;
     </PostBuildEventDependsOn>
   </PropertyGroup>
-  <Import Project="..\packages\System.Data.SQLite.Core.1.0.98.1\build\net40\System.Data.SQLite.Core.targets" Condition="Exists('..\packages\System.Data.SQLite.Core.1.0.98.1\build\net40\System.Data.SQLite.Core.targets')" />
+  <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')" />
   <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>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\System.Data.SQLite.Core.1.0.98.1\build\net40\System.Data.SQLite.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.Data.SQLite.Core.1.0.98.1\build\net40\System.Data.SQLite.Core.targets'))" />
+    <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.jsonnet.1.0.0\build\vocaluxe.dependencies.jsonnet.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.jsonnet.1.0.0\build\vocaluxe.dependencies.jsonnet.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.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.gstreamer.1.0.0\build\vocaluxe.dependencies.gstreamer.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.gstreamer.1.0.0\build\vocaluxe.dependencies.gstreamer.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.1\build\vocaluxe.dependencies.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vocaluxe.dependencies.1.0.1\build\vocaluxe.dependencies.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'))" />
+  </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.jsonnet.1.0.0\build\vocaluxe.dependencies.jsonnet.targets" Condition="Exists('..\packages\vocaluxe.dependencies.jsonnet.1.0.0\build\vocaluxe.dependencies.jsonnet.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.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.gstreamer.1.0.0\build\vocaluxe.dependencies.gstreamer.targets" Condition="Exists('..\packages\vocaluxe.dependencies.gstreamer.1.0.0\build\vocaluxe.dependencies.gstreamer.targets')" />
-  <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.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.1\build\vocaluxe.dependencies.targets" Condition="Exists('..\packages\vocaluxe.dependencies.1.0.1\build\vocaluxe.dependencies.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')" />
 </Project>
\ No newline at end of file
diff --git a/Vocaluxe/packages.config b/Vocaluxe/packages.config
index 7e093036..636b5f64 100644
--- a/Vocaluxe/packages.config
+++ b/Vocaluxe/packages.config
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Mono.Data.Sqlite.Portable" version="1.0.3.5" targetFramework="net40" />
-  <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net40" />
-  <package id="System.Data.SQLite.Core" version="1.0.98.1" targetFramework="net40" />
-  <package id="vocaluxe.dependencies" version="1.0.1" 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.gstreamer" 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.jsonnet" 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" />