Update R7.Dnn.Extensions to 0.13.0, bump version

r7-labs · Feb 13, 2019 · 931a2fc · 931a2fc
1 parent f168461
commit 931a2fc
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 36 deletions.
diff --git a/Deploy/Deploy.csproj b/Deploy/Deploy.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>Deploy</RootNamespace>
     <AssemblyName>Deploy</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>1.0</ReleaseVersion>
+    <ReleaseVersion>1.1</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/R7.Dnn.UserHtml.Tests/R7.Dnn.UserHtml.Tests.csproj b/R7.Dnn.UserHtml.Tests/R7.Dnn.UserHtml.Tests.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>R7.Dnn.UserHtml.Tests</RootNamespace>
     <AssemblyName>R7.Dnn.UserHtml.Tests</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>1.0</ReleaseVersion>
+    <ReleaseVersion>1.1</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>

diff --git a/R7.Dnn.UserHtml.sln b/R7.Dnn.UserHtml.sln
@@ -30,7 +30,6 @@ Global
 		Policies = $0
 		$0.StandardHeader = $1
 		$1.Text = @\n${FileName}\n \nAuthor:\n      ${AuthorName} <${AuthorEmail}>\n\nCopyright (c) ${Year} ${CopyrightHolder}\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the "Software"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.
-		$1.IncludeInNewFiles = True
-		version = 1.0
+		version = 1.1
 	EndGlobalSection
 EndGlobal
diff --git a/R7.Dnn.UserHtml/EditUserHtml.ascx.cs b/R7.Dnn.UserHtml/EditUserHtml.ascx.cs
@@ -4,7 +4,7 @@
 // Author:
 //       Roman M. Yagodin <roman.yagodin@gmail.com>
 //
-// Copyright (c) 2018 Roman M. Yagodin
+// Copyright (c) 2018-2019 Roman M. Yagodin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -34,7 +34,7 @@
 using DotNetNuke.Services.Exceptions;
 using DotNetNuke.UI.UserControls;
 using R7.Dnn.Extensions.Modules;
-using R7.Dnn.Extensions.Utilities;
+using R7.Dnn.Extensions.Text;
 using R7.Dnn.UserHtml.Components;
 using R7.Dnn.UserHtml.Data;
 using R7.Dnn.UserHtml.Models;
@@ -82,7 +82,7 @@ protected override void OnInit (EventArgs e)
 
         int? GetUserId ()
         {
-            return TypeUtils.ParseToNullable<int> (Request.QueryString ["user_id"]);
+            return ParseHelper.ParseToNullable<int> (Request.QueryString ["user_id"]);
         }
 
         /// <summary>

diff --git a/R7.Dnn.UserHtml/Models/UserFilters.cs b/R7.Dnn.UserHtml/Models/UserFilters.cs
@@ -4,7 +4,7 @@
 // Author:
 //       Roman M. Yagodin <roman.yagodin@gmail.com>
 //
-// Copyright (c) 2018 Roman M. Yagodin
+// Copyright (c) 2018-2019 Roman M. Yagodin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -28,7 +28,7 @@
 using System.Linq;
 using DotNetNuke.Entities.Users;
 using DotNetNuke.Security.Roles;
