upgraded to YAF 2.31.14

YAFNET · Mar 28, 2021 · 8a599f9 · 8a599f9
1 parent 766ea66
commit 8a599f9
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 19 deletions.
diff --git a/YAF.SampleWebApplication/Forum/Controls/UserMenu.ascx b/YAF.SampleWebApplication/Forum/Controls/UserMenu.ascx
@@ -6,9 +6,9 @@
         <span class="badge badge-light">
             <asp:Image runat="server" ID="UserAvatar" CssClass="img-navbar-avatar mr-1 rounded"/>
         </span>
-        <%= this.Get<BoardSettings>().EnableDisplayName ? 
+        <%= this.HtmlEncode(this.Get<BoardSettings>().EnableDisplayName ? 
                 this.PageContext.CurrentUserData.DisplayName : 
-                this.PageContext.CurrentUserData.UserName %>
+                this.PageContext.CurrentUserData.UserName) %>
         <asp:PlaceHolder runat="server" id="UnreadPlaceHolder">
             <asp:Label runat="server" ID="UnreadLabel" 
                        CssClass="ml-1 badge badge-danger">

diff --git a/YAF.SampleWebApplication/Forum/Forum.aspx b/YAF.SampleWebApplication/Forum/Forum.aspx
@@ -1,4 +1,4 @@
-<%@ Page Title="About" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Forum.aspx.cs" Inherits="YAF.SampleWebApplication.Forum" ValidateRequest="false" %>
+<%@ Page Title="About" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="Forum.aspx.cs" Inherits="YAF.SampleWebApplication.Forum" ValidateRequest="false" MaintainScrollPositionOnPostback="true" %>
 <asp:Content ID="BodyContent" ContentPlaceHolderID="MainContent" runat="server">
     <YAF:Forum runat="server" ID="forum" BoardID="1" />
 </asp:Content>
