Skip to content

Commit 6f24fa9

Browse files
donkerdonker
authored
Merge pull request #171 from donker/fixes
Update some packages
2 parents 46b398a + 6ab79fd commit 6f24fa9

6 files changed

Lines changed: 37 additions & 34 deletions

File tree

‎ReleaseNotes.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1-
## Release Notes
2-
Here are some notes
1+
## Release Notes v 6.5.0
2+
3+
* Removal of Telerik dependencies
4+
* Removed SharpzipLib dependency in favor of .net framework compression
5+
* Set the DNN dependency to version 9.4.0
36

‎Server/Blog/DotNetNuke.Modules.Blog.vbproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,26 +61,26 @@
6161
<Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
6262
<HintPath>..\..\packages\CookComputing.XmlRPCv2.2.5.0\lib\CookComputing.XmlRpcV2.dll</HintPath>
6363
</Reference>
64-
<Reference Include="DotNetNuke, Version=9.3.2.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\DotNetNuke.Core.9.3.2\lib\net45\DotNetNuke.dll</HintPath>
64+
<Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
6666
</Reference>
67-
<Reference Include="DotNetNuke.Web, Version=9.3.2.0, Culture=neutral, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\DotNetNuke.Web.9.3.2\lib\net45\DotNetNuke.Web.dll</HintPath>
67+
<Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll</HintPath>
6969
</Reference>
70-
<Reference Include="DotNetNuke.Web.Client, Version=9.3.2.0, Culture=neutral, processorArchitecture=MSIL">
71-
<HintPath>..\..\packages\DotNetNuke.Web.Client.9.3.2\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
70+
<Reference Include="DotNetNuke.Web.Client, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\..\packages\DotNetNuke.Web.Client.9.4.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
7272
</Reference>
7373
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\DotNetNuke.Web.9.3.2\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
74+
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
7575
</Reference>
7676
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\DotNetNuke.Core.9.3.2\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
77+
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
7878
</Reference>
7979
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8080
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
8181
</Reference>
82-
<Reference Include="Newtonsoft.Json, Version=7.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
83-
<HintPath>..\..\packages\Newtonsoft.Json.7.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
82+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
83+
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
8484
</Reference>
8585
<Reference Include="System" />
8686
<Reference Include="System.Data" />

‎Server/Blog/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="CookComputing.XmlRPCv2" version="2.5.0" targetFramework="net452" />
4-
<package id="DotNetNuke.Core" version="9.3.2" targetFramework="net452" />
5-
<package id="DotNetNuke.Web" version="9.3.2" targetFramework="net452" />
6-
<package id="DotNetNuke.Web.Client" version="9.3.2" targetFramework="net452" />
4+
<package id="DotNetNuke.Core" version="9.4.0" targetFramework="net472" />
5+
<package id="DotNetNuke.Web" version="9.4.0" targetFramework="net472" />
6+
<package id="DotNetNuke.Web.Client" version="9.4.0" targetFramework="net472" />
77
<package id="Microsoft.AspNet.Mvc" version="5.1.3" targetFramework="net452" />
88
<package id="Microsoft.AspNet.Razor" version="3.1.2" targetFramework="net452" />
99
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" />
@@ -12,5 +12,5 @@
1212
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
1313
<package id="Microsoft.AspNet.WebPages" version="3.1.2" targetFramework="net452" />
1414
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
15-
<package id="Newtonsoft.Json" version="7.0.1" targetFramework="net452" />
15+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net472" />
1616
</packages>

‎Server/OpenUrlRewriter/OpenUrlRewriterDNNBlogProvider.vbproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,23 +49,23 @@
4949
<OptionInfer>On</OptionInfer>
5050
</PropertyGroup>
5151
<ItemGroup>
52-
<Reference Include="DotNetNuke, Version=9.3.2.0, Culture=neutral, processorArchitecture=MSIL">
53-
<HintPath>..\..\packages\DotNetNuke.Core.9.3.2\lib\net45\DotNetNuke.dll</HintPath>
52+
<Reference Include="DotNetNuke, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
5454
</Reference>
55-
<Reference Include="DotNetNuke.Web, Version=9.3.2.0, Culture=neutral, processorArchitecture=MSIL">
56-
<HintPath>..\..\packages\DotNetNuke.Web.9.3.2\lib\net45\DotNetNuke.Web.dll</HintPath>
55+
<Reference Include="DotNetNuke.Web, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.Web.dll</HintPath>
5757
</Reference>
58-
<Reference Include="DotNetNuke.Web.Client, Version=9.3.2.0, Culture=neutral, processorArchitecture=MSIL">
59-
<HintPath>..\..\packages\DotNetNuke.Web.Client.9.3.2\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
58+
<Reference Include="DotNetNuke.Web.Client, Version=9.4.0.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\DotNetNuke.Web.Client.9.4.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
6060
</Reference>
6161
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\DotNetNuke.Web.9.3.2\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
62+
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
6363
</Reference>
6464
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\DotNetNuke.Core.9.3.2\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
65+
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
6666
</Reference>
67-
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68-
<HintPath>..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
67+
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
6969
</Reference>
7070
<Reference Include="Satrabel.OpenUrlRewriter">
7171
<HintPath>..\References\Satrabel.OpenUrlRewriter.dll</HintPath>

‎Server/OpenUrlRewriter/app.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<configuration>
33
<runtime>
44
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
55
<dependentAssembly>
6-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
7-
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0"/>
6+
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
7+
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
88
</dependentAssembly>
99
</assemblyBinding>
1010
</runtime>
11-
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/></startup></configuration>
11+
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" /></startup></configuration>

‎Server/OpenUrlRewriter/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="DotNetNuke.Core" version="9.3.2" targetFramework="net452" />
4-
<package id="DotNetNuke.Web" version="9.3.2" targetFramework="net452" />
5-
<package id="DotNetNuke.Web.Client" version="9.3.2" targetFramework="net452" />
3+
<package id="DotNetNuke.Core" version="9.4.0" targetFramework="net472" />
4+
<package id="DotNetNuke.Web" version="9.4.0" targetFramework="net472" />
5+
<package id="DotNetNuke.Web.Client" version="9.4.0" targetFramework="net472" />
66
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" />
77
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
88
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
99
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
10-
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net452" />
10+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net472" />
1111
</packages>

0 commit comments

Comments
 (0)