build: MonoDevelop csproj file updates

Removes more <Package> reference entries, syncs source file lists with
Makefiles, and updates a couple references.

39 files changed, 8 insertions, 67 deletions

diff --git a/Banshee.sln b/Banshee.sln
index 9d27d8bcb..5bdb2d526 100644
--- a/Banshee.sln
+++ b/Banshee.sln
@@ -226,7 +226,6 @@ Global
 		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Release|Any CPU.ActiveCfg = Debug|Any CPU

 		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Release|Any CPU.Build.0 = Debug|Any CPU

 		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Windows|Any CPU.ActiveCfg = Windows|Any CPU

-		{371ECE68-8D0F-4AFE-AC8F-147167AE3674}.Windows|Any CPU.Build.0 = Windows|Any CPU

 		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

 		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Debug|Any CPU.Build.0 = Debug|Any CPU

 		{379034DF-F34D-409B-8DE9-097BE78E37C8}.Release|Any CPU.ActiveCfg = Debug|Any CPU

diff --git a/extras/metrics/metrics.csproj b/extras/metrics/metrics.csproj
index 0f646a562..cb9872a50 100644
--- a/extras/metrics/metrics.csproj
+++ b/extras/metrics/metrics.csproj
@@ -51,10 +51,6 @@
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\src\Hyena\Mono.Data.Sqlite\Mono.Data.Sqlite.csproj">
-      <Project>{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}</Project>
-      <Name>Mono.Data.Sqlite</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/Backends/Banshee.Gio/Banshee.Gio.csproj b/src/Backends/Banshee.Gio/Banshee.Gio.csproj
index f23cb9495..0242daa15 100644
--- a/src/Backends/Banshee.Gio/Banshee.Gio.csproj
+++ b/src/Backends/Banshee.Gio/Banshee.Gio.csproj
@@ -79,7 +79,6 @@
     <Compile Include="Banshee.Hardware.Gio\Device.cs" />
     <Compile Include="Banshee.Hardware.Gio\DeviceMediaCapabilities.cs" />
     <Compile Include="Banshee.Hardware.Gio\DiscVolume.cs" />
-    <Compile Include="Banshee.Hardware.Gio\DiskDevice.cs" />
     <Compile Include="Banshee.Hardware.Gio\HardwareManager.cs" />
     <Compile Include="Banshee.Hardware.Gio\LowLevel\GioDriveMetadetaSource.cs" />
     <Compile Include="Banshee.Hardware.Gio\LowLevel\GioMetadataSource.cs" />
diff --git a/src/Backends/Banshee.Gnome/Banshee.Gnome.csproj b/src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
index a15a260c0..3e9090e0b 100644
--- a/src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
+++ b/src/Backends/Banshee.Gnome/Banshee.Gnome.csproj
@@ -75,7 +75,6 @@
     </Reference>
     <Reference Include="gconf-sharp">
       <SpecificVersion>False</SpecificVersion>
-      <Package>gconf-sharp-2.0</Package>
     </Reference>
     <Reference Include="Mono.Posix">
       <SpecificVersion>False</SpecificVersion>
@@ -84,12 +83,10 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="NDesk.DBus.GLib">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
-      <Package>ndesk-dbus-glib-1.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Backends/Banshee.Hal/Banshee.Hal.csproj b/src/Backends/Banshee.Hal/Banshee.Hal.csproj
index aaabb0394..40bfdb9d6 100644
--- a/src/Backends/Banshee.Hal/Banshee.Hal.csproj
+++ b/src/Backends/Banshee.Hal/Banshee.Hal.csproj
@@ -56,12 +56,10 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="NDesk.DBus.GLib">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
-      <Package>ndesk-dbus-glib-1.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Backends/Banshee.Unix/Banshee.Unix.csproj b/src/Backends/Banshee.Unix/Banshee.Unix.csproj
index e5e32202b..3fed088d4 100644
--- a/src/Backends/Banshee.Unix/Banshee.Unix.csproj
+++ b/src/Backends/Banshee.Unix/Banshee.Unix.csproj
@@ -47,7 +47,6 @@
     <Reference Include="taglib-sharp">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Clients/Beroe/Beroe.csproj b/src/Clients/Beroe/Beroe.csproj
