Skip to content

Commit 23e892f

Browse files
amarjit-dhunnaamarjit-dhunna
committed
Updates for references issues and ValidateAntiForgeryToken issues
1 parent 8b8225c commit 23e892f

14 files changed

+47
-37
lines changed

‎Dnn-Connect.sln renamed to ‎Dnn-MvcSpaSample.sln

File renamed without changes.

‎Website/Install/Module/DNN_ContactList_Mvc_01.00.01_Install.zip

-1.57 KB
Binary file not shown.

‎Website/Install/Module/DNN_ContactList_SPA_01.00.00_Install.zip

2.71 KB
Binary file not shown.

‎src/Dnn.ContactList.Api/Dnn.ContactList.Api.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="DotNetNuke, Version=8.0.0.581, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.581\lib\net40\DotNetNuke.dll</HintPath>
33+
<Reference Include="DotNetNuke, Version=8.0.0.726, Culture=neutral, processorArchitecture=MSIL">
34+
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.726\lib\net40\DotNetNuke.dll</HintPath>
3535
<Private>True</Private>
3636
</Reference>
3737
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.581\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
38+
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.726\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
3939
<Private>True</Private>
4040
</Reference>
4141
<Reference Include="System" />

‎src/Dnn.ContactList.Api/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetNuke.Core" version="8.0.0.581" targetFramework="net45" />
3+
<package id="DotNetNuke.Core" version="8.0.0.726" targetFramework="net45" />
44
</packages>

