From 69f686e64d348216be76731c35a6e90734dda57e Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 13:51:15 -0700 Subject: [PATCH 01/10] refactor version and assemblyInfo --- DurableTask.Netherite.sln | 5 +++- common.props | 13 +++++++++ ...urableTask.Netherite.AzureFunctions.csproj | 14 ++-------- .../DurableTask.Netherite.csproj | 12 +------- ...er.Extensions.DurableTask.Netherite.csproj | 28 +++++++++++-------- .../Properties/AssemblyInfo.cs | 7 ----- 6 files changed, 37 insertions(+), 42 deletions(-) create mode 100644 common.props delete mode 100644 src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs diff --git a/DurableTask.Netherite.sln b/DurableTask.Netherite.sln index 42971069..50f45917 100644 --- a/DurableTask.Netherite.sln +++ b/DurableTask.Netherite.sln @@ -24,6 +24,9 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerformanceTests", "test\PerformanceTests\PerformanceTests.csproj", "{DD1E1B3F-4FA2-4F3A-9AE1-6B2A0B864AAF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D33AB157-04B9-4BAD-B580-C3C87C17828C}" + ProjectSection(SolutionItems) = preProject + common.props = common.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4A7226CF-57BF-4CA3-A4AC-91A398A1D84B}" EndProject @@ -41,7 +44,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TokenCredentialDF", "sample EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TokenCredentialDTFx", "samples\TokenCredentialDTFx\TokenCredentialDTFx.csproj", "{FBFF0814-E6C0-489A-ACCF-9D0699219621}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Functions.Worker.Extensions.DurableTask.Netherite", "src\Functions.Worker.Extensions.DurableTask.Netherite\Functions.Worker.Extensions.DurableTask.Netherite.csproj", "{3E17402B-3F65-4E5B-B752-48AD56B81208}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Functions.Worker.Extensions.DurableTask.Netherite", "src\Functions.Worker.Extensions.DurableTask.Netherite\Functions.Worker.Extensions.DurableTask.Netherite.csproj", "{3E17402B-3F65-4E5B-B752-48AD56B81208}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/common.props b/common.props new file mode 100644 index 00000000..38639a82 --- /dev/null +++ b/common.props @@ -0,0 +1,13 @@ + + + + 1 + 5 + 1 + $(MajorVersion).$(MinorVersion).$(PatchVersion) + + $(MajorVersion).0.0.0 + .$(GITHUB_RUN_NUMBER) + $(VersionPrefix)$(BuildSuffix) + + \ No newline at end of file diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index d26eb1fd..31ac17d9 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -23,18 +23,10 @@ - - 1 - 5 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) - + + - + NETSDK1138 diff --git a/src/DurableTask.Netherite/DurableTask.Netherite.csproj b/src/DurableTask.Netherite/DurableTask.Netherite.csproj index 2988cad5..af94c7c3 100644 --- a/src/DurableTask.Netherite/DurableTask.Netherite.csproj +++ b/src/DurableTask.Netherite/DurableTask.Netherite.csproj @@ -23,17 +23,7 @@ - - 1 - 5 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) - - + diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj index 1ea28424..8646f8cf 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj @@ -23,19 +23,10 @@ - - - 1 - 5 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) - + - + + @@ -50,4 +41,17 @@ + + + + <_Parameter1>Microsoft.Azure.DurableTask.Netherite.AzureFunctions + <_Parameter2>$(PackageVersion) + <_Parameter3>true + <_Parameter3_IsLiteral>true + + + + + + diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs b/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs deleted file mode 100644 index 70f63c14..00000000 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) Microsoft Corporation. -// Licensed under the MIT License. - -using Microsoft.Azure.Functions.Worker.Extensions.Abstractions; - -// This must be updated when updating the version of the package -[assembly: ExtensionInformation("Microsoft.Azure.DurableTask.Netherite.AzureFunctions", "1.5.0", true)] \ No newline at end of file From b0f35ec1b2e6f46e2532dc6e2af4213fd7616c18 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 14:00:39 -0700 Subject: [PATCH 02/10] fix indentation --- ...er.Extensions.DurableTask.Netherite.csproj | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj index 8646f8cf..1f00df56 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj @@ -41,16 +41,17 @@ - - - - <_Parameter1>Microsoft.Azure.DurableTask.Netherite.AzureFunctions - <_Parameter2>$(PackageVersion) - <_Parameter3>true - <_Parameter3_IsLiteral>true - - - + + + + <_Parameter1>Microsoft.Azure.DurableTask.Netherite.AzureFunctions + <_Parameter2>$(PackageVersion) + <_Parameter3>true + <_Parameter3_IsLiteral>true + + + + From 532ead1cfdf6c49f31ff181a159f32c8445b451d Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 14:01:37 -0700 Subject: [PATCH 03/10] more indentation fixes --- .../DurableTask.Netherite.AzureFunctions.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index 31ac17d9..aaaa531e 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -26,7 +26,7 @@ - + NETSDK1138 From 26c6e4037fef19e5d2de5b9c30fafb8dad0fbb5e Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 14:03:06 -0700 Subject: [PATCH 04/10] fix indentation --- ...Functions.Worker.Extensions.DurableTask.Netherite.csproj | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj index 1f00df56..117c5e89 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj @@ -26,7 +26,7 @@ - + @@ -51,8 +51,4 @@ - - - - From 1d2f34b893da75dfa6b5ddb998bca81801414651 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 14:03:38 -0700 Subject: [PATCH 05/10] more indentation --- .../Functions.Worker.Extensions.DurableTask.Netherite.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj index 117c5e89..231929c6 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj @@ -26,7 +26,7 @@ - + From 61483702b98d56684a6d0086594f961c836ad9dd Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 14:05:17 -0700 Subject: [PATCH 06/10] more indentation fixes --- common.props | 20 +++++++++---------- ...er.Extensions.DurableTask.Netherite.csproj | 14 ++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/common.props b/common.props index 38639a82..1bff74dc 100644 --- a/common.props +++ b/common.props @@ -1,13 +1,13 @@  - - 1 - 5 - 1 - $(MajorVersion).$(MinorVersion).$(PatchVersion) - - $(MajorVersion).0.0.0 - .$(GITHUB_RUN_NUMBER) - $(VersionPrefix)$(BuildSuffix) - + + 1 + 5 + 1 + $(MajorVersion).$(MinorVersion).$(PatchVersion) + + $(MajorVersion).0.0.0 + .$(GITHUB_RUN_NUMBER) + $(VersionPrefix)$(BuildSuffix) + \ No newline at end of file diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj index 231929c6..879ae819 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj @@ -23,7 +23,7 @@ - + @@ -43,12 +43,12 @@ - - <_Parameter1>Microsoft.Azure.DurableTask.Netherite.AzureFunctions - <_Parameter2>$(PackageVersion) - <_Parameter3>true - <_Parameter3_IsLiteral>true - + + <_Parameter1>Microsoft.Azure.DurableTask.Netherite.AzureFunctions + <_Parameter2>$(PackageVersion) + <_Parameter3>true + <_Parameter3_IsLiteral>true + From 1933f69f9cb80134d4f4b0eb36b2aaff28aac704 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 14:06:06 -0700 Subject: [PATCH 07/10] indentation fixes --- .../Functions.Worker.Extensions.DurableTask.Netherite.csproj | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj index 879ae819..24b4c607 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj @@ -25,7 +25,6 @@ - From 05a9180ca7c3f9cc55d2a5106c81a37836076221 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 14:12:08 -0700 Subject: [PATCH 08/10] move common.props inside src/ --- DurableTask.Netherite.sln | 3 --- .../DurableTask.Netherite.AzureFunctions.csproj | 2 +- src/DurableTask.Netherite/DurableTask.Netherite.csproj | 2 +- .../Functions.Worker.Extensions.DurableTask.Netherite.csproj | 2 +- common.props => src/common.props | 0 5 files changed, 3 insertions(+), 6 deletions(-) rename common.props => src/common.props (100%) diff --git a/DurableTask.Netherite.sln b/DurableTask.Netherite.sln index 50f45917..3aa976a3 100644 --- a/DurableTask.Netherite.sln +++ b/DurableTask.Netherite.sln @@ -24,9 +24,6 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerformanceTests", "test\PerformanceTests\PerformanceTests.csproj", "{DD1E1B3F-4FA2-4F3A-9AE1-6B2A0B864AAF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D33AB157-04B9-4BAD-B580-C3C87C17828C}" - ProjectSection(SolutionItems) = preProject - common.props = common.props - EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4A7226CF-57BF-4CA3-A4AC-91A398A1D84B}" EndProject diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index aaaa531e..7387a147 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/DurableTask.Netherite/DurableTask.Netherite.csproj b/src/DurableTask.Netherite/DurableTask.Netherite.csproj index af94c7c3..dc36c398 100644 --- a/src/DurableTask.Netherite/DurableTask.Netherite.csproj +++ b/src/DurableTask.Netherite/DurableTask.Netherite.csproj @@ -23,7 +23,7 @@ - + diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj index 24b4c607..bcf84908 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj @@ -23,7 +23,7 @@ - + diff --git a/common.props b/src/common.props similarity index 100% rename from common.props rename to src/common.props From e68ccf1db66ae3c91fac9cc2aed8d75bcced38c2 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 14:15:49 -0700 Subject: [PATCH 09/10] add common.props to sln --- DurableTask.Netherite.sln | 3 +++ 1 file changed, 3 insertions(+) diff --git a/DurableTask.Netherite.sln b/DurableTask.Netherite.sln index 3aa976a3..08ee2a5a 100644 --- a/DurableTask.Netherite.sln +++ b/DurableTask.Netherite.sln @@ -24,6 +24,9 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PerformanceTests", "test\PerformanceTests\PerformanceTests.csproj", "{DD1E1B3F-4FA2-4F3A-9AE1-6B2A0B864AAF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D33AB157-04B9-4BAD-B580-C3C87C17828C}" + ProjectSection(SolutionItems) = preProject + src\common.props = src\common.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{4A7226CF-57BF-4CA3-A4AC-91A398A1D84B}" EndProject From a4c8cf73269eb6408abbc36d0bdbabad8b2521d7 Mon Sep 17 00:00:00 2001 From: David Justo Date: Fri, 3 May 2024 14:18:20 -0700 Subject: [PATCH 10/10] Add comments --- .../DurableTask.Netherite.AzureFunctions.csproj | 2 +- src/DurableTask.Netherite/DurableTask.Netherite.csproj | 2 +- .../Functions.Worker.Extensions.DurableTask.Netherite.csproj | 2 +- src/common.props | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj index 7387a147..3df2e8d5 100644 --- a/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj +++ b/src/DurableTask.Netherite.AzureFunctions/DurableTask.Netherite.AzureFunctions.csproj @@ -22,7 +22,7 @@ icon.png - + diff --git a/src/DurableTask.Netherite/DurableTask.Netherite.csproj b/src/DurableTask.Netherite/DurableTask.Netherite.csproj index dc36c398..e12df7cd 100644 --- a/src/DurableTask.Netherite/DurableTask.Netherite.csproj +++ b/src/DurableTask.Netherite/DurableTask.Netherite.csproj @@ -22,7 +22,7 @@ true - + diff --git a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj index bcf84908..7806b688 100644 --- a/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj +++ b/src/Functions.Worker.Extensions.DurableTask.Netherite/Functions.Worker.Extensions.DurableTask.Netherite.csproj @@ -22,7 +22,7 @@ icon.png - + diff --git a/src/common.props b/src/common.props index 1bff74dc..200b1b5b 100644 --- a/src/common.props +++ b/src/common.props @@ -1,5 +1,6 @@  + 1 5