Skip to content

Commit f950004

Browse files
donkerdonker
authored
Merge pull request #172 from donker/fixes
Bump dependency and release
2 parents 6f24fa9 + 1713861 commit f950004

File tree

9 files changed

+60
-29
lines changed

9 files changed

+60
-29
lines changed

‎ReleaseNotes.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22

33
* Removal of Telerik dependencies
44
* Removed SharpzipLib dependency in favor of .net framework compression
5-
* Set the DNN dependency to version 9.4.0
5+
* Set the DNN dependency to version 9.7.0
66

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

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -61,20 +61,32 @@
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.4.0.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\DotNetNuke.dll</HintPath>
64+
<Reference Include="DotNetNuke, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\DotNetNuke.Core.9.7.0\lib\net45\DotNetNuke.dll</HintPath>
6666
</Reference>
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>
67+
<Reference Include="DotNetNuke.Abstractions, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
68+
<HintPath>..\..\packages\DotNetNuke.Abstractions.9.7.0\lib\netstandard2.0\DotNetNuke.Abstractions.dll</HintPath>
6969
</Reference>
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>
70+
<Reference Include="DotNetNuke.DependencyInjection, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
71+
<HintPath>..\..\packages\DotNetNuke.DependencyInjection.9.7.0\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll</HintPath>
72+
</Reference>
73+
<Reference Include="DotNetNuke.Web, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\DotNetNuke.Web.9.7.0\lib\net45\DotNetNuke.Web.dll</HintPath>
75+
</Reference>
76+
<Reference Include="DotNetNuke.Web.Client, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
77+
<HintPath>..\..\packages\DotNetNuke.Web.Client.9.7.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
7278
</Reference>
7379
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
74-
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
80+
<HintPath>..\..\packages\DotNetNuke.Web.9.7.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
7581
</Reference>
7682
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
77-
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
83+
<HintPath>..\..\packages\DotNetNuke.Core.9.7.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
84+
</Reference>
85+
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
86+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
87+
</Reference>
88+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
89+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
7890
</Reference>
7991
<Reference Include="Microsoft.Web.Infrastructure, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
8092
<HintPath>..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>

‎Server/Blog/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ Imports System.Runtime.InteropServices
4444
' You can specify all the values or you can default the Build and Revision Numbers
4545
' by using the '*' as shown below:
4646

47-
<Assembly: AssemblyVersion("6.4.2")>
47+
<Assembly: AssemblyVersion("6.5.0")>
4848

4949
<Assembly: Guid("49cae2ac-30c7-45fe-8663-948e1543d8d3")>
5050
<Assembly: AssemblyInformationalVersion("06.04.01")>
51-
<Assembly: AssemblyFileVersion("6.4.2")>
51+
<Assembly: AssemblyFileVersion("6.5.0")>

‎Server/Blog/PostEdit.ascx.vb‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Imports DotNetNuke.Framework.JavaScriptLibraries
2828
Imports DotNetNuke.Modules.Blog.Entities.Blogs
2929
Imports DotNetNuke.Modules.Blog.Entities.Posts
3030
Imports DotNetNuke.Services.Localization
31-
Imports Telerik.Web.UI
3231
Imports DotNetNuke.Modules.Blog.Common.Globals
3332
Imports DotNetNuke.Modules.Blog.Integration
3433
Imports DotNetNuke.Modules.Blog.Entities.Terms

‎Server/Blog/packages.config‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,20 @@
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.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" />
4+
<package id="DotNetNuke.Abstractions" version="9.7.0" targetFramework="net472" />
5+
<package id="DotNetNuke.Core" version="9.7.0" targetFramework="net472" />
6+
<package id="DotNetNuke.DependencyInjection" version="9.7.0" targetFramework="net472" />
7+
<package id="DotNetNuke.Web" version="9.7.0" targetFramework="net472" />
8+
<package id="DotNetNuke.Web.Client" version="9.7.0" targetFramework="net472" />
79
<package id="Microsoft.AspNet.Mvc" version="5.1.3" targetFramework="net452" />
810
<package id="Microsoft.AspNet.Razor" version="3.1.2" targetFramework="net452" />
911
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" />
1012
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
1113
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
1214
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
1315
<package id="Microsoft.AspNet.WebPages" version="3.1.2" targetFramework="net452" />
16+
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net472" />
17+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net472" />
1418
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net452" />
1519
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net472" />
1620
</packages>

