Skip to content

Release 08.02.00 #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-poindexter merged 2 commits into from
Jul 6, 2021
Merged

Release 08.02.00 #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
863de83
Remove Telerik and update dependencies
david-poindexter Jul 6, 2021
4af2891
Merge pull request #32 from david-poindexter/telerik-removal
david-poindexter Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 20 additions & 30 deletions Dnn.Modules.Newsletters.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,38 +46,26 @@
<DocumentationFile>bin\Dnn.Modules.Newsletters.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetNuke, Version=9.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Core.9.4.2\lib\net45\DotNetNuke.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<Reference Include="DotNetNuke, Version=9.9.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Core.9.9.1\lib\net45\DotNetNuke.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.DependencyInjection, Version=9.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.DependencyInjection.9.4.2\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<Reference Include="DotNetNuke.DependencyInjection, Version=9.9.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.DependencyInjection.9.9.1\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Instrumentation, Version=9.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Instrumentation.9.4.2\lib\net45\DotNetNuke.Instrumentation.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<Reference Include="DotNetNuke.Instrumentation, Version=9.9.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Instrumentation.9.9.1\lib\net45\DotNetNuke.Instrumentation.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Log4Net, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Instrumentation.9.4.2\lib\net45\DotNetNuke.Log4Net.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<Reference Include="DotNetNuke.log4net, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Instrumentation.9.9.1\lib\net45\DotNetNuke.log4net.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web, Version=9.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.9.4.2\lib\net45\DotNetNuke.Web.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<Reference Include="DotNetNuke.Web, Version=9.9.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.9.9.1\lib\net45\DotNetNuke.Web.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web.Deprecated, Version=9.4.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.Deprecated.9.4.2\lib\net45\DotNetNuke.Web.Deprecated.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Web.9.9.1\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>packages\DotNetNuke.Core.9.4.2\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>packages\DotNetNuke.Core.9.9.1\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
Expand All @@ -101,11 +89,6 @@
<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">
<HintPath>packages\DotNetNuke.Web.Deprecated.9.4.2\lib\net45\Telerik.Web.UI.dll</HintPath>
<SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Components\NewsletterController.cs" />
Expand Down Expand Up @@ -139,6 +122,13 @@
<None Include="packages.config" />
<Content Include="Providers\DataProviders\SqlDataProviders\08.00.01.SqlDataProvider" />
<Content Include="README.md" />
<Content Include="web.config" />
<None Include="web.Debug.config">
<DependentUpon>web.config</DependentUpon>
</None>
<None Include="web.Release.config">
<DependentUpon>web.config</DependentUpon>
</None>
</ItemGroup>
<ItemGroup />
<PropertyGroup>
Expand Down
23 changes: 4 additions & 19 deletions Newsletter.ascx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" %>