index 7cbee4fcf..c2bafae37 100644
--- a/src/Clients/Beroe/Beroe.csproj
+++ b/src/Clients/Beroe/Beroe.csproj
@@ -44,7 +44,6 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Clients/Booter/Booter.csproj b/src/Clients/Booter/Booter.csproj
index 91390f865..405c5533e 100644
--- a/src/Clients/Booter/Booter.csproj
+++ b/src/Clients/Booter/Booter.csproj
@@ -41,7 +41,6 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="Mono.Posix">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Clients/Halie/Halie.csproj b/src/Clients/Halie/Halie.csproj
index e0fc4669f..46957985c 100644
--- a/src/Clients/Halie/Halie.csproj
+++ b/src/Clients/Halie/Halie.csproj
@@ -41,7 +41,6 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Clients/Muinshee/Muinshee.csproj b/src/Clients/Muinshee/Muinshee.csproj
index 4b67f5f95..ec4030894 100644
--- a/src/Clients/Muinshee/Muinshee.csproj
+++ b/src/Clients/Muinshee/Muinshee.csproj
@@ -63,12 +63,10 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="NDesk.DBus.GLib">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
-      <Package>ndesk-dbus-glib-1.0</Package>
     </Reference>
     <Reference Include="Mono.Posix">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj b/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
index d1b8b3cc2..4190d2ee8 100644
--- a/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
+++ b/src/Core/Banshee.CollectionIndexer/Banshee.CollectionIndexer.csproj
@@ -37,7 +37,6 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Core/Banshee.Core/Banshee.Core.csproj b/src/Core/Banshee.Core/Banshee.Core.csproj
index 6bb630952..cd96da823 100644
--- a/src/Core/Banshee.Core/Banshee.Core.csproj
+++ b/src/Core/Banshee.Core/Banshee.Core.csproj
@@ -74,17 +74,14 @@
     <Reference Include="Mono.Addins">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="taglib-sharp">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
     <ProjectReference Include="..\..\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
diff --git a/src/Core/Banshee.Services/Banshee.Services.csproj b/src/Core/Banshee.Services/Banshee.Services.csproj
index bb5230108..3facee827 100644
--- a/src/Core/Banshee.Services/Banshee.Services.csproj
+++ b/src/Core/Banshee.Services/Banshee.Services.csproj
@@ -46,17 +46,14 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="NDesk.DBus.GLib">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
-      <Package>ndesk-dbus-glib-1.0</Package>
     </Reference>
     <Reference Include="taglib-sharp">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <SpecificVersion>False</SpecificVersion>
@@ -69,7 +66,6 @@
     <Reference Include="Mono.Addins">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -323,6 +319,8 @@
     <Compile Include="Banshee.Database\Tests.cs" />
     <Compile Include="Banshee.Hardware\IUsbPortInfo.cs" />
     <Compile Include="Banshee.Hardware\UsbPortInfo.cs" />
+    <Compile Include="Banshee.MediaEngine\Tests.cs" />
+    <Compile Include="Banshee.Sources\Tests.cs" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Banshee.Services.addin.xml">
diff --git a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
index 353341ba6..60e8371d5 100644
--- a/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
+++ b/src/Core/Banshee.ThickClient/Banshee.ThickClient.csproj
@@ -91,32 +91,26 @@
     <Reference Include="Mono.Addins">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
     <Reference Include="Mono.Addins.Gui">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.Gui.dll</HintPath>
-      <Package>mono-addins-gui</Package>
     </Reference>
     <Reference Include="Mono.Addins.Setup">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.Setup.dll</HintPath>
-      <Package>mono-addins-setup</Package>
     </Reference>
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="NDesk.DBus.GLib">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
-      <Package>ndesk-dbus-glib-1.0</Package>
     </Reference>
     <Reference Include="taglib-sharp">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.csproj b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.csproj
