Merge pull request #54 from DNNCommunity/bump-dnn940

Bumped Dnn dependency to 9.4.0

BuildScripts/ModulePackage.Targets

@@ -13,10 +13,6 @@
     <BinDir>$(DotNetNukeDir)\bin</BinDir>
   </PropertyGroup>
 
-
-
-
-
   <Target Name="PackageModule">
     <CallTarget Targets="DeployModule" Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
     <CallTarget Targets="CreateInstallPackages" Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
@@ -64,15 +60,23 @@
     <Delete Files="$(MSBuildProjectDirectory)\DebugDeploy.zip" />
   </Target>
 
-  <Target Name="CreateInstallPackages">
+  <Target Name="CreateInstallPackages" Outputs="UpdatedAssemblyVersionFiles">
 
     <!-- Set the module version -->
     <XmlRead Prefix="n" Namespace="http://schemas.microsoft.com/developer/msbuild/2003"
              XPath="dotnetnuke/packages/package[1]/@version"
              XmlFileName="$(MSBuildProjectDirectory)\DNN_Links.dnn">
       <Output TaskParameter="Value" PropertyName="ModuleVersion" />
     </XmlRead>
-    <AssemblyInfo AssemblyVersion="$(ModuleVersion).00" CodeLanguage="CS"></AssemblyInfo>
+    <AssemblyInfo
+      AssemblyVersion="$(ModuleVersion).00"
+      CodeLanguage="CS"
+      AssemblyTitle="DotNetNuke Links Module"
+      AssemblyDescription="Provides an easy way to place a list of links on a website"
+      AssemblyCompany="DotNetNuke"
+      AssemblyProduct="Links"
+      AssemblyCopyright="Copyright © 2021"
+      OutputFile="$(MSBuildProjectDirectory)\Properties\AssemblyInfo.cs" />
     <Message Text="MSBUILD: Assembly Version set to: $(ModuleVersion)" Importance="high"></Message>
 
     <!-- Remove the temporary folders in case previous build failed in the middle of an operation-->

DNN_Links.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_Links" type="Module" version="7.0.2">
+    <package name="DNN_Links" type="Module" version="7.1.0">
       <friendlyName>Links</friendlyName>
       <description>This module renders a list of hyperlinks. Links includes an edit page, which allows authorized users to edit the Links data stored in the SQL database.</description>
       <iconFile>img/links-icon.png</iconFile>
@@ -14,7 +14,7 @@
       <releaseNotes src="ReleaseNotes.htm" />
       <azureCompatible>true</azureCompatible>
       <dependencies>
-        <dependency type="coreVersion">08.00.00</dependency>
+        <dependency type="coreVersion">09.04.00</dependency>
       </dependencies>
       <components>
         <component type="Config">
@@ -76,13 +76,13 @@
             </script>
             <script type="Install">
               <path>Providers\DataProviders\SqlDataProvider</path>
-              <name>07.00.02.SqlDataProvider</name>
-              <version>07.00.02</version>
+              <name>07.01.00.SqlDataProvider</name>
+              <version>07.01.00</version>
             </script>
             <script type="UnInstall">
               <path>Providers\DataProviders\SqlDataProvider\</path>
               <name>Uninstall.SqlDataProvider</name>
-              <version>7.0.0</version>
+              <version>7.1.0</version>
             </script>
           </scripts>
         </component>

Dnn.Links.csproj

@@ -15,7 +15,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DotNetNuke.Modules.Links</RootNamespace>
     <AssemblyName>DotNetNuke.Modules.Links</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
     <Use64BitIISExpress />
     <IISExpressSSLPort />
@@ -25,6 +25,7 @@
     <UseGlobalApplicationHostFile />
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -45,48 +46,46 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetNuke, Version=8.0.0.809, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetNuke.Core.8.0.0.809\lib\net40\DotNetNuke.dll</HintPath>
+    <Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DotNetNuke.Web, Version=8.0.0.809, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetNuke.Web.8.0.0.809\lib\net40\DotNetNuke.Web.dll</HintPath>
+    <Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
-    <Reference Include="DotNetNuke.Web.Deprecated, Version=8.0.0.809, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetNuke.Web.Deprecated.8.0.0.809\lib\net40\DotNetNuke.Web.Deprecated.dll</HintPath>
+    <Reference Include="DotNetNuke.Web.Deprecated, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\DotNetNuke.Web.Deprecated.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetNuke.Web.Deprecated.8.0.0.809\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
+      <HintPath>packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetNuke.Core.8.0.0.809\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
+      <HintPath>packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Net.Http" />
-    <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>packages\Microsoft.AspNet.WebApi.Client.4.0.20710.0\lib\net40\System.Net.Http.Formatting.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-      <Private>False</Private>
-    </Reference>
     <Reference Include="System.Net.Http.WebRequest" />
