Recompile for DNN 8

DNNCommunity · Feb 1, 2016 · 7affb77 · 7affb77
1 parent c17c624
commit 7affb77
Show file tree

Hide file tree

Showing 19 changed files with 103 additions and 105 deletions.
diff --git a/Admin.ascx b/Admin.ascx
@@ -1,6 +1,4 @@
 <%@ Control Language="vb" AutoEventWireup="false" CodeBehind="Admin.ascx.vb" Inherits="DotNetNuke.Modules.Blog.Admin" %>
-<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.UI.WebControls" Assembly="DotNetNuke" %>
-<%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls" %>
 <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
 <div class="dnnForm" id="tabs">
  <ul class="dnnAdminTabNav">

diff --git a/BlogEdit.ascx b/BlogEdit.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="vb" AutoEventWireup="false" CodeBehind="BlogEdit.ascx.vb" Inherits="DotNetNuke.Modules.Blog.BlogEdit" %>
-<%@ Register TagPrefix="dnnweb" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls" %>
 <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
 <%@ Register TagPrefix="blog" Namespace="DotNetNuke.Modules.Blog.Security.Controls" Assembly="DotNetNuke.Modules.Blog" %>
 <%@ Register TagPrefix="blog" Namespace="DotNetNuke.Modules.Blog.Controls" Assembly="DotNetNuke.Modules.Blog" %>

diff --git a/BlogImport.ascx b/BlogImport.ascx
@@ -1,8 +1,5 @@
 <%@ Control Language="vb" AutoEventWireup="false" CodeBehind="BlogImport.ascx.vb" Inherits="DotNetNuke.Modules.Blog.BlogImport" %>
 <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
-<%@ Register TagPrefix="dnn" Assembly="DotNetNuke" Namespace="DotNetNuke.UI.WebControls" %>
-<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Security.Permissions.Controls" Assembly="DotNetNuke" %>
-<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.Web.UI.WebControls" Assembly="DotNetNuke.Web" %>
 
 <div class="dnnForm dnnBlogImport dnnClear" id="dnnBlogImport">
  <asp:Wizard ID="wizBlogImport" runat="server"  DisplaySideBar="false" ActiveStepIndex="0"

diff --git a/Controls/ViewSettings.ascx b/Controls/ViewSettings.ascx
@@ -1,5 +1,4 @@
 <%@ Control Language="vb" AutoEventWireup="false" CodeBehind="ViewSettings.ascx.vb" Inherits="DotNetNuke.Modules.Blog.Controls.ViewSettings" %>
-<%@ Register TagPrefix="dnnweb" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls" %>
 <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
 <%@ Register TagPrefix="blog" Namespace="DotNetNuke.Modules.Blog.Controls" Assembly="DotNetNuke.Modules.Blog" %>
 

diff --git a/DotNetNuke.Modules.Blog.vbproj b/DotNetNuke.Modules.Blog.vbproj
@@ -62,21 +62,25 @@
       <HintPath>_References\CookComputing.XmlRpcV2.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="DotNetNuke, Version=7.1.2.356, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DotNetNuke, Version=8.0.0.809, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>_References\DotNetNuke.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DotNetNuke.Web, Version=7.1.2.356, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DotNetNuke.Web, Version=8.0.0.809, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>_References\DotNetNuke.Web.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DotNetNuke.Web.Client, Version=6.1.2.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DotNetNuke.Web.Client, Version=8.0.0.809, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>_References\DotNetNuke.Web.Client.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="DotNetNuke.Web.Deprecated">
+      <HintPath>_References\DotNetNuke.Web.Deprecated.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="DotNetNuke.WebControls, Version=2.4.0.598, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>_References\DotNetNuke.WebControls.dll</HintPath>
@@ -92,7 +96,7 @@
       <HintPath>_References\Microsoft.ApplicationBlocks.Data.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=4.5.6.14930, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+    <Reference Include="Newtonsoft.Json, Version=7.0.1.18622, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>_References\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
@@ -113,7 +117,7 @@
     <Reference Include="System.Web.DynamicData" />
     <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />
-    <Reference Include="System.Web.Http, Version=4.0.20710.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="System.Web.Http, Version=5.2.30128.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>_References\System.Web.Http.dll</HintPath>
       <Private>False</Private>
@@ -126,7 +130,7 @@
     <Reference Include="System.Web.Services" />
     <Reference Include="System.EnterpriseServices" />
     <Reference Include="System.Xml.Linq" />
