diff --git a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj index f55f56cee46..88dfbaf0703 100644 --- a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj +++ b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj @@ -123,8 +123,7 @@ False - ..\..\packages\WebFormsMvp.1.2.0.0\lib\WebFormsMvp.dll - False + ..\..\packages\WebFormsMVP.1.4.1.0\lib\WebFormsMvp.dll @@ -507,27 +506,12 @@ + - - - - - - - - - - - - - - - - - + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web/Library.build b/DNN Platform/DotNetNuke.Web/Library.build new file mode 100644 index 00000000000..49958e5b242 --- /dev/null +++ b/DNN Platform/DotNetNuke.Web/Library.build @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web/packages.config b/DNN Platform/DotNetNuke.Web/packages.config index 9576480c7f5..96c098b411b 100644 --- a/DNN Platform/DotNetNuke.Web/packages.config +++ b/DNN Platform/DotNetNuke.Web/packages.config @@ -6,5 +6,5 @@ - + \ No newline at end of file diff --git a/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj b/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj index 35fd1bff099..53d5107252c 100644 --- a/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj +++ b/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj @@ -70,8 +70,7 @@ - ..\..\..\packages\WebFormsMvp.1.2.0.0\lib\WebFormsMvp.dll - False + ..\..\..\packages\WebFormsMVP.1.4.1.0\lib\WebFormsMvp.dll @@ -105,6 +104,7 @@ Designer + diff --git a/DNN Platform/Modules/MemberDirectory/packages.config b/DNN Platform/Modules/MemberDirectory/packages.config new file mode 100644 index 00000000000..07ea1d26c6b --- /dev/null +++ b/DNN Platform/Modules/MemberDirectory/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/MobileManagement/DotNetNuke.Modules.MobileManagement.csproj b/DNN Platform/Modules/MobileManagement/DotNetNuke.Modules.MobileManagement.csproj index fe9e5e4b9c4..150234d9b1b 100644 --- a/DNN Platform/Modules/MobileManagement/DotNetNuke.Modules.MobileManagement.csproj +++ b/DNN Platform/Modules/MobileManagement/DotNetNuke.Modules.MobileManagement.csproj @@ -74,8 +74,7 @@ False - ..\..\..\packages\WebFormsMvp.1.2.0.0\lib\WebFormsMvp.dll - False + ..\..\..\packages\WebFormsMVP.1.4.1.0\lib\WebFormsMvp.dll diff --git a/DNN Platform/Modules/MobileManagement/packages.config b/DNN Platform/Modules/MobileManagement/packages.config index c7af4d48274..07ea1d26c6b 100644 --- a/DNN Platform/Modules/MobileManagement/packages.config +++ b/DNN Platform/Modules/MobileManagement/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/DNN Platform/Modules/PreviewProfileManagement/DotNetNuke.Modules.PreviewProfileManagement.csproj b/DNN Platform/Modules/PreviewProfileManagement/DotNetNuke.Modules.PreviewProfileManagement.csproj index 25e97cdeabb..f58d852eb5f 100644 --- a/DNN Platform/Modules/PreviewProfileManagement/DotNetNuke.Modules.PreviewProfileManagement.csproj +++ b/DNN Platform/Modules/PreviewProfileManagement/DotNetNuke.Modules.PreviewProfileManagement.csproj @@ -72,8 +72,7 @@ False - ..\..\..\packages\WebFormsMvp.1.2.0.0\lib\WebFormsMvp.dll - False + ..\..\..\packages\WebFormsMVP.1.4.1.0\lib\WebFormsMvp.dll diff --git a/DNN Platform/Modules/PreviewProfileManagement/packages.config b/DNN Platform/Modules/PreviewProfileManagement/packages.config index c7af4d48274..07ea1d26c6b 100644 --- a/DNN Platform/Modules/PreviewProfileManagement/packages.config +++ b/DNN Platform/Modules/PreviewProfileManagement/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/DNN Platform/Modules/Taxonomy/DotNetNuke.Modules.Taxonomy.csproj b/DNN Platform/Modules/Taxonomy/DotNetNuke.Modules.Taxonomy.csproj index b4f88b8d81f..3bfc5f49a26 100644 --- a/DNN Platform/Modules/Taxonomy/DotNetNuke.Modules.Taxonomy.csproj +++ b/DNN Platform/Modules/Taxonomy/DotNetNuke.Modules.Taxonomy.csproj @@ -101,8 +101,9 @@ ..\..\Components\Telerik\bin\Telerik.Web.UI.dll False - - ..\..\..\packages\WebFormsMvp.1.2.0.0\lib\WebFormsMvp.dll + + False + ..\..\..\packages\WebFormsMVP.1.4.1.0\lib\WebFormsMvp.dll diff --git a/DNN Platform/Modules/Taxonomy/packages.config b/DNN Platform/Modules/Taxonomy/packages.config index c7af4d48274..07ea1d26c6b 100644 --- a/DNN Platform/Modules/Taxonomy/packages.config +++ b/DNN Platform/Modules/Taxonomy/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj index 37bdf20eed8..00be9066656 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/DotNetNuke.Tests.Content.csproj @@ -60,7 +60,7 @@ ..\..\Components\Log4Net\bin\DotNetNuke.Log4Net.dll - ..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + ..\..\..\packages\Moq.4.1.1308.2321\lib\net40\Moq.dll ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config index 5c3ca54dd79..4e418ac68fd 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Content/packages.config @@ -1,4 +1,5 @@  + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj index b2019ed7b8b..97ca572e63b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/DotNetNuke.Tests.Core.csproj @@ -68,8 +68,9 @@ ..\..\Components\Lucene.Net.Contrib\bin\Lucene.Net.Contrib.FastVectorHighlighter.dll - - ..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + False + ..\..\..\packages\Moq.4.1.1308.2321\lib\net40\Moq.dll ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config index 0c185f3fb45..1635a987264 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Core/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj index 92b5101f723..576adb3fc11 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Data/DotNetNuke.Tests.Data.csproj @@ -63,8 +63,9 @@ ..\..\Components\DataAccessBlock\bin\Microsoft.ApplicationBlocks.Data.dll - - ..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + False + ..\..\..\packages\Moq.4.1.1308.2321\lib\net40\Moq.dll ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config index 0c185f3fb45..1635a987264 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Data/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.FiftyOneClientCapabilityProvider/DotNetNuke.Tests.FiftyOneClientCapabilityProvider.csproj b/DNN Platform/Tests/DotNetNuke.Tests.FiftyOneClientCapabilityProvider/DotNetNuke.Tests.FiftyOneClientCapabilityProvider.csproj index 0a27b126b7c..430e026ee3b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.FiftyOneClientCapabilityProvider/DotNetNuke.Tests.FiftyOneClientCapabilityProvider.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.FiftyOneClientCapabilityProvider/DotNetNuke.Tests.FiftyOneClientCapabilityProvider.csproj @@ -38,7 +38,7 @@ ..\..\Components\SharpZipLib\bin\ICSharpCode.SharpZipLib.dll - ..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + ..\..\..\packages\Moq.4.1.1308.2321\lib\net40\Moq.dll ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj index 7fe8b473cba..2a8b82f29b6 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/DotNetNuke.Tests.Integration.csproj @@ -68,8 +68,9 @@ ..\..\Components\Lucene.Net.Contrib\bin\Lucene.Net.Contrib.FastVectorHighlighter.dll - - ..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + False + ..\..\..\packages\Moq.4.1.1308.2321\lib\net40\Moq.dll ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config index 0c185f3fb45..1635a987264 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Integration/packages.config @@ -1,6 +1,6 @@  - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.MobileManagement/DotNetNuke.Tests.MobileManagement.csproj b/DNN Platform/Tests/DotNetNuke.Tests.MobileManagement/DotNetNuke.Tests.MobileManagement.csproj index ab345dc81a2..0865b13c81b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.MobileManagement/DotNetNuke.Tests.MobileManagement.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.MobileManagement/DotNetNuke.Tests.MobileManagement.csproj @@ -35,8 +35,9 @@ ..\..\Controls\DotNetNuke.WebUtility\bin\DotNetNuke.WebUtility.dll - - ..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + False + ..\..\..\packages\Moq.4.1.1308.2321\lib\net40\Moq.dll ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll @@ -59,8 +60,9 @@ ..\..\Components\Telerik\bin\Telerik.Web.UI.dll - - ..\..\..\packages\WebFormsMvp.1.2.0.0\lib\WebFormsMvp.dll + + False + ..\..\..\packages\WebFormsMVP.1.4.1.0\lib\WebFormsMvp.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.MobileManagement/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.MobileManagement/packages.config index 7dcc0dbf6f4..8fe8ceb9011 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.MobileManagement/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.MobileManagement/packages.config @@ -1,8 +1,8 @@  - + - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/DotNetNuke.Tests.PreviewProfileManagement.csproj b/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/DotNetNuke.Tests.PreviewProfileManagement.csproj index e8e1e26693c..d23b6f7014a 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/DotNetNuke.Tests.PreviewProfileManagement.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/DotNetNuke.Tests.PreviewProfileManagement.csproj @@ -32,8 +32,9 @@ 4 - - ..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + + False + ..\..\..\packages\Moq.4.1.1308.2321\lib\net40\Moq.dll ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll @@ -53,8 +54,9 @@ 4.0 - - ..\..\..\packages\WebFormsMvp.1.2.0.0\lib\WebFormsMvp.dll + + False + ..\..\..\packages\WebFormsMVP.1.4.1.0\lib\WebFormsMvp.dll diff --git a/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/packages.config index 7dcc0dbf6f4..8fe8ceb9011 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.PreviewProfileManagement/packages.config @@ -1,8 +1,8 @@  - + - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Taxonomy/DotNetNuke.Tests.Taxonomy.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Taxonomy/DotNetNuke.Tests.Taxonomy.csproj index 5e6c9f9a880..31a3b86d446 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Taxonomy/DotNetNuke.Tests.Taxonomy.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Taxonomy/DotNetNuke.Tests.Taxonomy.csproj @@ -60,7 +60,7 @@ ..\..\Components\Log4Net\bin\DotNetNuke.Log4Net.dll - ..\..\..\packages\Moq.4.0.10827\lib\NET40\Moq.dll + ..\..\..\packages\Moq.4.1.1308.2321\lib\net40\Moq.dll ..\..\..\packages\NUnit.2.6.2\lib\nunit.framework.dll @@ -81,7 +81,7 @@ ..\..\Components\Telerik\bin\Telerik.Web.UI.dll - ..\..\..\packages\WebFormsMvp.1.2.0.0\lib\WebFormsMvp.dll + ..\..\..\packages\WebFormsMVP.1.4.1.0\lib\WebFormsMvp.dll @@ -142,6 +142,9 @@ true + + +