diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalExample.cs b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalExample.cs index 769d9ba61a..7394f674b6 100644 --- a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalExample.cs +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalExample.cs @@ -7,11 +7,11 @@ public static class AsyncLocalExample public static async Task DoWork() { AsyncLocalInt.Value = 1; - Console.WriteLine($"AsyncLocal value in DoMainWork method: {AsyncLocalInt.Value}"); + Console.WriteLine($"AsyncLocal value in DoWork method: {AsyncLocalInt.Value}"); await DoSubTaskLevel1(); - Console.WriteLine($"AsyncLocal value in DoMainWork method after executing " + + Console.WriteLine($"AsyncLocal value in DoWork method after executing " + $"DoSubTaskLevel1 method: {AsyncLocalInt.Value}"); } diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalReferenceTypeExample.cs b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalReferenceTypeExample.cs new file mode 100644 index 0000000000..d66105f84d --- /dev/null +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalReferenceTypeExample.cs @@ -0,0 +1,23 @@ +namespace PersistValuesInAsyncFlowUsingAsyncLocalInCSharp; + +public static class AsyncLocalReferenceTypeExample +{ + public static readonly AsyncLocal> AsyncLocalList = new(); + + public static async Task DoWork() + { + AsyncLocalList.Value = ["Added in DoWork"]; + + await DoSubTask(); + + Console.WriteLine($"AsyncLocal list in DoWork method after executing DoSubTask method: " + + $"{string.Join(", ", AsyncLocalList.Value)}"); + } + + private static async Task DoSubTask() + { + AsyncLocalList.Value!.Add("Added in DoSubTask"); + + await Task.Delay(100); + } +} diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalVsThreadLocalExample.cs b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalVsThreadLocalExample.cs new file mode 100644 index 0000000000..f23129d800 --- /dev/null +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/AsyncLocalVsThreadLocalExample.cs @@ -0,0 +1,28 @@ +namespace PersistValuesInAsyncFlowUsingAsyncLocalInCSharp; + +public static class AsyncLocalVsThreadLocalExample +{ + private static readonly AsyncLocal AsyncLocalString = new(); + private static readonly ThreadLocal ThreadLocalString = new(); + + public static async Task DoWork() + { + AsyncLocalString.Value = "Set in DoWork"; + ThreadLocalString.Value = "Set in DoWork"; + + var thread = new Thread(() => + Console.WriteLine($"New thread, AsyncLocal: {AsyncLocalString.Value}, " + + $"ThreadLocal: {ThreadLocalString.Value ?? "null"}")); + thread.Start(); + thread.Join(); + + Task task; + using (ExecutionContext.SuppressFlow()) + { + task = Task.Run(() => + Console.WriteLine($"Task.Run with suppressed flow, AsyncLocal: {AsyncLocalString.Value ?? "null"}")); + } + + await task; + } +} diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp.csproj b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp.csproj index fd4bd08da2..9c8a72d56d 100644 --- a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp.csproj +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp.csproj @@ -2,7 +2,7 @@ Exe - net9.0 + net11.0 enable enable diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Program.cs b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Program.cs index 8eaa1b3131..783241bea1 100644 --- a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Program.cs +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Program.cs @@ -5,5 +5,15 @@ Console.WriteLine(); +Console.WriteLine("AsyncLocalVsThreadLocalExample execution: "); +await AsyncLocalVsThreadLocalExample.DoWork(); + +Console.WriteLine(); + +Console.WriteLine("AsyncLocalReferenceTypeExample execution: "); +await AsyncLocalReferenceTypeExample.DoWork(); + +Console.WriteLine(); + Console.WriteLine("AsyncLocalNotifyExample execution: "); await AsyncLocalNotifyExample.DoWork(); diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalExampleTests.cs b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalExampleTests.cs index 676bc04eee..03ca6caa5e 100644 --- a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalExampleTests.cs +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalExampleTests.cs @@ -6,7 +6,7 @@ namespace Tests; public class AsyncLocalExampleTests { [TestMethod] - public async Task GivenAsyncLocalExample_WhenDoWork_AsyncValueIsOne() + public async Task GivenAsyncLocalExample_WhenDoWork_ThenCallerKeepsDefaultValue() { await AsyncLocalExample.DoWork(); diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalNotifyExampleTests.cs b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalNotifyExampleTests.cs index 1d601205bb..3d91a2b8a4 100644 --- a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalNotifyExampleTests.cs +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalNotifyExampleTests.cs @@ -6,7 +6,7 @@ public class AsyncLocalNotifyExampleTests { [TestMethod] - public async Task GivenAsyncLocalNotifyExample_WhenDoWork_AsyncValueIsOne() + public async Task GivenAsyncLocalNotifyExample_WhenDoWork_ThenCallerKeepsNullValue() { await AsyncLocalNotifyExample.DoWork(); diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalReferenceTypeExampleTests.cs b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalReferenceTypeExampleTests.cs new file mode 100644 index 0000000000..ab777ff3af --- /dev/null +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalReferenceTypeExampleTests.cs @@ -0,0 +1,26 @@ +namespace Tests; + +using PersistValuesInAsyncFlowUsingAsyncLocalInCSharp; + +[TestClass] +public class AsyncLocalReferenceTypeExampleTests +{ + [TestMethod] + public async Task GivenAsyncLocalReferenceTypeExample_WhenDoWork_ThenCallerSeesChildChangeToList() + { + var output = new StringWriter(); + var originalOutput = Console.Out; + Console.SetOut(output); + + try + { + await AsyncLocalReferenceTypeExample.DoWork(); + } + finally + { + Console.SetOut(originalOutput); + } + + StringAssert.Contains(output.ToString(), "Added in DoWork, Added in DoSubTask"); + } +} diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalVsThreadLocalExampleTests.cs b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalVsThreadLocalExampleTests.cs new file mode 100644 index 0000000000..d32290bc48 --- /dev/null +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/AsyncLocalVsThreadLocalExampleTests.cs @@ -0,0 +1,27 @@ +namespace Tests; + +using PersistValuesInAsyncFlowUsingAsyncLocalInCSharp; + +[TestClass] +public class AsyncLocalVsThreadLocalExampleTests +{ + [TestMethod] + public async Task GivenAsyncLocalVsThreadLocalExample_WhenDoWork_ThenOnlyAsyncLocalFlowsUntilSuppressed() + { + var output = new StringWriter(); + var originalOutput = Console.Out; + Console.SetOut(output); + + try + { + await AsyncLocalVsThreadLocalExample.DoWork(); + } + finally + { + Console.SetOut(originalOutput); + } + + StringAssert.Contains(output.ToString(), "New thread, AsyncLocal: Set in DoWork, ThreadLocal: null"); + StringAssert.Contains(output.ToString(), "Task.Run with suppressed flow, AsyncLocal: null"); + } +} diff --git a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/Tests.csproj b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/Tests.csproj index 89ab9eedda..2e74642a6b 100644 --- a/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/Tests.csproj +++ b/csharp-intermediate-topics/PersistValuesInAsyncFlowUsingAsyncLocalInCSharp/Tests/Tests.csproj @@ -1,7 +1,7 @@  - net9.0 + net11.0 enable enable @@ -10,10 +10,10 @@ - - - - + + + +