-    <Reference Include="Telerik.Web.UI, Version=2013.2.717.40, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
+    <Reference Include="Telerik.Web.UI, Version=, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>_References\Telerik.Web.UI.dll</HintPath>
       <Private>False</Private>

diff --git a/Manage.ascx b/Manage.ascx
@@ -1,8 +1,6 @@
 <%@ Control Language="vb" AutoEventWireup="false" CodeBehind="Manage.ascx.vb" Inherits="DotNetNuke.Modules.Blog.Manage" %>
 <%@ Import Namespace="DotNetNuke.Entities.Users" %>
-<%@ Register TagPrefix="dnn" Namespace="DotNetNuke.UI.WebControls" Assembly="DotNetNuke" %>
-<%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls" %>
-<%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
+<%@ Register TagPrefix="dnnweb" Assembly="DotNetNuke.Web.Deprecated" Namespace="DotNetNuke.Web.UI.WebControls" %>
 <div class="dnnForm" id="tabs">
  <ul class="dnnAdminTabNav">
   <li id="blogsLink" runat="server"><a href="#<%= Blogs.ClientId %>"><%= LocalizeString("Blogs")%></a></li>
@@ -39,12 +37,12 @@
  </asp:Panel>
  <asp:Panel id="Posts" runat="server" CssClass="dnnClear">
   <div class="coreMessaging" id="blogPostsError"></div>
-  <dnn:DNNGrid id="grdPosts" autogeneratecolumns="false" cssclass="dnnGrid dnnSecurityRolesGrid"
+  <dnnweb:DNNGrid id="grdPosts" autogeneratecolumns="false" cssclass="dnnGrid dnnSecurityRolesGrid"
    runat="server" allowpaging="True" allowcustompaging="True" enableviewstate="True" AllowSorting="true"
    onneeddatasource="GetPosts">
    <MasterTableView>
     <Columns>
-     <dnn:DnnGridTemplateColumn HeaderText="Actions">
+     <dnnweb:DnnGridTemplateColumn HeaderText="Actions">
       <ItemStyle Width="90px"></ItemStyle>
       <ItemTemplate>
        <a href="<%# EditUrl("Post", Eval("ContentItemId"), "PostEdit") %>"
@@ -61,27 +59,27 @@
           title="Approve"
           style="display:<%# IIF(CType(Container.DataItem, DotNetNuke.Modules.Blog.Entities.Posts.PostInfo).Blog.CanApprove AND NOT CType(Container.DataItem, DotNetNuke.Modules.Blog.Entities.Posts.PostInfo).Published, "inline", "none") %>"><i class="fa fa-check icon16"></i></a>
       </ItemTemplate>
-     </dnn:DnnGridTemplateColumn>
-     <dnn:DnnGridTemplateColumn headertext="Date">
+     </dnnweb:DnnGridTemplateColumn>
+     <dnnweb:DnnGridTemplateColumn headertext="Date">
       <ItemTemplate>
        <%# DotNetNuke.Modules.Blog.Common.Globals.UtcToLocalTime(Eval("PublishedOnDate"), UserController.GetCurrentUserInfo().Profile.PreferredTimeZone)%>
       </ItemTemplate>
-     </dnn:DnnGridTemplateColumn>
-     <dnn:DnnGridBoundColumn datafield="Title" headertext="Title" AllowSorting="True" SortExpression="Title" />
-     <dnn:DnnGridTemplateColumn HeaderText="Published">
+     </dnnweb:DnnGridTemplateColumn>
+     <dnnweb:DnnGridBoundColumn datafield="Title" headertext="Title" AllowSorting="True" SortExpression="Title" />
+     <dnnweb:DnnGridTemplateColumn HeaderText="Published">
       <ItemStyle Width="30px" HorizontalAlign="Center"></ItemStyle>
       <ItemTemplate>
        <i class="fa fa-<%# IIf(Eval("Published"), "check", "times")%> icon16" id="approveTick<%# Eval("ContentItemID") %>"></i>
       </ItemTemplate>
-     </dnn:DnnGridTemplateColumn>
-     <dnn:DnnGridTemplateColumn HeaderText="Blog">
+     </dnnweb:DnnGridTemplateColumn>
+     <dnnweb:DnnGridTemplateColumn HeaderText="Blog">
       <ItemTemplate>
        <asp:Label ID="Label1" Runat="server" Text='<%# CType(Container.DataItem, DotNetNuke.Modules.Blog.Entities.Posts.PostInfo).Blog.Title %>' />
       </ItemTemplate>
