From 863de83920cf2e3b50cc2c57d37e58fd25daa7a5 Mon Sep 17 00:00:00 2001 From: David Poindexter Date: Tue, 6 Jul 2021 18:01:27 -0400 Subject: [PATCH] Remove Telerik and update dependencies --- Dnn.Modules.Newsletters.csproj | 50 ++++++++++++++-------------------- Newsletter.ascx | 23 +++------------- Newsletter.ascx.designer.cs | 4 +-- dnn_Newsletters.dnn | 2 +- packages.config | 9 +++--- releaseNotes.txt | 5 ++++ web.Debug.config | 30 ++++++++++++++++++++ web.Release.config | 31 +++++++++++++++++++++ web.config | 17 ++++++++++++ 9 files changed, 114 insertions(+), 57 deletions(-) create mode 100644 web.Debug.config create mode 100644 web.Release.config create mode 100644 web.config diff --git a/Dnn.Modules.Newsletters.csproj b/Dnn.Modules.Newsletters.csproj index a102b79..6cca8ba 100644 --- a/Dnn.Modules.Newsletters.csproj +++ b/Dnn.Modules.Newsletters.csproj @@ -46,38 +46,26 @@ bin\Dnn.Modules.Newsletters.XML - - packages\DotNetNuke.Core.9.4.2\lib\net45\DotNetNuke.dll - False - False + + packages\DotNetNuke.Core.9.9.1\lib\net45\DotNetNuke.dll - - packages\DotNetNuke.DependencyInjection.9.4.2\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll - False - False + + packages\DotNetNuke.DependencyInjection.9.9.1\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll - - packages\DotNetNuke.Instrumentation.9.4.2\lib\net45\DotNetNuke.Instrumentation.dll - False - False + + packages\DotNetNuke.Instrumentation.9.9.1\lib\net45\DotNetNuke.Instrumentation.dll - - packages\DotNetNuke.Instrumentation.9.4.2\lib\net45\DotNetNuke.Log4Net.dll - False - False + + packages\DotNetNuke.Instrumentation.9.9.1\lib\net45\DotNetNuke.log4net.dll - - packages\DotNetNuke.Web.9.4.2\lib\net45\DotNetNuke.Web.dll - False - False + + packages\DotNetNuke.Web.9.9.1\lib\net45\DotNetNuke.Web.dll - - packages\DotNetNuke.Web.Deprecated.9.4.2\lib\net45\DotNetNuke.Web.Deprecated.dll - False - False + + packages\DotNetNuke.Web.9.9.1\lib\net45\DotNetNuke.WebUtility.dll - packages\DotNetNuke.Core.9.4.2\lib\net45\Microsoft.ApplicationBlocks.Data.dll + packages\DotNetNuke.Core.9.9.1\lib\net45\Microsoft.ApplicationBlocks.Data.dll @@ -101,11 +89,6 @@ - - packages\DotNetNuke.Web.Deprecated.9.4.2\lib\net45\Telerik.Web.UI.dll - False - False - @@ -139,6 +122,13 @@ + + + web.config + + + web.config + diff --git a/Newsletter.ascx b/Newsletter.ascx index 26947e0..553a04f 100644 --- a/Newsletter.ascx +++ b/Newsletter.ascx @@ -4,7 +4,6 @@ <%@ Register TagPrefix="dnn" TagName="URLControl" Src="~/controls/DnnUrlControl.ascx" %> <%@ Register TagPrefix="dnn" Assembly="DotNetNuke" Namespace="DotNetNuke.UI.WebControls" %> <%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web" Namespace="DotNetNuke.Web.UI.WebControls" %> -<%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web.Deprecated" Namespace="DotNetNuke.Web.UI.WebControls"%> <%@ Register TagPrefix="dnn" Assembly="DotNetNuke.Web.Client" Namespace="DotNetNuke.Web.Client.ClientResourceManagement" %> @@ -65,33 +64,19 @@
- <%-- + - --%> - - - - - - - +
- <%-- + - --%> - - - - - - - +
diff --git a/Newsletter.ascx.designer.cs b/Newsletter.ascx.designer.cs index 1384d49..0a76090 100644 --- a/Newsletter.ascx.designer.cs +++ b/Newsletter.ascx.designer.cs @@ -201,7 +201,7 @@ public partial class Newsletter /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::DotNetNuke.Web.UI.WebControls.DnnComboBox cboPriority; + protected global::System.Web.UI.WebControls.DropDownList cboPriority; /// /// plSendMethod control. @@ -219,7 +219,7 @@ public partial class Newsletter /// Auto-generated field. /// To modify move field declaration from designer file to code-behind file. /// - protected global::DotNetNuke.Web.UI.WebControls.DnnComboBox cboSendMethod; + protected global::System.Web.UI.WebControls.DropDownList cboSendMethod; /// /// pnlRelayAddress control. diff --git a/dnn_Newsletters.dnn b/dnn_Newsletters.dnn index fc369c1..5c73269 100644 --- a/dnn_Newsletters.dnn +++ b/dnn_Newsletters.dnn @@ -1,6 +1,6 @@  - + Newsletters Administrators can send bulk email to all users belonging to a particular Role. ~/Icons/Sigma/Newsletters_32X32.png diff --git a/packages.config b/packages.config index adc84ce..8963c2b 100644 --- a/packages.config +++ b/packages.config @@ -1,10 +1,9 @@  - - - - - + + + + diff --git a/releaseNotes.txt b/releaseNotes.txt index c7db62d..dff8fe0 100644 --- a/releaseNotes.txt +++ b/releaseNotes.txt @@ -1,3 +1,8 @@ +

Newsletters 08.02.00

+
    +
  • Remove Telerik controls and update dependencies accordingly.
  • +
  • Update DNN NuGet Packages to DNN 09.09.01.
  • +

Newsletters 08.01.00

  • Update DNN NuGet Packages to DNN 09.04.02.
  • diff --git a/web.Debug.config b/web.Debug.config new file mode 100644 index 0000000..fae9cfe --- /dev/null +++ b/web.Debug.config @@ -0,0 +1,30 @@ + + + + + + + + + + \ No newline at end of file diff --git a/web.Release.config b/web.Release.config new file mode 100644 index 0000000..da6e960 --- /dev/null +++ b/web.Release.config @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/web.config b/web.config new file mode 100644 index 0000000..a9bf341 --- /dev/null +++ b/web.config @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + +