Skip to content

Commit dabcb3c

Browse files
valadasvaladas
authored
Merge pull request #67 from stetard/Upgrade
Fixed ambiguous usage of DnnFilePickerUploader
2 parents 9771c22 + ae48cc0 commit dabcb3c

5 files changed

+64
-44
lines changed

‎AnnouncementsEdit.ascx.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
using DotNetNuke.Web.Client;
4545
using DotNetNuke.Web.Client.ClientResourceManagement;
4646
using DotNetNuke.Web.Mvp;
47-
using DotNetNuke.Web.UI.WebControls;
4847
using DotNetNuke.Web.UI.WebControls.Internal;
4948
using WebFormsMvp;
5049

@@ -69,7 +68,7 @@ public partial class AnnouncementsEdit : ModuleView<AnnouncementsEditModel>, IAn
6968
public event EventHandler<EditItemEventArgs> UpdateAnnouncement;
7069

7170
protected UI.UserControls.LabelControl plTitle;
72-
protected DnnFilePickerUploader urlImage;
71+
protected DotNetNuke.Web.UI.WebControls.DnnFilePickerUploader urlImage;
7372
protected UI.UserControls.TextEditor teDescription;
7473
protected UI.UserControls.UrlControl ctlURL;
7574
protected UI.UserControls.ModuleAuditControl ctlAudit;

‎Components/Business/AnnouncementsController.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ public override IList<SearchDocument> GetModifiedSearchDocuments(ModuleInfo modu
278278
{
279279
var moduleSettings = moduleInfo.ModuleSettings;
280280
int descriptionLength = 100;
281-
if (!string.IsNullOrWhiteSpace(moduleSettings["descriptionLength"].ToString()))
281+
if (moduleSettings["descriptionLength"] != null && !string.IsNullOrWhiteSpace(moduleSettings["descriptionLength"].ToString()))
282282
{
283283
int.TryParse(moduleSettings["descriptionLength"].ToString(), out descriptionLength);
284284
if (descriptionLength < 1) { descriptionLength = 1950; }

‎DotNetNuke.Announcements.csproj

+30-19
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,9 @@
265265
<None Include="web.AutoInstallSourcePackage.config">
266266
<DependentUpon>web.config</DependentUpon>
267267
</None>
268-
<Content Include="web.config" />
268+
<Content Include="web.config">
269+
<SubType>Designer</SubType>
270+
</Content>
269271
<None Include="web.Debug.config">
270272
<DependentUpon>web.config</DependentUpon>
271273
</None>
@@ -280,41 +282,50 @@
280282
<WCFMetadata Include="Connected Services\" />
281283
</ItemGroup>
282284
<ItemGroup>
283-
<Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
284-
<HintPath>packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
285+
<Reference Include="DotNetNuke, Version=9.6.2.0, Culture=neutral, processorArchitecture=MSIL">
286+
<HintPath>packages\DotNetNuke.Core.9.6.2\lib\net45\DotNetNuke.dll</HintPath>
285287
<SpecificVersion>False</SpecificVersion>
286288
<Private>False</Private>
287289
</Reference>
288-
<Reference Include="DotNetNuke.Instrumentation, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
289-
<HintPath>packages\DotNetNuke.Instrumentation.9.4.0\lib\net45\DotNetNuke.Instrumentation.dll</HintPath>
290+
<Reference Include="DotNetNuke.DependencyInjection, Version=9.6.2.0, Culture=neutral, processorArchitecture=MSIL">
291+
<HintPath>packages\DotNetNuke.DependencyInjection.9.6.2\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll</HintPath>
290292
<SpecificVersion>False</SpecificVersion>
291293
<Private>False</Private>
292294
</Reference>
293-
<Reference Include="DotNetNuke.Log4Net, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
294-
<HintPath>packages\DotNetNuke.Instrumentation.9.4.0\lib\net45\DotNetNuke.Log4Net.dll</HintPath>
295+
<Reference Include="DotNetNuke.Instrumentation, Version=9.6.2.0, Culture=neutral, processorArchitecture=MSIL">
296+
<HintPath>packages\DotNetNuke.Instrumentation.9.6.2\lib\net45\DotNetNuke.Instrumentation.dll</HintPath>
295297
<SpecificVersion>False</SpecificVersion>
296298
<Private>False</Private>
297299
</Reference>
298-
<Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
299-
<HintPath>packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll</HintPath>
300+
<Reference Include="DotNetNuke.log4net, Version=3.0.1.0, Culture=neutral, processorArchitecture=MSIL">
301+
<HintPath>packages\DotNetNuke.Instrumentation.9.6.2\lib\net45\DotNetNuke.log4net.dll</HintPath>
300302
<SpecificVersion>False</SpecificVersion>
301303
<Private>False</Private>
302304
</Reference>
303-
<Reference Include="DotNetNuke.Web.Client, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
304-
<HintPath>packages\DotNetNuke.Web.Client.9.4.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
305+
<Reference Include="DotNetNuke.Web, Version=9.6.2.0, Culture=neutral, processorArchitecture=MSIL">
306+
<HintPath>packages\DotNetNuke.Web.9.6.2\lib\net45\DotNetNuke.Web.dll</HintPath>
305307
<SpecificVersion>False</SpecificVersion>
306308
<Private>False</Private>
307309
</Reference>
308-
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
309-
<HintPath>packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
310+
<Reference Include="DotNetNuke.Web.Client, Version=9.6.2.0, Culture=neutral, processorArchitecture=MSIL">
311+
<HintPath>packages\DotNetNuke.Web.Client.9.6.2\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
310312
<SpecificVersion>False</SpecificVersion>
311313
<Private>False</Private>
312314
</Reference>
313-
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
314-
<HintPath>packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
315+
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
316+
<HintPath>packages\DotNetNuke.Web.9.6.2\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
315317
<SpecificVersion>False</SpecificVersion>
316318
<Private>False</Private>
317319
</Reference>
320+
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
321+
<HintPath>packages\DotNetNuke.Core.9.6.2\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
322+
</Reference>
323+
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
324+
<HintPath>packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
325+
</Reference>
326+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
327+
<HintPath>packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
328+
</Reference>
318329
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
319330
<HintPath>packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
320331
<SpecificVersion>False</SpecificVersion>
@@ -325,8 +336,8 @@
325336
<Reference Include="System.Data.DataSetExtensions" />
326337
<Reference Include="System.Net" />
327338
<Reference Include="System.Net.Http" />
328-
<Reference Include="System.Net.Http.Formatting, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
329-
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
339+
<Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
340+
<HintPath>packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
330341
<SpecificVersion>False</SpecificVersion>
331342
<Private>False</Private>
332343
</Reference>
@@ -337,8 +348,8 @@
337348
<Reference Include="System.Web.DynamicData" />
338349
<Reference Include="System.Web.Entity" />
339350
<Reference Include="System.Web.Extensions" />
340-
<Reference Include="System.Web.Http, Version=5.2.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
341-
<HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
351+
<Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
352+
<HintPath>packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
342353
<SpecificVersion>False</SpecificVersion>
343354
<Private>False</Private>
344355
</Reference>

‎packages.config

+11-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetNuke.Core" version="9.4.0" targetFramework="net452" />
4-
<package id="DotNetNuke.Instrumentation" version="9.4.0" targetFramework="net452" />
5-
<package id="DotNetNuke.Web" version="9.4.0" targetFramework="net452" />
6-
<package id="DotNetNuke.Web.Client" version="9.4.0" targetFramework="net452" />
7-
<package id="DotNetNuke.Web.Deprecated" version="9.4.0" targetFramework="net452" />
8-
<package id="DotNetNuke.WebApi" version="9.4.0" targetFramework="net452" />
9-
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
10-
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
3+
<package id="DotNetNuke.Core" version="9.6.2" targetFramework="net472" />
4+
<package id="DotNetNuke.DependencyInjection" version="9.6.2" targetFramework="net472" />
5+
<package id="DotNetNuke.Instrumentation" version="9.6.2" targetFramework="net472" />
6+
<package id="DotNetNuke.Web" version="9.6.2" targetFramework="net472" />
7+
<package id="DotNetNuke.Web.Client" version="9.6.2" targetFramework="net472" />
8+
<package id="DotNetNuke.WebApi" version="9.6.2" targetFramework="net472" />
9+
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.7" targetFramework="net472" />
10+
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.7" targetFramework="net472" />
11+
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net472" />
12+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net472" />
1113
<package id="MSBuildTasks" version="1.5.0.235" targetFramework="net452" developmentDependency="true" />
12-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
14+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net472" />
1315
</packages>

‎web.config

+21-13
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
<?xml version="1.0"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
3-
<system.webServer>
4-
<handlers>
5-
<remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
6-
<remove name="OPTIONSVerbHandler"/>
7-
<remove name="TRACEVerbHandler"/>
8-
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
9-
</handlers>
10-
</system.webServer>
3+
114
<runtime>
125
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
136
<dependentAssembly>
14-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
15-
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0"/>
7+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
8+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
9+
</dependentAssembly>
10+
<dependentAssembly>
11+
<assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
12+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
13+
</dependentAssembly>
14+
<dependentAssembly>
15+
<assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
16+
<bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
1617
</dependentAssembly>
1718
</assemblyBinding>
1819
</runtime>
@@ -25,6 +26,13 @@
2526
</system.Web>
2627
-->
2728
<system.web>
28-
<compilation targetFramework="4.7.2"/>
29+
<compilation targetFramework="4.7.2" />
2930
</system.web>
30-
</configuration>
31+
<system.webServer>
32+
<handlers>
33+
<remove name="ExtensionlessUrlHandler-Integrated-4.0" />
34+
<remove name="OPTIONSVerbHandler" />
35+
<remove name="TRACEVerbHandler" />
36+
<add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
37+
</handlers>
38+
</system.webServer></configuration>

0 commit comments

Comments
 (0)