Cleanup of Module for 7.0.0 release.

- Fixed upgrade issue that resulted in a non-standard database configuration if upgrading from a version prior to 6.0.0.  (Fixes #8)
- Updated readme file to contain minimum version information as well as DNN 9.2.0 upgrade recommendations
- Corrrected cleanup file to ensure that upgrades to 6.0.0 and later remove the older files necessarry (Fixes #7)

Author: mitchelsellers

README.md

@@ -4,6 +4,11 @@ A simple document management module for DotNetNuke & Evoq.  This module has been
 
 ## Minimum DNN Versions
 
+The current release of the DNN Documents module requires DNN 7.0.0 and later and .NET 4.0.  This release can be installed on any DNN Version from 7.0.0 to 9.2.x and later.  This release contains major fixes required for the 9.2.x release.
+
+## DNN Uupgrade Considerations
+
+Due to the major API changes that was included as part of the DNN 9.2.0 release, it is recommended that you upgrade the DNN Documents module to 7.0.0 BEFORE upgrading your website to DNN/Evoq 9.2.0, this will ensure that you do not encounter any upgrade errors related to this module.
 * Prior to Version 6.2.5 - Supports DNN 6.0.0 and later, running .NET 3.5 and later
 * Version 6.2.5 and Later - Supports DNN 6.0.0 and later, running .NET 4.0 and later
 

Source/DnnDocuments/04.01.02.txt Source/DnnDocuments/06.00.00.txt

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_Documents" type="Module" version="06.02.05">
+    <package name="DNN_Documents" type="Module" version="07.00.00">
       <friendlyName>Documents</friendlyName>
       <description>This module renders a list of documents, including links to browse or download the document. 
         Documents includes an edit page, which allows authorized users to edit the information about the Documents 
@@ -33,6 +33,9 @@
       </license>
       <releaseNotes>
         <![CDATA[ 
+        <h3>Version 07.00.00</h3>
+        <p>This version was released to establish support for DNN 9.2.0 and later. Minimum version of DNN upgraded to require 7.0.0 or later.</p>
+        
         <h3>Version 06.02.05</h3>
         <p>This version is the 6.2.0 version compiled to run on .NET 4.0!</p>
 
@@ -78,6 +81,8 @@
           </resourceFiles>
         </component>
 
+        <component type="Cleanup" version="06.00.00" fileName="06.00.00.txt" />
+        
         <component type="Module">
           <desktopModule>
             <moduleName>DNN_Documents</moduleName>

Source/DnnDocuments/DNN_Documents.dnn

@@ -123,7 +123,7 @@
     <Compile Include="Providers\DataProviders\SQLDataProvider\SqlDataProvider.vb" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="04.01.02.txt" />
+    <Content Include="06.00.00.txt" />
     <Content Include="App_LocalResources\Document.ascx.resx">
       <SubType>Designer</SubType>
     </Content>

Source/DnnDocuments/DotNetNuke.Documents.vbproj

@@ -163,3 +163,99 @@ VALUES (
 SELECT SCOPE_IDENTITY()
 GO
 
+--Discrepancy fix for upgrades prior to version 06.00.00
+IF (SELECT COLUMNPROPERTY( OBJECT_ID('{databaseOwner}{objectQualifier}DocumentsSettings'),'AllowUserSort','AllowsNull')) IS NULL 
+	ALTER TABLE {databaseOwner}{objectQualifier}DocumentsSettings 
+		DefaultFolder NVARCHAR(2000) NULL,
+		CategoriesListName NVARCHAR(50) NULL,
+		ADD AllowUserSort BIT NULL
+GO
+
+--Ensure all procedures the same
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = object_id(N'{databaseOwner}[{objectQualifier}AddDocumentsSettings]') AND OBJECTPROPERTY(id, N'IsProcedure') = 1)
+	DROP PROCEDURE {databaseOwner}[{objectQualifier}AddDocumentsSettings]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = object_id(N'{databaseOwner}[{objectQualifier}UpdateDocumentsSettings]') AND OBJECTPROPERTY(id, N'IsProcedure') = 1)
+	DROP PROCEDURE {databaseOwner}[{objectQualifier}UpdateDocumentsSettings]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = object_id(N'{databaseOwner}[{objectQualifier}DeleteDocumentsSettings]') AND OBJECTPROPERTY(id, N'IsProcedure') = 1)
+	DROP PROCEDURE {databaseOwner}[{objectQualifier}DeleteDocumentsSettings]
+GO
+
+IF EXISTS (SELECT * FROM dbo.sysobjects WHERE id = object_id(N'{databaseOwner}[{objectQualifier}GetDocumentsSettings]') AND OBJECTPROPERTY(id, N'IsProcedure') = 1)
+	DROP PROCEDURE {databaseOwner}[{objectQualifier}GetDocumentsSettings]
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}AddDocumentsSettings]
+	@ModuleId          INT,
+	@ShowTitleLink     BIT,
+	@SortOrder         NVARCHAR(2000),
+	@DisplayColumns    NVARCHAR(2000),
+	@UseCategoriesList BIT,
+	@DefaultFolder     NVARCHAR(2000),
+	@CategoriesListName NVARCHAR(50),
+	@AllowUserSort     BIT
+
+AS
+INSERT INTO {databaseOwner}[{objectQualifier}DocumentsSettings] (
+  ModuleId,
+  ShowTitleLink,
+  SortOrder,    
+  DisplayColumns,
+  UseCategoriesList,
+  DefaultFolder,
+  CategoriesListName,
+  AllowUserSort
+)
+VALUES (
+  @ModuleId,
+  @ShowTitleLink,
+  @SortOrder,    
+  @DisplayColumns,
+  @UseCategoriesList,
+  @DefaultFolder,
+  @CategoriesListName,
+  @AllowUserSort
+)
+SELECT @ModuleId
+GO
+
+CREATE PROCEDURE {databaseOwner}{objectQualifier}UpdateDocumentsSettings
+	@ModuleId          INT,
+	@ShowTitleLink     BIT,
+	@SortOrder         NVARCHAR(2000),
+	@DisplayColumns    NVARCHAR(2000),
+	@UseCategoriesList BIT,
+	@DefaultFolder     NVARCHAR(2000),
+	@CategoriesListName NVARCHAR(50),
+	@AllowUserSort     BIT
+
+AS
+UPDATE {databaseOwner}{objectQualifier}DocumentsSettings
+SET    ShowTitleLink=@ShowTitleLink,
+       SortOrder=@SortOrder,    
+       DisplayColumns=@DisplayColumns,
+       UseCategoriesList=@UseCategoriesList,
+       DefaultFolder=@DefaultFolder,
+       CategoriesListName=@CategoriesListName,
+       AllowUserSort=@AllowUserSort
+WHERE  ModuleId = @ModuleId
+GO
+
+CREATE  PROCEDURE {databaseOwner}[{objectQualifier}DeleteDocumentsSettings]
+	@ModuleId INT
+AS
+DELETE
+FROM {objectQualifier}DocumentsSettings
+WHERE  ModuleId = @ModuleId
+GO
+
+CREATE PROCEDURE {databaseOwner}[{objectQualifier}GetDocumentsSettings]
+	@ModuleId INT
+AS
+SELECT *
+FROM {objectQualifier}DocumentsSettings
+WHERE  ModuleId = @ModuleId
+GO