[f-spot] Update all of the csproj files

From: Stephen Shaw <sshaw src gnome org>
To: commits-list gnome org
Cc:
Subject: [f-spot] Update all of the csproj files
Date: Tue, 14 May 2013 08:11:38 +0000 (UTC)
commit c1fd4a58cacde956961cc20cc5887a18dd7a4cc2
Author: Stephen Shaw <sshaw decriptor com>
Date:   Mon May 13 22:08:48 2013 -0600

    Update all of the csproj files

 F-Spot.sln                                         |  129 ++++++++++++++++---
 lib/Mono.Google/Mono.Google.csproj                 |    2 +-
 lib/Mono.Tabblo/Mono.Tabblo.csproj                 |    2 +-
 lib/SmugMugNet/SmugMugNet.csproj                   |    2 +-
 lib/unique-sharp/unique-sharp.csproj               |    1 -
 .../MainApp.UnitTest/MainApp.UnitTest.csproj       |    6 +-
 src/Clients/MainApp/MainApp.csproj                 |   29 ++---
 src/Core/FSpot.Bling/FSpot.Bling.csproj            |    5 +-
 src/Core/FSpot.Cms/FSpot.Cms.csproj                |    4 +-
 src/Core/FSpot.Core/FSpot.Core.csproj              |   11 +-
 src/Core/FSpot.Gui/FSpot.Gui.csproj                |   14 +--
 .../FSpot.JobScheduler/FSpot.JobScheduler.csproj   |    8 +-
 src/Core/FSpot.Platform/FSpot.Platform.csproj      |   14 +--
 src/Core/FSpot.Query/FSpot.Query.csproj            |   10 +-
 src/Core/FSpot.Utils/FSpot.Utils.csproj            |   16 +--
 .../FSpot.Editors.BW/FSpot.Editors.BW.csproj       |   18 +--
 .../FSpot.Editors.Blackout.csproj                  |    8 +-
 .../FSpot.Editors.Flip/FSpot.Editors.Flip.csproj   |    4 +-
 .../FSpot.Editors.Pixelate.csproj                  |    8 +-
 .../FSpot.Editors.Resize.csproj                    |    8 +-
 .../FSpot.Exporters.CD/FSpot.Exporters.CD.csproj   |    4 +-
 .../FSpot.Exporters.Facebook.csproj                |   34 ++---
 .../FSpot.Exporters.Flickr.csproj                  |   30 ++---
 .../FSpot.Exporters.Folder.csproj                  |   12 +-
 .../FSpot.Exporters.Gallery.csproj                 |   30 ++---
 .../FSpot.Exporters.PicasaWeb.csproj               |   29 ++---
 .../FSpot.Exporters.SmugMug.csproj                 |   19 +--
 .../FSpot.Exporters.Tabblo.csproj                  |   12 +-
 .../FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj |   26 ++---
 .../FSpotExporters.UnitTests.csproj                |    1 -
 .../FSpot.Tools.ChangePhotoPath.csproj             |   26 ++---
 .../FSpot.Tools.DevelopInUFRaw.csproj              |   12 +-
 .../FSpot.Tools.LiveWebGallery.csproj              |   19 +--
 .../FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj |   22 ++--
 .../FSpot.Tools.RawPlusJpeg.csproj                 |   18 ++--
 .../FSpot.Tools.RetroactiveRoll.csproj             |   20 ++--
 .../FSpot.Tools.ScreensaverConfig.csproj           |    5 +-
 .../FSpot.Transitions.Cover.csproj                 |    4 +-
 .../FSpot.Transitions.Dissolve.csproj              |    4 +-
 .../FSpot.Transitions.Push.csproj                  |    4 +-
 40 files changed, 306 insertions(+), 324 deletions(-)
---
diff --git a/F-Spot.sln b/F-Spot.sln
index 9c69c2a..d444f08 100644
--- a/F-Spot.sln
+++ b/F-Spot.sln
@@ -21,12 +21,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Gui", "src\Core\FSpot
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libraries", "Libraries", 
"{6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena", "lib\Hyena\Hyena\Hyena.csproj", 
"{95374549-9553-4C1E-9D89-667755F90E12}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Data.Sqlite", 
"lib\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj", "{95374549-9553-4C1E-9D89-667755F90E13}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Gui", "lib\Hyena\Hyena.Gui\Hyena.Gui.csproj", 
"{C856EFD8-E812-4E61-8B76-E3583D94C233}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Google", "lib\Mono.Google\Mono.Google.csproj", 
"{40C7D4EA-FB93-49FE-B18F-700A28C3E670}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SmugMugNet", "lib\SmugMugNet\SmugMugNet.csproj", 
"{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}"
@@ -101,12 +95,21 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.Tabblo", "s
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpotExporters.UnitTests", 
"src\Extensions\Exporters\FSpotExporters.UnitTests\FSpotExporters.UnitTests.csproj", 
"{F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Externals", "Externals", 
"{2F4164E3-FA81-4183-8119-79328936B7EA}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena", "external\Hyena\Hyena\Hyena.csproj", 
"{95374549-9553-4C1E-9D89-667755F90E12}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Data.Sqlite", 
"external\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj", "{95374549-9553-4C1E-9D89-667755F90E13}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hyena.Gui", 
"external\Hyena\Hyena.Gui\Hyena.Gui.csproj", "{C856EFD8-E812-4E61-8B76-E3583D94C233}"
+EndProject
 Global
        GlobalSection(SolutionConfigurationPlatforms) = preSolution
                Debug|Any CPU = Debug|Any CPU
                Submodule|Any CPU = Submodule|Any CPU
                Release|Any CPU = Release|Any CPU
                Default|Any CPU = Default|Any CPU
