From cd3804c29dfde1630ee86724061515644936322a Mon Sep 17 00:00:00 2001
From: Chad Retz <chad@temporal.io>
Date: Wed, 28 Jun 2023 16:36:06 -0500
Subject: [PATCH 1/2] Update to SDK alpha 6

---
 Directory.Build.props                   |  2 +-
 src/Encryption/Codec/EncryptionCodec.cs | 12 ++++++------
 src/Encryption/CodecServer/Program.cs   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index b26b75c..9b75c17 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -19,7 +19,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Temporalio" Version="0.1.0-alpha5" />
+    <PackageReference Include="Temporalio" Version="0.1.0-alpha6" />
     <!--
     Can also reference the SDK downloaded to a local directory:
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\temporal-sdk-dotnet\src\Temporalio\Temporalio.csproj" />
diff --git a/src/Encryption/Codec/EncryptionCodec.cs b/src/Encryption/Codec/EncryptionCodec.cs
index 82cf560..44e0b17 100644
--- a/src/Encryption/Codec/EncryptionCodec.cs
+++ b/src/Encryption/Codec/EncryptionCodec.cs
@@ -34,8 +34,8 @@ public void Dispose()
         GC.SuppressFinalize(this);
     }
 
-    public Task<IEnumerable<Payload>> EncodeAsync(IReadOnlyCollection<Payload> payloads) =>
-        Task.FromResult(payloads.Select(p =>
+    public Task<IReadOnlyCollection<Payload>> EncodeAsync(IReadOnlyCollection<Payload> payloads) =>
+        Task.FromResult<IReadOnlyCollection<Payload>>(payloads.Select(p =>
         {
             return new Payload()
             {
@@ -47,10 +47,10 @@ public Task<IEnumerable<Payload>> EncodeAsync(IReadOnlyCollection<Payload> paylo
                 // TODO(cretz): Not clear here how to prevent copy
                 Data = ByteString.CopyFrom(Encrypt(p.ToByteArray())),
             };
-        }));
+        }).ToList());
 
-    public Task<IEnumerable<Payload>> DecodeAsync(IReadOnlyCollection<Payload> payloads) =>
-        Task.FromResult(payloads.Select(p =>
+    public Task<IReadOnlyCollection<Payload>> DecodeAsync(IReadOnlyCollection<Payload> payloads) =>
+        Task.FromResult<IReadOnlyCollection<Payload>>(payloads.Select(p =>
         {
             // Ignore if it doesn't have our expected encoding
             if (p.Metadata.GetValueOrDefault("encoding") != EncodingByteString)
@@ -65,7 +65,7 @@ public Task<IEnumerable<Payload>> DecodeAsync(IReadOnlyCollection<Payload> paylo
             }
             // Decrypt
             return Payload.Parser.ParseFrom(Decrypt(p.Data.ToByteArray()));
-        }));
+        }).ToList());
 
     private byte[] Encrypt(byte[] data)
     {
diff --git a/src/Encryption/CodecServer/Program.cs b/src/Encryption/CodecServer/Program.cs
index 51884c4..bf780e9 100644
--- a/src/Encryption/CodecServer/Program.cs
+++ b/src/Encryption/CodecServer/Program.cs
@@ -42,7 +42,7 @@ private static Task<IResult> DecodeAsync(
         HttpContext ctx, IPayloadCodec codec) => ApplyCodecFuncAsync(ctx, codec.DecodeAsync);
 
     private static async Task<IResult> ApplyCodecFuncAsync(
-        HttpContext ctx, Func<IReadOnlyCollection<Payload>, Task<IEnumerable<Payload>>> func)
+        HttpContext ctx, Func<IReadOnlyCollection<Payload>, Task<IReadOnlyCollection<Payload>>> func)
     {
         // Read payloads as JSON
         if (ctx.Request.ContentType?.StartsWith("application/json") != true)

From 1fccda4650c0833cdc08b78589745deec0e1aba1 Mon Sep 17 00:00:00 2001
From: Chad Retz <chad@temporal.io>
Date: Thu, 29 Jun 2023 08:34:22 -0500
Subject: [PATCH 2/2] Update ASP.NET sample to use new hosting extension

---
 Directory.Build.props        |  2 ++
 src/AspNet/Worker/Program.cs | 40 +++++++++---------------------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 9b75c17..27424ab 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -20,6 +20,8 @@
 
   <ItemGroup>
     <PackageReference Include="Temporalio" Version="0.1.0-alpha6" />
+    <PackageReference Include="Temporalio.Extensions.Hosting" Version="0.1.0-alpha6" />
+    <PackageReference Include="Temporalio.Extensions.OpenTelemetry" Version="0.1.0-alpha6" />
     <!--
     Can also reference the SDK downloaded to a local directory:
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\temporal-sdk-dotnet\src\Temporalio\Temporalio.csproj" />
diff --git a/src/AspNet/Worker/Program.cs b/src/AspNet/Worker/Program.cs
index 1dc07f4..eb56fed 100644
--- a/src/AspNet/Worker/Program.cs
+++ b/src/AspNet/Worker/Program.cs
@@ -1,35 +1,15 @@
-using Temporalio.Client;
-using Temporalio.Worker;
+using Temporalio.Extensions.Hosting;
 using TemporalioSamples.AspNet.Worker;
 
 IHost host = Host.CreateDefaultBuilder(args)
-    .ConfigureLogging(ctx => ctx.AddSimpleConsole().SetMinimumLevel(LogLevel.Information))
-    .ConfigureServices(ctx => ctx.AddHostedService<Worker>())
+    .ConfigureLogging(ctx =>
+        ctx.AddSimpleConsole().SetMinimumLevel(LogLevel.Information))
+    .ConfigureServices(ctx =>
+        ctx.AddHostedTemporalWorker(
+            clientTargetHost: "localhost:7233",
+            clientNamespace: "default",
+            taskQueue: MyWorkflow.TaskQueue).
+        AddWorkflow<MyWorkflow>())
     .Build();
 
-host.Run();
-
-public sealed class Worker : BackgroundService
-{
-    private readonly ILoggerFactory loggerFactory;
-    private readonly ILogger<Worker> logger;
-
-    public Worker(ILoggerFactory loggerFactory, ILogger<Worker> logger)
-    {
-        this.loggerFactory = loggerFactory;
-        this.logger = logger;
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        using var worker = new TemporalWorker(
-            await TemporalClient.ConnectAsync(new()
-            {
-                TargetHost = "localhost:7233",
-                LoggerFactory = loggerFactory,
-            }),
-            new TemporalWorkerOptions(taskQueue: MyWorkflow.TaskQueue).
-                AddWorkflow<MyWorkflow>());
-        await worker.ExecuteAsync(stoppingToken);
-    }
-}
\ No newline at end of file
+host.Run();
\ No newline at end of file