From 1829d1810e6ca6476302669060717c3c9b1f2d86 Mon Sep 17 00:00:00 2001 From: Ben Date: Wed, 6 Sep 2017 10:48:47 +0800 Subject: [PATCH] DNN-10226: move newtonsoft josn into separate package. --- .../Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn | 49 +++++++++++++++++++ .../Components/Newtonsoft/License.txt | 9 ++++ DNN Platform/Library/Module.build | 15 ++++++ .../Website/Install/Config/09.02.00.config | 8 --- .../SqlDataProvider/09.02.00.SqlDataProvider | 14 ++---- 5 files changed, 76 insertions(+), 19 deletions(-) create mode 100644 DNN Platform/Components/Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn create mode 100644 DNN Platform/Components/Newtonsoft/License.txt diff --git a/DNN Platform/Components/Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn b/DNN Platform/Components/Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn new file mode 100644 index 00000000000..97d815c16a9 --- /dev/null +++ b/DNN Platform/Components/Newtonsoft/DotNetNuke.Newtonsoft.Json.dnn @@ -0,0 +1,49 @@ + + + + Newtonsoft Json Components + Provides Newtonsoft Json Components for DotNetNuke. + + + DNN + DNN Corp. + http://www.dnnsoftware.com + support@dnnsoftware.com + + License.txt + + This package includes Newtonsoft.Json assembly version 10.0.3. + Please go to https://www.newtonsoft.com/json to view release notes on this particular version. + + + + + bin + Newtonsoft.Json.dll + 10.0.3 + + + + + + web.config + + + + + + + + + + + + + + + + + + + + diff --git a/DNN Platform/Components/Newtonsoft/License.txt b/DNN Platform/Components/Newtonsoft/License.txt new file mode 100644 index 00000000000..ed11c37a1a2 --- /dev/null +++ b/DNN Platform/Components/Newtonsoft/License.txt @@ -0,0 +1,9 @@ +The MIT License (MIT) + +Copyright (c) 2007 James Newton-King + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/DNN Platform/Library/Module.build b/DNN Platform/Library/Module.build index f1cd1d01747..47795df4608 100644 --- a/DNN Platform/Library/Module.build +++ b/DNN Platform/Library/Module.build @@ -115,6 +115,21 @@ + + + + + + + + + + + + - - - - - - \ No newline at end of file diff --git a/Website/Providers/DataProviders/SqlDataProvider/09.02.00.SqlDataProvider b/Website/Providers/DataProviders/SqlDataProvider/09.02.00.SqlDataProvider index ee2567ce52f..a70ac5cf772 100644 --- a/Website/Providers/DataProviders/SqlDataProvider/09.02.00.SqlDataProvider +++ b/Website/Providers/DataProviders/SqlDataProvider/09.02.00.SqlDataProvider @@ -105,17 +105,9 @@ GO /***** DNN-10200: update newtonsoft.json assembly to 10.0.3. *****/ -IF NOT EXISTS(SELECT 1 FROM {databaseOwner}[{objectQualifier}Assemblies] WHERE AssemblyName = 'Newtonsoft.Json.dll' AND PackageID IS NULL) -BEGIN - INSERT INTO {databaseOwner}[{objectQualifier}Assemblies] (PackageID, AssemblyName, Version) - VALUES (NULL, 'Newtonsoft.Json.dll', '10.0.3') -END -ELSE -BEGIN - UPDATE {databaseOwner}[{objectQualifier}Assemblies] - SET Version = '10.0.3' - WHERE AssemblyName = 'Newtonsoft.Json.dll' AND PackageID IS NULL -END +DELETE FROM {databaseOwner}[{objectQualifier}Assemblies] + WHERE PackageID IS NULL AND AssemblyName = 'Newtonsoft.Json.dll' +GO /***** CONTENT-8440: update default MessagingThrottlingInterval value to 30 seconds. *****/ UPDATE {databaseOwner}[{objectQualifier}PortalSettings]