diff --git a/YAF.SampleWebApplication/Forum/Scripts/InstallWizard.comb.min.js b/YAF.SampleWebApplication/Forum/Scripts/InstallWizard.comb.min.js
diff --git a/YAF.SampleWebApplication/Forum/Scripts/jquery-3.5.1.min.js b/YAF.SampleWebApplication/Forum/Scripts/jquery-3.5.1.min.js
diff --git a/YAF.SampleWebApplication/Forum/Scripts/jquery-3.6.0.min.js b/YAF.SampleWebApplication/Forum/Scripts/jquery-3.6.0.min.js
diff --git a/YAF.SampleWebApplication/Forum/install/mssql/upgrade/constraints.sql b/YAF.SampleWebApplication/Forum/install/mssql/upgrade/constraints.sql
@@ -1214,3 +1214,6 @@ CREATE UNIQUE CLUSTERED INDEX [{objectQualifier}vaccess_group_UserForum_PK] ON [
 GO
 
 
+if exists(select top 1 1 from sys.indexes where name=N'UC_{objectQualifier}TopicTag_TopicID_TagID' and object_id=object_id(N'[{databaseOwner}].[{objectQualifier}TopicTag]'))
+	alter table [{databaseOwner}].[{objectQualifier}TopicTag] drop constraint [UC_{objectQualifier}TopicTag_TopicID_TagID]
+go
diff --git a/YAF.SampleWebApplication/Properties/AssemblyInfo.cs b/YAF.SampleWebApplication/Properties/AssemblyInfo.cs
@@ -54,5 +54,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.3.1.12")]
-[assembly: AssemblyFileVersion("2.3.1.12")]
+[assembly: AssemblyVersion("2.3.1.14")]
+[assembly: AssemblyFileVersion("2.3.1.14")]
diff --git a/YAF.SampleWebApplication/Web.config b/YAF.SampleWebApplication/Web.config
@@ -162,7 +162,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />

diff --git a/YAF.SampleWebApplication/YAF.SampleWebApplication.csproj b/YAF.SampleWebApplication/YAF.SampleWebApplication.csproj
@@ -64,8 +64,8 @@
     <Reference Include="Microsoft.Owin.Security, Version=4.1.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.Security.4.1.1\lib\net45\Microsoft.Owin.Security.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
       <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>

diff --git a/YAF.SampleWebApplication/bin/Newtonsoft.Json.xml b/YAF.SampleWebApplication/bin/Newtonsoft.Json.xml
@@ -2553,6 +2553,8 @@
         <member name="P:Newtonsoft.Json.JsonReader.MaxDepth">
             <summary>
             Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="T:Newtonsoft.Json.JsonReaderException"/>.
+            A null value means there is no maximum. 
+            The default value is <c>128</c>.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonReader.TokenType">
@@ -3012,7 +3014,7 @@
             <summary>
             Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="T:Newtonsoft.Json.JsonReaderException"/>.
             A null value means there is no maximum.
-            The default value is <c>null</c>.
+            The default value is <c>128</c>.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializer.CheckAdditionalContent">
@@ -3328,7 +3330,7 @@
             <summary>
             Gets or sets the maximum depth allowed when reading JSON. Reading past this depth will throw a <see cref="T:Newtonsoft.Json.JsonReaderException"/>.
             A null value means there is no maximum.
-            The default value is <c>null</c>.
+            The default value is <c>128</c>.
             </summary>
         </member>
         <member name="P:Newtonsoft.Json.JsonSerializerSettings.Formatting">
@@ -7090,6 +7092,27 @@
             </summary>
             <value>The comparison used to match property names while merging.</value>
         </member>
+        <member name="T:Newtonsoft.Json.Linq.JsonSelectSettings">
+            <summary>
+            Specifies the settings used when selecting JSON.
+            </summary>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonSelectSettings.RegexMatchTimeout">
+            <summary>
+            Gets or sets a timeout that will be used when executing regular expressions.
+            </summary>
+            <value>The timeout that will be used when executing regular expressions.</value>
+        </member>
+        <member name="P:Newtonsoft.Json.Linq.JsonSelectSettings.ErrorWhenNoMatch">
+            <summary>
+            Gets or sets a flag that indicates whether an error should be thrown if
+            no tokens are found when evaluating part of the expression.
+            </summary>
+            <value>
+            A flag that indicates whether an error should be thrown if
+            no tokens are found when evaluating part of the expression.
+            </value>
+        </member>
         <member name="T:Newtonsoft.Json.Linq.JToken">
             <summary>
             Represents an abstract JSON token.
@@ -7985,6 +8008,16 @@
             <param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no tokens are found when evaluating part of the expression.</param>
             <returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.SelectToken(System.String,Newtonsoft.Json.Linq.JsonSelectSettings)">
+            <summary>
+            Selects a <see cref="T:Newtonsoft.Json.Linq.JToken"/> using a JSONPath expression. Selects the token that matches the object path.
+            </summary>
+            <param name="path">
+            A <see cref="T:System.String"/> that contains a JSONPath expression.
+            </param>
+            <param name="settings">The <see cref="T:Newtonsoft.Json.Linq.JsonSelectSettings"/> used to select tokens.</param>
+            <returns>A <see cref="T:Newtonsoft.Json.Linq.JToken"/>.</returns>
+        </member>
         <member name="M:Newtonsoft.Json.Linq.JToken.SelectTokens(System.String)">
             <summary>
             Selects a collection of elements using a JSONPath expression.
@@ -8004,6 +8037,16 @@
             <param name="errorWhenNoMatch">A flag to indicate whether an error should be thrown if no tokens are found when evaluating part of the expression.</param>
             <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the selected elements.</returns>
         </member>
+        <member name="M:Newtonsoft.Json.Linq.JToken.SelectTokens(System.String,Newtonsoft.Json.Linq.JsonSelectSettings)">
+            <summary>
+            Selects a collection of elements using a JSONPath expression.
+            </summary>
+            <param name="path">
+            A <see cref="T:System.String"/> that contains a JSONPath expression.
+            </param>
+            <param name="settings">The <see cref="T:Newtonsoft.Json.Linq.JsonSelectSettings"/> used to select tokens.</param>
+            <returns>An <see cref="T:System.Collections.Generic.IEnumerable`1"/> of <see cref="T:Newtonsoft.Json.Linq.JToken"/> that contains the selected elements.</returns>
+        </member>
         <member name="M:Newtonsoft.Json.Linq.JToken.GetMetaObject(System.Linq.Expressions.Expression)">
             <summary>
             Returns the <see cref="T:System.Dynamic.DynamicMetaObject"/> responsible for binding operations performed on this object.

diff --git a/YAF.SampleWebApplication/bin/YAF.SampleWebApplication.dll.config b/YAF.SampleWebApplication/bin/YAF.SampleWebApplication.dll.config
@@ -162,7 +162,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />

diff --git a/YAF.SampleWebApplication/packages.config b/YAF.SampleWebApplication/packages.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr" version="3.5.0.2" targetFramework="net472" />
-  <package id="jQuery" version="3.5.1" targetFramework="net472" />
   <package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net472" />
   <package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net472" />
   <package id="Microsoft.AspNet.SignalR" version="2.4.1" targetFramework="net472" />
@@ -14,7 +13,7 @@
   <package id="Microsoft.Owin.Host.SystemWeb" version="4.1.1" targetFramework="net472" />
   <package id="Microsoft.Owin.Security" version="4.1.1" targetFramework="net472" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net472" />
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net472" />
   <package id="Owin" version="1.0" targetFramework="net472" />
   <package id="WebGrease" version="1.6.0" targetFramework="net472" />
 </packages>
-Original file line number
+Diff line change
@@ Expand Up @@
     GO
+    if exists(select top 1 1 from sys.indexes where name=N'UC_{objectQualifier}TopicTag_TopicID_TagID' and object_id=object_id(N'[{databaseOwner}].[{objectQualifier}TopicTag]'))
+    	alter table [{databaseOwner}].[{objectQualifier}TopicTag] drop constraint [UC_{objectQualifier}TopicTag_TopicID_TagID]
+    go