From 6ab6b4780620053c2194293266eded6e081d38eb Mon Sep 17 00:00:00 2001 From: Richard Edwards Date: Thu, 21 Jan 2016 12:03:11 -0500 Subject: [PATCH] Updated build for DNN8, released 06.05.00 --- AssemblyInfo.vb | 8 ++++---- Components/Data/AggregatorDB.vb | 10 ++++------ CopyAggregator.ascx.vb | 6 ------ Version/All/Version_Current.html | 10 ++++------ Version/All/Version_Current.md | 13 ++++--------- Version/Documentation/Releases.html.md | 15 ++++++--------- 6 files changed, 22 insertions(+), 40 deletions(-) diff --git a/AssemblyInfo.vb b/AssemblyInfo.vb index 4d4336b..b438117 100644 --- a/AssemblyInfo.vb +++ b/AssemblyInfo.vb @@ -1,7 +1,7 @@ '------------------------------------------------------------------------------ ' ' This code was generated by a tool. -' Runtime Version:4.0.30319.34209 +' Runtime Version:4.0.30319.42000 ' ' Changes to this file may cause incorrect behavior and will be lost if ' the code is regenerated. @@ -16,12 +16,12 @@ Imports System.Reflection Imports System.Runtime.CompilerServices Imports System.Runtime.InteropServices + Assembly: AssemblyVersion("06.05.00"), _ + Assembly: AssemblyFileVersion("06.05.00")> diff --git a/Components/Data/AggregatorDB.vb b/Components/Data/AggregatorDB.vb index fa9b7ab..8ba2ec1 100644 --- a/Components/Data/AggregatorDB.vb +++ b/Components/Data/AggregatorDB.vb @@ -11,14 +11,12 @@ '* DEALINGS IN THE SOFTWARE. '*************/ Option Strict On -Option Explicit On +Option Explicit On -Imports System -Imports System.Data Imports System.Xml Imports DotNetNuke Imports DotNetNuke.Common.Utilities -Imports DotNetNuke.Services.Search +''Imports DotNetNuke.Services.Search Namespace DNNStuff.Aggregator @@ -584,7 +582,7 @@ Namespace DNNStuff.Aggregator #Region " Search Interface" Public Function GetSearchItems(ByVal ModInfo As Entities.Modules.ModuleInfo) As Services.Search.SearchItemInfoCollection Implements Entities.Modules.ISearchable.GetSearchItems - Dim SearchItemCollection As New SearchItemInfoCollection + Dim SearchItemCollection As New DotNetNuke.Services.Search.SearchItemInfoCollection Dim ai As AggregatorInfo = GetAggregatorObjectGraph(ModInfo.ModuleID, "", "") @@ -598,7 +596,7 @@ Namespace DNNStuff.Aggregator Dim strDescription As String = HtmlUtils.Shorten(HtmlUtils.Clean(strDesktopHtml, False), MAX_DESCRIPTION_LENGTH, "...") Dim strGuid As String = "Agg" & ModInfo.ModuleID.ToString & "_SelectTab=" & tabNumber.ToString - Dim SearchItem As SearchItemInfo = New SearchItemInfo(ModInfo.ModuleTitle, strDescription, 0, Date.Now, ModInfo.ModuleID, tabNumber.ToString, strDesktopHtml, strGuid) + Dim SearchItem As DotNetNuke.Services.Search.SearchItemInfo = New DotNetNuke.Services.Search.SearchItemInfo(ModInfo.ModuleTitle, strDescription, 0, Date.Now, ModInfo.ModuleID, tabNumber.ToString, strDesktopHtml, strGuid) SearchItemCollection.Add(SearchItem) diff --git a/CopyAggregator.ascx.vb b/CopyAggregator.ascx.vb index 61cc72e..9624ed1 100644 --- a/CopyAggregator.ascx.vb +++ b/CopyAggregator.ascx.vb @@ -13,20 +13,14 @@ Option Strict On Option Explicit On -Imports System.Text.RegularExpressions Imports System.Collections.Generic -Imports System.Xml Imports DotNetNuke Imports DotNetNuke.Common Imports DotNetNuke.Common.Utilities -Imports DotNetNuke.Entities.Portals Imports DotNetNuke.Services.Exceptions -Imports DotNetNuke.Services.Localization Imports DotNetNuke.Entities.Tabs Imports DotNetNuke.Entities.Modules -Imports DotNetNuke.Services.FileSystem -Imports DotNetNuke.Security Imports DotNetNuke.Security.Permissions Namespace DNNStuff.Aggregator diff --git a/Version/All/Version_Current.html b/Version/All/Version_Current.html index 45c4060..e287d0a 100644 --- a/Version/All/Version_Current.html +++ b/Version/All/Version_Current.html @@ -1,14 +1,12 @@ -

06.04.11

-

01/Jun/2015

-

06.04.10

-

12/Feb/2015

+

06.05.00

+

21/Jan/2016

  • Fixes
      -
    • Added a jQueryUI 1.10.x specific version of the jQuery Accordion - in the list as Accordion_1_10
      • +
    • Added support for DNN8
      • +
    • Minimum configuration is now DNN 7.1.2+ (.NET 4.0) / DNN 8+ (.NET 4.5)

For additional release history please visit the documentation.

-

For additional release history please visit the documentation.

diff --git a/Version/All/Version_Current.md b/Version/All/Version_Current.md index c07e6c7..58db09a 100644 --- a/Version/All/Version_Current.md +++ b/Version/All/Version_Current.md @@ -1,17 +1,12 @@ -## 06.04.11 +## 06.05.00 -01/Jun/2015 +21/Jan/2016 -## 06.04.10 - -12/Feb/2015 - * Fixes - * Added a jQueryUI 1.10.x specific version of the jQuery Accordion - in the list as Accordion_1_10 + * Added support for DNN8 + * Minimum configuration is now DNN 7.1.2+ (.NET 4.0) / DNN 8+ (.NET 4.5) For additional release history please visit the [documentation](http://docs.dnnstuff.com/pages/aggregator). - -For additional release history please visit the [documentation](http://docs.dnnstuff.com/pages/aggregator). diff --git a/Version/Documentation/Releases.html.md b/Version/Documentation/Releases.html.md index e113fc9..c34315e 100644 --- a/Version/Documentation/Releases.html.md +++ b/Version/Documentation/Releases.html.md @@ -3,25 +3,22 @@ title: Release History tags: ['intro','page'] ``` -```Minimum configuration DNN 6.0.3+ / DNN7+ / .NET 3.5+ only``` +```Minimum configuration DNN 7.1.2+ (.NET 4.0) / DNN 8+ (.NET 4.5)``` -## 06.04.11 - -01/Jun/2015 +## 06.05.00 +21/Jan/2016 -## 06.04.10 - -12/Feb/2015 * Fixes - * Added a jQueryUI 1.10.x specific version of the jQuery Accordion - in the list as Accordion_1_10 + * Added support for DNN8 + * Minimum configuration is now DNN 7.1.2+ (.NET 4.0) / DNN 8+ (.NET 4.5) -For additional release history please visit the [documentation](http://docs.dnnstuff.com/pages/aggregator). +```Minimum configuration DNN 6.0.3+ / DNN7+ / .NET 3.5+ only``` ## 06.04.10