From fb22b60e6ee9240f63e2338fc581317499d5a695 Mon Sep 17 00:00:00 2001 From: "naiyuantian@microsoft.com" Date: Wed, 13 Nov 2024 14:42:45 -0800 Subject: [PATCH 1/4] update dotnet framework to be dotnet 6 --- .../aspnetcore-app/ToDoList.csproj | 2 +- .../functions-app/DurableClientSampleFunctionApp.csproj | 2 +- test/PerfTests/JavaScript/extensions.csproj | 2 +- test/PerfTests/Python/extensions.csproj | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/durable-client-managed-identity/aspnetcore-app/ToDoList.csproj b/samples/durable-client-managed-identity/aspnetcore-app/ToDoList.csproj index d37d305c5..de4c3ac33 100644 --- a/samples/durable-client-managed-identity/aspnetcore-app/ToDoList.csproj +++ b/samples/durable-client-managed-identity/aspnetcore-app/ToDoList.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 diff --git a/samples/durable-client-managed-identity/functions-app/DurableClientSampleFunctionApp.csproj b/samples/durable-client-managed-identity/functions-app/DurableClientSampleFunctionApp.csproj index 34b19725d..88ff21997 100644 --- a/samples/durable-client-managed-identity/functions-app/DurableClientSampleFunctionApp.csproj +++ b/samples/durable-client-managed-identity/functions-app/DurableClientSampleFunctionApp.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1 + net6.0 v3 diff --git a/test/PerfTests/JavaScript/extensions.csproj b/test/PerfTests/JavaScript/extensions.csproj index c138c6192..a79649f94 100644 --- a/test/PerfTests/JavaScript/extensions.csproj +++ b/test/PerfTests/JavaScript/extensions.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + net6.0 ** diff --git a/test/PerfTests/Python/extensions.csproj b/test/PerfTests/Python/extensions.csproj index c138c6192..a79649f94 100644 --- a/test/PerfTests/Python/extensions.csproj +++ b/test/PerfTests/Python/extensions.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + net6.0 ** From 134924a8fd9e1baca692325c30f73d5bac6cffd9 Mon Sep 17 00:00:00 2001 From: "naiyuantian@microsoft.com" Date: Wed, 13 Nov 2024 15:08:51 -0800 Subject: [PATCH 2/4] udpate all proj to use .net6 --- samples/VSSample.Tests/VSSample.Tests.csproj | 2 +- samples/csx/extensions.csproj | 2 +- .../v1/FunctionAppCorrelation/FunctionAppCorrelation.csproj | 2 +- .../entitites-csharp/RideSharing/RideSharing/RideSharing.csproj | 2 +- samples/fsharp/DurableFSharp.fsproj | 2 +- .../functionapp-csharp/DurableClientSampleFunctionApp.csproj | 2 +- samples/precompiled/VSSample.csproj | 2 +- samples/todolist-aspnetcore/ToDoList.csproj | 2 +- .../SourceGenerator/DurableFunctions.TypedInterfaces.csproj | 2 +- .../WebJobs.Extensions.DurableTask.Analyzers.csproj | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/samples/VSSample.Tests/VSSample.Tests.csproj b/samples/VSSample.Tests/VSSample.Tests.csproj index 2fda8af3a..77ac6e48d 100644 --- a/samples/VSSample.Tests/VSSample.Tests.csproj +++ b/samples/VSSample.Tests/VSSample.Tests.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 false diff --git a/samples/csx/extensions.csproj b/samples/csx/extensions.csproj index 10c855ae2..63a2a53d8 100644 --- a/samples/csx/extensions.csproj +++ b/samples/csx/extensions.csproj @@ -1,6 +1,6 @@ - netstandard2.0 + net6.0 ** diff --git a/samples/distributed-tracing/v1/FunctionAppCorrelation/FunctionAppCorrelation.csproj b/samples/distributed-tracing/v1/FunctionAppCorrelation/FunctionAppCorrelation.csproj index 355b54de0..f89591aeb 100644 --- a/samples/distributed-tracing/v1/FunctionAppCorrelation/FunctionAppCorrelation.csproj +++ b/samples/distributed-tracing/v1/FunctionAppCorrelation/FunctionAppCorrelation.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + net6.0 v3 true true diff --git a/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj b/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj index 4b754cf7b..ac89683b1 100644 --- a/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj +++ b/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj @@ -1,6 +1,6 @@  - netcoreapp2.1 + net6.0 v2 diff --git a/samples/fsharp/DurableFSharp.fsproj b/samples/fsharp/DurableFSharp.fsproj index 42ac6e0cb..73d233c75 100644 --- a/samples/fsharp/DurableFSharp.fsproj +++ b/samples/fsharp/DurableFSharp.fsproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 4.2.3 v2 diff --git a/samples/functionapp-csharp/DurableClientSampleFunctionApp.csproj b/samples/functionapp-csharp/DurableClientSampleFunctionApp.csproj index 370f7a018..eb6d480be 100644 --- a/samples/functionapp-csharp/DurableClientSampleFunctionApp.csproj +++ b/samples/functionapp-csharp/DurableClientSampleFunctionApp.csproj @@ -1,6 +1,6 @@ - netcoreapp3.1 + net6.0 v3 diff --git a/samples/precompiled/VSSample.csproj b/samples/precompiled/VSSample.csproj index 775356d75..a956bcbeb 100644 --- a/samples/precompiled/VSSample.csproj +++ b/samples/precompiled/VSSample.csproj @@ -1,6 +1,6 @@  - netcoreapp3.1 + net6.0 v3 diff --git a/samples/todolist-aspnetcore/ToDoList.csproj b/samples/todolist-aspnetcore/ToDoList.csproj index d46f62129..adc968022 100644 --- a/samples/todolist-aspnetcore/ToDoList.csproj +++ b/samples/todolist-aspnetcore/ToDoList.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net6.0 diff --git a/src/DurableFunctions.TypedInterfaces/SourceGenerator/DurableFunctions.TypedInterfaces.csproj b/src/DurableFunctions.TypedInterfaces/SourceGenerator/DurableFunctions.TypedInterfaces.csproj index 583668c31..f49c714b3 100644 --- a/src/DurableFunctions.TypedInterfaces/SourceGenerator/DurableFunctions.TypedInterfaces.csproj +++ b/src/DurableFunctions.TypedInterfaces/SourceGenerator/DurableFunctions.TypedInterfaces.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 8.0 0.1.0-preview diff --git a/src/WebJobs.Extensions.DurableTask.Analyzers/WebJobs.Extensions.DurableTask.Analyzers.csproj b/src/WebJobs.Extensions.DurableTask.Analyzers/WebJobs.Extensions.DurableTask.Analyzers.csproj index 6c627046e..26004aa8a 100644 --- a/src/WebJobs.Extensions.DurableTask.Analyzers/WebJobs.Extensions.DurableTask.Analyzers.csproj +++ b/src/WebJobs.Extensions.DurableTask.Analyzers/WebJobs.Extensions.DurableTask.Analyzers.csproj @@ -1,7 +1,7 @@  - netstandard2.0 + net6.0 false true RS1026 From 1eff6c51a8a9f193653460033ef619f41a4e1130 Mon Sep 17 00:00:00 2001 From: "naiyuantian@microsoft.com" Date: Wed, 13 Nov 2024 16:15:43 -0800 Subject: [PATCH 3/4] revert back to netstandard2.0 for certain projs --- samples/csx/extensions.csproj | 2 +- .../entitites-csharp/RideSharing/RideSharing/RideSharing.csproj | 2 +- samples/fsharp/DurableFSharp.fsproj | 2 +- .../SourceGenerator/DurableFunctions.TypedInterfaces.csproj | 2 +- .../WebJobs.Extensions.DurableTask.Analyzers.csproj | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/samples/csx/extensions.csproj b/samples/csx/extensions.csproj index 63a2a53d8..10c855ae2 100644 --- a/samples/csx/extensions.csproj +++ b/samples/csx/extensions.csproj @@ -1,6 +1,6 @@ - net6.0 + netstandard2.0 ** diff --git a/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj b/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj index ac89683b1..e15700ce2 100644 --- a/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj +++ b/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj @@ -1,6 +1,6 @@  - net6.0 + netstandard2.0 v2 diff --git a/samples/fsharp/DurableFSharp.fsproj b/samples/fsharp/DurableFSharp.fsproj index 73d233c75..42ac6e0cb 100644 --- a/samples/fsharp/DurableFSharp.fsproj +++ b/samples/fsharp/DurableFSharp.fsproj @@ -1,7 +1,7 @@  - net6.0 + netstandard2.0 4.2.3 v2 diff --git a/src/DurableFunctions.TypedInterfaces/SourceGenerator/DurableFunctions.TypedInterfaces.csproj b/src/DurableFunctions.TypedInterfaces/SourceGenerator/DurableFunctions.TypedInterfaces.csproj index f49c714b3..583668c31 100644 --- a/src/DurableFunctions.TypedInterfaces/SourceGenerator/DurableFunctions.TypedInterfaces.csproj +++ b/src/DurableFunctions.TypedInterfaces/SourceGenerator/DurableFunctions.TypedInterfaces.csproj @@ -1,7 +1,7 @@  - net6.0 + netstandard2.0 8.0 0.1.0-preview diff --git a/src/WebJobs.Extensions.DurableTask.Analyzers/WebJobs.Extensions.DurableTask.Analyzers.csproj b/src/WebJobs.Extensions.DurableTask.Analyzers/WebJobs.Extensions.DurableTask.Analyzers.csproj index 26004aa8a..6c627046e 100644 --- a/src/WebJobs.Extensions.DurableTask.Analyzers/WebJobs.Extensions.DurableTask.Analyzers.csproj +++ b/src/WebJobs.Extensions.DurableTask.Analyzers/WebJobs.Extensions.DurableTask.Analyzers.csproj @@ -1,7 +1,7 @@  - net6.0 + netstandard2.0 false true RS1026 From f0c2fc6f83917043ffa2cacc5b41621d457ad805 Mon Sep 17 00:00:00 2001 From: Naiyuan Tian <110135109+nytian@users.noreply.github.com> Date: Wed, 13 Nov 2024 16:17:01 -0800 Subject: [PATCH 4/4] Update RideSharing.csproj --- .../RideSharing/RideSharing/RideSharing.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj b/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj index e15700ce2..a3cd4be1c 100644 --- a/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj +++ b/samples/entitites-csharp/RideSharing/RideSharing/RideSharing.csproj @@ -1,6 +1,6 @@  - netstandard2.0 + netcoreapp2.1 v2 @@ -19,4 +19,4 @@ Never - \ No newline at end of file +