Skip to content

Commit ba4711b

Browse files
THardy98THardy98
authored
update .NET SDK version, update envconfig usage (namespace and fallback nullable target host) (#123)
1 parent 4a24bce commit ba4711b

37 files changed

Lines changed: 74 additions & 176 deletions

File tree

‎Directory.Build.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
</PropertyGroup>
2020

2121
<ItemGroup>
22-
<PackageReference Include="Temporalio" Version="1.9.0" />
23-
<PackageReference Include="Temporalio.Extensions.DiagnosticSource" Version="1.9.0" />
24-
<PackageReference Include="Temporalio.Extensions.Hosting" Version="1.9.0" />
25-
<PackageReference Include="Temporalio.Extensions.OpenTelemetry" Version="1.9.0" />
22+
<PackageReference Include="Temporalio" Version="1.10.0" />
23+
<PackageReference Include="Temporalio.Extensions.DiagnosticSource" Version="1.10.0" />
24+
<PackageReference Include="Temporalio.Extensions.Hosting" Version="1.10.0" />
25+
<PackageReference Include="Temporalio.Extensions.OpenTelemetry" Version="1.10.0" />
2626
<!--
2727
Can also reference the SDK downloaded to a local directory:
2828
<ProjectReference Include="$(MSBuildThisFileDirectory)..\temporal-sdk-dotnet\src\Temporalio\Temporalio.csproj" />

‎src/ActivityHeartbeatingCancellation/Program.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
using Microsoft.Extensions.Logging;
22
using Temporalio.Client;
3-
using Temporalio.Client.EnvConfig;
3+
using Temporalio.Common.EnvConfig;
44
using Temporalio.Exceptions;
55
using Temporalio.Worker;
66
using TemporalioSamples.ActivityHeartbeatingCancellation;
77

88
// Create a client to localhost on default namespace
99
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
10-
if (string.IsNullOrEmpty(connectOptions.TargetHost))
11-
{
12-
connectOptions.TargetHost = "localhost:7233";
13-
}
10+
connectOptions.TargetHost ??= "localhost:7233";
1411
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
1512
builder.
1613
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").

‎src/ActivitySimple/Program.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
using Microsoft.Extensions.Logging;
22
using Temporalio.Client;
3-
using Temporalio.Client.EnvConfig;
3+
using Temporalio.Common.EnvConfig;
44
using Temporalio.Worker;
55
using TemporalioSamples.ActivitySimple;
66

77
// Create a client to localhost on default namespace
88
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
9-
if (string.IsNullOrEmpty(connectOptions.TargetHost))
10-
{
11-
connectOptions.TargetHost = "localhost:7233";
12-
}
9+
connectOptions.TargetHost ??= "localhost:7233";
1310
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
1411
builder.
1512
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").

‎src/ActivityWorker/Program.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
using Temporalio.Activities;
22
using Temporalio.Client;
3-
using Temporalio.Client.EnvConfig;
3+
using Temporalio.Common.EnvConfig;
44
using Temporalio.Worker;
55
using Temporalio.Workflows;
66
using TemporalioSamples.ActivityWorker;
77

88
// Create a client to localhost on default namespace
99
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
10-
if (string.IsNullOrEmpty(connectOptions.TargetHost))
11-
{
12-
connectOptions.TargetHost = "localhost:7233";
13-
}
10+
connectOptions.TargetHost ??= "localhost:7233";
1411
var client = await TemporalClient.ConnectAsync(connectOptions);
1512

1613
// Create worker

‎src/AspNet/Web/Program.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
using Temporalio.Client;
2-
using Temporalio.Client.EnvConfig;
2+
using Temporalio.Common.EnvConfig;
33
using TemporalioSamples.AspNet.Worker;
44

55
var builder = WebApplication.CreateBuilder(args);
@@ -15,10 +15,7 @@
1515
// on separately (VSTHRD003). We may prefer a direct DI extension, see
1616
// https://github.com/temporalio/sdk-dotnet/issues/46.
1717
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
18-
if (string.IsNullOrEmpty(connectOptions.TargetHost))
19-
{
20-
connectOptions.TargetHost = "localhost:7233";
21-
}
18+
connectOptions.TargetHost ??= "localhost:7233";
2219
connectOptions.LoggerFactory = ctx.GetRequiredService<ILoggerFactory>();
2320
return TemporalClient.ConnectAsync(connectOptions);
2421
});