-using R7.Dnn.Extensions.Utilities;
+using R7.Dnn.Extensions.Text;
 
 namespace R7.Dnn.UserHtml.Models
 {
@@ -43,9 +43,9 @@ public static IEnumerable<UserInfoNameAdapter> WhereNameContains (this IEnumerab
                                 Contains (u.DisplayName, searchTextLC) ||
                                 Contains (u.LastName, searchTextLC) ||
                                 Contains (u.FirstName, searchTextLC) ||
-                                Contains (TextUtils.FormatList (" ", u.FirstName, u.LastName),
+                                Contains (FormatHelper.JoinNotNullOrEmpty (" ", u.FirstName, u.LastName),
                                           searchTextLC) ||
-                                Contains (TextUtils.FormatList (" ", u.LastName, u.FirstName),
+                                Contains (FormatHelper.JoinNotNullOrEmpty (" ", u.LastName, u.FirstName),
                                       searchTextLC));
         }
 

diff --git a/R7.Dnn.UserHtml/Properties/AssemblyInfo.cs b/R7.Dnn.UserHtml/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 // The form "{Major}.{Minor}.*" will automatically update the build and revision,
 // and "{Major}.{Minor}.{Build}.*" will update just the revision.
 
-[assembly: AssemblyVersion ("1.0.0.*")]
-[assembly: AssemblyInformationalVersion ("1.0.0-beta.2")]
+[assembly: AssemblyVersion ("1.1.0.*")]
+[assembly: AssemblyInformationalVersion ("1.1.0")]
 
 // The following attributes are used to specify the signing key for the assembly, 
 // if desired. See the Mono documentation for more information about signing.

diff --git a/R7.Dnn.UserHtml/R7.Dnn.UserHtml.csproj b/R7.Dnn.UserHtml/R7.Dnn.UserHtml.csproj
@@ -8,7 +8,7 @@
     <RootNamespace>R7.Dnn.UserHtml</RootNamespace>
     <AssemblyName>R7.Dnn.UserHtml</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
-    <ReleaseVersion>1.0</ReleaseVersion>
+    <ReleaseVersion>1.1</ReleaseVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -76,25 +76,25 @@
     <Reference Include="System.Web.Mvc">
       <HintPath>..\packages\Microsoft.AspNet.Mvc.5.1.1\lib\net45\System.Web.Mvc.dll</HintPath>
     </Reference>
+    <Reference Include="System.Net.Http" />
+    <Reference Include="NGettext">
+      <HintPath>..\packages\NGettext.0.6.3\lib\net45\NGettext.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="Newtonsoft.Json">
-      <HintPath>..\packages\Newtonsoft.Json.4.5.11\lib\net40\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http.Formatting">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.1.1\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http" />
     <Reference Include="System.Web.Http">
-      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.1.1\lib\net45\System.Web.Http.dll</HintPath>
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll</HintPath>
     </Reference>
-    <Reference Include="NGettext">
-      <HintPath>..\packages\NGettext.0.6.3\lib\net45\NGettext.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp" />
     <Reference Include="YamlDotNet">
-      <HintPath>..\packages\YamlDotNet.4.2.1\lib\net35\YamlDotNet.dll</HintPath>
+      <HintPath>..\packages\YamlDotNet.5.3.0\lib\net45\YamlDotNet.dll</HintPath>
     </Reference>
     <Reference Include="R7.Dnn.Extensions">
-      <HintPath>..\packages\R7.Dnn.Extensions.0.12.0\lib\net45\R7.Dnn.Extensions.dll</HintPath>
+      <HintPath>..\packages\R7.Dnn.Extensions.0.13.0\lib\net45\R7.Dnn.Extensions.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>

diff --git a/R7.Dnn.UserHtml/R7.Dnn.UserHtml.dnn b/R7.Dnn.UserHtml/R7.Dnn.UserHtml.dnn
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="R7.Dnn.UserHtml" type="Module" version="01.00.00">
+        <package name="R7.Dnn.UserHtml" type="Module" version="01.01.00">
             <friendlyName>R7.Dnn.UserHtml</friendlyName>
             <description>A module to display HTML content associated with a specific user.</description>
             <owner>
@@ -14,7 +14,7 @@
             <releaseNotes src="releaseNotes.htm" />
             <dependencies>
                 <dependency type="coreVersion">08.00.00</dependency>
-                <dependency type="managedPackage" version="0.12.0">R7.Dnn.Extensions</dependency>
+                <dependency type="managedPackage" version="0.13.0">R7.Dnn.Extensions</dependency>
             </dependencies>
             <components>
                 <component type="Module">

diff --git a/R7.Dnn.UserHtml/ViewUserHtml.ascx.cs b/R7.Dnn.UserHtml/ViewUserHtml.ascx.cs
@@ -4,7 +4,7 @@
 // Author:
 //       Roman M. Yagodin <roman.yagodin@gmail.com>
 //
-// Copyright (c) 2018 Roman M. Yagodin
+// Copyright (c) 2018-2019 Roman M. Yagodin
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal
@@ -37,7 +37,7 @@
 using DotNetNuke.Security.Permissions;
 using DotNetNuke.Services.Exceptions;
 using R7.Dnn.Extensions.Modules;
-using R7.Dnn.Extensions.Utilities;
+using R7.Dnn.Extensions.Text;
 using R7.Dnn.UserHtml.Components;
 using R7.Dnn.UserHtml.Data;
 using R7.Dnn.UserHtml.Models;
@@ -125,7 +125,7 @@ protected override void OnLoad (EventArgs e)
             }
         }
 
-        int? GetUserProfileId () => TypeUtils.ParseToNullable<int> (Request.QueryString ["userid"]);
+        int? GetUserProfileId () => ParseHelper.ParseToNullable<int> (Request.QueryString ["userid"]);
 
         // TODO: Use profile page from portal settings?
         bool IsOnProfilePage () => GetUserProfileId () != null;
@@ -229,12 +229,12 @@ void btnSearchUser_Click_Internal (string searchText)
         protected void selUser_SelectedIndexChanged (object sender, EventArgs e)
         {
             selUser_SelectedIndexChanged_Internal ();
-            SessionUserId = TypeUtils.ParseToNullable<int> (selUser.SelectedValue, true);;
+            SessionUserId = ParseHelper.ParseToNullable<int> (selUser.SelectedValue, true);;
         }
 
         void selUser_SelectedIndexChanged_Internal ()
         {
-            var userId = TypeUtils.ParseToNullable<int> (selUser.SelectedValue, true);
+            var userId = ParseHelper.ParseToNullable<int> (selUser.SelectedValue, true);
             if (userId != null) {
                 lnkEditUserHtml.Visible = true;
                 lnkEditUserHtml.NavigateUrl = EditUrl ("user_id", userId.ToString (), "Edit");

diff --git a/R7.Dnn.UserHtml/packages.config b/R7.Dnn.UserHtml/packages.config
@@ -6,12 +6,12 @@
   <package id="DotNetNuke.Web.Mvc" version="8.0.4.226" targetFramework="net45" />
   <package id="Microsoft.AspNet.Mvc" version="5.1.1" targetFramework="net45" />
   <package id="Microsoft.AspNet.Razor" version="3.1.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Client" version="5.1.1" targetFramework="net45" />
-  <package id="Microsoft.AspNet.WebApi.Core" version="5.1.1" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="5.2.3" targetFramework="net45" />
+  <package id="Microsoft.AspNet.WebApi.Core" version="5.2.3" targetFramework="net45" />
   <package id="Microsoft.AspNet.WebPages" version="3.1.1" targetFramework="net45" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="4.5.11" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="NGettext" version="0.6.3" targetFramework="net45" />
-  <package id="R7.Dnn.Extensions" version="0.12.0" targetFramework="net45" />
-  <package id="YamlDotNet" version="4.2.1" targetFramework="net45" />
+  <package id="R7.Dnn.Extensions" version="0.13.0" targetFramework="net45" />
+  <package id="YamlDotNet" version="5.3.0" targetFramework="net45" />
 </packages>