-    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
+    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Web" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
     <Reference Include="Telerik.Web.UI, Version=2013.2.717.40, Culture=neutral, PublicKeyToken=121fae78165ba3d4, processorArchitecture=MSIL">
-      <HintPath>packages\DotNetNuke.Web.Deprecated.8.0.0.809\lib\net40\Telerik.Web.UI.dll</HintPath>
+      <HintPath>packages\DotNetNuke.Web.Deprecated.9.4.0\lib\net45\Telerik.Web.UI.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
       <Private>False</Private>
     </Reference>
@@ -149,7 +148,7 @@
     <Content Include="README.md" />
     <Content Include="Providers\DataProviders\SqlDataProvider\Uninstall.SqlDataProvider" />
     <None Include="packages.config" />
-    <Content Include="Providers\DataProviders\SqlDataProvider\07.00.02.SqlDataProvider" />
+    <Content Include="Providers\DataProviders\SqlDataProvider\07.01.00.SqlDataProvider" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="App_LocalResources\EditLinks.ascx.resx" />

Properties/AssemblyInfo.cs

@@ -1,35 +1,18 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("DotNetNuke Links Module")]
-[assembly: AssemblyDescription("Provides an easy way to place a list of links on a website")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("DotNetNuke")]
-[assembly: AssemblyProduct("Links")]
-[assembly: AssemblyCopyright("Copyright ©  2018")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
+[assembly: System.Reflection.AssemblyDescription("Provides an easy way to place a list of links on a website")]
+[assembly: System.Reflection.AssemblyCompany("DotNetNuke")]
+[assembly: System.Reflection.AssemblyProduct("Links")]
+[assembly: System.Reflection.AssemblyCopyright("Copyright © 2021")]
+[assembly: System.Reflection.AssemblyVersion("7.1.0.00")]
+[assembly: System.Reflection.AssemblyTitle("DotNetNuke Links Module")]
 
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("adf90061-f58a-488a-84ae-8297a3b2d9c7")]
 
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-[assembly: AssemblyVersion("7.0.0.0")]
-[assembly: AssemblyFileVersion("7.0.0.0")]

Providers/DataProviders/SqlDataProvider/07.00.02.SqlDataProvider → Providers/DataProviders/SqlDataProvider/07.01.00.SqlDataProvider

@@ -1,6 +1,5 @@
 /************************************************************/
 /*****              SqlDataProvider                     *****/
-/*****              04.01.01                            *****/
 /*****                                                  *****/
 /***** Note: To manually execute this script you must   *****/
 /*****       perform a search and replace operation     *****/

ReleaseNotes.htm

@@ -1,4 +1,11 @@
-<h2>Release notes DNN Links 07.00.01</h2>
+<h2>Release notes for DNN Links 07.01.00</h2>
+<ul>
+    <li>Fixed an issue with wrong sql object qualifier</li>
+    <li>Fixed an issue with import/export</li>
+    <li>Bumped minimum Dnn depenency to 9.4.0</li>
+</ul>
+
+<h2>Release notes DNN Links 07.00.01</h2>
 <p>Links Module 07.00.01 will work for DNN version 08.00.00 and has been tested up to Dnn 9.2.0</p>
 <h3>Bug fixes</h3>
 <ul>

packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="DotNetNuke.Core" version="8.0.0.809" targetFramework="net45" />
-  <package id="DotNetNuke.Web" version="8.0.0.809" targetFramework="net45" />
-  <package id="DotNetNuke.Web.Deprecated" version="8.0.0.809" targetFramework="net45" />
+  <package id="DotNetNuke.Core" version="9.4.0" targetFramework="net45" />
+  <package id="DotNetNuke.Web" version="9.4.0" targetFramework="net45" />
+  <package id="DotNetNuke.Web.Deprecated" version="9.4.0" targetFramework="net45" />
   <package id="MSBuildTasks" version="1.5.0.235" targetFramework="net45" developmentDependency="true" />
 </packages>