From 98420b6a1305d4d6dc47a2867f390ed3d261e034 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Jan 2022 20:21:11 +0000 Subject: [PATCH 1/2] Bump NUnit3TestAdapter from 4.0.0 to 4.2.0 Bumps [NUnit3TestAdapter](https://github.com/nunit/nunit3-vs-adapter) from 4.0.0 to 4.2.0. - [Release notes](https://github.com/nunit/nunit3-vs-adapter/releases) - [Commits](https://github.com/nunit/nunit3-vs-adapter/compare/V4.0.0...V4.2.0) --- updated-dependencies: - dependency-name: NUnit3TestAdapter dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../DNN.Integration.Test.Framework.csproj | 4 ++-- .../packages.config | 2 +- .../DotNetNuke.Tests.AspNetCCP.csproj | 4 ++-- .../DotNetNuke.Tests.AspNetCCP/packages.config | 2 +- .../DotNetNuke.Tests.Authentication.csproj | 4 ++-- .../packages.config | 2 +- .../DotNetNuke.Tests.Content.csproj | 4 ++-- .../DotNetNuke.Tests.Content/packages.config | 2 +- .../DotNetNuke.Tests.Core.csproj | 4 ++-- .../Tests/DotNetNuke.Tests.Core/packages.config | 2 +- .../DotNetNuke.Tests.Data.csproj | 4 ++-- .../Tests/DotNetNuke.Tests.Data/packages.config | 2 +- .../DotNetNuke.Tests.Integration.csproj | 4 ++-- .../DotNetNuke.Tests.Integration/packages.config | 2 +- .../DotNetNuke.Tests.UI.csproj | 4 ++-- .../Tests/DotNetNuke.Tests.UI/packages.config | 2 +- .../DotNetNuke.Tests.Urls.csproj | 4 ++-- .../Tests/DotNetNuke.Tests.Urls/packages.config | 2 +- .../DotNetNuke.Tests.Utilities.csproj | 16 ++++++++-------- .../DotNetNuke.Tests.Utilities/packages.config | 2 +- .../DotNetNuke.Tests.Web.Mvc.csproj | 4 ++-- .../DotNetNuke.Tests.Web.Mvc/packages.config | 2 +- .../DotNetNuke.Tests.Web.csproj | 4 ++-- .../Tests/DotNetNuke.Tests.Web/packages.config | 2 +- .../Dnn.PersonaBar.ConfigConsole.Tests.csproj | 4 ++-- .../packages.config | 2 +- .../Dnn.PersonaBar.Pages.Tests.csproj | 4 ++-- .../Dnn.PersonaBar.Pages.Tests/packages.config | 2 +- .../Dnn.PersonaBar.Security.Tests.csproj | 4 ++-- .../packages.config | 2 +- .../Dnn.PersonaBar.Users.Tests.csproj | 4 ++-- .../Dnn.PersonaBar.Users.Tests/packages.config | 2 +- 32 files changed, 54 insertions(+), 54 deletions(-) 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 a04aa71ad5d..170c31d0741 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 @@  - + @@ -134,7 +134,7 @@ - + diff --git a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config index 38835651507..a1c9c675157 100644 --- a/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config +++ b/DNN Platform/Tests/DNN.Integration.Test.Framework/packages.config @@ -8,6 +8,6 @@ - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj b/DNN Platform/Tests/DotNetNuke.Tests.AspNetCCP/DotNetNuke.Tests.AspNetCCP.csproj index 42bfc6ec088..e5893002969 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 @@ -110,7 +110,7 @@ - + \ No newline at end of file diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config index 0271ff6f26d..66fcd943d8b 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Utilities/packages.config @@ -7,7 +7,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj index b2a496214be..19f447fec05 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj @@ -1,6 +1,6 @@  - + @@ -161,7 +161,7 @@ - + diff --git a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config index 105f30fe327..0f0124a87a7 100644 --- a/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config +++ b/DNN Platform/Tests/DotNetNuke.Tests.Web/packages.config @@ -9,7 +9,7 @@ - + \ 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 3f9f44b2ed6..3790e5a5396 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 @@  - + @@ -110,7 +110,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config index ad27086af4d..ffb6a9de36d 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.ConfigConsole.Tests/packages.config @@ -5,7 +5,7 @@ - + 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 fa07ce81c47..bb2af0cfb60 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 @@  - + @@ -102,6 +102,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/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config index ff1365e96fb..e36f70ffa69 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Pages.Tests/packages.config @@ -2,6 +2,6 @@ - + \ 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 325b6857183..addf7b927be 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 @@  - + @@ -107,6 +107,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/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config index 57964fa672a..a7e602bed1d 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Security.Tests/packages.config @@ -5,6 +5,6 @@ - + \ 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 f806a8bd64c..9177adc5495 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 @@  - + @@ -111,6 +111,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/packages.config b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config index ff1365e96fb..e36f70ffa69 100644 --- a/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config +++ b/Dnn.AdminExperience/Tests/Dnn.PersonaBar.Users.Tests/packages.config @@ -2,6 +2,6 @@ - + \ No newline at end of file From 35571f54dc6c658ee634c06a8a98b917e8e4c49a Mon Sep 17 00:00:00 2001 From: OneDNN Date: Mon, 6 Dec 2021 10:11:35 +0700 Subject: [PATCH 2/2] Fix OutputCacheAddItem stored procedure Fix OutputCacheAddItem stored procedure dublicate primarykey check --- .../DataProviders/09.10.03.SqlDataProvider | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 DNN Platform/Website/Providers/DataProviders/09.10.03.SqlDataProvider diff --git a/DNN Platform/Website/Providers/DataProviders/09.10.03.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/09.10.03.SqlDataProvider new file mode 100644 index 00000000000..419ddeffd39 --- /dev/null +++ b/DNN Platform/Website/Providers/DataProviders/09.10.03.SqlDataProvider @@ -0,0 +1,29 @@ +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}OutputCacheAddItem') AND type in (N'P', N'PC')) +DROP PROCEDURE {databaseOwner}{objectQualifier}OutputCacheAddItem +GO + +CREATE PROCEDURE {databaseOwner}[{objectQualifier}OutputCacheAddItem] + @ItemId Int, + @CacheKey VarChar ( 36), + @Data nVarChar(Max), + @Expiration DateTime +AS +BEGIN + IF NOT EXISTS (SELECT CacheKey from {databaseOwner}{objectQualifier}OutputCache where CacheKey = @CacheKey) + begin + INSERT INTO dbo.OutputCache + (ItemId, + CacheKey, + Data, + Expiration + ) VALUES + (@ItemId, + @CacheKey, + @Data, + @Expiration + ) + end + ELSE UPDATE {databaseOwner}{objectQualifier}OutputCache Set Data = @Data, Expiration = @Expiration Where CacheKey = @CacheKey +END + +GO