‎src/Bedrock/Basic/Program.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.Extensions.Hosting;
44
using Microsoft.Extensions.Logging;
55
using Temporalio.Client;
6-
using Temporalio.Client.EnvConfig;
6+
using Temporalio.Common.EnvConfig;
77
using Temporalio.Extensions.Hosting;
88
using TemporalioSamples.Bedrock.Basic;
99

@@ -51,10 +51,7 @@ async Task SendMessageAsync()
5151
async Task<ITemporalClient> CreateClientAsync()
5252
{
5353
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
54-
if (string.IsNullOrEmpty(connectOptions.TargetHost))
55-
{
56-
connectOptions.TargetHost = "localhost:7233";
57-
}
54+
connectOptions.TargetHost ??= "localhost:7233";
5855
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
5956
builder.
6057
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").

‎src/Bedrock/Entity/Program.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.Extensions.Hosting;
44
using Microsoft.Extensions.Logging;
55
using Temporalio.Client;
6-
using Temporalio.Client.EnvConfig;
6+
using Temporalio.Common.EnvConfig;
77
using Temporalio.Extensions.Hosting;
88
using TemporalioSamples.Bedrock.Entity;
99

@@ -82,10 +82,7 @@ async Task EndChatAsync()
8282
async Task<ITemporalClient> CreateClientAsync()
8383
{
8484
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
85-
if (string.IsNullOrEmpty(connectOptions.TargetHost))
86-
{
87-
connectOptions.TargetHost = "localhost:7233";
88-
}
85+
connectOptions.TargetHost ??= "localhost:7233";
8986
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
9087
builder.
9188
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").

‎src/Bedrock/SignalsAndQueries/Program.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
using Microsoft.Extensions.Hosting;
44
using Microsoft.Extensions.Logging;
55
using Temporalio.Client;
6-
using Temporalio.Client.EnvConfig;
6+
using Temporalio.Common.EnvConfig;
77
using Temporalio.Extensions.Hosting;
88
using TemporalioSamples.Bedrock.SignalsAndQueries;
99

@@ -73,10 +73,7 @@ async Task GetHistoryAsync()
7373
async Task<ITemporalClient> CreateClientAsync()
7474
{
7575
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
76-
if (string.IsNullOrEmpty(connectOptions.TargetHost))
77-
{
78-
connectOptions.TargetHost = "localhost:7233";
79-
}
76+
connectOptions.TargetHost ??= "localhost:7233";
8077
connectOptions.LoggerFactory = LoggerFactory.Create(builder =>
8178
builder.
8279
AddSimpleConsole(options => options.TimestampFormat = "[HH:mm:ss] ").

‎src/ContextPropagation/Program.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Microsoft.Extensions.Logging;
22
using Temporalio.Client;
3-
using Temporalio.Client.EnvConfig;
3+
using Temporalio.Common.EnvConfig;
44
using Temporalio.Converters;
55
using Temporalio.Worker;
66
using TemporalioSamples.ContextPropagation;
@@ -13,10 +13,7 @@
1313

1414
// Create a client to localhost on default namespace
1515
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
16-
if (string.IsNullOrEmpty(connectOptions.TargetHost))
17-
{
18-
connectOptions.TargetHost = "localhost:7233";
19-
}
16+
connectOptions.TargetHost ??= "localhost:7233";
2017
connectOptions.LoggerFactory = loggerFactory;
2118
// This is where we set the interceptor to propagate context
2219
connectOptions.Interceptors = new[]

‎src/CounterInterceptor/Program.cs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace TemporalioSamples.CounterInterceptor;
22

33
using Temporalio.Client;
4-
using Temporalio.Client.EnvConfig;
4+
using Temporalio.Common.EnvConfig;
55
using Temporalio.Worker;
66

77
internal class Program
@@ -10,10 +10,7 @@ private static async Task Main(string[] args)
1010
{
1111
var counterInterceptor = new MyCounterInterceptor();
1212
var connectOptions = ClientEnvConfig.LoadClientConnectOptions();
13-
if (string.IsNullOrEmpty(connectOptions.TargetHost))
14-
{
15-
connectOptions.TargetHost = "localhost:7233";
16-
}
13+
connectOptions.TargetHost ??= "localhost:7233";
1714
connectOptions.Interceptors = new[]
1815
{
1916
counterInterceptor,

0 commit comments

Comments
 (0)