‎src/Dnn.ContactList.Mvc/Controllers/ContactController.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ namespace Dnn.ContactList.Mvc.Controllers
1616
/// <summary>
1717
/// ContactController is the MVC Controller class for managing Contacts in the UI
1818
/// </summary>
19+
[DnnHandleError]
1920
public class ContactController : DnnController
2021
{
2122
private readonly IContactRepository _repository;
@@ -55,6 +56,7 @@ public ActionResult Delete(int contactId)
5556
/// </summary>
5657
/// <returns></returns>
5758
[HttpGet]
59+
[DotNetNuke.Web.Mvc.Framework.ActionFilters.ValidateAntiForgeryToken]
5860
public ActionResult Edit(int contactId = -1)
5961
{
6062
var contact = (contactId == -1)

‎src/Dnn.ContactList.Mvc/Controllers/SettingsController.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public ActionResult Index()
4141
/// <returns></returns>
4242
[HttpPost]
4343
[ValidateInput(false)]
44-
[ValidateAntiForgeryToken]
44+
[DotNetNuke.Web.Mvc.Framework.ActionFilters.ValidateAntiForgeryToken]
4545
public ActionResult Index(Settings settings)
4646
{
4747
ModuleContext.Configuration.ModuleSettings["PageSize"] = settings.PageSize.ToString();

‎src/Dnn.ContactList.Mvc/Dnn.ContactList.Mvc.csproj

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,22 @@
4141
<DocumentationFile>bin\Dnn.ContactList.Mvc.XML</DocumentationFile>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="DotNetNuke, Version=8.0.0.581, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.581\lib\net40\DotNetNuke.dll</HintPath>
46-
<Private>True</Private>
44+
<Reference Include="DotNetNuke, Version=8.0.0.726, Culture=neutral, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.726\lib\net40\DotNetNuke.dll</HintPath>
4747
</Reference>
48-
<Reference Include="DotNetNuke.Web.Mvc, Version=8.0.0.620, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\DotNetNuke.Web.Mvc.8.0.0.620\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
50-
<Private>True</Private>
48+
<Reference Include="DotNetNuke.Web.Mvc, Version=8.0.0.726, Culture=neutral, processorArchitecture=MSIL">
49+
<SpecificVersion>False</SpecificVersion>
50+
<HintPath>..\..\packages\DotNetNuke.Web.Mvc.8.0.0.726\lib\net45\DotNetNuke.Web.Mvc.dll</HintPath>
5151
</Reference>
5252
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5353
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.581\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
5454
<Private>True</Private>
5555
</Reference>
5656
<Reference Include="Microsoft.CSharp" />
57-
<Reference Include="Newtonsoft.Json">
58-
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
57+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
58+
<SpecificVersion>False</SpecificVersion>
59+
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
5960
</Reference>
6061
<Reference Include="System.Web.DynamicData" />
6162
<Reference Include="System.Web.Entity" />

‎src/Dnn.ContactList.Mvc/packages.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetNuke.Core" version="8.0.0.581" targetFramework="net45" />
4-
<package id="DotNetNuke.Web.Mvc" version="8.0.0.620" targetFramework="net45" />
3+
<package id="DotNetNuke.Core" version="8.0.0.726" targetFramework="net45" />
4+
<package id="DotNetNuke.Web.Mvc" version="8.0.0.726" targetFramework="net45" />
55
<package id="Microsoft.AspNet.Mvc" version="5.1.1" targetFramework="net45" />
66
<package id="Microsoft.AspNet.Razor" version="3.1.2" targetFramework="net45" />
77
<package id="Microsoft.AspNet.WebPages" version="3.1.1" targetFramework="net45" />
88
<package id="Microsoft.web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
9+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
910
</packages>

‎src/Dnn.ContactList.Spa/Dnn.ContactList.Spa.csproj

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,25 +41,24 @@
4141
<DocumentationFile>bin\Dnn.ContactList.Spa.XML</DocumentationFile>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="DotNetNuke, Version=8.0.0.581, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.581\lib\net40\DotNetNuke.dll</HintPath>
46-
<Private>True</Private>
44+
<Reference Include="DotNetNuke, Version=8.0.0.726, Culture=neutral, processorArchitecture=MSIL">
45+
<SpecificVersion>False</SpecificVersion>
46+
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.726\lib\net40\DotNetNuke.dll</HintPath>
4747
</Reference>
48-
<Reference Include="DotNetNuke.Web, Version=8.0.0.581, Culture=neutral, processorArchitecture=MSIL">
49-
<HintPath>..\..\packages\DotNetNuke.Web.8.0.0.581\lib\net40\DotNetNuke.Web.dll</HintPath>
50-
<Private>True</Private>
48+
<Reference Include="DotNetNuke.Web">
49+
<HintPath>..\..\packages\DotNetNuke.Web.8.0.0.726\lib\net40\DotNetNuke.Web.dll</HintPath>
5150
</Reference>
52-
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\DotNetNuke.Web.8.0.0.581\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
54-
<Private>True</Private>
51+
<Reference Include="DotNetNuke.WebUtility">
52+
<HintPath>..\..\packages\DotNetNuke.Web.8.0.0.726\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
5553
</Reference>
5654
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
5755
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.581\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
5856
<Private>True</Private>
5957
</Reference>
6058
<Reference Include="Microsoft.CSharp" />
61-
<Reference Include="Newtonsoft.Json">
62-
<HintPath>..\..\packages\Newtonsoft.Json.4.5.11\lib\portable-net40+sl4+wp7+win8\Newtonsoft.Json.dll</HintPath>
59+
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
60+
<SpecificVersion>False</SpecificVersion>
61+
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
6362
</Reference>
6463
<Reference Include="System.Net.Http" />
6564
<Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

‎src/Dnn.ContactList.Spa/packages.config

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetNuke.Core" version="8.0.0.581" targetFramework="net45" />
4-
<package id="DotNetNuke.Web" version="8.0.0.581" targetFramework="net45" />
3+
<package id="DotNetNuke.Core" version="8.0.0.726" targetFramework="net45" />
4+
<package id="DotNetNuke.Web" version="8.0.0.726" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi" version="5.1.1" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.Client" version="5.1.1" targetFramework="net45" />
77
<package id="Microsoft.AspNet.WebApi.Core" version="5.1.1" targetFramework="net45" />
88
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.1.1" targetFramework="net45" />
9-
<package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
9+
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net45" />
1010
</packages>

‎src/Dnn.ContactList.Spa/web.config

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<configuration>
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
23
<system.webServer>
34
<security>
45
<requestFiltering>
@@ -8,4 +9,12 @@
89
</requestFiltering>
910
</security>
1011
</system.webServer>
12+
<runtime>
13+
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
14+
<dependentAssembly>
15+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
16+
<bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
17+
</dependentAssembly>
18+
</assemblyBinding>
19+
</runtime>
1120
</configuration>

‎tests/Dnn.ContactList.Tests/Dnn.ContactList.Tests.csproj

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,11 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="DotNetNuke, Version=8.0.0.581, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.581\lib\net40\DotNetNuke.dll</HintPath>
35-
<Private>True</Private>
33+
<Reference Include="DotNetNuke">
34+
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.726\lib\net40\DotNetNuke.dll</HintPath>
3635
</Reference>
37-
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.581\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
39-
<Private>True</Private>
36+
<Reference Include="Microsoft.ApplicationBlocks.Data">
37+
<HintPath>..\..\packages\DotNetNuke.Core.8.0.0.726\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
4038
</Reference>
4139
<Reference Include="Moq, Version=4.2.1502.911, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
4240
<HintPath>..\..\packages\Moq.4.2.1502.0911\lib\net40\Moq.dll</HintPath>

‎tests/Dnn.ContactList.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetNuke.Core" version="8.0.0.581" targetFramework="net45" />
3+
<package id="DotNetNuke.Core" version="8.0.0.726" targetFramework="net45" />
44
<package id="Moq" version="4.2.1502.911" targetFramework="net45" />
55
<package id="NUnit" version="2.6.4" targetFramework="net45" />
66
</packages>

0 commit comments

Comments
 (0)