Update GridMvc package version 5.0.0-preview-2

gustavnavar · Oct 22, 2021 · 8fe08f6 · 8fe08f6
1 parent 7b15765
commit 8fe08f6
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 10 deletions.
diff --git a/GridCore/GridCore.csproj.user b/GridCore/GridCore.csproj.user
@@ -2,5 +2,6 @@
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <ShowAllFiles>false</ShowAllFiles>
+    <_LastSelectedProfileId>C:\Users\GustauNavarro\source\repos\Grid.Blazor\GridCore\Properties\PublishProfiles\FolderProfile.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
 </Project>
diff --git a/GridCore/Properties/AssemblyInfo.cs b/GridCore/Properties/AssemblyInfo.cs
@@ -0,0 +1,35 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+
+[assembly: Guid("7d38c093-51ea-4869-8044-0a85eda1bb6f")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+
+[assembly: InternalsVisibleTo("GridMvc")]
+[assembly: InternalsVisibleTo("GridMvc.Tests")]
diff --git a/GridMvc/GridMvc.csproj b/GridMvc/GridMvc.csproj
@@ -8,7 +8,7 @@
     <EnableDefaultEmbeddedResourceItems>False</EnableDefaultEmbeddedResourceItems>
     <Product>GridMvc</Product>
     <PackageId>GridMvcCore</PackageId>
-    <Version>5.0.0-preview-1</Version>
+    <Version>5.0.0-preview-2</Version>
     <Title>GridMvc</Title>
     <Description>ASP.NET MVC Grid component</Description>
     <Summary>ASP.NET MVC Grid component</Summary>

diff --git a/GridMvc/Views/Shared/_GridExtSortHeader.cshtml b/GridMvc/Views/Shared/_GridExtSortHeader.cshtml
@@ -38,7 +38,7 @@
             }
             var exceptParameterValues = new List<Tuple<string, string>>();
             exceptParameterValues.Add(new Tuple<string, string>(ColumnOrderValue.DefaultSortingQueryParameter, column.ToString()));
-            string hrefCancel = Context.Request.Path + queryBuilder.GetQueryStringExcept(exceptParameterValues);
+            string hrefCancel = Context.Request.PathBase + Context.Request.Path + queryBuilder.GetQueryStringExcept(exceptParameterValues);
             string href = hrefCancel;
             if (href.Length > 0)
             {

diff --git a/GridMvc/Views/Shared/_GridHeader.cshtml b/GridMvc/Views/Shared/_GridHeader.cshtml
@@ -103,7 +103,7 @@
     }
     _cssSortingClass = string.Join(" ", cssSortingClass);
 
-    string _href = Context.Request.Path + GetSortUrl(Model.Name, Model.Direction);
+    string _href = Context.Request.PathBase + Context.Request.Path + GetSortUrl(Model.Name, Model.Direction);
 
     string GetPagerQueryParameterName(IGridPager pager)
     {

diff --git a/GridMvc/Views/Shared/_GridPager.cshtml b/GridMvc/Views/Shared/_GridPager.cshtml
@@ -9,18 +9,18 @@
         @if (Model.CurrentPage > 1)
         {
             <li class="page-item">
-                <a class="page-link grid-page-link" href="@[email protected](Model.CurrentPage - 1)">«</a>
+                <a class="page-link grid-page-link" href="@Context.Request.[email protected].[email protected](Model.CurrentPage - 1)">«</a>
             </li>
         }
 
         @if (Model.StartDisplayedPage > 1)
         {
             <li class="page-item">
-                <a class="page-link grid-page-link" href="@[email protected](1)">1</a>
+                <a class="page-link grid-page-link" href="@Context.Request.[email protected].[email protected](1)">1</a>
             </li>
             if (Model.StartDisplayedPage > 2)
             {
-                <li class="page-item"><a class="page-link grid-page-link" href="@[email protected](Model.StartDisplayedPage - 1)">...</a></li>
+                <li class="page-item"><a class="page-link grid-page-link" href="@Context.Request.[email protected].[email protected](Model.StartDisplayedPage - 1)">...</a></li>
             }
         }
         @for (int i = Model.StartDisplayedPage; i <= Model.EndDisplayedPage; i++)
@@ -31,20 +31,20 @@
             }
             else
             {
-                <li class="page-item"><a class="page-link grid-page-link" href="@[email protected](i)">@i</a></li>
+                <li class="page-item"><a class="page-link grid-page-link" href="@Context.Request.[email protected].[email protected](i)">@i</a></li>
             }
         }
         @if (Model.EndDisplayedPage < Model.PageCount)
         {
             if (Model.EndDisplayedPage < Model.PageCount - 1)
             {
-                <li class="page-item"><a class="page-link grid-page-link" href="@[email protected](Model.EndDisplayedPage + 1)">...</a></li>
+                <li class="page-item"><a class="page-link grid-page-link" href="@Context.Request.[email protected].[email protected](Model.EndDisplayedPage + 1)">...</a></li>
             }
-            <li><a class="page-link grid-page-link" href="@[email protected](Model.PageCount)">@Model.PageCount</a></li>
+            <li><a class="page-link grid-page-link" href="@Context.Request.[email protected].[email protected](Model.PageCount)">@Model.PageCount</a></li>
         }
         @if (Model.CurrentPage < Model.PageCount)
         {
-            <li class="page-item"><a class="page-link grid-page-link" href="@[email protected](Model.CurrentPage + 1)">»</a></li>
+            <li class="page-item"><a class="page-link grid-page-link" href="@Context.Request.[email protected].[email protected](Model.CurrentPage + 1)">»</a></li>
         }
     </ul>
 </nav>