-     </dnn:DnnGridTemplateColumn>
+     </dnnweb:DnnGridTemplateColumn>
     </Columns>
    </MasterTableView>
-  </dnn:DNNGrid>
+  </dnnweb:DNNGrid>
  </asp:Panel>
 </div>
 <p class="updatecancelbar">

diff --git a/Manage.ascx.designer.vb b/Manage.ascx.designer.vb
diff --git a/My Project/AssemblyInfo.vb b/My Project/AssemblyInfo.vb
@@ -44,8 +44,8 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("06.02.02")> 
+<Assembly: AssemblyVersion("06.03.00")> 
 
 <Assembly: Guid("49cae2ac-30c7-45fe-8663-948e1543d8d3")> 
-<Assembly: AssemblyInformationalVersion("06.02.02")> 
-<Assembly: AssemblyFileVersion("06.02.02")> 
+<Assembly: AssemblyInformationalVersion("06.03.00")> 
+<Assembly: AssemblyFileVersion("06.03.00")> 
diff --git a/PostEdit.ascx b/PostEdit.ascx
@@ -1,5 +1,5 @@
 <%@ Control Language="vb" AutoEventWireup="false" CodeBehind="PostEdit.ascx.vb" Inherits="DotNetNuke.Modules.Blog.PostEdit" %>
-<%@ Register TagPrefix="dnnweb" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls" %>
+<%@ Register TagPrefix="dnnweb" Assembly="DotNetNuke.Web.Deprecated" Namespace="DotNetNuke.Web.UI.WebControls" %>
 <%@ Register TagPrefix="dnn" TagName="TextEditor" Src="~/controls/TextEditor.ascx" %>
 <%@ Register TagPrefix="dnn" TagName="Label" Src="~/controls/LabelControl.ascx" %>
 <%@ Register TagPrefix="blog" Namespace="DotNetNuke.Modules.Blog.Controls" Assembly="DotNetNuke.Modules.Blog" %>

diff --git a/_Installation/Changelog.xml b/_Installation/Changelog.xml
@@ -134,4 +134,7 @@
  <release version="06.02.02">
   <change type="Fix">Fix for OpenGraph metadata</change>
  </release>
+ <release version="06.03.00">
+  <change type="Enhancement">Release for DNN 8</change>
+ </release>
 </changelog>
diff --git a/_Installation/DNN_Blog.dnn b/_Installation/DNN_Blog.dnn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dotnetnuke type="Package" version="5.0">
  <packages>
-  <package name="DotNetNuke.Blog" type="Module" version="05.00.00">
+  <package name="DotNetNuke.Blog" type="Module" version="05.00.00">
    <friendlyName>Blog</friendlyName>
    <description>The DotNetNuke Blog module is an easy to use content publishing module that is tightly integrated with the core DotNetNuke framework. It can be used in single or multi-author environments and also permits content authoring using off-site tools such as Windows Live Writer.</description>
    <iconFile>~/DesktopModules/Blog/Images/dnnBlog_32.png</iconFile>
@@ -15,7 +15,7 @@
    <releaseNotes />
    <azureCompatible>true</azureCompatible>
    <dependencies>
-    <dependency type="CoreVersion">07.01.02</dependency>
+    <dependency type="CoreVersion">08.00.00</dependency>
    </dependencies>
    <components>
     <component type="Module">

diff --git a/_References/DotNetNuke.Web.Client.dll b/_References/DotNetNuke.Web.Client.dll
diff --git a/_References/DotNetNuke.Web.dll b/_References/DotNetNuke.Web.dll
diff --git a/_References/DotNetNuke.WebUtility.dll b/_References/DotNetNuke.WebUtility.dll
diff --git a/_References/DotNetNuke.dll b/_References/DotNetNuke.dll
diff --git a/_References/Newtonsoft.Json.dll b/_References/Newtonsoft.Json.dll
diff --git a/_References/System.Net.Http.dll b/_References/System.Net.Http.dll
diff --git a/_References/System.Web.Http.dll b/_References/System.Web.Http.dll
diff --git a/_References/Telerik.Web.UI.dll b/_References/Telerik.Web.UI.dll