Skip to content

Commit

Permalink
Set core object versions to core version (#3287)
Browse files Browse the repository at this point in the history
Ensure skin and radeditorprovider get the core version nr and add SPROC to set the version of all core packages/desktopmodules to the core version

Fixes #3239
  • Loading branch information
donker authored and bdukes committed Nov 18, 2019
1 parent 30bfa5f commit 42c3d97
Show file tree
Hide file tree
Showing 7 changed files with 147 additions and 3 deletions.
5 changes: 5 additions & 0 deletions DNN Platform/Library/Data/DataProvider.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions DNN Platform/Library/Services/Upgrade/Upgrade.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<br>");
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.RadEditorProvider" type="Provider" version="09.01.00">
<package name="DotNetNuke.RadEditorProvider" type="Provider" version="09.04.02">
<friendlyName>RadEditor Manager</friendlyName>
<description>A module used to configure toolbar items, behavior, and other options used in the DotNetNuke RadEditor Provider.</description>
<owner>
Expand Down
4 changes: 2 additions & 2 deletions DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="1.0">
<packages>
<package name="Skin.Xcillion" type="Skin" version="02.00.00">
<package name="Skin.Xcillion" type="Skin" version="09.04.02">
<friendlyName>Xcillion</friendlyName>
<iconFile></iconFile>
<description><![CDATA[A new default DNN skin]]></description>
Expand Down Expand Up @@ -29,7 +29,7 @@
</component>
</components>
</package>
<package name="Container.Xcillion" type="Container" version="02.00.00">
<package name="Container.Xcillion" type="Container" version="09.04.02">
<friendlyName>Xcillion</friendlyName>
<iconFile></iconFile>
<description><![CDATA[DNN container]]></description>
Expand Down
1 change: 1 addition & 0 deletions DNN Platform/Website/DotNetNuke.Website.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3326,6 +3326,7 @@
<Content Include="Providers\DataProviders\SqlDataProvider\09.04.01.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\09.03.02.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\09.04.02.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\09.04.03.SqlDataProvider" />
<None Include="Providers\DataProviders\SqlDataProvider\DotNetNuke.Data.SqlDataProvider" />
<None Include="Providers\DataProviders\SqlDataProvider\DotNetNuke.Schema.SqlDataProvider" />
<None Include="Providers\DataProviders\SqlDataProvider\UnInstall.SqlDataProvider" />
Expand Down
Original file line number Diff line number Diff line change
@@ -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 *****/
/************************************************************/
/************************************************************/
Original file line number Diff line number Diff line change
Expand Up @@ -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 **/

Expand Down

0 comments on commit 42c3d97

Please sign in to comment.