index 4f433a36a..8a9b45a48 100644
--- a/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.csproj
+++ b/src/Dap/Banshee.Dap.AppleDevice/Banshee.Dap.AppleDevice.csproj
@@ -76,9 +76,9 @@
     </Reference>
     <Reference Include="taglib-sharp, Version=2.0.3.6, Culture=neutral, PublicKeyToken=db62eba44689b5b0">
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
     <Reference Include="libgpod-sharp, Version=1.0.3824.40135, Culture=neutral">
+      <Package>libgpod-sharp</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.csproj b/src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.csproj
index 457e4d90e..9da11e542 100644
--- a/src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.csproj
+++ b/src/Dap/Banshee.Dap.Ipod/Banshee.Dap.Ipod.csproj
@@ -86,7 +86,6 @@
     <Reference Include="taglib-sharp">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
     <Reference Include="ipod-sharp, Version=0.0.1.0, Culture=neutral, PublicKeyToken=536f152cecbf758a">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.csproj b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.csproj
index 687b654f4..f4b74cb37 100644
--- a/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.csproj
+++ b/src/Dap/Banshee.Dap.MassStorage/Banshee.Dap.MassStorage.csproj
@@ -109,7 +109,6 @@
     <Reference Include="Mono.Addins">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
     <Reference Include="System.Core">
     </Reference>
diff --git a/src/Dap/Banshee.Dap/Banshee.Dap.csproj b/src/Dap/Banshee.Dap/Banshee.Dap.csproj
index 0116a7c88..cdc0b2e0b 100644
--- a/src/Dap/Banshee.Dap/Banshee.Dap.csproj
+++ b/src/Dap/Banshee.Dap/Banshee.Dap.csproj
@@ -87,7 +87,6 @@
     <Reference Include="Mono.Addins">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.csproj b/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.csproj
index dc7dc7436..9ee29fbac 100644
--- a/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.csproj
+++ b/src/Extensions/Banshee.AmazonMp3/Banshee.AmazonMp3.csproj
@@ -49,7 +49,10 @@
     <Reference Include="atk-sharp">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
-    <Reference Include="taglib-sharp" />
+    <Reference Include="taglib-sharp">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Banshee.AmazonMp3.addin.xml">
diff --git a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd.csproj b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd.csproj
index 7fbb7ac18..2717cf3d8 100644
--- a/src/Extensions/Banshee.AudioCd/Banshee.AudioCd.csproj
+++ b/src/Extensions/Banshee.AudioCd/Banshee.AudioCd.csproj
@@ -58,11 +58,9 @@
     <Reference Include="taglib-sharp">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
     <Reference Include="Mono.Addins">
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
     <Reference Include="Mono.Posix">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Extensions/Banshee.Audiobook/Banshee.Audiobook.csproj b/src/Extensions/Banshee.Audiobook/Banshee.Audiobook.csproj
index 00d37082b..d8d395016 100644
--- a/src/Extensions/Banshee.Audiobook/Banshee.Audiobook.csproj
+++ b/src/Extensions/Banshee.Audiobook/Banshee.Audiobook.csproj
@@ -93,7 +93,6 @@
     <Reference Include="taglib-sharp, Version=2.0.3.7, Culture=neutral, PublicKeyToken=db62eba44689b5b0">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Banshee.BooScript/Banshee.BooScript.csproj b/src/Extensions/Banshee.BooScript/Banshee.BooScript.csproj
index c8e94b89a..577815aac 100644
--- a/src/Extensions/Banshee.BooScript/Banshee.BooScript.csproj
+++ b/src/Extensions/Banshee.BooScript/Banshee.BooScript.csproj
@@ -56,22 +56,18 @@
     <Reference Include="Boo.Lang">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Boo.Lang.dll</HintPath>
-      <Package>boo</Package>
     </Reference>
     <Reference Include="Boo.Lang.Compiler">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Boo.Lang.Compiler.dll</HintPath>
