diff --git a/GridBlazor.Tests/GridBlazor.Tests.csproj b/GridBlazor.Tests/GridBlazor.Tests.csproj index dce200f8..abaeaf20 100644 --- a/GridBlazor.Tests/GridBlazor.Tests.csproj +++ b/GridBlazor.Tests/GridBlazor.Tests.csproj @@ -1,16 +1,16 @@  - net7.0 - 4.1.0 + net8.0 + 5.0.0 - - - - - + + + + + diff --git a/GridBlazor/ExcelWriter.cs b/GridBlazor/ExcelWriter.cs index 70ded4a1..25b35f6a 100644 --- a/GridBlazor/ExcelWriter.cs +++ b/GridBlazor/ExcelWriter.cs @@ -170,8 +170,8 @@ public byte[] GenerateExcel(IGridColumnCollection columns, IEnumerable public byte[] GenerateExcel(ExcelData data) { - var stream = new MemoryStream(); - var document = SpreadsheetDocument.Create(stream, SpreadsheetDocumentType.Workbook); + using var stream = new MemoryStream(); + using var document = SpreadsheetDocument.Create(stream, SpreadsheetDocumentType.Workbook); var workbookpart = document.AddWorkbookPart(); workbookpart.Workbook = new Workbook(); @@ -197,8 +197,6 @@ public byte[] GenerateExcel(ExcelData data) AppendDataToSheet(sheetData, data); workbookpart.Workbook.Save(); - document.Close(); - return stream.ToArray(); } diff --git a/GridBlazor/GridBlazor.csproj b/GridBlazor/GridBlazor.csproj index 2cbcb160..4be14648 100644 --- a/GridBlazor/GridBlazor.csproj +++ b/GridBlazor/GridBlazor.csproj @@ -1,12 +1,12 @@  - netstandard2.1;net5.0;net6.0;net7.0 + netstandard2.1;net5.0;net6.0;net7.0;net8.0 3.0 11.0 True False - 4.1.1 + 5.0.0 GridBlazor Grid components for Blazor Grid components for Blazor @@ -14,7 +14,7 @@ grid blazor table crud rest grpc https://github.com/gustavnavar/Grid.Blazor LGPL-2.1-only - Supports .NET Standard 2.1, .NET 5.0, .NET 6.0, .NET 7.0 + Supports .NET Standard 2.1, .NET 5.0, .NET 6.0, .NET 7.0, .NET 8.0 True @@ -24,6 +24,14 @@ + + + + + + + + @@ -39,27 +47,27 @@ - + - - - - - + + + + + - - - - - + + + + + - + - + diff --git a/GridBlazorClientSide.Client/GridBlazorClientSide.Client.csproj b/GridBlazorClientSide.Client/GridBlazorClientSide.Client.csproj index 8932bd17..474de097 100644 --- a/GridBlazorClientSide.Client/GridBlazorClientSide.Client.csproj +++ b/GridBlazorClientSide.Client/GridBlazorClientSide.Client.csproj @@ -1,17 +1,17 @@  - net7.0 - 4.1.1 + net8.0 + 5.0.0 true - - - - - + + + + + diff --git a/GridBlazorClientSide.Server/GridBlazorClientSide.Server.csproj b/GridBlazorClientSide.Server/GridBlazorClientSide.Server.csproj index 488f96cd..b4acb6a8 100644 --- a/GridBlazorClientSide.Server/GridBlazorClientSide.Server.csproj +++ b/GridBlazorClientSide.Server/GridBlazorClientSide.Server.csproj @@ -1,13 +1,13 @@  - net7.0 + net8.0 true - 4.0.4 + 5.0.0 - + diff --git a/GridBlazorClientSide.Shared/GridBlazorClientSide.Shared.csproj b/GridBlazorClientSide.Shared/GridBlazorClientSide.Shared.csproj index b7257181..23d36458 100644 --- a/GridBlazorClientSide.Shared/GridBlazorClientSide.Shared.csproj +++ b/GridBlazorClientSide.Shared/GridBlazorClientSide.Shared.csproj @@ -1,8 +1,8 @@  - net7.0 - 4.0.0 + net8.0 + 5.0.0 diff --git a/GridBlazorGrpc.Client/GridBlazorGrpc.Client.csproj b/GridBlazorGrpc.Client/GridBlazorGrpc.Client.csproj index 174c5656..a92d0bdc 100644 --- a/GridBlazorGrpc.Client/GridBlazorGrpc.Client.csproj +++ b/GridBlazorGrpc.Client/GridBlazorGrpc.Client.csproj @@ -1,20 +1,20 @@  - net7.0 - 4.1.1 + net8.0 + 5.0.0 true - - - - - - + + + + + + - + diff --git a/GridBlazorGrpc.Server/GridBlazorGrpc.Server.csproj b/GridBlazorGrpc.Server/GridBlazorGrpc.Server.csproj index 5b46fe0d..465bdbb2 100644 --- a/GridBlazorGrpc.Server/GridBlazorGrpc.Server.csproj +++ b/GridBlazorGrpc.Server/GridBlazorGrpc.Server.csproj @@ -1,14 +1,14 @@  - net7.0 + net8.0 true - 4.0.4 + 5.0.0 - - + + diff --git a/GridBlazorGrpc.Shared/GridBlazorGrpc.Shared.csproj b/GridBlazorGrpc.Shared/GridBlazorGrpc.Shared.csproj index d66df098..2cba53bb 100644 --- a/GridBlazorGrpc.Shared/GridBlazorGrpc.Shared.csproj +++ b/GridBlazorGrpc.Shared/GridBlazorGrpc.Shared.csproj @@ -1,13 +1,13 @@  - net7.0 - 4.0.0 + net8.0 + 5.0.0 - + diff --git a/GridBlazorOData.Client/GridBlazorOData.Client.csproj b/GridBlazorOData.Client/GridBlazorOData.Client.csproj index 6afd24c3..e2d63595 100644 --- a/GridBlazorOData.Client/GridBlazorOData.Client.csproj +++ b/GridBlazorOData.Client/GridBlazorOData.Client.csproj @@ -1,17 +1,17 @@  - net7.0 - 4.1.1 + net8.0 + 5.0.0 true - - - - - + + + + + diff --git a/GridBlazorOData.Server/GridBlazorOData.Server.csproj b/GridBlazorOData.Server/GridBlazorOData.Server.csproj index 5781ce6e..0322dea1 100644 --- a/GridBlazorOData.Server/GridBlazorOData.Server.csproj +++ b/GridBlazorOData.Server/GridBlazorOData.Server.csproj @@ -1,15 +1,15 @@  - net7.0 + net8.0 true - 4.0.0 + 5.0.0 - - - + + + diff --git a/GridBlazorOData.Shared/GridBlazorOData.Shared.csproj b/GridBlazorOData.Shared/GridBlazorOData.Shared.csproj index b7257181..23d36458 100644 --- a/GridBlazorOData.Shared/GridBlazorOData.Shared.csproj +++ b/GridBlazorOData.Shared/GridBlazorOData.Shared.csproj @@ -1,8 +1,8 @@  - net7.0 - 4.0.0 + net8.0 + 5.0.0 diff --git a/GridBlazorServerSide/GridBlazorServerSide.csproj b/GridBlazorServerSide/GridBlazorServerSide.csproj index 14ab0668..5c6a75a6 100644 --- a/GridBlazorServerSide/GridBlazorServerSide.csproj +++ b/GridBlazorServerSide/GridBlazorServerSide.csproj @@ -1,12 +1,12 @@  - net7.0 - 4.1.1 + net8.0 + 5.0.0 - + diff --git a/GridBlazorStandalone/GridBlazorStandalone.csproj b/GridBlazorStandalone/GridBlazorStandalone.csproj index e9434d7d..3d267fae 100644 --- a/GridBlazorStandalone/GridBlazorStandalone.csproj +++ b/GridBlazorStandalone/GridBlazorStandalone.csproj @@ -1,18 +1,18 @@  - net7.0 - 4.1.1 + net8.0 + 5.0.0 true - - - - - - + + + + + + diff --git a/GridCore/GridCore.csproj b/GridCore/GridCore.csproj index 8789aede..e87062ee 100644 --- a/GridCore/GridCore.csproj +++ b/GridCore/GridCore.csproj @@ -1,13 +1,13 @@  - netstandard2.1;net5.0;net6.0;net7.0 + netstandard2.1;net5.0;net6.0;net7.0;net8.0 11.0 True False GridCore GridCore - 6.1.2 + 7.0.0 GridCore Grid core component Grid core component @@ -15,34 +15,39 @@ grid blazor table crud rest grpc https://github.com/gustavnavar/Grid.Blazor LGPL-2.1-only - Supports .NET Standard 2.1, .NET 5.0, .NET 6.0, .NET 7.0 + Supports .NET Standard 2.1, .NET 5.0, .NET 6.0, .NET 7.0, .NET8.0 True + + + + + - + - + - - + + - + - - + + - + - - + + - + - + diff --git a/GridMvc.Demo/GridMvc.Demo.csproj b/GridMvc.Demo/GridMvc.Demo.csproj index c3b0d828..d39dbe55 100644 --- a/GridMvc.Demo/GridMvc.Demo.csproj +++ b/GridMvc.Demo/GridMvc.Demo.csproj @@ -1,11 +1,11 @@  - net7.0 + net8.0 InProcess 3.1 $(AssetTargetFallback);portable-net45+win8+wp8+wpa81; - 6.1.2 + 7.0.0 diff --git a/GridMvc.Tests/GridMvc.Tests.csproj b/GridMvc.Tests/GridMvc.Tests.csproj index 071045a4..a99bd461 100644 --- a/GridMvc.Tests/GridMvc.Tests.csproj +++ b/GridMvc.Tests/GridMvc.Tests.csproj @@ -1,16 +1,16 @@  - net7.0 - 6.1.0 + net8.0 + 7.0.0 - - - - - + + + + + diff --git a/GridMvc/GridMvc.csproj b/GridMvc/GridMvc.csproj index ac90d72f..b1d4e1fa 100644 --- a/GridMvc/GridMvc.csproj +++ b/GridMvc/GridMvc.csproj @@ -1,14 +1,14 @@  - netcoreapp3.1;net5.0;net6.0;net7.0 + netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 true 11.0 True False GridMvc GridMvcCore - 6.1.2 + 7.0.0 GridMvc ASP.NET MVC Grid component ASP.NET MVC Grid component @@ -16,30 +16,34 @@ grid table mvc https://github.com/gustavnavar/Grid.Blazor LGPL-2.1-only - Supports .NET Core 3.1, .NET 5.0, .NET 6.0, .NET 7.0 + Supports .NET Core 3.1, .NET 5.0, .NET 6.0, .NET 7.0, .NET 8.0 True + + + + - + - + - + - + - + - + - + - + Always diff --git a/GridShared/GridShared.csproj b/GridShared/GridShared.csproj index 38b51660..73527571 100644 --- a/GridShared/GridShared.csproj +++ b/GridShared/GridShared.csproj @@ -1,9 +1,9 @@  - netstandard2.1;net5.0;net6.0;net7.0 + netstandard2.1;net5.0;net6.0;net7.0;net8.0 11.0 - 6.1.0 + 7.0.0 GridShared Support library for GridBlazor and GridMvcCore component libraries Support library for GridBlazor and GridMvcCore component libraries @@ -11,28 +11,33 @@ grid blazor mvc table crud rest grpc https://github.com/gustavnavar/Grid.Blazor LGPL-2.1-only - Supports .NET Standard 2.1, .NET 5.0, .NET 6.0, .NET 7.0 + Supports .NET Standard 2.1, .NET 5.0, .NET 6.0, .NET 7.0, .NET 8.0 True - - - + + + + + + + + - - + + - + - - + + - - + + diff --git a/GridSharedData/GridSharedData.csproj b/GridSharedData/GridSharedData.csproj index 46ca6b1e..6f99caa4 100644 --- a/GridSharedData/GridSharedData.csproj +++ b/GridSharedData/GridSharedData.csproj @@ -1,14 +1,14 @@  - net7.0 + net8.0 GridShared.Data - 6.0.0 + 7.0.0 - - - + + + diff --git a/README.md b/README.md index 1ade6495..e8faaf82 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This back-end component can be one of the following: - GridCore (v.5.0.0 or later), supporting ASP.Net Core 3.1, ASP.Net 5.0, ASP.Net 6.0 and ASP.Net 7.0. GridMvcCore, that it is a fork from https://gridmvc.codeplex.com/, was working for earlier versions. But GridMvcCore is only required for Blazor WASM (REST) and ASP.NET MVC projects now. - an OData back-end. All samples are based on Microsoft.AspNetCore.OData library, but it can be any other OData provider. -It supports .NET Core 3.1 and 5.0, 6.0 and 7.0, and Blazor WebAssembly 3.2.0, 5.0, 6.0 and 7.0 +It supports .NET Core 3.1 and 5.0, 6.0, 7.0 and 8.0, and Blazor WebAssembly 3.2.0, 5.0, 6.0, 7.0 and 8.0 ## Demo - Blazor server-side: http://gridblazor.azurewebsites.net