diff --git a/Marketplace/Marketplace.csproj b/Marketplace/Marketplace.csproj index ac8e255f..de9f9ad8 100644 --- a/Marketplace/Marketplace.csproj +++ b/Marketplace/Marketplace.csproj @@ -48,19 +48,20 @@ false - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.2\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.2.1\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -74,22 +75,27 @@ False ..\packages\UmbracoCms.Core.7.2.2\lib\controls.dll - + + False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll ..\dependencies\Our\Elmah.dll - - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + + False + ..\packages\Examine.0.1.60.2941\lib\Examine.dll - + + False ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll - + + False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -106,6 +112,7 @@ ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + True False @@ -139,14 +146,16 @@ ..\packages\UmbracoCms.Core.7.2.2\lib\Microsoft.ApplicationBlocks.Data.dll - - True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + True - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -175,22 +184,27 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + + True ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll @@ -205,8 +219,6 @@ True ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - - True ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll diff --git a/Marketplace/Web.config b/Marketplace/Web.config index 9aac87a0..54c641b9 100644 --- a/Marketplace/Web.config +++ b/Marketplace/Web.config @@ -13,7 +13,7 @@
- + @@ -110,10 +110,9 @@ - - + - + @@ -125,11 +124,9 @@ - - - + - + @@ -139,10 +136,9 @@ - - - + + @@ -209,14 +205,14 @@ - + - + @@ -224,16 +220,16 @@ - - + + - + - + - + @@ -260,6 +256,14 @@ + + + + + + + + @@ -268,8 +272,6 @@ - - @@ -277,7 +279,8 @@ - + + @@ -326,5 +329,5 @@ - + \ No newline at end of file diff --git a/Marketplace/packages.config b/Marketplace/packages.config index f1861182..5893c47c 100644 --- a/Marketplace/packages.config +++ b/Marketplace/packages.config @@ -1,7 +1,7 @@  - + @@ -16,7 +16,6 @@ - diff --git a/Notification/Notification.csproj b/Notification/Notification.csproj index 4cfb3b62..a45b8746 100644 --- a/Notification/Notification.csproj +++ b/Notification/Notification.csproj @@ -41,19 +41,21 @@ false - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - + False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -63,9 +65,9 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\cms.dll - + + False ..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll - True False @@ -83,7 +85,8 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -114,10 +117,12 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -148,6 +153,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -161,10 +167,11 @@ ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll diff --git a/Notification/packages.config b/Notification/packages.config index 17e6222a..4ada0154 100644 --- a/Notification/packages.config +++ b/Notification/packages.config @@ -1,7 +1,7 @@  - + @@ -16,7 +16,6 @@ - diff --git a/NotificationsWeb/NotificationsWeb.csproj b/NotificationsWeb/NotificationsWeb.csproj index 534aeae8..9f56f943 100644 --- a/NotificationsWeb/NotificationsWeb.csproj +++ b/NotificationsWeb/NotificationsWeb.csproj @@ -41,19 +41,20 @@ false - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -71,8 +72,7 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - False + ..\packages\Examine.0.1.60.2941\lib\Examine.dll @@ -83,7 +83,8 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -114,10 +115,12 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -145,6 +148,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -159,13 +163,15 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll diff --git a/NotificationsWeb/packages.config b/NotificationsWeb/packages.config index 17e6222a..4ada0154 100644 --- a/NotificationsWeb/packages.config +++ b/NotificationsWeb/packages.config @@ -1,7 +1,7 @@  - + @@ -16,7 +16,6 @@ - diff --git a/OurUmbraco.Site/OurUmbraco.Site.csproj b/OurUmbraco.Site/OurUmbraco.Site.csproj index 72b0ba4d..b6259cf5 100644 --- a/OurUmbraco.Site/OurUmbraco.Site.csproj +++ b/OurUmbraco.Site/OurUmbraco.Site.csproj @@ -1,4 +1,4 @@ - + @@ -55,9 +55,8 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -84,7 +83,6 @@ ..\packages\Examine.0.1.60.2941\lib\Examine.dll - True ..\dependencies\Our\FergusonMoriyama.ConfigFormRenderer.dll @@ -129,6 +127,10 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll + + False + ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + ..\packages\MarkdownSharp.1.13.0.0\lib\35\MarkdownSharp.dll @@ -203,6 +205,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -215,18 +218,20 @@ - - True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll @@ -4728,8 +4733,8 @@ - MD "$(ProjectDir)bin\legacy\" -XCOPY "$(ProjectDir)..\dependencies\legacy\*.dll" "$(ProjectDir)bin\legacy\" /S /Y + +
-
+ + @@ -32,14 +33,12 @@ - - - + - + @@ -111,8 +110,8 @@ - - + + @@ -169,6 +168,7 @@ + @@ -177,13 +177,15 @@ - + + + @@ -198,10 +200,10 @@ - + - + @@ -252,7 +254,7 @@ - + @@ -266,13 +268,16 @@ + + + - + @@ -296,15 +301,23 @@ + + + + + + + + + + + - - - @@ -327,6 +340,7 @@ + diff --git a/dependencies/legacy/HtmlAgilityPack.dll b/dependencies/legacy/HtmlAgilityPack.dll deleted file mode 100644 index 227af836..00000000 Binary files a/dependencies/legacy/HtmlAgilityPack.dll and /dev/null differ diff --git a/dependencies/legacy/Lucene.Net.dll b/dependencies/legacy/Lucene.Net.dll deleted file mode 100644 index 138ec608..00000000 Binary files a/dependencies/legacy/Lucene.Net.dll and /dev/null differ diff --git a/our.umbraco.org.sln b/our.umbraco.org.sln index db4a865d..8eae49b2 100644 --- a/our.umbraco.org.sln +++ b/our.umbraco.org.sln @@ -1,6 +1,8 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 2012 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OurUmbraco.Site", "OurUmbraco.Site\OurUmbraco.Site.csproj", "{911907FB-3B9D-4E5F-9A45-16700A451A54}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{84E122E2-FB7D-4732-A764-B6EFB1F524DE}" diff --git a/our.umbraco.org/our.umbraco.org.csproj b/our.umbraco.org/our.umbraco.org.csproj index 96bf0339..6c5fc4f7 100644 --- a/our.umbraco.org/our.umbraco.org.csproj +++ b/our.umbraco.org/our.umbraco.org.csproj @@ -52,19 +52,20 @@ False ..\dependencies\Our\AjaxControlToolkit.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -82,8 +83,7 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - False + ..\packages\Examine.0.1.60.2941\lib\Examine.dll @@ -94,7 +94,8 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -126,10 +127,12 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -158,6 +161,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -172,13 +176,15 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll diff --git a/our.umbraco.org/packages.config b/our.umbraco.org/packages.config index 17e6222a..4ada0154 100644 --- a/our.umbraco.org/packages.config +++ b/our.umbraco.org/packages.config @@ -1,7 +1,7 @@  - + @@ -16,7 +16,6 @@ - diff --git a/packages/repositories.config b/packages/repositories.config index 8658a024..2ee50677 100644 --- a/packages/repositories.config +++ b/packages/repositories.config @@ -1,4 +1,4 @@ - + diff --git a/uDocumentation/packages.config b/uDocumentation/packages.config index cc68fb5f..86faaa7e 100644 --- a/uDocumentation/packages.config +++ b/uDocumentation/packages.config @@ -1,7 +1,7 @@  - + @@ -18,12 +18,11 @@ - - + \ No newline at end of file diff --git a/uDocumentation/uDocumentation.csproj b/uDocumentation/uDocumentation.csproj index 066ae7ab..896f0727 100644 --- a/uDocumentation/uDocumentation.csproj +++ b/uDocumentation/uDocumentation.csproj @@ -46,19 +46,21 @@ false - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll + True False @@ -76,18 +78,19 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - False + ..\packages\Examine.0.1.60.2941\lib\Examine.dll False ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll - + + False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -125,10 +128,12 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -153,6 +158,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -169,13 +175,15 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll diff --git a/uEvents/packages.config b/uEvents/packages.config index b3950745..e30dbb1d 100644 --- a/uEvents/packages.config +++ b/uEvents/packages.config @@ -1,7 +1,7 @@  - + @@ -16,11 +16,10 @@ - - + - + diff --git a/uEvents/uEvents.csproj b/uEvents/uEvents.csproj index 06e7ec83..ed037154 100644 --- a/uEvents/uEvents.csproj +++ b/uEvents/uEvents.csproj @@ -44,19 +44,21 @@ False ..\dependencies\Our\AjaxControlToolkit.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - + False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -86,7 +88,8 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -117,10 +120,12 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -129,7 +134,7 @@ False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll ..\packages\RestSharp.104.1\lib\net4\RestSharp.dll @@ -153,6 +158,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -166,13 +172,15 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll diff --git a/uForum/packages.config b/uForum/packages.config index d0851cae..85ccffa8 100644 --- a/uForum/packages.config +++ b/uForum/packages.config @@ -1,7 +1,7 @@  - + @@ -16,7 +16,6 @@ - diff --git a/uForum/uForum.csproj b/uForum/uForum.csproj index ad171e3c..01f4644c 100644 --- a/uForum/uForum.csproj +++ b/uForum/uForum.csproj @@ -45,19 +45,20 @@ false - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -75,8 +76,7 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - False + ..\packages\Examine.0.1.60.2941\lib\Examine.dll @@ -87,7 +87,8 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -101,9 +102,9 @@ ..\dependencies\Akismet\Joel.Net.Akismet.dll - - False + ..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll + True False @@ -125,10 +126,12 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -149,9 +152,9 @@ - - ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.dll + True + ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.dll True @@ -159,6 +162,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -174,13 +178,15 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll diff --git a/uPowers/packages.config b/uPowers/packages.config index 17e6222a..4ada0154 100644 --- a/uPowers/packages.config +++ b/uPowers/packages.config @@ -1,7 +1,7 @@  - + @@ -16,7 +16,6 @@ - diff --git a/uPowers/uPowers.csproj b/uPowers/uPowers.csproj index f1b734bd..5bfdfef9 100644 --- a/uPowers/uPowers.csproj +++ b/uPowers/uPowers.csproj @@ -45,19 +45,20 @@ false - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -75,8 +76,7 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - False + ..\packages\Examine.0.1.60.2941\lib\Examine.dll @@ -87,7 +87,8 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -118,10 +119,12 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -149,6 +152,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -162,13 +166,15 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll diff --git a/uRelease/packages.config b/uRelease/packages.config index ad979a88..b4d2433a 100644 --- a/uRelease/packages.config +++ b/uRelease/packages.config @@ -1,7 +1,7 @@  - + @@ -16,8 +16,7 @@ - - + @@ -26,16 +25,14 @@ - - + - + - + - - + \ No newline at end of file diff --git a/uRelease/uRelease.csproj b/uRelease/uRelease.csproj index f049924d..c8f5985b 100644 --- a/uRelease/uRelease.csproj +++ b/uRelease/uRelease.csproj @@ -47,19 +47,20 @@ false - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.0.0\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -73,14 +74,24 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll + + ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + ..\packages\EasyHttp.1.6.29.0\lib\net40\EasyHttp.dll - - False - ..\packages\Examine.0.1.57.2941\lib\Examine.dll + + ..\packages\Examine.0.1.60.2941\lib\Examine.dll - + + ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + + + False + ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -95,13 +106,33 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll + + False + ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + False ..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.ApplicationBlocks.Data.dll + + ..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.Web.Helpers.dll + + + True + ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + + ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll + + + ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll + + + ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll False @@ -113,14 +144,54 @@ - + True - ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll + ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.dll + + + True + ..\packages\UmbracoCms.Core.7.2.1\lib\System.Data.SqlServerCe.Entity.dll + + + True + ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + + + True + ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + + + True + ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll + + + False + ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll + + + True + ..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll + + + True + ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll + @@ -163,7 +234,8 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\UrlRewritingNet.UrlRewriter.dll - + + False ..\packages\YouTrackSharp.2.0.11.0\lib\net40\YouTrackSharp.dll diff --git a/uRepo/packages.config b/uRepo/packages.config index 63e8de37..4ada0154 100644 --- a/uRepo/packages.config +++ b/uRepo/packages.config @@ -1,7 +1,7 @@  - + @@ -11,15 +11,15 @@ - - - - - - + + + + + + - + diff --git a/uRepo/uRepo.csproj b/uRepo/uRepo.csproj index 0f52baea..f54181ba 100644 --- a/uRepo/uRepo.csproj +++ b/uRepo/uRepo.csproj @@ -41,29 +41,49 @@ false + + ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll + + + ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll + False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll - + + False ..\packages\ClientDependency-Mvc.1.8.0.0\lib\net45\ClientDependency.Core.Mvc.dll - + + False ..\packages\UmbracoCms.Core.7.2.1\lib\cms.dll - True False ..\packages\UmbracoCms.Core.7.2.1\lib\controls.dll + + ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll + ..\packages\Examine.0.1.60.2941\lib\Examine.dll - + + ..\packages\HtmlAgilityPack.1.4.6\lib\Net45\HtmlAgilityPack.dll + + + False + ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll + + + ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll + + + False ..\packages\ImageProcessor.Web.3.3.1.0\lib\net45\ImageProcessor.Web.dll @@ -74,6 +94,10 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll + + False + ..\packages\Lucene.Net.2.9.4.1\lib\net40\Lucene.Net.dll + False ..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.ApplicationBlocks.Data.dll @@ -82,16 +106,26 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\Microsoft.Web.Helpers.dll - + + True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll + + ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll + + + ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll + + + ..\packages\MySql.Data.6.6.5\lib\net40\MySql.Data.dll + False - ..\packages\Newtonsoft.Json.6.0.6\lib\net40\Newtonsoft.Json.dll + ..\packages\Newtonsoft.Json.6.0.5\lib\net45\Newtonsoft.Json.dll - - False + ..\packages\UmbracoCms.Core.7.2.1\lib\SQLCE4Umbraco.dll + True @@ -109,9 +143,9 @@ True ..\packages\Microsoft.Net.Http.2.0.20710.0\lib\net40\System.Net.Http.dll - - ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll + True + ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll True @@ -123,7 +157,8 @@ - + + True ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll @@ -134,13 +169,24 @@ True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - + + False + ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll + + + True + ..\packages\Microsoft.AspNet.Razor.2.0.20710.0\lib\net40\System.Web.Razor.dll + + + True ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.dll - + + True ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Deployment.dll - + + True ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.WebPages.Razor.dll diff --git a/uVersion/packages.config b/uVersion/packages.config index 17e6222a..4ada0154 100644 --- a/uVersion/packages.config +++ b/uVersion/packages.config @@ -1,7 +1,7 @@  - + @@ -16,7 +16,6 @@ - diff --git a/uVersion/uVersion.csproj b/uVersion/uVersion.csproj index a55b89ad..eede3866 100644 --- a/uVersion/uVersion.csproj +++ b/uVersion/uVersion.csproj @@ -36,19 +36,21 @@ false - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - + False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -78,7 +80,8 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -109,10 +112,12 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -139,6 +144,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -148,13 +154,15 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll + True ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll diff --git a/uWiki/packages.config b/uWiki/packages.config index 17e6222a..4ada0154 100644 --- a/uWiki/packages.config +++ b/uWiki/packages.config @@ -1,7 +1,7 @@  - + @@ -16,7 +16,6 @@ - diff --git a/uWiki/uWiki.csproj b/uWiki/uWiki.csproj index cd52c880..22e16c2f 100644 --- a/uWiki/uWiki.csproj +++ b/uWiki/uWiki.csproj @@ -41,19 +41,20 @@ false - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.dll - + + False ..\packages\AutoMapper.3.0.0\lib\net40\AutoMapper.Net4.dll False ..\packages\UmbracoCms.Core.7.2.1\lib\businesslogic.dll - - False - ..\packages\ClientDependency.1.8.2.0\lib\net45\ClientDependency.Core.dll + + ..\packages\ClientDependency.1.8.3\lib\net45\ClientDependency.Core.dll False @@ -71,8 +72,7 @@ False ..\packages\xmlrpcnet.2.5.0\lib\net20\CookComputing.XmlRpcV2.dll - - False + ..\packages\Examine.0.1.60.2941\lib\Examine.dll @@ -83,7 +83,8 @@ False ..\packages\SharpZipLib.0.86.0\lib\20\ICSharpCode.SharpZipLib.dll - + + False ..\packages\ImageProcessor.1.9.5.0\lib\ImageProcessor.dll @@ -94,9 +95,9 @@ False ..\packages\UmbracoCms.Core.7.2.1\lib\interfaces.dll - + + False ..\packages\UmbracoCms.Core.7.2.1\lib\log4net.dll - True False @@ -115,10 +116,12 @@ True ..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - + + False ..\packages\Microsoft.AspNet.Mvc.FixedDisplayModes.1.0.1\lib\net40\Microsoft.Web.Mvc.FixedDisplayModes.dll - + + False ..\packages\MiniProfiler.2.1.0\lib\net40\MiniProfiler.dll @@ -146,6 +149,7 @@ + True ..\packages\Microsoft.AspNet.WebApi.Client.4.0.30506.0\lib\net40\System.Net.Http.Formatting.dll @@ -160,13 +164,15 @@ ..\packages\Microsoft.AspNet.WebPages.2.0.20710.0\lib\net40\System.Web.Helpers.dll + True ..\packages\Microsoft.AspNet.WebApi.Core.4.0.30506.0\lib\net40\System.Web.Http.dll - + ..\packages\Microsoft.AspNet.WebApi.WebHost.4.0.30506.0\lib\net40\System.Web.Http.WebHost.dll + True - True + False ..\packages\Microsoft.AspNet.Mvc.4.0.30506.0\lib\net40\System.Web.Mvc.dll