From 4286f0d74f17852f818ad592a8b43e332618a4d8 Mon Sep 17 00:00:00 2001 From: Daniel Valadas Date: Sat, 1 Feb 2025 01:57:51 -0500 Subject: [PATCH] Revert "Bump dependencies" --- Build/Build.csproj | 10 +- Build/Program.cs | 6 +- Build/Tasks/CreateDatabase.cs | 6 +- Build/Tasks/ResetDatabase.cs | 3 +- .../Dnn.Modules.Console.csproj | 12 +- .../Dnn.Modules.Console/packages.config | 6 +- .../Dnn.Modules.Console/web.config | 22 +-- DNN Platform/Components/MailKit/MailKit.dnn | 32 +--- .../Azure/Dnn.AzureConnector.csproj | 20 +-- DNN Platform/Connectors/Azure/app.config | 22 +-- DNN Platform/Connectors/Azure/packages.config | 10 +- .../Dnn.GoogleAnalyticsConnector.csproj | 20 +-- .../Connectors/GoogleAnalytics/app.config | 22 +-- .../GoogleAnalytics/packages.config | 10 +- .../Dnn.GoogleAnalytics4Connector.csproj | 20 +-- .../Connectors/GoogleAnalytics4/app.config | 20 +-- .../GoogleAnalytics4/packages.config | 10 +- .../Dnn.GoogleTagManagerConnector.csproj | 20 +-- .../Connectors/GoogleTagManager/app.config | 22 +-- .../GoogleTagManager/packages.config | 10 +- .../Dnn.AuthServices.Jwt.csproj | 42 +++-- DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn | 156 +++++++++--------- DNN Platform/Dnn.AuthServices.Jwt/app.config | 26 +-- .../Dnn.AuthServices.Jwt/packages.config | 17 +- .../DotNetNuke.DependencyInjection.csproj | 2 +- .../DotNetNuke.Maintenance.csproj | 2 +- .../DotNetNuke.ModulePipeline.csproj | 2 +- .../DotNetNuke.Web.Mvc.csproj | 27 +-- DNN Platform/DotNetNuke.Web.Mvc/app.config | 22 +-- .../DotNetNuke.Web.Mvc/packages.config | 12 +- .../DotNetNuke.Web.Razor.csproj | 12 +- DNN Platform/DotNetNuke.Web.Razor/app.config | 6 +- .../DotNetNuke.Web.Razor/packages.config | 6 +- .../DotNetNuke.Web/DotNetNuke.Web.csproj | 24 +-- DNN Platform/DotNetNuke.Web/app.config | 22 +-- DNN Platform/DotNetNuke.Web/packages.config | 12 +- .../HttpModules/DotNetNuke.HttpModules.csproj | 12 +- DNN Platform/HttpModules/app.config | 22 +-- DNN Platform/HttpModules/packages.config | 6 +- .../Library/DotNetNuke.Library.csproj | 44 +++-- DNN Platform/Library/app.config | 22 +-- DNN Platform/Library/packages.config | 22 ++- .../DotNetNuke.Modules.CoreMessaging.csproj | 22 +-- .../Modules/CoreMessaging/packages.config | 10 +- DNN Platform/Modules/CoreMessaging/web.config | 22 +-- .../DDRMenu/DotNetNuke.Modules.DDRMenu.csproj | 12 +- DNN Platform/Modules/DDRMenu/packages.config | 6 +- DNN Platform/Modules/DDRMenu/web.config | 22 +-- .../DnnExportImport/DnnExportImport.csproj | 31 ++-- .../Modules/DnnExportImport/app.config | 22 +-- .../Modules/DnnExportImport/packages.config | 14 +- .../DnnExportImportLibrary.csproj | 9 +- .../Modules/DnnExportImportLibrary/app.config | 11 -- .../DnnExportImportLibrary/packages.config | 3 +- .../Groups/DotNetNuke.Modules.Groups.csproj | 27 +-- DNN Platform/Modules/Groups/packages.config | 12 +- DNN Platform/Modules/Groups/web.config | 22 +-- .../HTML/DotNetNuke.Modules.Html.csproj | 12 +- DNN Platform/Modules/HTML/packages.config | 6 +- DNN Platform/Modules/HTML/web.config | 22 +-- .../Modules/HtmlEditorManager/web.config | 22 +-- .../Journal/DotNetNuke.Modules.Journal.csproj | 27 +-- DNN Platform/Modules/Journal/packages.config | 12 +- DNN Platform/Modules/Journal/web.config | 22 +-- .../DotNetNuke.Modules.MemberDirectory.csproj | 20 +-- .../Modules/MemberDirectory/packages.config | 10 +- .../Modules/MemberDirectory/web.config | 22 +-- .../DotNetNuke.Modules.RazorHost.csproj | 12 +- .../Modules/RazorHost/packages.config | 6 +- DNN Platform/Modules/RazorHost/web.config | 22 +-- .../Dnn.Modules.ResourceManager.csproj | 24 +-- .../Modules/ResourceManager/packages.config | 12 +- .../Modules/ResourceManager/web.config | 22 +-- .../Dnn.Modules.TelerikRemoval.csproj | 12 +- .../Modules/TelerikRemoval/Web.config | 22 +-- .../Modules/TelerikRemoval/packages.config | 6 +- .../web.config | 22 +-- .../web.config | 22 +-- .../web.config | 22 +-- .../web.config | 22 +-- .../app.config | 22 +-- .../Provider.AspNetCCP/app.config | 22 +-- .../Providers/FolderProviders/app.config | 22 +-- .../DNNConnect.CKEditorProvider.csproj | 27 +-- .../DNNConnect.CKE/packages.config | 12 +- .../DNNConnect.CKE/web.config | 22 +-- .../Dnn.ExchangeOnlineAuthProvider.csproj | 46 +++--- .../ExchangeOnlineAuthProvider/app.config | 22 +-- .../packages.config | 20 +-- .../Components/GoogleMailOAuthProvider.cs | 4 +- .../Dnn.GoogleMailAuthProvider.csproj | 65 ++++---- .../GoogleMailAuthProvider/app.config | 22 +-- .../GoogleMailAuthProvider/packages.config | 26 ++- DNN Platform/Tests/App.config | 22 +-- .../DNN.Integration.Test.Framework.csproj | 34 ++-- .../DNN.Integration.Test.Framework/app.config | 22 +-- .../packages.config | 16 +- .../DotNetNuke.Tests.AspNetCCP/App.config | 22 +-- .../DotNetNuke.Tests.AspNetCCP.csproj | 34 ++-- .../packages.config | 14 +- .../DotNetNuke.Tests.Authentication.csproj | 34 ++-- .../app.config | 22 +-- .../packages.config | 14 +- .../DotNetNuke.Tests.Content.csproj | 38 ++--- .../Tests/DotNetNuke.Tests.Content/app.config | 22 +-- .../DotNetNuke.Tests.Content/packages.config | 16 +- .../DotNetNuke.Tests.Core.csproj | 38 ++--- .../DotNetNuke.Tests.Core/packages.config | 16 +- .../DotNetNuke.Tests.Data.csproj | 38 ++--- .../DotNetNuke.Tests.Data/packages.config | 16 +- .../DotNetNuke.Tests.Integration.csproj | 38 ++--- .../packages.config | 18 +- .../Tests/DotNetNuke.Tests.Mail/App.config | 22 +-- .../DotNetNuke.Tests.Mail.csproj | 38 ++--- .../DotNetNuke.Tests.Mail/packages.config | 16 +- .../DotNetNuke.Tests.Modules.DDRMenu.csproj | 32 ++-- .../app.config | 22 +-- .../packages.config | 12 +- .../DotNetNuke.Tests.Modules.csproj | 34 ++-- .../DotNetNuke.Tests.Modules/packages.config | 14 +- .../DotNetNuke.Tests.SourceGenerators.csproj | 11 +- .../DotNetNuke.Tests.UI.csproj | 34 ++-- .../Tests/DotNetNuke.Tests.UI/app.config | 22 +-- .../Tests/DotNetNuke.Tests.UI/packages.config | 14 +- .../DotNetNuke.Tests.Urls.csproj | 42 ++--- .../DotNetNuke.Tests.Urls/packages.config | 18 +- .../DotNetNuke.Tests.Utilities.csproj | 42 ++--- .../DotNetNuke.Tests.Utilities/app.config | 22 +-- .../packages.config | 18 +- .../DotNetNuke.Tests.Web.Mvc.csproj | 38 ++--- .../Tests/DotNetNuke.Tests.Web.Mvc/app.config | 22 +-- .../DotNetNuke.Tests.Web.Mvc/packages.config | 16 +- .../Tests/DotNetNuke.Tests.Web/App.config | 26 +-- .../DotNetNuke.Tests.Web.csproj | 38 ++--- .../DotNetNuke.Tests.Web/packages.config | 16 +- .../Website/DotNetNuke.Website.csproj | 24 +-- DNN Platform/Website/packages.config | 12 +- DNN Platform/Website/web.config | 22 +-- .../Dnn.PersonaBar.Extensions.csproj | 27 +-- .../Dnn.PersonaBar.Extensions/app.config | 22 +-- .../Dnn.PersonaBar.Extensions/packages.config | 12 +- .../EditBar/Dnn.EditBar.Library/app.config | 22 +-- .../Dnn.EditBar.UI/Dnn.EditBar.UI.csproj | 20 +-- .../EditBar/Dnn.EditBar.UI/app.config | 22 +-- .../EditBar/Dnn.EditBar.UI/packages.config | 10 +- .../Dnn.PersonaBar.Library.csproj | 24 +-- .../Library/Dnn.PersonaBar.Library/app.config | 22 +-- .../Dnn.PersonaBar.Library/packages.config | 12 +- .../Dnn.PersonaBar.UI.csproj | 27 +-- .../Library/Dnn.PersonaBar.UI/app.config | 22 +-- .../Library/Dnn.PersonaBar.UI/packages.config | 12 +- .../Dnn.PersonaBar.ConfigConsole.Tests.csproj | 39 ++--- .../app.config | 22 +-- .../packages.config | 16 +- .../Dnn.PersonaBar.Pages.Tests.csproj | 38 ++--- .../Dnn.PersonaBar.Pages.Tests/app.config | 22 +-- .../packages.config | 16 +- .../Dnn.PersonaBar.Security.Tests.csproj | 38 ++--- .../Dnn.PersonaBar.Security.Tests/app.config | 22 +-- .../packages.config | 16 +- .../Dnn.PersonaBar.Users.Tests.csproj | 38 ++--- .../Dnn.PersonaBar.Users.Tests/app.config | 22 +-- .../packages.config | 16 +- ...otNetNuke.Internal.SourceGenerators.csproj | 2 +- 164 files changed, 1482 insertions(+), 1979 deletions(-) delete mode 100644 DNN Platform/Modules/DnnExportImportLibrary/app.config diff --git a/Build/Build.csproj b/Build/Build.csproj index 06b3aecd4ba..ff455c1142d 100644 --- a/Build/Build.csproj +++ b/Build/Build.csproj @@ -18,17 +18,17 @@ - - - + + + - - + all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/Build/Program.cs b/Build/Program.cs index 505de375651..6284ab6c72d 100644 --- a/Build/Program.cs +++ b/Build/Program.cs @@ -12,10 +12,10 @@ namespace DotNetNuke.Build public class Program { /// The version of the Microsoft.TestPlatform NuGet package. - internal const string MicrosoftTestPlatformVersion = "17.12.0"; + internal const string MicrosoftTestPlatformVersion = "17.6.2"; /// The version of the NUnit3TestAdapter NuGet package. - internal const string NUnit3TestAdapterVersion = "4.6.0"; + internal const string NUnit3TestAdapterVersion = "4.5.0"; /// Runs the build process. /// The arguments from the command line. @@ -30,7 +30,7 @@ public static int Main(string[] args) .InstallTool(new Uri("dotnet:?package=GitVersion.Tool&version=5.12.0")) .InstallTool(new Uri("nuget:?package=Microsoft.TestPlatform&version=" + MicrosoftTestPlatformVersion)) .InstallTool(new Uri("nuget:?package=NUnit3TestAdapter&version=" + NUnit3TestAdapterVersion)) - .InstallTool(new Uri("nuget:?package=NuGet.CommandLine&version=6.12.2")) + .InstallTool(new Uri("nuget:?package=NuGet.CommandLine&version=6.5.0")) .Run(args); } } diff --git a/Build/Tasks/CreateDatabase.cs b/Build/Tasks/CreateDatabase.cs index 39af558a203..1947b1772e3 100644 --- a/Build/Tasks/CreateDatabase.cs +++ b/Build/Tasks/CreateDatabase.cs @@ -11,8 +11,6 @@ namespace DotNetNuke.Build.Tasks using Cake.Common.Xml; using Cake.Frosting; - using Microsoft.Data.SqlClient; - /// A cake task to crete a localdb database named Dnn_Platform. public sealed class CreateDatabase : FrostingTask { @@ -149,12 +147,12 @@ private bool ExecuteSqlScript(Context context, string scriptStatement) { try { - using (var connection = new SqlConnection(this.connectionString)) + using (var connection = new System.Data.SqlClient.SqlConnection(this.connectionString)) { connection.Open(); var cmdText = scriptStatement.Replace("{databaseOwner}", "dbo.").Replace("{objectQualifier}", "dnn_"); - var command = new SqlCommand(cmdText, connection); + var command = new System.Data.SqlClient.SqlCommand(cmdText, connection); command.ExecuteNonQuery(); connection.Close(); diff --git a/Build/Tasks/ResetDatabase.cs b/Build/Tasks/ResetDatabase.cs index 1e72073ec95..d05247ca6b9 100644 --- a/Build/Tasks/ResetDatabase.cs +++ b/Build/Tasks/ResetDatabase.cs @@ -4,6 +4,7 @@ namespace DotNetNuke.Build.Tasks { using System; + using System.Data.SqlClient; using System.IO; using System.Linq; @@ -12,8 +13,6 @@ namespace DotNetNuke.Build.Tasks using Cake.FileHelpers; using Cake.Frosting; - using Microsoft.Data.SqlClient; - /// A cake task to reset the local dev database. public sealed class ResetDatabase : FrostingTask { diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj b/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj index d5d6709740d..7dd527a77e7 100644 --- a/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj +++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/Dnn.Modules.Console.csproj @@ -58,8 +58,8 @@ False ..\..\DotNetNuke.WebUtility\bin\DotNetNuke.WebUtility.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -69,11 +69,11 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/packages.config b/DNN Platform/Admin Modules/Dnn.Modules.Console/packages.config index 56c459f4229..578de695555 100644 --- a/DNN Platform/Admin Modules/Dnn.Modules.Console/packages.config +++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/packages.config @@ -1,9 +1,9 @@  - + - - + + \ No newline at end of file diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config b/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config index 231c8f7b820..72043ad64c6 100644 --- a/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config +++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/web.config @@ -16,23 +16,23 @@ - + - + - + - + - + @@ -40,24 +40,16 @@ - + - + - - - - - - - - \ No newline at end of file diff --git a/DNN Platform/Components/MailKit/MailKit.dnn b/DNN Platform/Components/MailKit/MailKit.dnn index 54d0dceec2a..045a8d89853 100644 --- a/DNN Platform/Components/MailKit/MailKit.dnn +++ b/DNN Platform/Components/MailKit/MailKit.dnn @@ -1,6 +1,6 @@ - + MailKit Components Libraries required for MailKit. @@ -12,7 +12,7 @@ - This package includes MailKit assembly version 4.10.0 and MimeKit assembly version 4.10.0. + This package includes MailKit assembly version 4.0.0 and MimeKit assembly version 4.0.0. Please go to http://www.mimekit.com/ to view release notes on this particular version. @@ -20,42 +20,22 @@ bin MailKit.dll - 4.10.0.0 + 4.0.0.0 bin MimeKit.dll - 4.10.0.0 + 4.0.0.0 bin BouncyCastle.Cryptography.dll - 2.5.0.6119 + 2.1.1 bin System.Buffers.dll - 4.600.24.56208 - - - bin - System.Memory.dll - 4.600.24.56208 - - - bin - System.Threading.Tasks.Extensions.dll - 4.600.24.56208 - - - bin - System.Formats.Asn1.dll - 9.0.124.61010 - - - bin - System.ValueTuple.dll - 4.6.26515.06 + 4.6.28619.01 diff --git a/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj b/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj index 8b081fdae40..ad001ab7448 100644 --- a/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj +++ b/DNN Platform/Connectors/Azure/Dnn.AzureConnector.csproj @@ -79,12 +79,12 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -92,14 +92,14 @@ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Connectors/Azure/app.config b/DNN Platform/Connectors/Azure/app.config index 5f530aadf72..1836174bd31 100644 --- a/DNN Platform/Connectors/Azure/app.config +++ b/DNN Platform/Connectors/Azure/app.config @@ -16,23 +16,23 @@ - + - + - + - + - + @@ -40,24 +40,16 @@ - + - + - - - - - - - - diff --git a/DNN Platform/Connectors/Azure/packages.config b/DNN Platform/Connectors/Azure/packages.config index e3bfcbad374..304658fb9ef 100644 --- a/DNN Platform/Connectors/Azure/packages.config +++ b/DNN Platform/Connectors/Azure/packages.config @@ -7,9 +7,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj b/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj index 2ac246a5764..c473caab079 100644 --- a/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj +++ b/DNN Platform/Connectors/GoogleAnalytics/Dnn.GoogleAnalyticsConnector.csproj @@ -74,12 +74,12 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -87,14 +87,14 @@ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Connectors/GoogleAnalytics/app.config b/DNN Platform/Connectors/GoogleAnalytics/app.config index efe4fb22950..99a5d1bd346 100644 --- a/DNN Platform/Connectors/GoogleAnalytics/app.config +++ b/DNN Platform/Connectors/GoogleAnalytics/app.config @@ -24,23 +24,23 @@ - + - + - + - + - + @@ -48,24 +48,16 @@ - + - + - - - - - - - - diff --git a/DNN Platform/Connectors/GoogleAnalytics/packages.config b/DNN Platform/Connectors/GoogleAnalytics/packages.config index abb213fd20e..95d10dfe637 100644 --- a/DNN Platform/Connectors/GoogleAnalytics/packages.config +++ b/DNN Platform/Connectors/GoogleAnalytics/packages.config @@ -5,9 +5,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj b/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj index d9488f5c480..576d0740a9f 100644 --- a/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj +++ b/DNN Platform/Connectors/GoogleAnalytics4/Dnn.GoogleAnalytics4Connector.csproj @@ -74,12 +74,12 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -87,14 +87,14 @@ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Connectors/GoogleAnalytics4/app.config b/DNN Platform/Connectors/GoogleAnalytics4/app.config index 9f8fa40b76c..c85e9370913 100644 --- a/DNN Platform/Connectors/GoogleAnalytics4/app.config +++ b/DNN Platform/Connectors/GoogleAnalytics4/app.config @@ -20,11 +20,11 @@ - + - + @@ -36,27 +36,19 @@ - + - + - + - - - - - - - - - + diff --git a/DNN Platform/Connectors/GoogleAnalytics4/packages.config b/DNN Platform/Connectors/GoogleAnalytics4/packages.config index abb213fd20e..95d10dfe637 100644 --- a/DNN Platform/Connectors/GoogleAnalytics4/packages.config +++ b/DNN Platform/Connectors/GoogleAnalytics4/packages.config @@ -5,9 +5,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj b/DNN Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj index ce0e949a834..dfd228652db 100644 --- a/DNN Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj +++ b/DNN Platform/Connectors/GoogleTagManager/Dnn.GoogleTagManagerConnector.csproj @@ -75,12 +75,12 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -88,14 +88,14 @@ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Connectors/GoogleTagManager/app.config b/DNN Platform/Connectors/GoogleTagManager/app.config index efe4fb22950..99a5d1bd346 100644 --- a/DNN Platform/Connectors/GoogleTagManager/app.config +++ b/DNN Platform/Connectors/GoogleTagManager/app.config @@ -24,23 +24,23 @@ - + - + - + - + - + @@ -48,24 +48,16 @@ - + - + - - - - - - - - diff --git a/DNN Platform/Connectors/GoogleTagManager/packages.config b/DNN Platform/Connectors/GoogleTagManager/packages.config index abb213fd20e..95d10dfe637 100644 --- a/DNN Platform/Connectors/GoogleTagManager/packages.config +++ b/DNN Platform/Connectors/GoogleTagManager/packages.config @@ -5,9 +5,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.AuthServices.Jwt.csproj b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.AuthServices.Jwt.csproj index bf314e06df2..043927912e1 100644 --- a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.AuthServices.Jwt.csproj +++ b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.AuthServices.Jwt.csproj @@ -42,8 +42,8 @@ true - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -65,8 +65,8 @@ ..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -74,36 +74,42 @@ ..\..\packages\System.IdentityModel.Tokens.Jwt.6.31.0\lib\net472\System.IdentityModel.Tokens.Jwt.dll - - ..\..\packages\System.IO.Pipelines.9.0.1\lib\net462\System.IO.Pipelines.dll + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + - - ..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\packages\System.Text.Encodings.Web.9.0.1\lib\net462\System.Text.Encodings.Web.dll + + ..\..\packages\System.Text.Encodings.Web.7.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\..\packages\System.Text.Json.9.0.1\lib\net462\System.Text.Json.dll + + ..\..\packages\System.Text.Json.7.0.3\lib\net462\System.Text.Json.dll - - ..\..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn index 6bc8189c7f5..0f9fa20c957 100644 --- a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn +++ b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn @@ -1,32 +1,32 @@ - - + + - DNN JWT Auth Handler - DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients - - - .NET Foundation and Contributors - DNN Community - https://dnncommunity.org - info@dnncommunity.org - - - - true - - 08.00.00 - - - - - - bin - Dnn.AuthServices.Jwt.dll - - - bin - System.IdentityModel.Tokens.Jwt.dll - + DNN JWT Auth Handler + DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients + + + .NET Foundation and Contributors + DNN Community + https://dnncommunity.org + info@dnncommunity.org + + + + true + + 08.00.00 + + + + + + bin + Dnn.AuthServices.Jwt.dll + + + bin + System.IdentityModel.Tokens.Jwt.dll + bin Microsoft.IdentityModel.Abstractions.dll @@ -47,10 +47,6 @@ bin System.Text.Json.dll - - bin - System.IO.Pipelines.dll - bin System.Text.Encodings.Web.dll @@ -83,51 +79,51 @@ bin Microsoft.Bcl.AsyncInterfaces.dll - - - - - DesktopModules\AuthenticationServices\JWTAuth - - - - - - - - web.config - - - - - - - - - - - - - - - - - - - - - - + + + + + DesktopModules\AuthenticationServices\JWTAuth + + + + + + + + web.config + + + + + + + + + + + + + + + + + + + + + + diff --git a/DNN Platform/Dnn.AuthServices.Jwt/app.config b/DNN Platform/Dnn.AuthServices.Jwt/app.config index 9e386207968..c7298c30e4d 100644 --- a/DNN Platform/Dnn.AuthServices.Jwt/app.config +++ b/DNN Platform/Dnn.AuthServices.Jwt/app.config @@ -16,23 +16,23 @@ - + - + - + - + - + @@ -40,11 +40,11 @@ - + - + @@ -52,24 +52,16 @@ - + - + - - - - - - - - diff --git a/DNN Platform/Dnn.AuthServices.Jwt/packages.config b/DNN Platform/Dnn.AuthServices.Jwt/packages.config index d80509d7e76..74e3086737c 100644 --- a/DNN Platform/Dnn.AuthServices.Jwt/packages.config +++ b/DNN Platform/Dnn.AuthServices.Jwt/packages.config @@ -4,7 +4,7 @@ - + @@ -12,15 +12,14 @@ - + - - - - + + + - - - + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj b/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj index 0a385b579ad..5e131b07228 100644 --- a/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj +++ b/DNN Platform/DotNetNuke.DependencyInjection/DotNetNuke.DependencyInjection.csproj @@ -14,7 +14,7 @@ - + all diff --git a/DNN Platform/DotNetNuke.Maintenance/DotNetNuke.Maintenance.csproj b/DNN Platform/DotNetNuke.Maintenance/DotNetNuke.Maintenance.csproj index 283907ed83e..825e9bd8cdd 100644 --- a/DNN Platform/DotNetNuke.Maintenance/DotNetNuke.Maintenance.csproj +++ b/DNN Platform/DotNetNuke.Maintenance/DotNetNuke.Maintenance.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj b/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj index 181fe2ed28e..f51eb165b73 100644 --- a/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj +++ b/DNN Platform/DotNetNuke.ModulePipeline/DotNetNuke.ModulePipeline.csproj @@ -25,7 +25,7 @@ - + all diff --git a/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj b/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj index 7ebf58b0219..f0c562e8082 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj +++ b/DNN Platform/DotNetNuke.Web.Mvc/DotNetNuke.Web.Mvc.csproj @@ -55,8 +55,8 @@ False ..\Library\bin\DotNetNuke.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -78,27 +78,30 @@ ..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/DotNetNuke.Web.Mvc/app.config b/DNN Platform/DotNetNuke.Web.Mvc/app.config index 2fdb41115b6..20da4c9540d 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/app.config +++ b/DNN Platform/DotNetNuke.Web.Mvc/app.config @@ -20,23 +20,23 @@ - + - + - + - + - + @@ -44,24 +44,16 @@ - + - + - - - - - - - - diff --git a/DNN Platform/DotNetNuke.Web.Mvc/packages.config b/DNN Platform/DotNetNuke.Web.Mvc/packages.config index 7b089a72956..f9650035282 100644 --- a/DNN Platform/DotNetNuke.Web.Mvc/packages.config +++ b/DNN Platform/DotNetNuke.Web.Mvc/packages.config @@ -9,7 +9,7 @@ - + @@ -19,9 +19,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj b/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj index 6eb07578f94..3f30506b3f1 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj +++ b/DNN Platform/DotNetNuke.Web.Razor/DotNetNuke.Web.Razor.csproj @@ -59,8 +59,8 @@ False ..\Library\bin\DotNetNuke.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -75,11 +75,11 @@ ..\..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/DotNetNuke.Web.Razor/app.config b/DNN Platform/DotNetNuke.Web.Razor/app.config index de71d8314a1..a5cf101cb4f 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/app.config +++ b/DNN Platform/DotNetNuke.Web.Razor/app.config @@ -8,15 +8,15 @@ - + - + - + diff --git a/DNN Platform/DotNetNuke.Web.Razor/packages.config b/DNN Platform/DotNetNuke.Web.Razor/packages.config index 712eb42a5e4..025f0d868d4 100644 --- a/DNN Platform/DotNetNuke.Web.Razor/packages.config +++ b/DNN Platform/DotNetNuke.Web.Razor/packages.config @@ -5,7 +5,7 @@ - + @@ -13,6 +13,6 @@ - - + + \ No newline at end of file diff --git a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj index 7f1b9bbb6b8..a89b8622591 100644 --- a/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj +++ b/DNN Platform/DotNetNuke.Web/DotNetNuke.Web.csproj @@ -108,8 +108,8 @@ False ..\DotNetNuke.WebUtility\bin\DotNetNuke.WebUtility.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -127,31 +127,31 @@ ..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/DotNetNuke.Web/app.config b/DNN Platform/DotNetNuke.Web/app.config index 5f530aadf72..1836174bd31 100644 --- a/DNN Platform/DotNetNuke.Web/app.config +++ b/DNN Platform/DotNetNuke.Web/app.config @@ -16,23 +16,23 @@ - + - + - + - + - + @@ -40,24 +40,16 @@ - + - + - - - - - - - - diff --git a/DNN Platform/DotNetNuke.Web/packages.config b/DNN Platform/DotNetNuke.Web/packages.config index e846748c726..e022c5a1b45 100644 --- a/DNN Platform/DotNetNuke.Web/packages.config +++ b/DNN Platform/DotNetNuke.Web/packages.config @@ -7,7 +7,7 @@ - + @@ -17,10 +17,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj index 0ebe0c728c6..3f5aba1d516 100644 --- a/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj +++ b/DNN Platform/HttpModules/DotNetNuke.HttpModules.csproj @@ -68,8 +68,8 @@ False ..\DotNetNuke.Instrumentation\bin\DotNetNuke.Instrumentation.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -80,11 +80,11 @@ - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/HttpModules/app.config b/DNN Platform/HttpModules/app.config index fa6212ca453..bdbc452b494 100644 --- a/DNN Platform/HttpModules/app.config +++ b/DNN Platform/HttpModules/app.config @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + @@ -28,23 +28,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/HttpModules/packages.config b/DNN Platform/HttpModules/packages.config index 8b18bce5f38..8043f02a0b8 100644 --- a/DNN Platform/HttpModules/packages.config +++ b/DNN Platform/HttpModules/packages.config @@ -1,12 +1,12 @@  - + - - + + \ No newline at end of file diff --git a/DNN Platform/Library/DotNetNuke.Library.csproj b/DNN Platform/Library/DotNetNuke.Library.csproj index b0da143e04c..113139e6ebc 100644 --- a/DNN Platform/Library/DotNetNuke.Library.csproj +++ b/DNN Platform/Library/DotNetNuke.Library.csproj @@ -92,7 +92,7 @@ ..\..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll - ..\..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll + ..\..\packages\BouncyCastle.Cryptography.2.2.1\lib\net461\BouncyCastle.Cryptography.dll ..\..\packages\Dnn.ClientDependency.1.9.10\lib\net45\ClientDependency.Core.dll @@ -110,16 +110,16 @@ ..\Components\Lucene.Net.Contrib\bin\Lucene.Net.Contrib.FastVectorHighlighter.dll - - ..\..\packages\MailKit.4.10.0\lib\net48\MailKit.dll + + ..\..\packages\MailKit.4.0.0\lib\net48\MailKit.dll False ..\Components\DataAccessBlock\bin\Microsoft.ApplicationBlocks.Data.dll False - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -135,21 +135,21 @@ ..\..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll - - ..\..\packages\MimeKit.4.10.0\lib\net48\MimeKit.dll + + ..\..\packages\MimeKit.4.0.0\lib\net48\MimeKit.dll ..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll - - ..\..\packages\PetaPoco.Compiled.6.0.683\lib\net45\PetaPoco.dll + + ..\..\packages\PetaPoco.Compiled.6.0.524\lib\net45\PetaPoco.dll ..\..\packages\QuickIO.NET.2.6.2.0\lib\net45\SchwabenCode.QuickIO.dll - - ..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -159,30 +159,24 @@ - - ..\..\packages\System.Formats.Asn1.9.0.1\lib\net462\System.Formats.Asn1.dll - - - ..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll - - - ..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Library/app.config b/DNN Platform/Library/app.config index fa6212ca453..bdbc452b494 100644 --- a/DNN Platform/Library/app.config +++ b/DNN Platform/Library/app.config @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + @@ -28,23 +28,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/Library/packages.config b/DNN Platform/Library/packages.config index 1c9fadd835b..46a28768174 100644 --- a/DNN Platform/Library/packages.config +++ b/DNN Platform/Library/packages.config @@ -1,11 +1,11 @@  - + - + - + @@ -15,18 +15,16 @@ - + - + - - - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj b/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj index c133365f6f6..c2c98b59845 100644 --- a/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj +++ b/DNN Platform/Modules/CoreMessaging/DotNetNuke.Modules.CoreMessaging.csproj @@ -76,27 +76,27 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll + + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/CoreMessaging/packages.config b/DNN Platform/Modules/CoreMessaging/packages.config index e3bfcbad374..304658fb9ef 100644 --- a/DNN Platform/Modules/CoreMessaging/packages.config +++ b/DNN Platform/Modules/CoreMessaging/packages.config @@ -7,9 +7,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/CoreMessaging/web.config b/DNN Platform/Modules/CoreMessaging/web.config index a9787ec57ef..91eefad7c25 100644 --- a/DNN Platform/Modules/CoreMessaging/web.config +++ b/DNN Platform/Modules/CoreMessaging/web.config @@ -20,23 +20,23 @@ - + - + - + - + - + @@ -44,19 +44,11 @@ - + - - - - - - - - - + diff --git a/DNN Platform/Modules/DDRMenu/DotNetNuke.Modules.DDRMenu.csproj b/DNN Platform/Modules/DDRMenu/DotNetNuke.Modules.DDRMenu.csproj index 140ed99752b..9bf4ce60561 100644 --- a/DNN Platform/Modules/DDRMenu/DotNetNuke.Modules.DDRMenu.csproj +++ b/DNN Platform/Modules/DDRMenu/DotNetNuke.Modules.DDRMenu.csproj @@ -86,8 +86,8 @@ False ..\..\Controls\DotNetNuke.WebControls\bin\DotNetNuke.WebControls.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -100,11 +100,11 @@ - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/DDRMenu/packages.config b/DNN Platform/Modules/DDRMenu/packages.config index f97221e4206..f700a000f43 100644 --- a/DNN Platform/Modules/DDRMenu/packages.config +++ b/DNN Platform/Modules/DDRMenu/packages.config @@ -2,11 +2,11 @@ - + - - + + \ No newline at end of file diff --git a/DNN Platform/Modules/DDRMenu/web.config b/DNN Platform/Modules/DDRMenu/web.config index ad5213468a9..84f3938843b 100644 --- a/DNN Platform/Modules/DDRMenu/web.config +++ b/DNN Platform/Modules/DDRMenu/web.config @@ -12,15 +12,15 @@ - + - + - + @@ -36,23 +36,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj b/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj index 4a2bcf6a26d..20a6e369c3f 100644 --- a/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj +++ b/DNN Platform/Modules/DnnExportImport/DnnExportImport.csproj @@ -50,11 +50,11 @@ CS0618,SA1600,SA1614 - - ..\..\..\packages\LiteDB.5.0.21\lib\net45\LiteDB.dll + + ..\..\..\packages\LiteDB.5.0.13\lib\net45\LiteDB.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -68,31 +68,34 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/DnnExportImport/app.config b/DNN Platform/Modules/DnnExportImport/app.config index efe4fb22950..99a5d1bd346 100644 --- a/DNN Platform/Modules/DnnExportImport/app.config +++ b/DNN Platform/Modules/DnnExportImport/app.config @@ -24,23 +24,23 @@ - + - + - + - + - + @@ -48,24 +48,16 @@ - + - + - - - - - - - - diff --git a/DNN Platform/Modules/DnnExportImport/packages.config b/DNN Platform/Modules/DnnExportImport/packages.config index 53553b179fc..4eebcd0f231 100644 --- a/DNN Platform/Modules/DnnExportImport/packages.config +++ b/DNN Platform/Modules/DnnExportImport/packages.config @@ -1,9 +1,9 @@  - + - + @@ -11,9 +11,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj b/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj index 7036c5cb69b..aa7ac43789c 100644 --- a/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj +++ b/DNN Platform/Modules/DnnExportImportLibrary/DnnExportImportLibrary.csproj @@ -49,13 +49,11 @@ CS0618,SA1600 - - ..\..\..\packages\LiteDB.5.0.21\lib\net45\LiteDB.dll + + ..\..\..\packages\LiteDB.5.0.19\lib\net45\LiteDB.dll + True - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - @@ -109,7 +107,6 @@ stylecop.json - diff --git a/DNN Platform/Modules/DnnExportImportLibrary/app.config b/DNN Platform/Modules/DnnExportImportLibrary/app.config deleted file mode 100644 index 172009abdb7..00000000000 --- a/DNN Platform/Modules/DnnExportImportLibrary/app.config +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/DNN Platform/Modules/DnnExportImportLibrary/packages.config b/DNN Platform/Modules/DnnExportImportLibrary/packages.config index 338504cfb70..79ad35d6c1d 100644 --- a/DNN Platform/Modules/DnnExportImportLibrary/packages.config +++ b/DNN Platform/Modules/DnnExportImportLibrary/packages.config @@ -1,9 +1,8 @@  - + - \ No newline at end of file diff --git a/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj b/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj index ecebf27b169..592884603e9 100644 --- a/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj +++ b/DNN Platform/Modules/Groups/DotNetNuke.Modules.Groups.csproj @@ -58,8 +58,8 @@ False ..\..\DotNetNuke.Web.Client\bin\DotNetNuke.Web.Client.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -75,27 +75,30 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/Groups/packages.config b/DNN Platform/Modules/Groups/packages.config index 0df6acdfe0e..f105604c2c8 100644 --- a/DNN Platform/Modules/Groups/packages.config +++ b/DNN Platform/Modules/Groups/packages.config @@ -4,15 +4,15 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/Groups/web.config b/DNN Platform/Modules/Groups/web.config index ceaf97bb5de..0dacedacf0e 100644 --- a/DNN Platform/Modules/Groups/web.config +++ b/DNN Platform/Modules/Groups/web.config @@ -20,23 +20,23 @@ - + - + - + - + - + @@ -44,19 +44,11 @@ - + - - - - - - - - - + diff --git a/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj b/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj index 4643213f47a..36992033395 100644 --- a/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj +++ b/DNN Platform/Modules/HTML/DotNetNuke.Modules.Html.csproj @@ -98,8 +98,8 @@ False ..\..\DotNetNuke.WebUtility\bin\DotNetNuke.WebUtility.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -110,11 +110,11 @@ - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/HTML/packages.config b/DNN Platform/Modules/HTML/packages.config index 56c459f4229..578de695555 100644 --- a/DNN Platform/Modules/HTML/packages.config +++ b/DNN Platform/Modules/HTML/packages.config @@ -1,9 +1,9 @@  - + - - + + \ No newline at end of file diff --git a/DNN Platform/Modules/HTML/web.config b/DNN Platform/Modules/HTML/web.config index e04eb95767b..1966bd59e69 100644 --- a/DNN Platform/Modules/HTML/web.config +++ b/DNN Platform/Modules/HTML/web.config @@ -16,23 +16,23 @@ - + - + - + - + - + @@ -40,24 +40,16 @@ - + - + - - - - - - - - \ No newline at end of file diff --git a/DNN Platform/Modules/HtmlEditorManager/web.config b/DNN Platform/Modules/HtmlEditorManager/web.config index e04eb95767b..1966bd59e69 100644 --- a/DNN Platform/Modules/HtmlEditorManager/web.config +++ b/DNN Platform/Modules/HtmlEditorManager/web.config @@ -16,23 +16,23 @@ - + - + - + - + - + @@ -40,24 +40,16 @@ - + - + - - - - - - - - \ No newline at end of file diff --git a/DNN Platform/Modules/Journal/DotNetNuke.Modules.Journal.csproj b/DNN Platform/Modules/Journal/DotNetNuke.Modules.Journal.csproj index ff8445ba753..f5fa35185ba 100644 --- a/DNN Platform/Modules/Journal/DotNetNuke.Modules.Journal.csproj +++ b/DNN Platform/Modules/Journal/DotNetNuke.Modules.Journal.csproj @@ -64,8 +64,8 @@ False ..\..\DotNetNuke.Web.Client\bin\DotNetNuke.Web.Client.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -81,14 +81,14 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\Components\WebAPI\System.Net.Http.dll @@ -97,14 +97,17 @@ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/Journal/packages.config b/DNN Platform/Modules/Journal/packages.config index 0df6acdfe0e..f105604c2c8 100644 --- a/DNN Platform/Modules/Journal/packages.config +++ b/DNN Platform/Modules/Journal/packages.config @@ -4,15 +4,15 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/Journal/web.config b/DNN Platform/Modules/Journal/web.config index a9787ec57ef..91eefad7c25 100644 --- a/DNN Platform/Modules/Journal/web.config +++ b/DNN Platform/Modules/Journal/web.config @@ -20,23 +20,23 @@ - + - + - + - + - + @@ -44,19 +44,11 @@ - + - - - - - - - - - + diff --git a/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj b/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj index 19d1c07a896..d2d0c9c5055 100644 --- a/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj +++ b/DNN Platform/Modules/MemberDirectory/DotNetNuke.Modules.MemberDirectory.csproj @@ -75,13 +75,13 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\DotNetNuke.Web\bin\System.Net.Http.dll @@ -90,14 +90,14 @@ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/MemberDirectory/packages.config b/DNN Platform/Modules/MemberDirectory/packages.config index 1319577759f..393b1f4a59d 100644 --- a/DNN Platform/Modules/MemberDirectory/packages.config +++ b/DNN Platform/Modules/MemberDirectory/packages.config @@ -7,10 +7,10 @@ - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/MemberDirectory/web.config b/DNN Platform/Modules/MemberDirectory/web.config index a9787ec57ef..91eefad7c25 100644 --- a/DNN Platform/Modules/MemberDirectory/web.config +++ b/DNN Platform/Modules/MemberDirectory/web.config @@ -20,23 +20,23 @@ - + - + - + - + - + @@ -44,19 +44,11 @@ - + - - - - - - - - - + diff --git a/DNN Platform/Modules/RazorHost/DotNetNuke.Modules.RazorHost.csproj b/DNN Platform/Modules/RazorHost/DotNetNuke.Modules.RazorHost.csproj index 3b1834ab9c5..5857bf29971 100644 --- a/DNN Platform/Modules/RazorHost/DotNetNuke.Modules.RazorHost.csproj +++ b/DNN Platform/Modules/RazorHost/DotNetNuke.Modules.RazorHost.csproj @@ -70,8 +70,8 @@ False ..\..\DotNetNuke.Instrumentation\bin\DotNetNuke.Instrumentation.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -82,11 +82,11 @@ - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/RazorHost/packages.config b/DNN Platform/Modules/RazorHost/packages.config index 56c459f4229..578de695555 100644 --- a/DNN Platform/Modules/RazorHost/packages.config +++ b/DNN Platform/Modules/RazorHost/packages.config @@ -1,9 +1,9 @@  - + - - + + \ No newline at end of file diff --git a/DNN Platform/Modules/RazorHost/web.config b/DNN Platform/Modules/RazorHost/web.config index e04eb95767b..1966bd59e69 100644 --- a/DNN Platform/Modules/RazorHost/web.config +++ b/DNN Platform/Modules/RazorHost/web.config @@ -16,23 +16,23 @@ - + - + - + - + - + @@ -40,24 +40,16 @@ - + - + - - - - - - - - \ No newline at end of file diff --git a/DNN Platform/Modules/ResourceManager/Dnn.Modules.ResourceManager.csproj b/DNN Platform/Modules/ResourceManager/Dnn.Modules.ResourceManager.csproj index 93b4abefdb7..3de812a239f 100644 --- a/DNN Platform/Modules/ResourceManager/Dnn.Modules.ResourceManager.csproj +++ b/DNN Platform/Modules/ResourceManager/Dnn.Modules.ResourceManager.csproj @@ -51,8 +51,8 @@ 4 - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -67,28 +67,28 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/ResourceManager/packages.config b/DNN Platform/Modules/ResourceManager/packages.config index c4cc9554c33..cfd1de99a9a 100644 --- a/DNN Platform/Modules/ResourceManager/packages.config +++ b/DNN Platform/Modules/ResourceManager/packages.config @@ -2,15 +2,15 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Modules/ResourceManager/web.config b/DNN Platform/Modules/ResourceManager/web.config index 04d2d85916c..aa7dbe9bfb2 100644 --- a/DNN Platform/Modules/ResourceManager/web.config +++ b/DNN Platform/Modules/ResourceManager/web.config @@ -40,23 +40,23 @@ - + - + - + - + - + @@ -64,19 +64,11 @@ - + - - - - - - - - - + diff --git a/DNN Platform/Modules/TelerikRemoval/Dnn.Modules.TelerikRemoval.csproj b/DNN Platform/Modules/TelerikRemoval/Dnn.Modules.TelerikRemoval.csproj index cfe0d3694ad..2f6087629ed 100644 --- a/DNN Platform/Modules/TelerikRemoval/Dnn.Modules.TelerikRemoval.csproj +++ b/DNN Platform/Modules/TelerikRemoval/Dnn.Modules.TelerikRemoval.csproj @@ -50,8 +50,8 @@ 4 - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.4.1.0\lib\net472\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll @@ -61,11 +61,11 @@ ..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Modules/TelerikRemoval/Web.config b/DNN Platform/Modules/TelerikRemoval/Web.config index 1c96ef7a8f4..3c6897a392a 100644 --- a/DNN Platform/Modules/TelerikRemoval/Web.config +++ b/DNN Platform/Modules/TelerikRemoval/Web.config @@ -32,23 +32,23 @@ - + - + - + - + - + @@ -56,24 +56,16 @@ - + - + - - - - - - - - diff --git a/DNN Platform/Modules/TelerikRemoval/packages.config b/DNN Platform/Modules/TelerikRemoval/packages.config index a8de6d3bcc5..10a9ad101f9 100644 --- a/DNN Platform/Modules/TelerikRemoval/packages.config +++ b/DNN Platform/Modules/TelerikRemoval/packages.config @@ -1,9 +1,9 @@  - + - - + + \ No newline at end of file diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/web.config b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/web.config index 578072dcc07..89e21e86ba6 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/web.config +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/web.config @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + @@ -28,23 +28,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/web.config b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/web.config index 578072dcc07..89e21e86ba6 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/web.config +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/web.config @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + @@ -28,23 +28,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/web.config b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/web.config index 578072dcc07..89e21e86ba6 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/web.config +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/web.config @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + @@ -28,23 +28,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/web.config b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/web.config index 578072dcc07..89e21e86ba6 100644 --- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/web.config +++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/web.config @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + @@ -28,23 +28,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/app.config b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/app.config index fa6212ca453..bdbc452b494 100644 --- a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/app.config +++ b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/app.config @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + @@ -28,23 +28,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/app.config b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/app.config index fa6212ca453..bdbc452b494 100644 --- a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/app.config +++ b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/app.config @@ -8,7 +8,7 @@ - + @@ -16,11 +16,11 @@ - + - + @@ -28,23 +28,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/Providers/FolderProviders/app.config b/DNN Platform/Providers/FolderProviders/app.config index 017adca4c51..146b527bf6a 100644 --- a/DNN Platform/Providers/FolderProviders/app.config +++ b/DNN Platform/Providers/FolderProviders/app.config @@ -28,7 +28,7 @@ - + @@ -36,11 +36,11 @@ - + - + @@ -48,23 +48,11 @@ - + - - - - - - - - - - - - - + diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj index b7dd5cdea56..9724ccd757f 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/DNNConnect.CKEditorProvider.csproj @@ -81,8 +81,8 @@ ..\..\..\Components\DataAccessBlock\bin\Microsoft.ApplicationBlocks.Data.dll - - ..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -100,15 +100,15 @@ ..\..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -116,14 +116,17 @@ ..\..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll + + + ..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/packages.config b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/packages.config index d9d5a0e2a5b..94deec0a540 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/packages.config +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/packages.config @@ -4,15 +4,15 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/web.config b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/web.config index 3dbc27e3b1b..cd5e39d6ea8 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/web.config +++ b/DNN Platform/Providers/HtmlEditorProviders/DNNConnect.CKE/web.config @@ -28,23 +28,23 @@ - + - + - + - + - + @@ -52,24 +52,16 @@ - + - + - - - - - - - - diff --git a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/Dnn.ExchangeOnlineAuthProvider.csproj b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/Dnn.ExchangeOnlineAuthProvider.csproj index c2cb7609122..d45e3b8bd11 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/Dnn.ExchangeOnlineAuthProvider.csproj +++ b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/Dnn.ExchangeOnlineAuthProvider.csproj @@ -73,13 +73,13 @@ ..\..\..\..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll - ..\..\..\..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll + ..\..\..\..\packages\BouncyCastle.Cryptography.2.2.1\lib\net461\BouncyCastle.Cryptography.dll - - ..\..\..\..\packages\MailKit.4.10.0\lib\net48\MailKit.dll + + ..\..\..\..\packages\MailKit.4.0.0\lib\net48\MailKit.dll - - ..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -91,8 +91,8 @@ ..\..\..\..\packages\Microsoft.IdentityModel.Abstractions.6.31.0\lib\net472\Microsoft.IdentityModel.Abstractions.dll - - ..\..\..\..\packages\MimeKit.4.10.0\lib\net48\MimeKit.dll + + ..\..\..\..\packages\MimeKit.4.0.0\lib\net48\MimeKit.dll ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -101,17 +101,14 @@ ..\..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\..\packages\System.Formats.Asn1.9.0.1\lib\net462\System.Formats.Asn1.dll - - - ..\..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -119,19 +116,22 @@ ..\..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\..\..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + + + ..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/app.config b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/app.config index 2e79aa43782..3aab1b5b9f9 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/app.config +++ b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/app.config @@ -16,7 +16,7 @@ - + @@ -24,23 +24,23 @@ - + - + - + - + - + @@ -48,20 +48,12 @@ - + - - - - - - - - diff --git a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/packages.config b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/packages.config index 0acab8788b9..2fc58a0c076 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/packages.config +++ b/DNN Platform/Providers/SmtpOAuthProviders/ExchangeOnlineAuthProvider/packages.config @@ -1,25 +1,23 @@  - - + + - + - + - - - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Components/GoogleMailOAuthProvider.cs b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Components/GoogleMailOAuthProvider.cs index 778765d332c..aa40aae6d9e 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Components/GoogleMailOAuthProvider.cs +++ b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Components/GoogleMailOAuthProvider.cs @@ -134,7 +134,7 @@ public void Authorize(int portalId, IOAuth2SmtpClient smtpClient) var response = new GoogleCredentialDataStore(portalId, this.hostSettingsService).GetAsync(accountEmail).Result; var credential = new UserCredential(codeFlow, accountEmail, response); - if (credential.Token.IsStale) + if (credential.Token.IsExpired(SystemClock.Default)) { _ = credential.RefreshTokenAsync(CancellationToken.None).Result; } @@ -155,7 +155,7 @@ public async Task AuthorizeAsync(int portalId, IOAuth2SmtpClient smtpClient, Can var response = await new GoogleCredentialDataStore(portalId, this.hostSettingsService).GetAsync(accountEmail); var credential = new UserCredential(codeFlow, accountEmail, response); - if (credential.Token.IsStale) + if (credential.Token.IsExpired(SystemClock.Default)) { _ = await credential.RefreshTokenAsync(cancellationToken); } diff --git a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Dnn.GoogleMailAuthProvider.csproj b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Dnn.GoogleMailAuthProvider.csproj index 0b5d81f4feb..b493c909876 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Dnn.GoogleMailAuthProvider.csproj +++ b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/Dnn.GoogleMailAuthProvider.csproj @@ -75,28 +75,34 @@ ..\..\..\..\packages\Portable.BouncyCastle.1.9.0\lib\net40\BouncyCastle.Crypto.dll - ..\..\..\..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll + ..\..\..\..\packages\BouncyCastle.Cryptography.2.2.1\lib\net461\BouncyCastle.Cryptography.dll - - ..\..\..\..\packages\Google.Apis.1.69.0\lib\net462\Google.Apis.dll + + ..\..\..\..\packages\Google.Apis.1.58.0\lib\net45\Google.Apis.dll - - ..\..\..\..\packages\Google.Apis.Auth.1.69.0\lib\net462\Google.Apis.Auth.dll + + ..\..\..\..\packages\Google.Apis.Auth.1.58.0\lib\net461\Google.Apis.Auth.dll - - ..\..\..\..\packages\Google.Apis.Core.1.69.0\lib\net462\Google.Apis.Core.dll + + ..\..\..\..\packages\Google.Apis.Auth.1.58.0\lib\net461\Google.Apis.Auth.PlatformServices.dll - - ..\..\..\..\packages\MailKit.4.10.0\lib\net48\MailKit.dll + + ..\..\..\..\packages\Google.Apis.Core.1.58.0\lib\net45\Google.Apis.Core.dll - - ..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\..\packages\Google.Apis.1.58.0\lib\net45\Google.Apis.PlatformServices.dll + + + ..\..\..\..\packages\MailKit.4.0.0\lib\net48\MailKit.dll + + + ..\..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll - - ..\..\..\..\packages\MimeKit.4.10.0\lib\net48\MimeKit.dll + + ..\..\..\..\packages\MimeKit.4.0.0\lib\net48\MimeKit.dll ..\..\..\..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -105,16 +111,12 @@ ..\..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\..\packages\System.Formats.Asn1.9.0.1\lib\net462\System.Formats.Asn1.dll - - - - ..\..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -122,19 +124,22 @@ ..\..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + + + ..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.4.5.3\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + ..\..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - - ..\..\..\..\packages\System.Threading.Tasks.Extensions.4.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll - - ..\..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll + + + ..\..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/app.config b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/app.config index 68ec09a46e4..a5ba7bac2bb 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/app.config +++ b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/app.config @@ -16,7 +16,7 @@ - + @@ -24,40 +24,32 @@ - + - + - + - + - + - + - - - - - - - - diff --git a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/packages.config b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/packages.config index 45a117f613e..8f48b827dda 100644 --- a/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/packages.config +++ b/DNN Platform/Providers/SmtpOAuthProviders/GoogleMailAuthProvider/packages.config @@ -1,26 +1,24 @@  - - - - - + + + + + - + - + - - - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Tests/App.config b/DNN Platform/Tests/App.config index 0315642d1de..761e0e2cfcf 100644 --- a/DNN Platform/Tests/App.config +++ b/DNN Platform/Tests/App.config @@ -197,7 +197,7 @@ - + @@ -213,7 +213,7 @@ - + @@ -233,15 +233,15 @@ - + - + - + @@ -249,24 +249,16 @@ - + - + - - - - - - - - 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 9cb2e98ff78..8cfa6613e83 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 @@  - + @@ -61,33 +61,33 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.legacy.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll ..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -158,7 +158,7 @@ - + @@ -174,7 +174,7 @@ - + diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config index ea8c836d262..11da688855a 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/app.config @@ -12,11 +12,11 @@ - + - + @@ -24,7 +24,7 @@ - + @@ -32,28 +32,16 @@ - + - + - - - - - - - - - - - - diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config index 6aa28c8a78f..74d32d6a0eb 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config @@ -9,14 +9,14 @@ - - + + - - - - - + + + + + - \ 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 53dc60787cf..96a3f797cd6 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/App.config @@ -12,7 +12,7 @@ - + @@ -28,19 +28,19 @@ - + - + - + - + @@ -48,24 +48,16 @@ - + - + - - - - - - - - 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 fc5b397d5a1..484183c6ad8 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,31 +58,31 @@ ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll True - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.legacy.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll ..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -130,7 +130,7 @@ - + @@ -142,7 +142,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config index abadbe205c2..88c4cd295dd 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config @@ -5,21 +5,21 @@ - + - - + + - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Website/DotNetNuke.Website.csproj b/DNN Platform/Website/DotNetNuke.Website.csproj index 9ebe1967528..85281dbb17e 100644 --- a/DNN Platform/Website/DotNetNuke.Website.csproj +++ b/DNN Platform/Website/DotNetNuke.Website.csproj @@ -81,8 +81,8 @@ False ..\Controls\DotNetNuke.WebControls\bin\DotNetNuke.WebControls.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -107,14 +107,14 @@ ..\Components\PetaPoco\bin\PetaPoco.dll - - ..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -122,15 +122,15 @@ ..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/DNN Platform/Website/packages.config b/DNN Platform/Website/packages.config index 5e66b8594d0..692b1e6ef6a 100644 --- a/DNN Platform/Website/packages.config +++ b/DNN Platform/Website/packages.config @@ -6,16 +6,16 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/DNN Platform/Website/web.config b/DNN Platform/Website/web.config index b9230962346..bc1021c17d2 100644 --- a/DNN Platform/Website/web.config +++ b/DNN Platform/Website/web.config @@ -32,23 +32,23 @@ - + - + - + - + - + @@ -56,11 +56,11 @@ - + - + @@ -78,14 +78,6 @@ - - - - - - - - diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj index 69043b47ce2..654e0f7e038 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.csproj @@ -729,8 +729,8 @@ ..\..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll - - ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -747,8 +747,8 @@ ..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -756,24 +756,27 @@ - - ..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll + - - ..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/app.config b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/app.config index 9ebcd754e02..7dcc5670d51 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/app.config +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/app.config @@ -16,23 +16,23 @@ - + - + - + - + - + @@ -44,19 +44,11 @@ - + - - - - - - - - - + diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config index 316eb91d3ff..f74229ce20b 100644 --- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config +++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/packages.config @@ -3,16 +3,16 @@ - + - - - - - + + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/app.config b/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/app.config index 158c5fd5a7a..292a7ba0859 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/app.config +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.Library/app.config @@ -12,7 +12,7 @@ - + @@ -20,11 +20,11 @@ - + - + @@ -32,23 +32,11 @@ - + - - - - - - - - - - - - - + diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj index 90390f450e0..84a2e1fd552 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.csproj @@ -282,11 +282,11 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll @@ -294,14 +294,14 @@ ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/app.config b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/app.config index c75d080b512..eee4e100207 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/app.config +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/app.config @@ -28,23 +28,23 @@ - + - + - + - + - + @@ -52,19 +52,11 @@ - + - - - - - - - - - + diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/packages.config b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/packages.config index 4c84aa3ba74..0f3777007e4 100644 --- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/packages.config +++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/packages.config @@ -8,9 +8,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj index 6c570c10cd5..3a98d517115 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/Dnn.PersonaBar.Library.csproj @@ -151,8 +151,8 @@ - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -169,28 +169,28 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/app.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/app.config index 85113a4aa96..83ee0b90c00 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/app.config +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/app.config @@ -32,23 +32,23 @@ - + - + - + - + - + @@ -56,19 +56,11 @@ - + - - - - - - - - - + diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config index 8cf0001baa3..601af995002 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.Library/packages.config @@ -2,7 +2,7 @@ - + @@ -11,9 +11,9 @@ - - - - - + + + + + \ No newline at end of file diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj index 1c63535dbcc..f5cf5f2eca4 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.csproj @@ -57,8 +57,8 @@ ..\..\..\packages\Dnn.ClientDependency.1.9.10\lib\net45\ClientDependency.Core.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll @@ -75,8 +75,8 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -84,23 +84,26 @@ - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/app.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/app.config index 1652f94d098..8f902a1f4ff 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/app.config +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/app.config @@ -20,23 +20,23 @@ - + - + - + - + - + @@ -44,19 +44,11 @@ - + - - - - - - - - - + diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config index 863d7566222..db13c7b295e 100644 --- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config +++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/packages.config @@ -4,7 +4,7 @@ - + @@ -13,9 +13,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 136391c8642..4052713c82b 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 @@  - + @@ -45,8 +45,9 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + True ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -58,30 +59,30 @@ ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll True - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.legacy.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll ..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -131,7 +132,7 @@ - + @@ -140,7 +141,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/app.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config index 8977cbc3306..1b92f2d201b 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/app.config @@ -4,7 +4,7 @@ - + @@ -32,15 +32,15 @@ - + - + - + @@ -48,28 +48,20 @@ - + - + - + - - - - - - - - diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config index 0a17744c723..b8aa1aa2791 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config @@ -1,18 +1,18 @@  - + - - + + - - - - - + + + + + \ No newline at end of file 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 ffceb51cc9f..f3f76fb5a04 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 @@  - + @@ -45,8 +45,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -61,30 +61,30 @@ ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll True - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.legacy.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll ..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -143,7 +143,7 @@ - + @@ -153,6 +153,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 772039353e5..755f54de1be 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/app.config @@ -24,7 +24,7 @@ - + @@ -32,19 +32,19 @@ - + - + - + - + @@ -52,24 +52,16 @@ - + - + - - - - - - - - diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config index 0a17744c723..b8aa1aa2791 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config @@ -1,18 +1,18 @@  - + - - + + - - - - - + + + + + \ 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 619050611cb..44c1f1a7c81 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 @@  - + @@ -45,8 +45,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -68,34 +68,34 @@ ..\..\..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.legacy.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll ..\..\..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll ..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -159,7 +159,7 @@ - + @@ -169,6 +169,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 b912879060b..97d7b220359 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/app.config @@ -24,7 +24,7 @@ - + @@ -32,19 +32,19 @@ - + - + - + - + @@ -52,24 +52,16 @@ - + - + - - - - - - - - diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config index 9a17669cfda..da517fc2463 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config @@ -3,19 +3,19 @@ - + - - + + - - - - - + + + + + \ 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 ab7d6d96997..53d07da9072 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 @@  - + @@ -45,8 +45,8 @@ ..\..\..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll - - ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.1\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\..\..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll ..\..\..\packages\Microsoft.Extensions.DependencyInjection.8.0.0\lib\net462\Microsoft.Extensions.DependencyInjection.dll @@ -61,30 +61,30 @@ ..\..\..\packages\Moq.4.20.72\lib\net462\Moq.dll True - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.dll - - ..\..\..\packages\NUnit.4.3.2\lib\net462\nunit.framework.legacy.dll + + ..\..\..\packages\NUnit.4.2.2\lib\net462\nunit.framework.legacy.dll - - ..\..\..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + ..\..\..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll - - ..\..\..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + ..\..\..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll - - ..\..\..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + ..\..\..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll - - ..\..\..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\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.6.0\lib\net462\System.Threading.Tasks.Extensions.dll + + ..\..\..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll ..\..\..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll @@ -151,7 +151,7 @@ - + @@ -161,6 +161,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 4c4cc96bfa2..52cdc996c40 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/app.config @@ -16,7 +16,7 @@ - + @@ -24,19 +24,19 @@ - + - + - + - + @@ -44,24 +44,16 @@ - + - + - - - - - - - - diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config index 0a17744c723..b8aa1aa2791 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config @@ -1,18 +1,18 @@  - + - - + + - - - - - + + + + + \ No newline at end of file diff --git a/DotNetNuke.Internal.SourceGenerators/DotNetNuke.Internal.SourceGenerators.csproj b/DotNetNuke.Internal.SourceGenerators/DotNetNuke.Internal.SourceGenerators.csproj index e2150beb30b..163057b5dfe 100644 --- a/DotNetNuke.Internal.SourceGenerators/DotNetNuke.Internal.SourceGenerators.csproj +++ b/DotNetNuke.Internal.SourceGenerators/DotNetNuke.Internal.SourceGenerators.csproj @@ -13,7 +13,7 @@ - +