Skip to content

Commit 986360a

Browse files
Tsvetomir-HrTsvetomir-Hr
authored
Remove cast object (#316)
* chore: remove cast object and bump version in grpc example * chore: remove cast object and bump version in custom serializer example * chore: remove cast object and bump version in server app * chore: remove cast object and bump version in wasm app * chore: remove cast object and bump version in WebApiServer app
1 parent 3938789 commit 986360a

25 files changed

+63
-51
lines changed

‎common/grpc-example/datasource-request-result/gRPCsample/Client/Pages/TestGrid.razor

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
<GridColumn Field="@nameof(TestDataModel.Modified)" FieldType="@typeof(DateTime)" Title="Modified" Editable="false" Width="180px" DisplayFormat="{0:dd/MM/yyyy HH:mm:ss}" />
3434
<GridColumn Field="@nameof(TestDataModel.Created)" FieldType="@typeof(DateTime)" Title="Created" Editable="false" Width="180px" DisplayFormat="{0:dd/MM/yyyy HH:mm:ss}" />
3535
<GridCommandColumn Width="100px" Locked="true">
36-
<GridCommandButton Command="Save" Icon="save" ShowInEdit="true"></GridCommandButton>
37-
<GridCommandButton Command="Edit" Icon="edit"></GridCommandButton>
38-
<GridCommandButton Command="Cancel" Icon="cancel" ShowInEdit="true"></GridCommandButton>
39-
<GridCommandButton Command="Delete" Icon="delete" OnClick="@DeleteWithConfirmation"></GridCommandButton>
36+
<GridCommandButton Command="Save" Icon="SvgIcon.Save" ShowInEdit="true"></GridCommandButton>
37+
<GridCommandButton Command="Edit" Icon="SvgIcon.Pencil"></GridCommandButton>
38+
<GridCommandButton Command="Cancel" Icon="SvgIcon.Cancel" ShowInEdit="true"></GridCommandButton>
39+
<GridCommandButton Command="Delete" Icon="SvgIcon.Trash" OnClick="@DeleteWithConfirmation"></GridCommandButton>
4040
</GridCommandColumn>
4141
</GridColumns>
42-
<GridToolBar>
43-
<GridCommandButton Command="CustomAdd" Icon="add" OnClick="@StartInsert">Add Record</GridCommandButton>
44-
</GridToolBar>
42+
<GridToolBarTemplate>
43+
<GridCommandButton Command="CustomAdd" Icon="SvgIcon.Plus" OnClick="@StartInsert">Add Record</GridCommandButton>
44+
</GridToolBarTemplate>
4545
</TelerikGrid>
4646

4747
<MessageWindow OnClose="@MessageCallbackAsync" Visible="@( _message != null )"

‎common/grpc-example/datasource-request-result/gRPCsample/Client/Pages/TestGrid.razor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ async Task StartInsert()
133133
currState.EditItem = null;
134134
currState.OriginalEditItem = null;
135135
currState.InsertedItem = new TestDataModel();
136-
await GridRef.SetState(currState);
136+
await GridRef.SetStateAsync(currState);
137137
}
138138

139139
public async Task CreateHandler(GridCommandEventArgs args)

‎common/grpc-example/datasource-request-result/gRPCsample/Client/Pages/TestGridJSON.razor.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ private async Task ReadHandler(GridReadEventArgs args)
3232
if (args.Request.Groups.Count > 0)
3333
{
3434
var data = GroupDataHelpers.DeserializeGroups<TestGridJSONModel>(result.GroupedData);
35-
args.Data = data.Cast<object>().ToList();
35+
args.Data = data.ToList();
3636
}
3737
else
3838
{
39-
args.Data = result.CurrentPageData.Cast<object>().ToList();
39+
args.Data = result.CurrentPageData.ToList();
4040
}
4141

4242
args.Total = result.TotalItemCount;

‎common/grpc-example/datasource-request-result/gRPCsample/Client/_Imports.razor

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
@using gRPCsample.Client.Shared
1111
@using Telerik.Blazor
1212
@using Telerik.Blazor.Components
13+
@using Telerik.SvgIcons
1314

1415

‎common/grpc-example/datasource-request-result/gRPCsample/Client/gRPCsample.Client.csproj

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Grpc.Net.Client.Web" Version="2.34.0" />
9-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.1" />
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.1" PrivateAssets="all" />
11-
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
12-
<PackageReference Include="System.Net.Http.Json" Version="5.0.0" />
13-
<PackageReference Include="Telerik.UI.for.Blazor" Version="3.0.1" />
8+
<PackageReference Include="Google.Protobuf" Version="3.29.3" />
9+
<PackageReference Include="Grpc.Net.Client.Web" Version="2.67.0" />
10+
<PackageReference Include="Grpc.Tools" Version="2.69.0">
11+
<PrivateAssets>all</PrivateAssets>
12+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
13+
</PackageReference>
14+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.36" />
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.36" PrivateAssets="all" />
16+
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
17+
<PackageReference Include="System.Net.Http.Json" Version="6.0.2" />
18+
<PackageReference Include="Telerik.UI.for.Blazor" Version="7.1.0" />
1419
</ItemGroup>
1520

