Skip to content

Commit f418e5d

Browse files
JamesNKJamesNK
authored
Update example projects to net5.0 (#1058)
1 parent 11a7146 commit f418e5d

File tree

83 files changed

+190
-247
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+190
-247
lines changed

‎build/dependencies.props‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
<GoogleProtobufPackageVersion>3.13.0</GoogleProtobufPackageVersion>
55
<GrpcDotNetPackageVersion>2.32.0-pre1</GrpcDotNetPackageVersion> <!-- Used by example projects -->
66
<GrpcPackageVersion>2.32.0-pre1</GrpcPackageVersion>
7-
<MicrosoftAspNetCoreAppPackageVersion>3.1.3</MicrosoftAspNetCoreAppPackageVersion>
8-
<MicrosoftAspNetCoreBlazorPackageVersion>5.0.0-rc.1.20431.20</MicrosoftAspNetCoreBlazorPackageVersion>
9-
<MicrosoftAspNetCoreBlazor31PackageVersion>3.2.0</MicrosoftAspNetCoreBlazor31PackageVersion>
7+
<MicrosoftAspNetCoreAppPackageVersion>5.0.0-rc.1.20451.17</MicrosoftAspNetCoreAppPackageVersion>
8+
<MicrosoftAspNetCoreApp31PackageVersion>3.1.3</MicrosoftAspNetCoreApp31PackageVersion>
109
<MicrosoftBuildLocatorPackageVersion>1.2.2</MicrosoftBuildLocatorPackageVersion>
1110
<MicrosoftBuildPackageVersion>16.0.461</MicrosoftBuildPackageVersion>
1211
<MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>3.0.0</MicrosoftCodeAnalysisFxCopAnalyzersPackageVersion>
@@ -20,7 +19,7 @@
2019
<NewtonsoftJsonPackageVersion>12.0.3</NewtonsoftJsonPackageVersion>
2120
<NunitPackageVersion>3.12.0</NunitPackageVersion>
2221
<Nunit3TestAdapterPackageVersion>3.16.1</Nunit3TestAdapterPackageVersion>
23-
<OpenTelemetryPackageVersion>0.4.0-beta.2</OpenTelemetryPackageVersion>
22+
<OpenTelemetryPackageVersion>0.6.0-beta.1</OpenTelemetryPackageVersion>
2423
<SystemCommandLinePackageVersion>2.0.0-beta1.20214.1</SystemCommandLinePackageVersion>
2524
<SystemCommandLineRenderingPackageVersion>0.3.0-alpha.20214.1</SystemCommandLineRenderingPackageVersion>
2625
<SystemDiagnosticsDiagnosticSourcePackageVersion>4.5.1</SystemDiagnosticsDiagnosticSourcePackageVersion>

‎examples/Aggregator/Client/Client.csproj‎

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

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>netcoreapp3.1</TargetFramework>
5+
<TargetFramework>net5.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>

‎examples/Aggregator/Client/Program.cs‎

Lines changed: 20 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ namespace Client
2929
{
3030
public class Program
3131
{
32-
static Random RNG = new Random();
32+
private static readonly Random Random = new Random();
3333

3434
static async Task Main(string[] args)
3535
{
36-
var channel = GrpcChannel.ForAddress("https://localhost:5001");
36+
using var channel = GrpcChannel.ForAddress("https://localhost:5001");
3737
var client = new Aggregator.AggregatorClient(channel);
3838

3939
await ServerStreamingCallExample(client);
@@ -49,39 +49,35 @@ private static async Task ServerStreamingCallExample(Aggregator.AggregatorClient
4949
var cts = new CancellationTokenSource();
5050
cts.CancelAfter(TimeSpan.FromSeconds(3.5));
5151

52-
using (var replies = client.SayHellos(new HelloRequest { Name = "AggregatorClient" }, cancellationToken: cts.Token))
52+
using var call = client.SayHellos(new HelloRequest { Name = "AggregatorClient" }, cancellationToken: cts.Token);
53+
try
5354
{
54-
try
55+
await foreach (var message in call.ResponseStream.ReadAllAsync())
5556
{
56-
await foreach (var message in replies.ResponseStream.ReadAllAsync())
57-
{
58-
Console.WriteLine("Greeting: " + message.Message);
59-
}
60-
}
61-
catch (RpcException ex) when (ex.StatusCode == StatusCode.Cancelled)
62-
{
63-
Console.WriteLine("Stream cancelled.");
57+
Console.WriteLine("Greeting: " + message.Message);
6458
}
6559
}
60+
catch (RpcException ex) when (ex.StatusCode == StatusCode.Cancelled)
61+
{
62+
Console.WriteLine("Stream cancelled.");
63+
}
6664
}
6765

6866
private static async Task ClientStreamingCallExample(Aggregator.AggregatorClient client)
6967
{
70-
using (var call = client.AccumulateCount())
68+
using var call = client.AccumulateCount();
69+
for (var i = 0; i < 3; i++)
7170
{
72-
for (var i = 0; i < 3; i++)
73-
{
74-
var count = RNG.Next(5);
75-
Console.WriteLine($"Accumulating with {count}");
76-
await call.RequestStream.WriteAsync(new CounterRequest { Count = count });
77-
await Task.Delay(2000);
78-
}
71+
var count = Random.Next(5);
72+
Console.WriteLine($"Accumulating with {count}");
73+
await call.RequestStream.WriteAsync(new CounterRequest { Count = count });
74+
await Task.Delay(2000);
75+
}
7976

80-
await call.RequestStream.CompleteAsync();
77+
await call.RequestStream.CompleteAsync();
8178

82-
var response = await call;
83-
Console.WriteLine($"Count: {response.Count}");
84-
}
79+
var response = await call;
80+
Console.WriteLine($"Count: {response.Count}");
8581
}
8682
}
8783
}

‎examples/Aggregator/Server/Server.csproj‎

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

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

77
<ItemGroup>
@@ -14,7 +14,7 @@
1414
<PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="$(OpenTelemetryPackageVersion)" />
1515
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="$(OpenTelemetryPackageVersion)" />
1616
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="$(OpenTelemetryPackageVersion)" />
17-
<PackageReference Include="OpenTelemetry.Instrumentation.Grpc" Version="$(OpenTelemetryPackageVersion)" />
17+
<PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="$(OpenTelemetryPackageVersion)" />
1818
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="$(OpenTelemetryPackageVersion)" />
1919
</ItemGroup>
2020

‎examples/Aggregator/Server/Startup.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ public void ConfigureServices(IServiceCollection services)
4646

4747
if (_configuration.GetValue<bool>(EnableOpenTelemetryKey))
4848
{
49-
services.AddOpenTelemetry(telemetry =>
49+
services.AddOpenTelemetryTracing(telemetry =>
5050
{
51-
telemetry.UseZipkinExporter(o => o.ServiceName = "aggregator");
51+
telemetry.AddZipkinExporter(o => o.ServiceName = "aggregator");
5252
telemetry.AddGrpcClientInstrumentation();
5353
telemetry.AddHttpClientInstrumentation();
5454
telemetry.AddAspNetCoreInstrumentation();

‎examples/Blazor/Client/Client.csproj‎

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

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.1</TargetFramework>
5-
<RazorLangVersion>3.0</RazorLangVersion>
4+
<TargetFramework>net5.0</TargetFramework>
65
</PropertyGroup>
76

87
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftAspNetCoreBlazor31PackageVersion)" />
10-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="$(MicrosoftAspNetCoreBlazor31PackageVersion)" PrivateAssets="all" />
11-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftAspNetCoreBlazor31PackageVersion)" PrivateAssets="all" />
8+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
9+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="$(MicrosoftAspNetCoreAppPackageVersion)" PrivateAssets="all" />
1210

1311
<PackageReference Include="Google.Protobuf" Version="$(GoogleProtobufPackageVersion)" />
1412
<PackageReference Include="Grpc.Tools" Version="$(GrpcPackageVersion)" PrivateAssets="All" />

‎examples/Blazor/Client/Pages/Counter.razor‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
cts = new CancellationTokenSource();
2626

2727
var client = new Count.Counter.CounterClient(Channel);
28-
var call = client.StartCounter(new CounterRequest() { Start = currentCount }, cancellationToken: cts.Token);
28+
using var call = client.StartCounter(new CounterRequest() { Start = currentCount }, cancellationToken: cts.Token);
2929

3030
try
3131
{

‎examples/Blazor/Client/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class Program
3131
public static async Task Main(string[] args)
3232
{
3333
var builder = WebAssemblyHostBuilder.CreateDefault(args);
34-
builder.RootComponents.Add<App>("app");
34+
builder.RootComponents.Add<App>("#app");
3535

3636
builder.Services.AddSingleton(services =>
3737
{

‎examples/Blazor/Client/wwwroot/css/site.css‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ a, .btn-link {
1414
border-color: #1861ac;
1515
}
1616

17-
app {
17+
#app {
1818
position: relative;
1919
display: flex;
2020
flex-direction: column;
@@ -151,7 +151,7 @@ app {
151151
}
152152

153153
@media (min-width: 768px) {
154-
app {
154+
#app {
155155
flex-direction: row;
156156
}
157157

‎examples/Blazor/Client/wwwroot/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</head>
1212

1313
<body>
14-
<app>Loading...</app>
14+
<div id="app">Loading...</div>
1515

1616
<div id="blazor-error-ui">
1717
An unhandled error has occurred.

0 commit comments

Comments
 (0)