-      <Package>boo</Package>
     </Reference>
     <Reference Include="Boo.Lang.Interpreter">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Boo.Lang.Interpreter.dll</HintPath>
-      <Package>boo</Package>
     </Reference>
     <Reference Include="Boo.Lang.Parser">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Boo.Lang.Parser.dll</HintPath>
-      <Package>boo</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj b/src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj
index 7af1d8c71..641653b45 100644
--- a/src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj
+++ b/src/Extensions/Banshee.Bpm/Banshee.Bpm.csproj
@@ -79,7 +79,6 @@
     <Reference Include="Mono.Addins">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core">
diff --git a/src/Extensions/Banshee.Daap/Banshee.Daap.csproj b/src/Extensions/Banshee.Daap/Banshee.Daap.csproj
index 58b0f528b..d8edb3552 100644
--- a/src/Extensions/Banshee.Daap/Banshee.Daap.csproj
+++ b/src/Extensions/Banshee.Daap/Banshee.Daap.csproj
@@ -84,7 +84,6 @@
     <Reference Include="Mono.Zeroconf">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Zeroconf.dll</HintPath>
-      <Package>mono-zeroconf</Package>
     </Reference>
     <Reference Include="ICSharpCode.SharpZipLib">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup.csproj b/src/Extensions/Banshee.Fixup/Banshee.Fixup.csproj
index a22fe06b0..ca36fabf1 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup.csproj
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup.csproj
@@ -89,6 +89,7 @@
     <Compile Include="Banshee.Fixup\Solver.cs" />
     <Compile Include="Banshee.Fixup\Tests.cs" />
     <Compile Include="Banshee.Fixup\View.cs" />
+    <Compile Include="Banshee.Fixup\GenreDuplicateSolver.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ProjectExtensions>
diff --git a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
index 6ef7f5f68..c104d1627 100644
--- a/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
+++ b/src/Extensions/Banshee.Lastfm/Banshee.Lastfm.csproj
@@ -61,7 +61,6 @@
     <Reference Include="Mono.Addins">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj
index 058ed153f..6b1c8c076 100644
--- a/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj
+++ b/src/Extensions/Banshee.LibraryWatcher/Banshee.LibraryWatcher.csproj
@@ -57,7 +57,6 @@
     <Reference Include="Mono.Addins">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
     <Reference Include="gtk-sharp">
       <SpecificVersion>False</SpecificVersion>
@@ -65,7 +64,6 @@
     <Reference Include="taglib-sharp">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj
index a6b767cdf..9f3502c9b 100644
--- a/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj
+++ b/src/Extensions/Banshee.MeeGo/Banshee.MeeGo.csproj
@@ -55,11 +55,9 @@
     </Reference>
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="NDesk.DBus.GLib">
       <SpecificVersion>False</SpecificVersion>
-      <Package>ndesk-dbus-glib-1.0</Package>
     </Reference>
     <Reference Include="gtk-sharp">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.csproj b/src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.csproj
index 2d4eb9121..9f9a815df 100644
--- a/src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.csproj
+++ b/src/Extensions/Banshee.MiroGuide/Banshee.MiroGuide.csproj
@@ -74,7 +74,6 @@
     </Reference>
     <Reference Include="Mono.Cairo" />
     <Reference Include="Mono.Addins">
-      <Package>mono-addins</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj b/src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj
index 840d3831a..d3e3454b7 100644
--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj
+++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris.csproj
@@ -39,10 +39,8 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="NDesk.DBus, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="NDesk.DBus.GLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f6716e4f9b2ed099">
-      <Package>ndesk-dbus-glib-1.0</Package>
     </Reference>
     <Reference Include="System.Core" />
   </ItemGroup>