1621
<ItemGroup>

‎common/grpc-example/datasource-request-result/gRPCsample/Server/gRPCsample.Server.csproj

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Grpc.AspNetCore" Version="2.34.0" />
9-
<PackageReference Include="Grpc.AspNetCore.Web" Version="2.34.0" />
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="5.0.1" />
11-
<PackageReference Include="Telerik.UI.for.Blazor" Version="3.0.1" />
8+
<PackageReference Include="Google.Protobuf" Version="3.29.3" />
9+
<PackageReference Include="Grpc.AspNetCore" Version="2.67.0" />
10+
<PackageReference Include="Grpc.AspNetCore.Web" Version="2.67.0" />
11+
<PackageReference Include="Grpc.Tools" Version="2.69.0">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
</PackageReference>
15+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.36" />
16+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.36" />
17+
<PackageReference Include="System.Net.Http.Json" Version="6.0.2" />
18+
<PackageReference Include="Telerik.UI.for.Blazor" Version="7.1.0" />
1219
</ItemGroup>
1320

1421
<ItemGroup>

‎common/grpc-example/datasource-request-result/gRPCsample/Shared/Common/DataSourceProtoRequest.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
using System.Text.Json;
1+
using System.Text.Json;
52
using Telerik.DataSource;
63

74
namespace gRPCsample.Shared

‎common/grpc-example/datasource-request-result/gRPCsample/Shared/gRPCsample.Shared.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
@@ -10,13 +10,13 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReference Include="Google.Protobuf" Version="3.15.0" />
14-
<PackageReference Include="Grpc.Net.Client" Version="2.52.0" />
15-
<PackageReference Include="Grpc.Tools" Version="2.34.0">
13+
<PackageReference Include="Google.Protobuf" Version="3.29.3" />
14+
<PackageReference Include="Grpc.Net.Client" Version="2.67.0" />
15+
<PackageReference Include="Grpc.Tools" Version="2.69.0">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1818
</PackageReference>
19-
<PackageReference Include="Telerik.UI.for.Blazor" Version="3.0.1" />
19+
<PackageReference Include="Telerik.UI.for.Blazor" Version="7.1.0" />
2020
</ItemGroup>
2121

2222
<ItemGroup>

‎grid/datasourcerequest-on-server/CustomSerializer/Client/CustomSerializer.Client.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.15" />
99
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.15" PrivateAssets="all" />
1010
<PackageReference Include="System.Net.Http.Json" Version="6.0.1" />
11-
<PackageReference Include="Telerik.UI.for.Blazor" Version="4.1.0" />
11+
<PackageReference Include="Telerik.DataSource" Version="3.0.3" />
12+
<PackageReference Include="Telerik.UI.for.Blazor" Version="7.1.0" />
1213
</ItemGroup>
1314
<ItemGroup>
1415
<ProjectReference Include="..\Shared\CustomSerializer.Shared.csproj" />

‎grid/datasourcerequest-on-server/CustomSerializer/Client/Pages/Index.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
if (args.Request.Groups.Count > 0)
3333
{
3434
var data = GroupDataHelpers.DeserializeGroups<WeatherForecast>(result.GroupedData);
35-
args.Data = data.Cast<object>().ToList();
35+
args.Data = data.ToList();
3636
}
3737
else
3838
{
39-
args.Data = result.CurrentPageData.Cast<object>().ToList();
39+
args.Data = result.CurrentPageData.ToList();
4040
}
4141

4242
args.Total = result.TotalItemCount;

‎grid/datasourcerequest-on-server/CustomSerializer/Server/CustomSerializer.Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<ItemGroup>
99
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
1010
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.5" />
11-
<PackageReference Include="Telerik.DataSource" Version="2.1.3" />
11+
<PackageReference Include="Telerik.DataSource" Version="3.0.3" />
1212
</ItemGroup>
1313

1414
<ItemGroup>

‎grid/datasourcerequest-on-server/CustomSerializer/Shared/CustomSerializer.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Telerik.DataSource" Version="2.1.3" />
8+
<PackageReference Include="Telerik.DataSource" Version="3.0.3" />
99
</ItemGroup>
1010

1111
</Project>

‎grid/datasourcerequest-on-server/ServerApp/Pages/Index.razor

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// we pass the request to the service, and there Telerik DataSource Extension methods will shape the data
2727
var datasourceResult = await ForecastService.GetForecastListAsync(args.Request);
2828

29-
args.Data = datasourceResult.Data.Cast<object>().ToList();
29+
args.Data = datasourceResult.Data;
3030
args.Total = datasourceResult.Total;
3131
}
3232

‎grid/datasourcerequest-on-server/ServerApp/Pages/_Host.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<link href="css/site.css" rel="stylesheet" />
1414

1515
<link rel="stylesheet" href="_content/Telerik.UI.for.Blazor/css/kendo-theme-bootstrap/all.css" />
16-
<script src="_content/Telerik.UI.for.Blazor/js/telerik-blazor.js" defer></script>
16+
<script src="_content/Telerik.UI.for.Blazor/js/telerik-blazor.js"></script>
1717
</head>
1818
<body>
1919
<app><component type="typeof(App)" render-mode="ServerPrerendered" /></app>