<dnn:DnnJsInclude runat="server" FilePath="~/Resources/Shared/Components/Tokeninput/jquery.tokeninput.js" Priority="103" />
Expand Down Expand Up @@ -65,33 +64,19 @@
</div>
<div class="dnnFormItem">
<dnn:Label id="plPriority" runat="server" ControlName="cboPriority" />
<%-- <asp:DropDownList id="cboPriority" runat="server">
<asp:DropDownList id="cboPriority" runat="server">
<asp:ListItem resourcekey="High" Value="1" />
<asp:ListItem resourcekey="Normal" Value="2" Selected="True" />
<asp:ListItem resourcekey="Low" Value="3" />
</asp:DropDownList>--%>
<dnn:DnnComboBox id="cboPriority" runat="server">
<items>
<dnn:DnnComboBoxItem resourcekey="High" Value="1" />
<dnn:DnnComboBoxItem resourcekey="Normal" Value="2" Selected="True" />
<dnn:DnnComboBoxItem resourcekey="Low" Value="3" />
</items>
</dnn:DnnComboBox>
</asp:DropDownList>
</div>
<div class="dnnFormItem">
<dnn:Label id="plSendMethod" runat="server" ControlName="cboSendMethod" />
<%-- <asp:DropDownList id="cboSendMethod" runat="server" AutoPostBack="true">
<asp:DropDownList id="cboSendMethod" runat="server" AutoPostBack="true">
<asp:ListItem resourcekey="SendTo" Value="TO" Selected="True" />
<asp:ListItem resourcekey="SendBCC" Value="BCC" />
<asp:ListItem resourcekey="SendRelay" Value="RELAY" />
</asp:DropDownList>--%>
<dnn:DnnComboBox id="cboSendMethod" runat="server" AutoPostBack="true">
<Items>
<dnn:DnnComboBoxItem resourcekey="SendTo" Value="TO" Selected="True" />
<dnn:DnnComboBoxItem resourcekey="SendBCC" Value="BCC" />
<dnn:DnnComboBoxItem resourcekey="SendRelay" Value="RELAY"/>
</Items>
</dnn:DnnComboBox>
</asp:DropDownList>
</div>
<div id="pnlRelayAddress" runat="server" visible="false" class="dnnFormItem">
<dnn:label id="plRelayAddress" runat="server" controlname="txtRelayAddress" />
Expand Down
4 changes: 2 additions & 2 deletions Newsletter.ascx.designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dnn_Newsletters.dnn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<dotnetnuke type="Package" version="5.0">
<packages>
<package name="DotNetNuke.Newsletters" type="Module" version="08.01.00">
<package name="DotNetNuke.Newsletters" type="Module" version="08.02.00">
<friendlyName>Newsletters</friendlyName>
<description>Administrators can send bulk email to all users belonging to a particular Role.</description>
<iconFile>~/Icons/Sigma/Newsletters_32X32.png</iconFile>
Expand Down
9 changes: 4 additions & 5 deletions packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="DotNetNuke.Core" version="9.4.2" targetFramework="net472" />
<package id="DotNetNuke.DependencyInjection" version="9.4.2" targetFramework="net472" />
<package id="DotNetNuke.Instrumentation" version="9.4.2" targetFramework="net472" />
<package id="DotNetNuke.Web" version="9.4.2" targetFramework="net472" />
<package id="DotNetNuke.Web.Deprecated" version="9.4.2" targetFramework="net472" />
<package id="DotNetNuke.Core" version="9.9.1" targetFramework="net472" />
<package id="DotNetNuke.DependencyInjection" version="9.9.1" targetFramework="net472" />
<package id="DotNetNuke.Instrumentation" version="9.9.1" targetFramework="net472" />
<package id="DotNetNuke.Web" version="9.9.1" targetFramework="net472" />
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net472" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net472" />
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net451" developmentDependency="true" />
Expand Down
5 changes: 5 additions & 0 deletions releaseNotes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
<h3>Newsletters 08.02.00</h3>
<ul style="padding-left: 30px;">
<li>Remove Telerik controls and update dependencies accordingly.</li>
<li>Update DNN NuGet Packages to DNN 09.09.01.</li>
</ul><br />
<h3>Newsletters 08.01.00</h3>
<ul style="padding-left: 30px;">
<li>Update DNN NuGet Packages to DNN 09.04.02.</li>
Expand Down
30 changes: 30 additions & 0 deletions web.Debug.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>

<!-- For more information on using web.config transformation visit https://go.microsoft.com/fwlink/?LinkId=125889 -->

<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an attribute "name" that has a value of "MyDB".

<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.
Note that because there is only one customErrors section under the
<system.web> node, there is no need to use the "xdt:Locator" attribute.

<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>
31 changes: 31 additions & 0 deletions web.Release.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>

<!-- For more information on using web.config transformation visit https://go.microsoft.com/fwlink/?LinkId=125889 -->

<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an attribute "name" that has a value of "MyDB".

<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.
Note that because there is only one customErrors section under the
<system.web> node, there is no need to use the "xdt:Locator" attribute.

<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>
17 changes: 17 additions & 0 deletions web.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0"?>
<configuration>

<system.web>
<compilation debug="true" targetFramework="4.7.2"/>
<httpRuntime targetFramework="4.7.2"/>
</system.web>

<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
<dependentAssembly>
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30AD4FE6B2A6AEED" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Loading