‎Server/OpenUrlRewriter/My Project/AssemblyInfo.vb‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
3131
' by using the '*' as shown below:
3232
' <Assembly: AssemblyVersion("1.0.*")>
3333

34-
<Assembly: AssemblyVersion("6.4.2")>
35-
<Assembly: AssemblyFileVersion("6.4.2")>
34+
<Assembly: AssemblyVersion("6.5.0")>
35+
<Assembly: AssemblyFileVersion("6.5.0")>

‎Server/OpenUrlRewriter/OpenUrlRewriterDNNBlogProvider.vbproj‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,20 +49,32 @@
4949
<OptionInfer>On</OptionInfer>
5050
</PropertyGroup>
5151
<ItemGroup>
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>
52+
<Reference Include="DotNetNuke, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
53+
<HintPath>..\..\packages\DotNetNuke.Core.9.7.0\lib\net45\DotNetNuke.dll</HintPath>
5454
</Reference>
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>
55+
<Reference Include="DotNetNuke.Abstractions, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
56+
<HintPath>..\..\packages\DotNetNuke.Abstractions.9.7.0\lib\netstandard2.0\DotNetNuke.Abstractions.dll</HintPath>
5757
</Reference>
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>
58+
<Reference Include="DotNetNuke.DependencyInjection, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
59+
<HintPath>..\..\packages\DotNetNuke.DependencyInjection.9.7.0\lib\netstandard2.0\DotNetNuke.DependencyInjection.dll</HintPath>
60+
</Reference>
61+
<Reference Include="DotNetNuke.Web, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
62+
<HintPath>..\..\packages\DotNetNuke.Web.9.7.0\lib\net45\DotNetNuke.Web.dll</HintPath>
63+
</Reference>
64+
<Reference Include="DotNetNuke.Web.Client, Version=9.7.0.0, Culture=neutral, processorArchitecture=MSIL">
65+
<HintPath>..\..\packages\DotNetNuke.Web.Client.9.7.0\lib\net45\DotNetNuke.Web.Client.dll</HintPath>
6066
</Reference>
6167
<Reference Include="DotNetNuke.WebUtility, Version=4.2.1.783, Culture=neutral, processorArchitecture=MSIL">
62-
<HintPath>..\..\packages\DotNetNuke.Web.9.4.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
68+
<HintPath>..\..\packages\DotNetNuke.Web.9.7.0\lib\net45\DotNetNuke.WebUtility.dll</HintPath>
6369
</Reference>
6470
<Reference Include="Microsoft.ApplicationBlocks.Data, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
65-
<HintPath>..\..\packages\DotNetNuke.Core.9.4.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
71+
<HintPath>..\..\packages\DotNetNuke.Core.9.7.0\lib\net45\Microsoft.ApplicationBlocks.Data.dll</HintPath>
72+
</Reference>
73+
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
74+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.2.1.1\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
75+
</Reference>
76+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
77+
<HintPath>..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
6678
</Reference>
6779
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6880
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

‎Server/OpenUrlRewriter/packages.config‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
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" />
3+
<package id="DotNetNuke.Abstractions" version="9.7.0" targetFramework="net472" />
4+
<package id="DotNetNuke.Core" version="9.7.0" targetFramework="net472" />
5+
<package id="DotNetNuke.DependencyInjection" version="9.7.0" targetFramework="net472" />
6+
<package id="DotNetNuke.Web" version="9.7.0" targetFramework="net472" />
7+
<package id="DotNetNuke.Web.Client" version="9.7.0" targetFramework="net472" />
68
<package id="Microsoft.AspNet.WebApi" version="5.2.3" targetFramework="net452" />
79
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net452" />
810
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net452" />
911
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.3" targetFramework="net452" />
12+
<package id="Microsoft.Extensions.DependencyInjection" version="2.1.1" targetFramework="net472" />
13+
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net472" />
1014
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net472" />
1115
</packages>

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "dnn-blog",
3-
"version": "6.4.2",
3+
"version": "6.5.0",
44
"description": "The DotNetNuke Blog module is an easy to use content publishing module that is tightly integrated with the core DotNetNuke framework. It can be used in single or multi-author environments and also permits content authoring using off-site tools such as Windows Live Writer.",
55
"dnn": {
66
"projectFolders": [

0 commit comments

Comments
 (0)