Fixed #21

DNNCommunity · Oct 13, 2019 · 60e86b5 · 60e86b5
1 parent ddc332b
commit 60e86b5
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/DNN_IFrame.dnn b/DNN_IFrame.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
    <packages>
-      <package name="DNN_IFrame" type="Module" version="08.01.01">
+      <package name="DNN_IFrame" type="Module" version="08.01.02">
          <friendlyName>IFrame</friendlyName>
          <description>
             <![CDATA[
@@ -19,6 +19,7 @@
          <azureCompatible>true</azureCompatible>
          <dependencies>
             <dependency type="CoreVersion">08.00.00</dependency>
+            <dependency type="Type">System.Data.SqlClient.SqlColumnEncryptionEnclaveProvider</dependency>
          </dependencies>
          <components>
             <component type="Config">
@@ -181,7 +182,7 @@
                   <script type="UnInstall">
                      <path>Providers\DataProviders\SqlDataProvider</path>
                      <name>Uninstall.SqlDataProvider</name>
-                     <version>08.01.01</version>
+                     <version>08.01.02</version>
                   </script>
                 </scripts>
             </component>
@@ -231,7 +232,7 @@
                   <attributes>
                      <businessControllerClass>DotNetNuke.Modules.IFrame.Components.ParametersController</businessControllerClass>
                      <desktopModuleID>[DESKTOPMODULEID]</desktopModuleID>
-                     <upgradeVersionsList>03.02.00,03.02.03,04.03.00,04.04.00,08.00.00,08.00.01,08.00.02,08.01.00,08.01.01</upgradeVersionsList>
+                     <upgradeVersionsList>03.02.00,03.02.03,04.03.00,04.04.00,08.00.00,08.00.01,08.00.02,08.01.00,08.01.01,08.01.02</upgradeVersionsList>
                   </attributes>
                </eventMessage>
             </component>
@@ -241,7 +242,7 @@
                   <assembly>
                      <path>bin</path>
                      <name>DotNetNuke.Modules.IFrame.dll</name>
-                     <version>8.1.1.0</version>
+                     <version>8.1.2.0</version>
                   </assembly>
                </assemblies>
             </component>

diff --git a/Documentation/ReleaseNotes.html b/Documentation/ReleaseNotes.html
@@ -38,4 +38,9 @@ <h3>DNN IFrame Project 08.01.01</h3>
    <ul>
       <li>Corrected bug #12 (Making a change to the settings forced re-check of disable validation box)</li>
    </ul>
+   <h3>DNN IFrame Project 08.01.02</h3>
+   <ul>
+      <li>Requires .Net Framework 4.7.2</li>
+      <li>Fixed #21 (Errors running in DNN 09.04.01)</li>
+   </ul>
 </div>
diff --git a/IFrame.ascx.cs b/IFrame.ascx.cs
@@ -61,7 +61,7 @@ private string Source
 
                   List<ParametersInfo> parameters = (List<ParametersInfo>)ParametersController.GetParameters(ModuleId);
 
-                  if (parameters.Count() > 0)
+                  if ((parameters != null) && (parameters.Count() > 0))
                   {
                      bool queryStringOpen = false;
                      foreach (ParametersInfo p in parameters)

diff --git a/IFrame.csproj b/IFrame.csproj
@@ -15,7 +15,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>DotNetNuke.Modules.IFrame</RootNamespace>
     <AssemblyName>DotNetNuke.Modules.IFrame</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
     <IISExpressSSLPort />
     <IISExpressAnonymousAuthentication />
@@ -112,9 +112,15 @@
       <HintPath>..\..\..\bin\DotNetNuke.WebUtility.dll</HintPath>
     </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Web" />
+    <Reference Include="System.Web.ApplicationServices" />
+    <Reference Include="System.Web.DynamicData" />
+    <Reference Include="System.Web.Entity" />
     <Reference Include="System.Web.Extensions" />
     <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("8.1.1.0")]
-[assembly: AssemblyFileVersion("8.1.1.0")]
+[assembly: AssemblyVersion("8.1.2.0")]
+[assembly: AssemblyFileVersion("8.1.2.0")]