diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 00000000..a1e78379 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,82 @@ + + + + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nuget.config b/nuget.config index 1dfe90ff..6f509391 100644 --- a/nuget.config +++ b/nuget.config @@ -2,8 +2,6 @@ - - \ No newline at end of file diff --git a/samples/AzureFunctionsApp/AzureFunctionsApp.csproj b/samples/AzureFunctionsApp/AzureFunctionsApp.csproj index b0563376..1e56f9fd 100644 --- a/samples/AzureFunctionsApp/AzureFunctionsApp.csproj +++ b/samples/AzureFunctionsApp/AzureFunctionsApp.csproj @@ -8,11 +8,11 @@ - - - - - + + + + + diff --git a/samples/AzureFunctionsUnitTests/AzureFunctionsApp.Tests.csproj b/samples/AzureFunctionsUnitTests/AzureFunctionsApp.Tests.csproj index b818c269..faa8299a 100644 --- a/samples/AzureFunctionsUnitTests/AzureFunctionsApp.Tests.csproj +++ b/samples/AzureFunctionsUnitTests/AzureFunctionsApp.Tests.csproj @@ -10,11 +10,11 @@ - - - - - + + + + + diff --git a/samples/AzureFunctionsUnitTests/SampleUnitTests.cs b/samples/AzureFunctionsUnitTests/SampleUnitTests.cs index b780b5ef..85d3a5b7 100644 --- a/samples/AzureFunctionsUnitTests/SampleUnitTests.cs +++ b/samples/AzureFunctionsUnitTests/SampleUnitTests.cs @@ -33,6 +33,9 @@ public async Task OrchestrationReturnsMultipleGreetings() Mock loggerFactoryMock = new(); loggerFactoryMock.Setup(x => x.CreateLogger(It.IsAny())).Returns(logger); contextMock.Protected().Setup("LoggerFactory").Returns(loggerFactoryMock.Object); + contextMock.Setup(x => x.CreateReplaySafeLogger(It.IsAny())) + .Returns((string categoryName) => loggerFactoryMock.Object.CreateLogger(categoryName)); + // mock activity results // In Moq, optional arguments need to be specified as well. We specify them with It.IsAny(), where T is the type of the optional argument @@ -144,10 +147,10 @@ public async Task ClientReturnsUrls() // Validate format of response URLs Assert.NotNull(keyValuePairs); - Assert.Contains(keyValuePairs, kvp => kvp.Key == "id" && kvp.Value == instanceId); - Assert.Contains(keyValuePairs, kvp => kvp.Key == "purgeHistoryDeleteUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}"); - Assert.Contains(keyValuePairs, kvp => kvp.Key == "sendEventPostUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}/raiseEvent/{{eventName}}"); - Assert.Contains(keyValuePairs, kvp => kvp.Key == "statusQueryGetUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}"); + Assert.Contains(keyValuePairs, kvp => kvp.Key == "Id" && kvp.Value == instanceId); + Assert.Contains(keyValuePairs, kvp => kvp.Key == "PurgeHistoryDeleteUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}"); + Assert.Contains(keyValuePairs, kvp => kvp.Key == "SendEventPostUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}/raiseEvent/{{eventName}}"); + Assert.Contains(keyValuePairs, kvp => kvp.Key == "StatusQueryGetUri" && kvp.Value == $"http://localhost:8888/runtime/webhooks/durabletask/instances/{instanceId}"); } diff --git a/samples/ConsoleApp/ConsoleApp.csproj b/samples/ConsoleApp/ConsoleApp.csproj index 2434e53d..36bad25c 100644 --- a/samples/ConsoleApp/ConsoleApp.csproj +++ b/samples/ConsoleApp/ConsoleApp.csproj @@ -7,7 +7,7 @@ - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/samples/NetFxConsoleApp/NetFxConsoleApp.csproj b/samples/NetFxConsoleApp/NetFxConsoleApp.csproj index 077e220f..2a6a04e3 100644 --- a/samples/NetFxConsoleApp/NetFxConsoleApp.csproj +++ b/samples/NetFxConsoleApp/NetFxConsoleApp.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/samples/WebAPI/WebAPI.csproj b/samples/WebAPI/WebAPI.csproj index aa48c13c..2ee98470 100644 --- a/samples/WebAPI/WebAPI.csproj +++ b/samples/WebAPI/WebAPI.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/src/Abstractions/Abstractions.csproj b/src/Abstractions/Abstractions.csproj index 9c76d48e..e4c127b9 100644 --- a/src/Abstractions/Abstractions.csproj +++ b/src/Abstractions/Abstractions.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/src/Analyzers/Analyzers.csproj b/src/Analyzers/Analyzers.csproj index 336af0e4..d8de1db6 100644 --- a/src/Analyzers/Analyzers.csproj +++ b/src/Analyzers/Analyzers.csproj @@ -21,10 +21,10 @@ - - - - + + + + diff --git a/src/Client/AzureManaged/Client.AzureManaged.csproj b/src/Client/AzureManaged/Client.AzureManaged.csproj index 98202006..ae63b9a9 100644 --- a/src/Client/AzureManaged/Client.AzureManaged.csproj +++ b/src/Client/AzureManaged/Client.AzureManaged.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/src/Client/Core/Client.csproj b/src/Client/Core/Client.csproj index 2b45b1a7..1099102e 100644 --- a/src/Client/Core/Client.csproj +++ b/src/Client/Core/Client.csproj @@ -9,7 +9,7 @@ The client is responsible for interacting with orchestrations from outside the w - + diff --git a/src/Client/Grpc/Client.Grpc.csproj b/src/Client/Grpc/Client.Grpc.csproj index 8125229c..fe13b9df 100644 --- a/src/Client/Grpc/Client.Grpc.csproj +++ b/src/Client/Grpc/Client.Grpc.csproj @@ -7,8 +7,8 @@ - - + + diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets index 13d3e148..cf6e5046 100644 --- a/src/Directory.Build.targets +++ b/src/Directory.Build.targets @@ -14,11 +14,11 @@ - + - + diff --git a/src/Generators/Generators.csproj b/src/Generators/Generators.csproj index 24b9aae8..ff7cffe2 100644 --- a/src/Generators/Generators.csproj +++ b/src/Generators/Generators.csproj @@ -9,6 +9,7 @@ true false false + true @@ -24,8 +25,8 @@ - - + + diff --git a/src/Grpc/Grpc.csproj b/src/Grpc/Grpc.csproj index 394b4787..4839af20 100644 --- a/src/Grpc/Grpc.csproj +++ b/src/Grpc/Grpc.csproj @@ -5,16 +5,16 @@ The gRPC Protobuf .NET services for Durable Task Framework. - - + + - + - + diff --git a/src/Shared/Shared.csproj b/src/Shared/Shared.csproj index b227c9f8..76b3bed6 100644 --- a/src/Shared/Shared.csproj +++ b/src/Shared/Shared.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/src/Worker/AzureManaged/Worker.AzureManaged.csproj b/src/Worker/AzureManaged/Worker.AzureManaged.csproj index 9f3b877d..4e7aefd6 100644 --- a/src/Worker/AzureManaged/Worker.AzureManaged.csproj +++ b/src/Worker/AzureManaged/Worker.AzureManaged.csproj @@ -12,9 +12,9 @@ - - - + + + diff --git a/src/Worker/Core/Worker.csproj b/src/Worker/Core/Worker.csproj index b96e25b1..5791edf7 100644 --- a/src/Worker/Core/Worker.csproj +++ b/src/Worker/Core/Worker.csproj @@ -9,9 +9,9 @@ The worker is responsible for processing durable task work items. - - - + + + diff --git a/test/Analyzers.Tests/Analyzers.Tests.csproj b/test/Analyzers.Tests/Analyzers.Tests.csproj index 23fbfaeb..a43fbdd0 100644 --- a/test/Analyzers.Tests/Analyzers.Tests.csproj +++ b/test/Analyzers.Tests/Analyzers.Tests.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/test/Benchmarks/Benchmarks.csproj b/test/Benchmarks/Benchmarks.csproj index 1db58794..58504ddf 100644 --- a/test/Benchmarks/Benchmarks.csproj +++ b/test/Benchmarks/Benchmarks.csproj @@ -7,11 +7,11 @@ - - - - - + + + + + diff --git a/test/Client/AzureManaged.Tests/Client.AzureManaged.Tests.csproj b/test/Client/AzureManaged.Tests/Client.AzureManaged.Tests.csproj index d7f4726c..22142fa2 100644 --- a/test/Client/AzureManaged.Tests/Client.AzureManaged.Tests.csproj +++ b/test/Client/AzureManaged.Tests/Client.AzureManaged.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/test/Client/Core.Tests/Client.Tests.csproj b/test/Client/Core.Tests/Client.Tests.csproj index 8ae39015..29966adc 100644 --- a/test/Client/Core.Tests/Client.Tests.csproj +++ b/test/Client/Core.Tests/Client.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/test/Client/Grpc.Tests/Client.Grpc.Tests.csproj b/test/Client/Grpc.Tests/Client.Grpc.Tests.csproj index 7f0e11ed..6d3dba79 100644 --- a/test/Client/Grpc.Tests/Client.Grpc.Tests.csproj +++ b/test/Client/Grpc.Tests/Client.Grpc.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/test/Client/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj b/test/Client/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj index 9bf8b3d1..f24130cb 100644 --- a/test/Client/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj +++ b/test/Client/OrchestrationServiceClientShim.Tests/Client.OrchestrationServiceClientShim.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 1bd854ed..911567b5 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -4,22 +4,22 @@ Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, $(_DirectoryBuildTargetsFile)))' != '' " /> - - - + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/test/Generators.Tests/Generators.Tests.csproj b/test/Generators.Tests/Generators.Tests.csproj index 836eb62a..f805fecb 100644 --- a/test/Generators.Tests/Generators.Tests.csproj +++ b/test/Generators.Tests/Generators.Tests.csproj @@ -5,15 +5,15 @@ - + - - - - - + + + + + diff --git a/test/Grpc.IntegrationTests/Grpc.IntegrationTests.csproj b/test/Grpc.IntegrationTests/Grpc.IntegrationTests.csproj index c34fb172..2669b373 100644 --- a/test/Grpc.IntegrationTests/Grpc.IntegrationTests.csproj +++ b/test/Grpc.IntegrationTests/Grpc.IntegrationTests.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/test/Shared/AzureManaged.Tests/Shared.AzureManaged.Tests.csproj b/test/Shared/AzureManaged.Tests/Shared.AzureManaged.Tests.csproj index a30522af..849b655f 100644 --- a/test/Shared/AzureManaged.Tests/Shared.AzureManaged.Tests.csproj +++ b/test/Shared/AzureManaged.Tests/Shared.AzureManaged.Tests.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/test/TestHelpers/TestHelpers.csproj b/test/TestHelpers/TestHelpers.csproj index 6ad0bad4..55514082 100644 --- a/test/TestHelpers/TestHelpers.csproj +++ b/test/TestHelpers/TestHelpers.csproj @@ -5,9 +5,9 @@ - - - + + + diff --git a/test/Worker/AzureManaged.Tests/Worker.AzureManaged.Tests.csproj b/test/Worker/AzureManaged.Tests/Worker.AzureManaged.Tests.csproj index c22ad3f9..4a5a7cc1 100644 --- a/test/Worker/AzureManaged.Tests/Worker.AzureManaged.Tests.csproj +++ b/test/Worker/AzureManaged.Tests/Worker.AzureManaged.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/test/Worker/Core.Tests/Worker.Tests.csproj b/test/Worker/Core.Tests/Worker.Tests.csproj index b5bb6a47..736986d4 100644 --- a/test/Worker/Core.Tests/Worker.Tests.csproj +++ b/test/Worker/Core.Tests/Worker.Tests.csproj @@ -5,7 +5,7 @@ - + diff --git a/test/Worker/Grpc.Tests/Worker.Grpc.Tests.csproj b/test/Worker/Grpc.Tests/Worker.Grpc.Tests.csproj index 7547f853..cda2aa55 100644 --- a/test/Worker/Grpc.Tests/Worker.Grpc.Tests.csproj +++ b/test/Worker/Grpc.Tests/Worker.Grpc.Tests.csproj @@ -5,7 +5,7 @@ - +