diff --git a/Build/Program.cs b/Build/Program.cs index 0ef1aa76cff..7399b327176 100644 --- a/Build/Program.cs +++ b/Build/Program.cs @@ -13,10 +13,10 @@ namespace DotNetNuke.Build public class Program { /// The version of the Microsoft.TestPlatform NuGet package. - internal const string MicrosoftTestPlatformVersion = "17.4.1"; + internal const string MicrosoftTestPlatformVersion = "17.5.0"; /// The version of the NUnit3TestAdapter NuGet package. - internal const string NUnit3TestAdapterVersion = "4.3.1"; + internal const string NUnit3TestAdapterVersion = "4.4.2"; /// Runs the build process. /// The arguments from the command line. diff --git a/DNN Platform/Tests/App.config b/DNN Platform/Tests/App.config index e5d70ad3339..95eedde44a2 100644 --- a/DNN Platform/Tests/App.config +++ b/DNN Platform/Tests/App.config @@ -221,7 +221,7 @@ - + @@ -229,7 +229,7 @@ - + diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj b/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj index 48cc3743fda..92c049406e7 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/DNN.Integration.Test.Framework.csproj @@ -1,6 +1,6 @@  - + @@ -64,8 +64,8 @@ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -143,7 +143,7 @@ - + diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config index eac412fe488..2c0cf2cdc75 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config @@ -10,6 +10,10 @@ + + + + diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config index a9088b21258..527eea455a1 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config @@ -9,8 +9,8 @@ - + - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config index 4331fbdb811..9bd1f3aaa66 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config @@ -14,6 +14,10 @@ + + + + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj index 144835bf063..3612112179c 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj @@ -1,6 +1,6 @@  - + Debug @@ -58,8 +58,8 @@ - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -118,7 +118,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config index bfd53b42cb4..97fbc155e4f 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config @@ -10,9 +10,9 @@ - + - + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj index cb8535dd486..8b7d89108a2 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/Dnn.PersonaBar.ConfigConsole.Tests.csproj @@ -1,6 +1,6 @@  - + @@ -39,8 +39,11 @@ 7 - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll + + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll @@ -48,20 +51,18 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll + + ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll + ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll - @@ -111,7 +112,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config index f0622f3347d..266cb3f8e39 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config @@ -1,11 +1,12 @@  - + + - + - + diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj index f0a6aaa7e30..86433f00ec4 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/Dnn.PersonaBar.Pages.Tests.csproj @@ -1,6 +1,6 @@  - + @@ -39,14 +39,24 @@ 7 - - ..\..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll + + ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll + + + ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll + + + ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + @@ -102,6 +112,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config index 8fcff5793a0..9dd43d2a7a8 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config @@ -22,6 +22,10 @@ + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config index 19a8461030d..5c7c244c978 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config @@ -1,7 +1,10 @@  - + + - + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj index 825d6030991..b8106e7b66d 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/Dnn.PersonaBar.Security.Tests.csproj @@ -1,6 +1,6 @@  - + @@ -39,8 +39,11 @@ 7 - - ..\..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll + + ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll + + + ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll ..\..\..\packages\Newtonsoft.Json.13.0.2\lib\net45\Newtonsoft.Json.dll @@ -50,11 +53,18 @@ ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll + ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll + + ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + ..\..\..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll @@ -118,6 +128,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config index 8fcff5793a0..9dd43d2a7a8 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config @@ -22,6 +22,10 @@ + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config index 3cb666d12de..285a985d33e 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config @@ -1,10 +1,13 @@  + - + - + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj index 14f8ffe1e68..3895c2e7b7c 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/Dnn.PersonaBar.Users.Tests.csproj @@ -1,6 +1,6 @@  - + @@ -40,14 +40,24 @@ 7 - - ..\..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll + + ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll + + + ..\..\..\packages\Moq.4.18.4\lib\net462\Moq.dll ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll + + + ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll + + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + @@ -111,6 +121,6 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config index 17af53ce56d..e08ed98a2b2 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config @@ -14,6 +14,10 @@ + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config index 19a8461030d..5c7c244c978 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config @@ -1,7 +1,10 @@  - + + - + + + \ No newline at end of file