+               SubmoduleWindows|Any CPU = SubmoduleWindows|Any CPU
        EndGlobalSection
        GlobalSection(ProjectConfigurationPlatforms) = postSolution
                {05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -115,98 +118,132 @@ Global
                {05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.Release|Any CPU.Build.0 = Release|Any CPU
                {05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Release|Any CPU.Build.0 = Release|Any CPU
                {0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Release|Any CPU.Build.0 = Release|Any CPU
                {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.Release|Any CPU.Build.0 = Release|Any CPU
                {13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {1F610540-D2ED-4F58-87CE-9092A43DBD4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {1F610540-D2ED-4F58-87CE-9092A43DBD4A}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {1F610540-D2ED-4F58-87CE-9092A43DBD4A}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {1F610540-D2ED-4F58-87CE-9092A43DBD4A}.Release|Any CPU.Build.0 = Release|Any CPU
                {1F610540-D2ED-4F58-87CE-9092A43DBD4A}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {1F610540-D2ED-4F58-87CE-9092A43DBD4A}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {1F610540-D2ED-4F58-87CE-9092A43DBD4A}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {1F610540-D2ED-4F58-87CE-9092A43DBD4A}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Release|Any CPU.Build.0 = Release|Any CPU
                {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {203D1EDB-3885-4CD7-BBA1-190393E4876A}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {203D1EDB-3885-4CD7-BBA1-190393E4876A}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {27EC05FB-0223-4B26-8157-E49AF81D0007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {27EC05FB-0223-4B26-8157-E49AF81D0007}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {27EC05FB-0223-4B26-8157-E49AF81D0007}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {27EC05FB-0223-4B26-8157-E49AF81D0007}.Release|Any CPU.Build.0 = Release|Any CPU
                {27EC05FB-0223-4B26-8157-E49AF81D0007}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {27EC05FB-0223-4B26-8157-E49AF81D0007}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {27EC05FB-0223-4B26-8157-E49AF81D0007}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {27EC05FB-0223-4B26-8157-E49AF81D0007}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {2D3B12F7-ABF3-4784-92FE-78A1C775E157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {2D3B12F7-ABF3-4784-92FE-78A1C775E157}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {2D3B12F7-ABF3-4784-92FE-78A1C775E157}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {2D3B12F7-ABF3-4784-92FE-78A1C775E157}.Release|Any CPU.Build.0 = Release|Any CPU
                {2D3B12F7-ABF3-4784-92FE-78A1C775E157}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {2D3B12F7-ABF3-4784-92FE-78A1C775E157}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {2D3B12F7-ABF3-4784-92FE-78A1C775E157}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {2D3B12F7-ABF3-4784-92FE-78A1C775E157}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}.Release|Any CPU.Build.0 = Release|Any CPU
                {3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {40C7D4EA-FB93-49FE-B18F-700A28C3E670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {40C7D4EA-FB93-49FE-B18F-700A28C3E670}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {40C7D4EA-FB93-49FE-B18F-700A28C3E670}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {40C7D4EA-FB93-49FE-B18F-700A28C3E670}.Release|Any CPU.Build.0 = Release|Any CPU
                {40C7D4EA-FB93-49FE-B18F-700A28C3E670}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {40C7D4EA-FB93-49FE-B18F-700A28C3E670}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {40C7D4EA-FB93-49FE-B18F-700A28C3E670}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {40C7D4EA-FB93-49FE-B18F-700A28C3E670}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {414E9813-E0A8-4BD4-8694-485F528518F5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {414E9813-E0A8-4BD4-8694-485F528518F5}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {414E9813-E0A8-4BD4-8694-485F528518F5}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {414E9813-E0A8-4BD4-8694-485F528518F5}.Release|Any CPU.Build.0 = Release|Any CPU
                {414E9813-E0A8-4BD4-8694-485F528518F5}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {414E9813-E0A8-4BD4-8694-485F528518F5}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {414E9813-E0A8-4BD4-8694-485F528518F5}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {414E9813-E0A8-4BD4-8694-485F528518F5}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}.Release|Any CPU.Build.0 = Release|Any CPU
                {46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {4C9355A7-1797-4708-A1F2-FBCDB782D04D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {4C9355A7-1797-4708-A1F2-FBCDB782D04D}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {4C9355A7-1797-4708-A1F2-FBCDB782D04D}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {4C9355A7-1797-4708-A1F2-FBCDB782D04D}.Release|Any CPU.Build.0 = Release|Any CPU
                {4C9355A7-1797-4708-A1F2-FBCDB782D04D}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {4C9355A7-1797-4708-A1F2-FBCDB782D04D}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {4C9355A7-1797-4708-A1F2-FBCDB782D04D}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {4C9355A7-1797-4708-A1F2-FBCDB782D04D}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {4E372D8D-A822-40F2-8C64-25F2296DAC6F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {4E372D8D-A822-40F2-8C64-25F2296DAC6F}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {4E372D8D-A822-40F2-8C64-25F2296DAC6F}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {4E372D8D-A822-40F2-8C64-25F2296DAC6F}.Release|Any CPU.Build.0 = Release|Any CPU
                {4E372D8D-A822-40F2-8C64-25F2296DAC6F}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {4E372D8D-A822-40F2-8C64-25F2296DAC6F}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {4E372D8D-A822-40F2-8C64-25F2296DAC6F}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {4E372D8D-A822-40F2-8C64-25F2296DAC6F}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Release|Any CPU.Build.0 = Release|Any CPU
                {53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {53DAC12F-0421-4F5E-A746-17A701D2BDDA}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {53DAC12F-0421-4F5E-A746-17A701D2BDDA}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {55199016-6D69-4F52-AB82-06FC99408E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {55199016-6D69-4F52-AB82-06FC99408E78}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {55199016-6D69-4F52-AB82-06FC99408E78}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {55199016-6D69-4F52-AB82-06FC99408E78}.Release|Any CPU.Build.0 = Release|Any CPU
                {55199016-6D69-4F52-AB82-06FC99408E78}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {55199016-6D69-4F52-AB82-06FC99408E78}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {55199016-6D69-4F52-AB82-06FC99408E78}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {55199016-6D69-4F52-AB82-06FC99408E78}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Default|Any CPU.ActiveCfg = Debug|Any CPU
@@ -215,131 +252,181 @@ Global
                {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Release|Any CPU.Build.0 = Release|Any CPU
                {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {61DAD6B1-E866-485B-819E-A9E86B793F5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {61DAD6B1-E866-485B-819E-A9E86B793F5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {61DAD6B1-E866-485B-819E-A9E86B793F5E}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {61DAD6B1-E866-485B-819E-A9E86B793F5E}.Release|Any CPU.Build.0 = Release|Any CPU
                {61DAD6B1-E866-485B-819E-A9E86B793F5E}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {61DAD6B1-E866-485B-819E-A9E86B793F5E}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {61DAD6B1-E866-485B-819E-A9E86B793F5E}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {61DAD6B1-E866-485B-819E-A9E86B793F5E}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {7004A4E6-12A5-46F1-BB1F-578FA9B63493}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {7004A4E6-12A5-46F1-BB1F-578FA9B63493}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {7004A4E6-12A5-46F1-BB1F-578FA9B63493}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {7004A4E6-12A5-46F1-BB1F-578FA9B63493}.Release|Any CPU.Build.0 = Release|Any CPU
                {7004A4E6-12A5-46F1-BB1F-578FA9B63493}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {7004A4E6-12A5-46F1-BB1F-578FA9B63493}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {7004A4E6-12A5-46F1-BB1F-578FA9B63493}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {7004A4E6-12A5-46F1-BB1F-578FA9B63493}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {7011154B-87B0-4C54-98DD-B5FF1E60B75F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {7011154B-87B0-4C54-98DD-B5FF1E60B75F}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {7011154B-87B0-4C54-98DD-B5FF1E60B75F}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {7011154B-87B0-4C54-98DD-B5FF1E60B75F}.Release|Any CPU.Build.0 = Release|Any CPU
                {7011154B-87B0-4C54-98DD-B5FF1E60B75F}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {7011154B-87B0-4C54-98DD-B5FF1E60B75F}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {7011154B-87B0-4C54-98DD-B5FF1E60B75F}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {7011154B-87B0-4C54-98DD-B5FF1E60B75F}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}.Release|Any CPU.Build.0 = Release|Any CPU
                {7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {7281334F-0B1D-4383-9EA2-6740D56ADCDE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {7281334F-0B1D-4383-9EA2-6740D56ADCDE}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {7281334F-0B1D-4383-9EA2-6740D56ADCDE}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {7281334F-0B1D-4383-9EA2-6740D56ADCDE}.Release|Any CPU.Build.0 = Release|Any CPU
                {7281334F-0B1D-4383-9EA2-6740D56ADCDE}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {7281334F-0B1D-4383-9EA2-6740D56ADCDE}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {7281334F-0B1D-4383-9EA2-6740D56ADCDE}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {7281334F-0B1D-4383-9EA2-6740D56ADCDE}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {7FBEAF56-65E5-4C07-B346-C6A0BC87B368}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {7FBEAF56-65E5-4C07-B346-C6A0BC87B368}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {7FBEAF56-65E5-4C07-B346-C6A0BC87B368}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {7FBEAF56-65E5-4C07-B346-C6A0BC87B368}.Release|Any CPU.Build.0 = Release|Any CPU
                {7FBEAF56-65E5-4C07-B346-C6A0BC87B368}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {7FBEAF56-65E5-4C07-B346-C6A0BC87B368}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {7FBEAF56-65E5-4C07-B346-C6A0BC87B368}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {7FBEAF56-65E5-4C07-B346-C6A0BC87B368}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {8EB3933F-A089-43A3-B662-617DC71A2173}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {8EB3933F-A089-43A3-B662-617DC71A2173}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {8EB3933F-A089-43A3-B662-617DC71A2173}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {8EB3933F-A089-43A3-B662-617DC71A2173}.Release|Any CPU.Build.0 = Release|Any CPU
                {8EB3933F-A089-43A3-B662-617DC71A2173}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {8EB3933F-A089-43A3-B662-617DC71A2173}.Submodule|Any CPU.Build.0 = Debug|Any CPU
-               {95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
-               {95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.Build.0 = Submodule|Any CPU
+               {8EB3933F-A089-43A3-B662-617DC71A2173}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {8EB3933F-A089-43A3-B662-617DC71A2173}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E12}.Default|Any CPU.ActiveCfg = Debug|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E12}.Default|Any CPU.Build.0 = Debug|Any CPU
                {95374549-9553-4C1E-9D89-667755F90E12}.Release|Any CPU.ActiveCfg = Debug|Any CPU
                {95374549-9553-4C1E-9D89-667755F90E12}.Release|Any CPU.Build.0 = Debug|Any CPU
                {95374549-9553-4C1E-9D89-667755F90E12}.Submodule|Any CPU.ActiveCfg = Submodule|Any CPU
                {95374549-9553-4C1E-9D89-667755F90E12}.Submodule|Any CPU.Build.0 = Submodule|Any CPU
-               {95374549-9553-4C1E-9D89-667755F90E13}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
-               {95374549-9553-4C1E-9D89-667755F90E13}.Debug|Any CPU.Build.0 = Submodule|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E12}.SubmoduleWindows|Any CPU.ActiveCfg = 
SubmoduleWindows|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E12}.SubmoduleWindows|Any CPU.Build.0 = 
SubmoduleWindows|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E13}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E13}.Default|Any CPU.ActiveCfg = Debug|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E13}.Default|Any CPU.Build.0 = Debug|Any CPU
                {95374549-9553-4C1E-9D89-667755F90E13}.Release|Any CPU.ActiveCfg = Debug|Any CPU
                {95374549-9553-4C1E-9D89-667755F90E13}.Release|Any CPU.Build.0 = Debug|Any CPU
                {95374549-9553-4C1E-9D89-667755F90E13}.Submodule|Any CPU.ActiveCfg = Submodule|Any CPU
                {95374549-9553-4C1E-9D89-667755F90E13}.Submodule|Any CPU.Build.0 = Submodule|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E13}.SubmoduleWindows|Any CPU.ActiveCfg = 
SubmoduleWindows|Any CPU
+               {95374549-9553-4C1E-9D89-667755F90E13}.SubmoduleWindows|Any CPU.Build.0 = 
SubmoduleWindows|Any CPU
                {9D66BC1B-4390-4B8D-8468-19D5A862EC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {9D66BC1B-4390-4B8D-8468-19D5A862EC23}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {9D66BC1B-4390-4B8D-8468-19D5A862EC23}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {9D66BC1B-4390-4B8D-8468-19D5A862EC23}.Release|Any CPU.Build.0 = Release|Any CPU
                {9D66BC1B-4390-4B8D-8468-19D5A862EC23}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {9D66BC1B-4390-4B8D-8468-19D5A862EC23}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {9D66BC1B-4390-4B8D-8468-19D5A862EC23}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {9D66BC1B-4390-4B8D-8468-19D5A862EC23}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {A19E926A-19C5-428B-8518-8CCC7B255C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {A19E926A-19C5-428B-8518-8CCC7B255C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {A19E926A-19C5-428B-8518-8CCC7B255C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {A19E926A-19C5-428B-8518-8CCC7B255C42}.Release|Any CPU.Build.0 = Release|Any CPU
                {A19E926A-19C5-428B-8518-8CCC7B255C42}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {A19E926A-19C5-428B-8518-8CCC7B255C42}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {A19E926A-19C5-428B-8518-8CCC7B255C42}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {A19E926A-19C5-428B-8518-8CCC7B255C42}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.SubmoduleWindows|Any CPU.ActiveCfg = DebugTests|Any CPU
+               {A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}.SubmoduleWindows|Any CPU.Build.0 = DebugTests|Any CPU
                {B5CDF05C-278A-40AA-A587-B27A00BD9135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {B5CDF05C-278A-40AA-A587-B27A00BD9135}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {B5CDF05C-278A-40AA-A587-B27A00BD9135}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {B5CDF05C-278A-40AA-A587-B27A00BD9135}.Release|Any CPU.Build.0 = Release|Any CPU
                {B5CDF05C-278A-40AA-A587-B27A00BD9135}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {B5CDF05C-278A-40AA-A587-B27A00BD9135}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {B5CDF05C-278A-40AA-A587-B27A00BD9135}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {B5CDF05C-278A-40AA-A587-B27A00BD9135}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Release|Any CPU.Build.0 = Release|Any CPU
                {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {BE981FC8-9B41-4336-815C-ECC365AE05D4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {BE981FC8-9B41-4336-815C-ECC365AE05D4}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {BE981FC8-9B41-4336-815C-ECC365AE05D4}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {BE981FC8-9B41-4336-815C-ECC365AE05D4}.Release|Any CPU.Build.0 = Release|Any CPU
                {BE981FC8-9B41-4336-815C-ECC365AE05D4}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {BE981FC8-9B41-4336-815C-ECC365AE05D4}.Submodule|Any CPU.Build.0 = Debug|Any CPU
-               {C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
-               {C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.Build.0 = Submodule|Any CPU
+               {BE981FC8-9B41-4336-815C-ECC365AE05D4}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {BE981FC8-9B41-4336-815C-ECC365AE05D4}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
+               {C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+               {C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.Build.0 = Debug|Any CPU
+               {C856EFD8-E812-4E61-8B76-E3583D94C233}.Default|Any CPU.ActiveCfg = Debug|Any CPU
+               {C856EFD8-E812-4E61-8B76-E3583D94C233}.Default|Any CPU.Build.0 = Debug|Any CPU
                {C856EFD8-E812-4E61-8B76-E3583D94C233}.Release|Any CPU.ActiveCfg = Debug|Any CPU
                {C856EFD8-E812-4E61-8B76-E3583D94C233}.Release|Any CPU.Build.0 = Debug|Any CPU
                {C856EFD8-E812-4E61-8B76-E3583D94C233}.Submodule|Any CPU.ActiveCfg = Submodule|Any CPU
                {C856EFD8-E812-4E61-8B76-E3583D94C233}.Submodule|Any CPU.Build.0 = Submodule|Any CPU
+               {C856EFD8-E812-4E61-8B76-E3583D94C233}.SubmoduleWindows|Any CPU.ActiveCfg = 
SubmoduleWindows|Any CPU
+               {C856EFD8-E812-4E61-8B76-E3583D94C233}.SubmoduleWindows|Any CPU.Build.0 = 
SubmoduleWindows|Any CPU
                {CE160879-1BF0-4711-A18F-FDA2772900FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {CE160879-1BF0-4711-A18F-FDA2772900FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {CE160879-1BF0-4711-A18F-FDA2772900FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {CE160879-1BF0-4711-A18F-FDA2772900FA}.Release|Any CPU.Build.0 = Release|Any CPU
                {CE160879-1BF0-4711-A18F-FDA2772900FA}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {CE160879-1BF0-4711-A18F-FDA2772900FA}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {CE160879-1BF0-4711-A18F-FDA2772900FA}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {CE160879-1BF0-4711-A18F-FDA2772900FA}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}.Release|Any CPU.Build.0 = Release|Any CPU
                {D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {D6004A34-A123-415D-A79C-21FD3F96A1E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {D6004A34-A123-415D-A79C-21FD3F96A1E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {D6004A34-A123-415D-A79C-21FD3F96A1E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {D6004A34-A123-415D-A79C-21FD3F96A1E5}.Release|Any CPU.Build.0 = Release|Any CPU
                {D6004A34-A123-415D-A79C-21FD3F96A1E5}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {D6004A34-A123-415D-A79C-21FD3F96A1E5}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {D6004A34-A123-415D-A79C-21FD3F96A1E5}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {D6004A34-A123-415D-A79C-21FD3F96A1E5}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {E55F73E0-576A-4FE2-9108-E76960820AA3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {E55F73E0-576A-4FE2-9108-E76960820AA3}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {E55F73E0-576A-4FE2-9108-E76960820AA3}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {E55F73E0-576A-4FE2-9108-E76960820AA3}.Release|Any CPU.Build.0 = Release|Any CPU
                {E55F73E0-576A-4FE2-9108-E76960820AA3}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {E55F73E0-576A-4FE2-9108-E76960820AA3}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {E55F73E0-576A-4FE2-9108-E76960820AA3}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {E55F73E0-576A-4FE2-9108-E76960820AA3}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {ECF8996A-DE63-4225-927F-84641E0EB794}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {ECF8996A-DE63-4225-927F-84641E0EB794}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {ECF8996A-DE63-4225-927F-84641E0EB794}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {ECF8996A-DE63-4225-927F-84641E0EB794}.Release|Any CPU.Build.0 = Release|Any CPU
                {ECF8996A-DE63-4225-927F-84641E0EB794}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {ECF8996A-DE63-4225-927F-84641E0EB794}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {ECF8996A-DE63-4225-927F-84641E0EB794}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {ECF8996A-DE63-4225-927F-84641E0EB794}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Default|Any CPU.ActiveCfg = Debug|Any CPU
@@ -348,18 +435,24 @@ Global
                {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Release|Any CPU.Build.0 = Release|Any CPU
                {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Release|Any CPU.Build.0 = Release|Any CPU
                {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
                {FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                {FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.Debug|Any CPU.Build.0 = Debug|Any CPU
                {FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.Release|Any CPU.ActiveCfg = Release|Any CPU
                {FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.Release|Any CPU.Build.0 = Release|Any CPU
                {FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
                {FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+               {FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.SubmoduleWindows|Any CPU.ActiveCfg = Debug|Any CPU
+               {FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.SubmoduleWindows|Any CPU.Build.0 = Debug|Any CPU
        EndGlobalSection
        GlobalSection(NestedProjects) = preSolution
                {7281334F-0B1D-4383-9EA2-6740D56ADCDE} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
@@ -370,9 +463,6 @@ Global
                {D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
                {CE160879-1BF0-4711-A18F-FDA2772900FA} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
                {05A7FEC4-974A-40EB-AFB8-14E523EEEFFB} = {6DC9A109-EC89-4221-B8CD-9E88B589DBC1}
-               {95374549-9553-4C1E-9D89-667755F90E12} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
-               {95374549-9553-4C1E-9D89-667755F90E13} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
-               {C856EFD8-E812-4E61-8B76-E3583D94C233} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
                {40C7D4EA-FB93-49FE-B18F-700A28C3E670} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
                {FFC3D9B1-B19A-44D8-8AA2-96DDE911320E} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
                {B5CDF05C-278A-40AA-A587-B27A00BD9135} = {6369E0D4-0A68-4D4E-A6A0-EF2EA793002F}
@@ -408,6 +498,9 @@ Global
                {4C9355A7-1797-4708-A1F2-FBCDB782D04D} = {C9302C4A-B571-4F8E-8FFA-7B4C7DF8B3E3}
                {414E9813-E0A8-4BD4-8694-485F528518F5} = {C9302C4A-B571-4F8E-8FFA-7B4C7DF8B3E3}
                {F38C0ADF-29A3-453B-B272-61CC5BF3BB1E} = {C9302C4A-B571-4F8E-8FFA-7B4C7DF8B3E3}
+               {95374549-9553-4C1E-9D89-667755F90E12} = {2F4164E3-FA81-4183-8119-79328936B7EA}
+               {95374549-9553-4C1E-9D89-667755F90E13} = {2F4164E3-FA81-4183-8119-79328936B7EA}
+               {C856EFD8-E812-4E61-8B76-E3583D94C233} = {2F4164E3-FA81-4183-8119-79328936B7EA}
        EndGlobalSection
        GlobalSection(MonoDevelopProperties) = preSolution
                StartupItem = src\Clients\MainApp\MainApp.csproj
@@ -421,12 +514,6 @@ Global
                $2.inheritsScope = text/plain
                $2.scope = text/x-csharp
                $0.CSharpFormattingPolicy = $3
-               $3.IfElseBraceForcement = RemoveBraces
-               $3.ForBraceForcement = AddBraces
-               $3.ForEachBraceForcement = AddBraces
-               $3.WhileBraceForcement = AddBraces
-               $3.UsingBraceForcement = AddBraces
-               $3.FixedBraceForcement = AddBraces
                $3.inheritsSet = Mono
                $3.inheritsScope = text/x-csharp
                $3.scope = text/x-csharp
diff --git a/lib/Mono.Google/Mono.Google.csproj b/lib/Mono.Google/Mono.Google.csproj
index dc2ba88..eda7038 100644
--- a/lib/Mono.Google/Mono.Google.csproj
+++ b/lib/Mono.Google/Mono.Google.csproj
@@ -75,7 +75,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Hyena\Hyena\Hyena.csproj">
+    <ProjectReference Include="..\..\external\Hyena\Hyena\Hyena.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
       <Private>False</Private>
diff --git a/lib/Mono.Tabblo/Mono.Tabblo.csproj b/lib/Mono.Tabblo/Mono.Tabblo.csproj
index a898df7..a509512 100644
--- a/lib/Mono.Tabblo/Mono.Tabblo.csproj
+++ b/lib/Mono.Tabblo/Mono.Tabblo.csproj
@@ -64,7 +64,7 @@
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Hyena\Hyena\Hyena.csproj">
+    <ProjectReference Include="..\..\external\Hyena\Hyena\Hyena.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
       <Private>False</Private>
diff --git a/lib/SmugMugNet/SmugMugNet.csproj b/lib/SmugMugNet/SmugMugNet.csproj
index 2c74fd1..de68044 100644
--- a/lib/SmugMugNet/SmugMugNet.csproj
+++ b/lib/SmugMugNet/SmugMugNet.csproj
@@ -63,7 +63,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Hyena\Hyena\Hyena.csproj">
+    <ProjectReference Include="..\..\external\Hyena\Hyena\Hyena.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
       <Private>False</Private>
diff --git a/lib/unique-sharp/unique-sharp.csproj b/lib/unique-sharp/unique-sharp.csproj
index 86b0239..60dbccd 100644
--- a/lib/unique-sharp/unique-sharp.csproj
+++ b/lib/unique-sharp/unique-sharp.csproj
@@ -33,7 +33,6 @@
     <Reference Include="System" />
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>glib-sharp-2.0</Package>
     </Reference>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/src/Clients/MainApp.UnitTest/MainApp.UnitTest.csproj 
b/src/Clients/MainApp.UnitTest/MainApp.UnitTest.csproj
index ffa2deb..4e036f5 100644
--- a/src/Clients/MainApp.UnitTest/MainApp.UnitTest.csproj
+++ b/src/Clients/MainApp.UnitTest/MainApp.UnitTest.csproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" 
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Configuration Condition=" '$(Configuration)' == '' ">DebugTests</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
@@ -39,11 +39,9 @@
     <Reference Include="System" />
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>glib-sharp-2.0</Package>
     </Reference>
     <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0">
       <Private>False</Private>
-      <Package>taglib-sharp</Package>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
   </ItemGroup>
@@ -61,7 +59,7 @@
       <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
       <Name>MainApp</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena\Hyena.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
     </ProjectReference>
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index 1d5b43c..bf98813 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -331,15 +331,12 @@
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
     </Reference>
-    <Reference Include="gtk-sharp-beans, Version=2.14.0.0, Culture=neutral, PublicKeyToken=97a95fb57b03c03a">
-      <Package>gtk-sharp-beans-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp-beans, Version=2.14.0.0, Culture=neutral, PublicKeyToken=97a95fb57b03c03a" 
/>
     <Reference Include="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -347,14 +344,6 @@
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
-      <Name>Hyena.Data.Sqlite</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Core\FSpot.JobScheduler\FSpot.JobScheduler.csproj">
       <Project>{46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}</Project>
       <Name>FSpot.JobScheduler</Name>
@@ -363,10 +352,6 @@
       <Project>{2D3B12F7-ABF3-4784-92FE-78A1C775E157}</Project>
       <Name>FSpot.Platform</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
-      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
-      <Name>Hyena.Gui</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\Core\FSpot.Query\FSpot.Query.csproj">
       <Project>{D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}</Project>
       <Name>FSpot.Query</Name>
@@ -391,6 +376,18 @@
       <Project>{5DBBB8C5-7BAF-46DA-B7D2-2486430141E2}</Project>
       <Name>unique-sharp</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
+      <Name>Hyena.Data.Sqlite</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+      <Name>Hyena.Gui</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="FSpot\" />
diff --git a/src/Core/FSpot.Bling/FSpot.Bling.csproj b/src/Core/FSpot.Bling/FSpot.Bling.csproj
index 9ac318e..e188249 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling.csproj
+++ b/src/Core/FSpot.Bling/FSpot.Bling.csproj
@@ -56,14 +56,11 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>glib-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System" />
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Cms/FSpot.Cms.csproj b/src/Core/FSpot.Cms/FSpot.Cms.csproj
index e98c724..d3bfb28 100644
--- a/src/Core/FSpot.Cms/FSpot.Cms.csproj
+++ b/src/Core/FSpot.Cms/FSpot.Cms.csproj
@@ -65,9 +65,7 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
   <ItemGroup>
     <None Include="FSpot.Cms.dll.config">
diff --git a/src/Core/FSpot.Core/FSpot.Core.csproj b/src/Core/FSpot.Core/FSpot.Core.csproj
index 2d8a00f..9ce3fe3 100644
--- a/src/Core/FSpot.Core/FSpot.Core.csproj
+++ b/src/Core/FSpot.Core/FSpot.Core.csproj
@@ -61,11 +61,6 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\FSpot.Utils\FSpot.Utils.csproj">
       <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
       <Name>FSpot.Utils</Name>
@@ -76,6 +71,11 @@
       <Name>FSpot.Cms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -85,7 +85,6 @@
     <Reference Include="System" />
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
     </Reference>
     <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0">
       <Private>False</Private>
diff --git a/src/Core/FSpot.Gui/FSpot.Gui.csproj b/src/Core/FSpot.Gui/FSpot.Gui.csproj
index d4a5323..68f665a 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui.csproj
+++ b/src/Core/FSpot.Gui/FSpot.Gui.csproj
@@ -88,11 +88,9 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -106,11 +104,6 @@
       <Name>FSpot.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\FSpot.Bling\FSpot.Bling.csproj">
       <Project>{7281334F-0B1D-4383-9EA2-6740D56ADCDE}</Project>
       <Name>FSpot.Bling</Name>
@@ -121,7 +114,12 @@
       <Name>FSpot.Cms</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
       <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
       <Name>Hyena.Gui</Name>
       <Private>False</Private>
diff --git a/src/Core/FSpot.JobScheduler/FSpot.JobScheduler.csproj 
b/src/Core/FSpot.JobScheduler/FSpot.JobScheduler.csproj
index 1c43c7c..2adb0a0 100644
--- a/src/Core/FSpot.JobScheduler/FSpot.JobScheduler.csproj
+++ b/src/Core/FSpot.JobScheduler/FSpot.JobScheduler.csproj
@@ -55,13 +55,13 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+    <Reference Include="System" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena\Hyena.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Platform/FSpot.Platform.csproj b/src/Core/FSpot.Platform/FSpot.Platform.csproj
index c00acec..f5d0927 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform.csproj
+++ b/src/Core/FSpot.Platform/FSpot.Platform.csproj
@@ -52,19 +52,13 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="gconf-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gconf-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gconf-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System" />
-    <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
-      <Package>dbus-sharp-1.0</Package>
-    </Reference>
-    <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5">
-      <Package>dbus-sharp-glib-1.0</Package>
-    </Reference>
+    <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5" />
+    <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5" 
/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena\Hyena.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
       <Private>False</Private>
diff --git a/src/Core/FSpot.Query/FSpot.Query.csproj b/src/Core/FSpot.Query/FSpot.Query.csproj
index 5e215be..acd229a 100644
--- a/src/Core/FSpot.Query/FSpot.Query.csproj
+++ b/src/Core/FSpot.Query/FSpot.Query.csproj
@@ -59,16 +59,16 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/src/Core/FSpot.Utils/FSpot.Utils.csproj b/src/Core/FSpot.Utils/FSpot.Utils.csproj
index b30682a..b113a8f 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils.csproj
+++ b/src/Core/FSpot.Utils/FSpot.Utils.csproj
@@ -73,13 +73,6 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
     <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Cairo" />
     <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
@@ -95,11 +88,9 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -107,4 +98,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Editors.BW.csproj 
b/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Editors.BW.csproj
index a720201..0563d5e 100644
--- a/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Editors.BW.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Editors.BW.csproj
@@ -66,24 +66,20 @@
       <Name>MainApp</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
       <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
       <Name>FSpot.Cms</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Posix" />
     <Reference Include="Mono.Simd" />
   </ItemGroup>
diff --git a/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Editors.Blackout.csproj 
b/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Editors.Blackout.csproj
index 59c0835..3a4ebcc 100644
--- a/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Editors.Blackout.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Editors.Blackout.csproj
@@ -66,13 +66,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="FSpot.Addins.Editors\" />
diff --git a/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Editors.Flip.csproj 
b/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Editors.Flip.csproj
index 6e67f28..2384ef7 100644
--- a/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Editors.Flip.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Editors.Flip.csproj
@@ -67,9 +67,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Mono.Posix" />
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="FSpot.Addins.Editors\" />
diff --git a/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Editors.Pixelate.csproj 
b/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Editors.Pixelate.csproj
index 1ad5e12..278dc88 100644
--- a/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Editors.Pixelate.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Editors.Pixelate.csproj
@@ -66,12 +66,8 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Posix" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Editors.Resize.csproj 
b/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Editors.Resize.csproj
index 4da69d8..e5c2e2e 100644
--- a/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Editors.Resize.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Editors.Resize.csproj
@@ -55,12 +55,8 @@
   </ProjectExtensions>
   <ItemGroup>
     <Reference Include="Mono.Posix" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj 
b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
index f0f3daf..c576681 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
@@ -67,11 +67,9 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -85,7 +83,7 @@
       <Name>FSpot.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
       <Private>False</Private>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj 
b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
index 23cf3bb..494989d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
@@ -86,33 +86,20 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66">
-      <Package>gnome-keyring-sharp-1.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
     <Reference Include="System.Xml" />
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System.Core" />
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
@@ -123,11 +110,6 @@
       <Name>MainApp</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
-      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
-      <Name>Hyena.Gui</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Platform\FSpot.Platform.csproj">
       <Project>{2D3B12F7-ABF3-4784-92FE-78A1C775E157}</Project>
       <Name>FSpot.Platform</Name>
@@ -143,5 +125,15 @@
       <Name>FSpot.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+      <Name>Hyena.Gui</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj 
b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
index 163b390..304c4de 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
@@ -59,21 +59,15 @@
   </ProjectExtensions>
   <ItemGroup>
     <Reference Include="Mono.Posix" />
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>glib-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="FlickrNet, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2491df59efa5d132">
       <Private>False</Private>
       <SpecificVersion>False</SpecificVersion>
-      <Package>flickrnet</Package>
     </Reference>
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -82,16 +76,6 @@
       <Name>MainApp</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
-      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
-      <Name>Hyena.Gui</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
       <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
       <Name>FSpot.Utils</Name>
@@ -102,6 +86,16 @@
       <Name>FSpot.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+      <Name>Hyena.Gui</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj 
b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
index c2c5284..7058164 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
@@ -69,11 +69,6 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
@@ -94,6 +89,11 @@
       <Name>FSpot.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="ICSharpCode.SharpZipLib" />
@@ -105,11 +105,9 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj 
b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
index 291a9b6..e64027d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
@@ -76,28 +76,17 @@
     <Reference Include="Mono.Posix" />
     <Reference Include="System" />
     <Reference Include="System.Xml" />
-    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>glib-sharp-2.0</Package>
-    </Reference>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
@@ -113,16 +102,21 @@
       <Name>MainApp</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
-      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
-      <Name>Hyena.Gui</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
       <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
       <Name>FSpot.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+      <Name>Hyena.Gui</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj 
b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
index d757e1e..908d372 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
@@ -73,29 +73,14 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66">
-      <Package>gnome-keyring-sharp-1.0</Package>
-    </Reference>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
-      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
-      <Name>Hyena.Gui</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
@@ -111,5 +96,15 @@
       <Name>Mono.Google</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+      <Name>Hyena.Gui</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
 </Project>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj 
b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
index 27b4fbe..8fee8e9 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
@@ -77,30 +77,25 @@
       <Name>MainApp</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66">
-      <Package>gnome-keyring-sharp-1.0</Package>
-    </Reference>
+    <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
     <Reference Include="System" />
     <Reference Include="Mono.Posix" />
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj 
b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
index 9c7b8d7..ec01343 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
@@ -74,19 +74,12 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\..\lib\Mono.Tabblo\Mono.Tabblo.csproj">
       <Project>{B5CDF05C-278A-40AA-A587-B27A00BD9135}</Project>
       <Name>Mono.Tabblo</Name>
@@ -107,6 +100,11 @@
       <Name>FSpot.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj 
b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
index a4b9c48..56aeaa9 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
@@ -57,16 +57,6 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
-      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
-      <Name>Hyena.Gui</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
       <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
       <Name>MainApp</Name>
@@ -77,22 +67,28 @@
       <Name>FSpot.Core</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+      <Name>Hyena.Gui</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Posix" />
     <Reference Include="ICSharpCode.SharpZipLib" />
     <Reference Include="System" />
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Exporters/FSpotExporters.UnitTests/FSpotExporters.UnitTests.csproj 
b/src/Extensions/Exporters/FSpotExporters.UnitTests/FSpotExporters.UnitTests.csproj
index ef3f235..cb43fbb 100644
--- a/src/Extensions/Exporters/FSpotExporters.UnitTests/FSpotExporters.UnitTests.csproj
+++ b/src/Extensions/Exporters/FSpotExporters.UnitTests/FSpotExporters.UnitTests.csproj
@@ -39,7 +39,6 @@
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj 
b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
index c9deb68..0293edf 100644
--- a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
@@ -59,31 +59,17 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="System" />
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
-      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
-      <Name>Hyena.Gui</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
       <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
       <Name>MainApp</Name>
@@ -99,6 +85,16 @@
       <Name>FSpot.Utils</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+      <Name>Hyena.Gui</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="FSpot.Tools.ChangePhotoPath\" />
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFRaw.csproj 
b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFRaw.csproj
index ff23240..03b0e1f 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFRaw.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFRaw.csproj
@@ -60,11 +60,6 @@
     <Folder Include="FSpot.Tools.DevelopInUFraw\" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
@@ -80,18 +75,21 @@
       <Name>FSpot.Utils</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Mono.Posix" />
     <Reference Include="System" />
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
     </Reference>
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj 
b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
index 9d2f93e..097488e 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
@@ -78,18 +78,13 @@
     <Folder Include="Resources\" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Posix" />
     <Reference Include="System" />
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -103,15 +98,15 @@
       <Name>FSpot.Core</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
       <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
       <Name>FSpot.Utils</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj 
b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
index ae1e1a2..f9b672e 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
@@ -62,16 +62,6 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
-      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
-      <Name>Hyena.Gui</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
@@ -92,6 +82,16 @@
       <Name>FSpot.Utils</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+      <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+      <Name>Hyena.Gui</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Mono.Posix" />
@@ -99,11 +99,9 @@
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
     <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
       <Private>False</Private>
-      <Package>gio-sharp-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj 
b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj
index 168baae..e198f07 100644
--- a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj
@@ -54,9 +54,7 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
@@ -69,21 +67,21 @@
       <Name>MainApp</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+    <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+      <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+      <Name>FSpot.Utils</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
       <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
       <Name>Hyena</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena.Gui\Hyena.Gui.csproj">
       <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
       <Name>Hyena.Gui</Name>
       <Private>False</Private>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
-      <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
-      <Name>FSpot.Utils</Name>
-      <Private>False</Private>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Resources\" />
diff --git a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj 
b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj
index c9f49f6..11b0495 100644
--- a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj
@@ -54,16 +54,6 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
-      <Name>Hyena</Name>
-      <Private>False</Private>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
-      <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
-      <Name>Hyena.Data.Sqlite</Name>
-      <Private>False</Private>
-    </ProjectReference>
     <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
       <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
       <Name>FSpot.Core</Name>
@@ -74,6 +64,16 @@
       <Name>MainApp</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena\Hyena.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+      <Name>Hyena</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\..\external\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
+      <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
+      <Name>Hyena.Data.Sqlite</Name>
+      <Private>False</Private>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="FSpot.Tools.RetroactiveRoll\" />
diff --git a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj 
b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
index 32cdc08..2cfa282 100644
--- a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
@@ -57,13 +57,10 @@
     </MonoDevelop>
   </ProjectExtensions>
   <ItemGroup>
-    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="gtk-sharp-beans">
       <HintPath>..\..\..\..\external\gtk-sharp-beans.dll</HintPath>
       <Private>False</Private>
-      <Package>gtk-sharp-beans-2.0</Package>
     </Reference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Transitions.Cover.csproj 
b/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Transitions.Cover.csproj
index 18593dc..5b9b449 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Transitions.Cover.csproj
+++ b/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Transitions.Cover.csproj
@@ -59,9 +59,7 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Mono.Cairo" />
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Posix" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Transitions.Dissolve.csproj 
b/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Transitions.Dissolve.csproj
index c8c9da6..b167d1c 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Transitions.Dissolve.csproj
+++ b/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Transitions.Dissolve.csproj
@@ -52,9 +52,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Cairo" />
     <Reference Include="Mono.Posix" />
   </ItemGroup>
diff --git a/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Transitions.Push.csproj 
b/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Transitions.Push.csproj
index b04a662..b1369cd 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Transitions.Push.csproj
+++ b/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Transitions.Push.csproj
@@ -43,9 +43,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
-      <Package>gtk-sharp-2.0</Package>
-    </Reference>
+    <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <Reference Include="Mono.Cairo" />
     <Reference Include="Mono.Posix" />
   </ItemGroup>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]