diff --git a/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj b/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
index d3eabe0bf..07c6bfa28 100644
--- a/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
+++ b/src/Extensions/Banshee.MultimediaKeys/Banshee.MultimediaKeys.csproj
@@ -44,7 +44,6 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="Mono.Posix">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
index 2d865d26d..0ad7874a3 100644
--- a/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
+++ b/src/Extensions/Banshee.NotificationArea/Banshee.NotificationArea.csproj
@@ -60,12 +60,10 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="NDesk.DBus.GLib">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
-      <Package>ndesk-dbus-glib-1.0</Package>
     </Reference>
     <ProjectReference Include="..\..\Hyena\Hyena.Gui\Hyena.Gui.csproj">
       <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
diff --git a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.csproj b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.csproj
index 21440d35f..f80c0dcc2 100644
--- a/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.csproj
+++ b/src/Extensions/Banshee.NowPlaying/Banshee.NowPlaying.csproj
@@ -58,7 +58,6 @@
     <Reference Include="Mono.Addins">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Mono.Addins.dll</HintPath>
-      <Package>mono-addins</Package>
     </Reference>
     <ProjectReference Include="..\..\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
diff --git a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
index 2251556f1..770dfa22e 100644
--- a/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
+++ b/src/Extensions/Banshee.PlayQueue/Banshee.PlayQueue.csproj
@@ -64,12 +64,10 @@
     <Reference Include="NDesk.DBus">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.dll</HintPath>
-      <Package>ndesk-dbus-1.0</Package>
     </Reference>
     <Reference Include="NDesk.DBus.GLib">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\NDesk.DBus.GLib.dll</HintPath>
-      <Package>ndesk-dbus-glib-1.0</Package>
     </Reference>
     <Reference Include="Mono.Posix">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.csproj b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.csproj
index 73e705bd9..39772d7ab 100644
--- a/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.csproj
+++ b/src/Extensions/Banshee.Podcasting/Banshee.Podcasting.csproj
@@ -70,7 +70,6 @@
     <Reference Include="taglib-sharp">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\taglib-sharp.dll</HintPath>
-      <Package>taglib-sharp</Package>
     </Reference>
     <Reference Include="Mono.Posix">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.csproj b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.csproj
index 3cc2f1c2a..5e0dc8527 100644
--- a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.csproj
+++ b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu.csproj
@@ -41,10 +41,8 @@
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
     </Reference>
     <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-      <Package>mono-addins</Package>
     </Reference>
     <Reference Include="indicate-sharp, Version=0.4.1.0, Culture=neutral, PublicKeyToken=2e8e49ba7d172cb0">
-      <Package>indicate-sharp-0.1</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.csproj b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.csproj
index 91832991b..7c5905aae 100644
--- a/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.csproj
+++ b/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore.csproj
@@ -41,10 +41,8 @@
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
     </Reference>
     <Reference Include="ubuntuone-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-      <Package>ubuntuone-sharp-1.0</Package>
     </Reference>
     <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
-      <Package>mono-addins</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Banshee.YouTube/Banshee.YouTube.csproj b/src/Extensions/Banshee.YouTube/Banshee.YouTube.csproj
index 1493de8c2..3cc60cda0 100644
--- a/src/Extensions/Banshee.YouTube/Banshee.YouTube.csproj
+++ b/src/Extensions/Banshee.YouTube/Banshee.YouTube.csproj
@@ -53,17 +53,14 @@
     <Reference Include="Google.GData.YouTube">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Google.GData.YouTube.dll</HintPath>
-      <Package>gdata-sharp-youtube</Package>
     </Reference>
     <Reference Include="Google.GData.Extensions">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Google.GData.Extensions.dll</HintPath>
-      <Package>gdata-sharp-core</Package>
     </Reference>
     <Reference Include="Google.GData.Client">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\bin\Google.GData.Client.dll</HintPath>
-      <Package>gdata-sharp-core</Package>
     </Reference>
     <Reference Include="Mono.Posix">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/Hyena b/src/Hyena
-Subproject b0a0a9c96f52f141f84e0e6bdd8100b26535b90
+Subproject e72559d086766e116c5bc53c23f317041c16ec8