From 0187328e19909dfb8a3d2191800477f21ab7ec2a Mon Sep 17 00:00:00 2001 From: Mitchel Sellers Date: Fri, 28 Dec 2018 02:03:09 -0600 Subject: [PATCH 1/3] Fix for missing SQL change Fixes #2521 by rebuilding the PortalsDefaultLanguage view --- .../SqlDataProvider/09.03.00.01.SqlDataProvider | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Website/Providers/DataProviders/SqlDataProvider/09.03.00.01.SqlDataProvider b/Website/Providers/DataProviders/SqlDataProvider/09.03.00.01.SqlDataProvider index 58e00b2f016..e9a3c84de9d 100644 --- a/Website/Providers/DataProviders/SqlDataProvider/09.03.00.01.SqlDataProvider +++ b/Website/Providers/DataProviders/SqlDataProvider/09.03.00.01.SqlDataProvider @@ -275,6 +275,17 @@ AS LEFT JOIN {databaseOwner}[{objectQualifier}Users] AS U ON P.AdministratorId = U.UserID GO +IF OBJECT_ID(N'{databaseOwner}[{objectQualifier}vw_PortalsDefaultLanguage]', N'V') IS NOT NULL + DROP VIEW {databaseOwner}[{objectQualifier}vw_PortalsDefaultLanguage] +GO + +CREATE VIEW {databaseOwner}[{objectQualifier}vw_PortalsDefaultLanguage] +AS +SELECT + * +FROM {databaseOwner}[{objectQualifier}vw_Portals] +WHERE CultureCode = DefaultLanguage +GO /************************************************************/ /***** SqlDataProvider *****/ From fc55c86d941e99e7d62684b6391a2ff30f97dd03 Mon Sep 17 00:00:00 2001 From: Mitchel Sellers Date: Thu, 28 Feb 2019 01:41:47 -0600 Subject: [PATCH 2/3] NuGet Package Improvement Changes to modernize the NuGet packages published by the DNN Platform. Changes include * Migration of license information to the suggested node rather than the deprecated node. * Inclusion of target framework for all included .dll files, this prevents installation of the package to pre-4.5 projects protecting downstream users. * Improved package descriptions based on discussions held in the RFC regarding these improvements * Added Package-to-Package dependencies to ensure quick usage and inclusion * Updated the WebAPI and MVC packages to be holistic packages, including references to ALL needed items to develop using those patterns. All changes are current for DNN Platform version 9.3.0 or later. --- Build/Tools/NuGet/DotNetNuke.Bundle.nuspec | 32 +++++++++---------- Build/Tools/NuGet/DotNetNuke.Core.nuspec | 13 ++++---- .../NuGet/DotNetNuke.Instrumentation.nuspec | 18 ++++++----- ...otNetNuke.Providers.FolderProviders.nuspec | 16 +++++++--- .../NuGet/DotNetNuke.SiteExportImport.nuspec | 13 ++++---- .../Tools/NuGet/DotNetNuke.Web.Client.nuspec | 14 ++++---- .../NuGet/DotNetNuke.Web.Deprecated.nuspec | 13 ++++---- Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec | 13 +++++--- Build/Tools/NuGet/DotNetNuke.Web.nuspec | 18 ++++++----- Build/Tools/NuGet/DotNetNuke.WebApi.nuspec | 14 ++++---- 10 files changed, 88 insertions(+), 76 deletions(-) diff --git a/Build/Tools/NuGet/DotNetNuke.Bundle.nuspec b/Build/Tools/NuGet/DotNetNuke.Bundle.nuspec index 030eaf9b125..95ced463f27 100644 --- a/Build/Tools/NuGet/DotNetNuke.Bundle.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.Bundle.nuspec @@ -6,39 +6,39 @@ DNN Platform (Bundle) DNN Corp DNN Corp - https://github.com/dnnsoftware/Dnn.Platform/blob/development/LICENSE + MIT false http://www.dnnsoftware.com/favicon.ico https://github.com/dnnsoftware/Dnn.Platform - DNN Platform is an open source web application framework. - This package contains components required for developing many different kinds of extensions for DNN Platform. - Installing this package also installs DotNetNuke.Core, DotNetNuke.Instrumentation, DotNetNuke.Web, DotNetNuke.Web.Client, DotNetNuke.Web.Mvc, DotNetNuke.WebApi, and DotNetNuke.Web.Deprecated. + This package is a metapackage that automatically includes all other available DNN Packages, this should only be used in situations where support for ALL types of development are truly needed. - DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved. + DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved. - + + + + - - - + + - - + + - - + + - - + + - + diff --git a/Build/Tools/NuGet/DotNetNuke.Core.nuspec b/Build/Tools/NuGet/DotNetNuke.Core.nuspec index 5ce79125ae0..9413fe556ac 100644 --- a/Build/Tools/NuGet/DotNetNuke.Core.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.Core.nuspec @@ -6,19 +6,18 @@ DNN Platform (Core) DNN Corp DNN Corp - https://github.com/dnnsoftware/Dnn.Platform/blob/development/LICENSE + MIT false http://www.dnnsoftware.com/favicon.ico https://github.com/dnnsoftware/Dnn.Platform - DNN Platform is an open source web application framework. - This package contains only the core DNN Platform library. + Provides basic references to the DotNetNuke.dll to develop extensions for the DNN Platform. For MVC or WebAPI please see other packages available as well - DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved. + DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved. - - - + + + \ No newline at end of file diff --git a/Build/Tools/NuGet/DotNetNuke.Instrumentation.nuspec b/Build/Tools/NuGet/DotNetNuke.Instrumentation.nuspec index 37cd69dc0ec..5dffdf8d456 100644 --- a/Build/Tools/NuGet/DotNetNuke.Instrumentation.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.Instrumentation.nuspec @@ -6,20 +6,22 @@ DNN Platform (Instrumentation) DNN Corp DNN Corp - https://github.com/dnnsoftware/Dnn.Platform/blob/development/LICENSE + MIT false http://www.dnnsoftware.com/favicon.ico https://github.com/dnnsoftware/Dnn.Platform - DNN Platform is an open source web application framework. - This package contains components required for logging and instrumentation for DNN Platform. + Provides references to enhanced logging and instrumentation available within DNN Platform for extension developers. Including access to Log4Net - DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved. + DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved. + + + - - - - + + + + \ No newline at end of file diff --git a/Build/Tools/NuGet/DotNetNuke.Providers.FolderProviders.nuspec b/Build/Tools/NuGet/DotNetNuke.Providers.FolderProviders.nuspec index 97624470215..7f1792f0f55 100644 --- a/Build/Tools/NuGet/DotNetNuke.Providers.FolderProviders.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.Providers.FolderProviders.nuspec @@ -3,15 +3,21 @@ DotNetNuke.Providers.FolderProviders $version$ - DotNetNuke.Providers.FolderProviders + DNN Platform (Folder Providers) DNN Corp. DNN Corp. + MIT false - DotNetNuke Folder Providers - DotNetNuke is copyright 2002-2018 by DNN Corp. All Rights Reserved. + + Provides API references needed to develop custom folder providers, or to consume folder providers + + DotNetNuke is copyright 2002-2019 by DNN Corp. All Rights Reserved. + + + - - + + \ No newline at end of file diff --git a/Build/Tools/NuGet/DotNetNuke.SiteExportImport.nuspec b/Build/Tools/NuGet/DotNetNuke.SiteExportImport.nuspec index e9b09c0b3b0..cb9a17f77eb 100644 --- a/Build/Tools/NuGet/DotNetNuke.SiteExportImport.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.SiteExportImport.nuspec @@ -3,15 +3,14 @@ DotNetNuke.SiteExportImport $version$ - DNN Site Export/Import + DNN Platform (Site Export/Import) DNN Corp DNN Corp - https://github.com/dnnsoftware/Dnn.Platform/blob/development/LICENSE + MIT false http://www.dnnsoftware.com/favicon.ico https://github.com/dnnsoftware/Dnn.Platform - DNN Platform is an open source web application framework. This package contains components required for developing extensiong to utilize site export/import features. DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved. @@ -22,10 +21,10 @@ - - + + - - + + \ No newline at end of file diff --git a/Build/Tools/NuGet/DotNetNuke.Web.Client.nuspec b/Build/Tools/NuGet/DotNetNuke.Web.Client.nuspec index d8b1758d4c2..adb9ba22b5a 100644 --- a/Build/Tools/NuGet/DotNetNuke.Web.Client.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.Web.Client.nuspec @@ -6,18 +6,20 @@ DNN Platform (Client Resources) DNN Corp DNN Corp - https://github.com/dnnsoftware/Dnn.Platform/blob/development/LICENSE + MIT false http://www.dnnsoftware.com/favicon.ico https://github.com/dnnsoftware/Dnn.Platform - DNN Platform is an open source web application framework. - This package contains components which can be used for managing client-side resources (e.g. JavaScript and CSS) within DNN Platform. + Provides API references for usage of the Client Dependency Framework (CDF) for the inclusion of CSS and JS files within DNN Platform - DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved. + DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved. + + + - - + + \ No newline at end of file diff --git a/Build/Tools/NuGet/DotNetNuke.Web.Deprecated.nuspec b/Build/Tools/NuGet/DotNetNuke.Web.Deprecated.nuspec index 5ab1ffa18d5..0907ec5e7bb 100644 --- a/Build/Tools/NuGet/DotNetNuke.Web.Deprecated.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.Web.Deprecated.nuspec @@ -6,23 +6,22 @@ DNN Platform (Deprecated Components) DNN Corp DNN Corp - https://github.com/dnnsoftware/Dnn.Platform/blob/development/LICENSE + MIT false http://www.dnnsoftware.com/favicon.ico https://github.com/dnnsoftware/Dnn.Platform - DNN Platform is an open source web application framework. - This package contains components which are deprecated and expected to be removed from DNN Platform in a later version. + Provides API references for deprecated items removed from the primary API's, such as DNN's Telerik component. These elements may not be distributed with DNN in the future - DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved. + DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved. - - - + + + \ No newline at end of file diff --git a/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec b/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec index d55a9d840dc..2b11ea530bf 100644 --- a/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec @@ -6,17 +6,22 @@ DNN Platform (ASP.NET MVC) DNN Corp DNN Corp - https://github.com/dnnsoftware/Dnn.Platform/blob/development/LICENSE + MIT false http://www.dnnsoftware.com/favicon.ico https://github.com/dnnsoftware/Dnn.Platform - DNN Platform is an open source web application framework. - This package contains components required for developing DNN Platform modules using ASP.NET MVC. + Provides API references needed to develop ASP.MVC extensions for DNN Platform - DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved. + DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved. + + + + + + diff --git a/Build/Tools/NuGet/DotNetNuke.Web.nuspec b/Build/Tools/NuGet/DotNetNuke.Web.nuspec index 359d6b72079..19187265f56 100644 --- a/Build/Tools/NuGet/DotNetNuke.Web.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.Web.nuspec @@ -6,20 +6,22 @@ DNN Platform (Web) DNN Corp DNN Corp - https://github.com/dnnsoftware/Dnn.Platform/blob/development/LICENSE + MIT false http://www.dnnsoftware.com/favicon.ico https://github.com/dnnsoftware/Dnn.Platform - DNN Platform is an open source web application framework. - This package contains components required for developing extensions for DNN Platform. + Provides references to core components such as Caching, Security and other security-related items for DNN Platform - DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved. + DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved. + + + - - - - + + + + \ No newline at end of file diff --git a/Build/Tools/NuGet/DotNetNuke.WebApi.nuspec b/Build/Tools/NuGet/DotNetNuke.WebApi.nuspec index 3e7872cdf2c..f8cb6c2ec87 100644 --- a/Build/Tools/NuGet/DotNetNuke.WebApi.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.WebApi.nuspec @@ -6,20 +6,18 @@ DNN Platform (ASP.NET Web API) DNN Corp DNN Corp - https://github.com/dnnsoftware/Dnn.Platform/blob/development/LICENSE + MIT false - DNN Platform is an open source web application framework. - This package contains components required for developing web services for DNN Platform. + This package contains components required for developing WebAPI based services for DNN Platform. - DNN and DotNetNuke are copyright 2002-2018 by DNN Corp. All Rights Reserved. + DNN and DotNetNuke are copyright 2002-2019 by DNN Corp. All Rights Reserved. - + + + - - - From eb6e4495f7550ad62ea257de9b452c00aeb5ad56 Mon Sep 17 00:00:00 2001 From: Mitchel Sellers Date: Wed, 6 Mar 2019 09:47:13 -0600 Subject: [PATCH 3/3] Corrected package name Corrected package name per review comments --- Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec b/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec index 2b11ea530bf..f4f93d06834 100644 --- a/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec +++ b/Build/Tools/NuGet/DotNetNuke.Web.Mvc.nuspec @@ -17,7 +17,7 @@ - + @@ -28,4 +28,4 @@ - \ No newline at end of file +