diff --git a/DNN Platform/Library/Data/DataProvider.cs b/DNN Platform/Library/Data/DataProvider.cs index b6eb426643b..c1ce410e7a9 100644 --- a/DNN Platform/Library/Data/DataProvider.cs +++ b/DNN Platform/Library/Data/DataProvider.cs @@ -3179,6 +3179,11 @@ public virtual void UpdatePackage(int packageID, int portalID, string friendlyNa iconFile); } + public virtual void SetCorePackageVersions() + { + ExecuteNonQuery("SetCorePackageVersions"); + } + #endregion #region Languages/Localization diff --git a/DNN Platform/Library/Services/Upgrade/Upgrade.cs b/DNN Platform/Library/Services/Upgrade/Upgrade.cs index 82789722798..87224f5b994 100644 --- a/DNN Platform/Library/Services/Upgrade/Upgrade.cs +++ b/DNN Platform/Library/Services/Upgrade/Upgrade.cs @@ -5877,6 +5877,7 @@ public static void UpgradeDNN(string providerPath, Version dataBaseVersion) //execute config file updates UpdateConfig(providerPath, ver, true); } + DataProvider.Instance().SetCorePackageVersions(); // perform general application upgrades HtmlUtils.WriteFeedback(HttpContext.Current.Response, 0, "Performing General Upgrades
"); diff --git a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/DotNetNuke.RadEditorProvider.dnn b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/DotNetNuke.RadEditorProvider.dnn index 1eccabbdc03..c6caa0c6ea2 100644 --- a/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/DotNetNuke.RadEditorProvider.dnn +++ b/DNN Platform/Providers/HtmlEditorProviders/RadEditorProvider/DotNetNuke.RadEditorProvider.dnn @@ -1,6 +1,6 @@  - + RadEditor Manager A module used to configure toolbar items, behavior, and other options used in the DotNetNuke RadEditor Provider. diff --git a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn index 5823618725b..b33320db1e1 100644 --- a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn +++ b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn @@ -1,6 +1,6 @@ - + Xcillion @@ -29,7 +29,7 @@ - + Xcillion diff --git a/DNN Platform/Website/DotNetNuke.Website.csproj b/DNN Platform/Website/DotNetNuke.Website.csproj index 6108d2b201e..8d3e74d1308 100644 --- a/DNN Platform/Website/DotNetNuke.Website.csproj +++ b/DNN Platform/Website/DotNetNuke.Website.csproj @@ -3326,6 +3326,7 @@ + diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.04.03.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.04.03.SqlDataProvider new file mode 100644 index 00000000000..17536ff063e --- /dev/null +++ b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/09.04.03.SqlDataProvider @@ -0,0 +1,135 @@ +/************************************************************/ +/***** SqlDataProvider *****/ +/***** *****/ +/***** *****/ +/***** Note: To manually execute this script you must *****/ +/***** perform a search and replace operation *****/ +/***** for {databaseOwner} and {objectQualifier} *****/ +/***** *****/ +/************************************************************/ + +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'{databaseOwner}{objectQualifier}SetCorePackageVersions') AND type in (N'P', N'PC')) +DROP PROCEDURE {databaseOwner}{objectQualifier}SetCorePackageVersions +GO + +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +CREATE PROCEDURE {databaseOwner}{objectQualifier}SetCorePackageVersions +AS +DECLARE @Version VARCHAR(10) +SET @Version = (SELECT TOP 1 + CAST(v.Major AS VARCHAR) + '.' + + CAST(v.Minor AS VARCHAR) + '.' + + CAST(v.Build AS VARCHAR) +FROM {databaseOwner}{objectQualifier}Version v +ORDER BY v.Major DESC, v.Minor DESC, v.Build DESC); +UPDATE {databaseOwner}{objectQualifier}Packages +SET Version=@Version +WHERE [Name] IN ('DotNetNuke.Authentication', +'DotNetNuke.SearchResults', +'DotNetNuke.Security', +'DotNetNuke.ACTIONBUTTONSkinObject', +'DotNetNuke.ACTIONSSkinObject', +'DotNetNuke.BANNERSkinObject', +'DotNetNuke.BREADCRUMBSkinObject', +'DotNetNuke.COPYRIGHTSkinObject', +'DotNetNuke.CURRENTDATESkinObject', +'DotNetNuke.DOTNETNUKESkinObject', +'DotNetNuke.DROPDOWNACTIONSSkinObject', +'DotNetNuke.HELPSkinObject', +'DotNetNuke.HOSTNAMESkinObject', +'DotNetNuke.ICONSkinObject', +'DotNetNuke.LANGUAGESkinObject', +'DotNetNuke.LINKACTIONSSkinObject', +'DotNetNuke.LINKSSkinObject', +'DotNetNuke.LOGINSkinObject', +'DotNetNuke.LOGOSkinObject', +'DotNetNuke.MENUSkinObject', +'DotNetNuke.NAVSkinObject', +'DotNetNuke.PRINTMODULESkinObject', +'DotNetNuke.PRIVACYSkinObject', +'DotNetNuke.SEARCHSkinObject', +'DotNetNuke.SIGNINSkinObject', +'DotNetNuke.TERMSSkinObject', +'DotNetNuke.TITLESkinObject', +'DotNetNuke.TREEVIEWSkinObject', +'DotNetNuke.USERSkinObject', +'DotNetNuke.VISIBILITYSkinObject', +'DotNetNuke.TEXTSkinObject', +'DotNetNuke.STYLESSkinObject', +'DotNetNuke.LEFTMENUSkinObject', +'DotNetNuke.JQUERYSkinObject', +'DotNetNuke.CONTROLPANEL.SkinObject', +'DotNetNuke.Console', +'DefaultAuthentication', +'DotNetNuke.ViewProfile', +'DotNetNuke.TagsSkinObject', +'DotNetNuke.Skin.Default', +'DotNetNuke.Container.Default', +'DotNetNuke.Registration', +'DotNetNuke.ToastSkinObject', +'DotNetNuke.DNNCSSINCLUDESkinObject', +'DotNetNuke.DNNCSSEXCLUDESkinObject', +'DotNetNuke.DNNJSINCLUDESkinObject', +'DotNetNuke.DNNJSEXCLUDESkinObject', +'DotNetNuke.Module Creator'); +UPDATE {databaseOwner}{objectQualifier}DesktopModules +SET Version=@Version +FROM {databaseOwner}{objectQualifier}DesktopModules dtm +INNER JOIN {databaseOwner}{objectQualifier}Packages p ON p.PackageID=dtm.PackageID +WHERE p.[Name] IN ('DotNetNuke.Authentication', +'DotNetNuke.SearchResults', +'DotNetNuke.Security', +'DotNetNuke.ACTIONBUTTONSkinObject', +'DotNetNuke.ACTIONSSkinObject', +'DotNetNuke.BANNERSkinObject', +'DotNetNuke.BREADCRUMBSkinObject', +'DotNetNuke.COPYRIGHTSkinObject', +'DotNetNuke.CURRENTDATESkinObject', +'DotNetNuke.DOTNETNUKESkinObject', +'DotNetNuke.DROPDOWNACTIONSSkinObject', +'DotNetNuke.HELPSkinObject', +'DotNetNuke.HOSTNAMESkinObject', +'DotNetNuke.ICONSkinObject', +'DotNetNuke.LANGUAGESkinObject', +'DotNetNuke.LINKACTIONSSkinObject', +'DotNetNuke.LINKSSkinObject', +'DotNetNuke.LOGINSkinObject', +'DotNetNuke.LOGOSkinObject', +'DotNetNuke.MENUSkinObject', +'DotNetNuke.NAVSkinObject', +'DotNetNuke.PRINTMODULESkinObject', +'DotNetNuke.PRIVACYSkinObject', +'DotNetNuke.SEARCHSkinObject', +'DotNetNuke.SIGNINSkinObject', +'DotNetNuke.TERMSSkinObject', +'DotNetNuke.TITLESkinObject', +'DotNetNuke.TREEVIEWSkinObject', +'DotNetNuke.USERSkinObject', +'DotNetNuke.VISIBILITYSkinObject', +'DotNetNuke.TEXTSkinObject', +'DotNetNuke.STYLESSkinObject', +'DotNetNuke.LEFTMENUSkinObject', +'DotNetNuke.JQUERYSkinObject', +'DotNetNuke.CONTROLPANEL.SkinObject', +'DotNetNuke.Console', +'DefaultAuthentication', +'DotNetNuke.ViewProfile', +'DotNetNuke.TagsSkinObject', +'DotNetNuke.Skin.Default', +'DotNetNuke.Container.Default', +'DotNetNuke.Registration', +'DotNetNuke.ToastSkinObject', +'DotNetNuke.DNNCSSINCLUDESkinObject', +'DotNetNuke.DNNCSSEXCLUDESkinObject', +'DotNetNuke.DNNJSINCLUDESkinObject', +'DotNetNuke.DNNJSEXCLUDESkinObject', +'DotNetNuke.Module Creator'); +GO + +/************************************************************/ +/***** SqlDataProvider *****/ +/************************************************************/ +/************************************************************/ diff --git a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/UnInstall.SqlDataProvider b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/UnInstall.SqlDataProvider index d40d8211b5b..078f18cfcf7 100644 --- a/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/UnInstall.SqlDataProvider +++ b/DNN Platform/Website/Providers/DataProviders/SqlDataProvider/UnInstall.SqlDataProvider @@ -1160,6 +1160,8 @@ DROP PROCEDURE {databaseOwner}[{objectQualifier}ResetTermsAgreement] GO DROP PROCEDURE {databaseOwner}[{objectQualifier}UserRequestsRemoval] GO +DROP PROCEDURE {databaseOwner}[{objectQualifier}SetCorePackageVersions] +GO /** Remove AspNet Data **/