‎grid/datasourcerequest-on-server/ServerApp/ServerApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Telerik.UI.for.Blazor" Version="4.1.0" />
8+
<PackageReference Include="Telerik.UI.for.Blazor" Version="7.1.0" />
99
</ItemGroup>
1010

1111
</Project>

‎grid/datasourcerequest-on-server/WasmApp/Client/Pages/Index.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
if (args.Request.Groups.Count > 0)
3131
{
3232
var data = GroupDataHelpers.DeserializeGroups<WeatherForecast>(result.GroupedData);
33-
args.Data = data.Cast<object>().ToList();
33+
args.Data = data.ToList();
3434
}
3535
else
3636
{
37-
args.Data = result.CurrentPageData.Cast<object>().ToList();
37+
args.Data = result.CurrentPageData.ToList();
3838
}
3939

4040
args.Total = result.TotalItemCount;

‎grid/datasourcerequest-on-server/WasmApp/Client/WasmApp.Client.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.15" />
99
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.15" />
1010
<PackageReference Include="System.Net.Http.Json" Version="6.0.1" />
11-
<PackageReference Include="Telerik.UI.for.Blazor" Version="4.1.0" />
11+
<PackageReference Include="Telerik.UI.for.Blazor" Version="7.1.0" />
1212
</ItemGroup>
1313
<ItemGroup>
1414
<ProjectReference Include="..\Shared\WasmApp.Shared.csproj" />

‎grid/datasourcerequest-on-server/WasmApp/Server/WasmApp.Server.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PropertyGroup Condition=" '$(RunConfiguration)' == 'ClientApp.Server' " />
88
<ItemGroup>
99
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="6.0.15" />
10-
<PackageReference Include="Telerik.DataSource" Version="2.1.3" />
10+
<PackageReference Include="Telerik.DataSource" Version="3.0.3" />
1111
</ItemGroup>
1212

1313
<ItemGroup>

‎grid/datasourcerequest-on-server/WasmApp/Shared/WasmApp.Shared.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<ItemGroup>
88
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
9-
<PackageReference Include="Telerik.DataSource" Version="2.1.3" />
9+
<PackageReference Include="Telerik.DataSource" Version="3.0.3" />
1010
</ItemGroup>
1111

1212
</Project>

‎grid/datasourcerequest-on-server/WebApiFromServerApp/SampleWebApi/SampleWebApi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Telerik.DataSource" Version="2.1.3" />
8+
<PackageReference Include="Telerik.DataSource" Version="3.0.3" />
99
</ItemGroup>
1010

1111
<ItemGroup>

‎grid/datasourcerequest-on-server/WebApiFromServerApp/SampleWebApi/appsettings.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
23
"Logging": {
34
"LogLevel": {
45
"Default": "Information",

‎grid/datasourcerequest-on-server/WebApiFromServerApp/SharedClasses/SharedClasses.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
4+
<TargetFramework>net6</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Telerik.DataSource" Version="2.1.3" />
8+
<PackageReference Include="Telerik.DataSource" Version="3.0.3" />
99
</ItemGroup>
1010

1111
</Project>

‎grid/datasourcerequest-on-server/WebApiFromServerApp/WebApiFromServerApp/Pages/GridWithService.razor

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
if (args.Request.Groups.Count > 0)
3232
{
3333
var data = GroupDataHelpers.DeserializeGroups<WeatherForecast>(result.GroupedData);
34-
args.Data = data.Cast<object>().ToList();
34+
args.Data = data.ToList();
3535
}
3636
else
3737
{
38-
args.Data = result.CurrentPageData.Cast<object>().ToList();
38+
args.Data = result.CurrentPageData.ToList();
3939
}
4040

4141
args.Total = result.TotalItemCount;

‎grid/datasourcerequest-on-server/WebApiFromServerApp/WebApiFromServerApp/Pages/_Host.cshtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<link rel="stylesheet" href="css/bootstrap/bootstrap.min.css" />
1313
<link href="css/site.css" rel="stylesheet" />
1414
<link rel="stylesheet" href="_content/Telerik.UI.for.Blazor/css/kendo-theme-default/all.css" />
15-
<script src="_content/Telerik.UI.for.Blazor/js/telerik-blazor.js" defer></script>
15+
<script src="_content/Telerik.UI.for.Blazor/js/telerik-blazor.js"></script>
1616
</head>
1717
<body>
1818
<app><component type="typeof(App)" render-mode="ServerPrerendered" /></app>

‎grid/datasourcerequest-on-server/WebApiFromServerApp/WebApiFromServerApp/WebApiFromServerApp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Telerik.UI.for.Blazor" Version="4.1.0" />
8+
<PackageReference Include="Telerik.UI.for.Blazor" Version="7.1.0" />
99
</ItemGroup>
1010

1111
<ItemGroup>

0 commit comments

Comments
 (0)