From be75bd83ae987cd71162fb7758b82a0ae0113312 Mon Sep 17 00:00:00 2001 From: Henrique <999396+hjgraca@users.noreply.github.com> Date: Mon, 2 Sep 2024 14:53:49 +0100 Subject: [PATCH 1/2] refactor and simplify Common dependency. --- ...S.Lambda.Powertools.BatchProcessing.csproj | 6 ++--- .../AWS.Lambda.Powertools.Idempotency.csproj | 25 +++++++++++++------ .../AWS.Lambda.Powertools.Logging.csproj | 10 +++----- .../AWS.Lambda.Powertools.Metrics.csproj | 6 ++--- .../AWS.Lambda.Powertools.Parameters.csproj | 6 ++--- .../AWS.Lambda.Powertools.Tracing.csproj | 7 +++--- libraries/src/Directory.Build.props | 22 ++++++++++++---- libraries/src/Directory.Build.targets | 19 -------------- 8 files changed, 47 insertions(+), 54 deletions(-) delete mode 100644 libraries/src/Directory.Build.targets diff --git a/libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj b/libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj index 3a2fdfe8..54af1670 100644 --- a/libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj +++ b/libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj @@ -5,6 +5,7 @@ Powertools for AWS Lambda (.NET) - BatchProcessing package. AWS.Lambda.Powertools.BatchProcessing AWS.Lambda.Powertools.BatchProcessing + true @@ -12,9 +13,6 @@ - - false - runtime - + diff --git a/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj b/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj index d86fc3b1..56d67057 100644 --- a/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj +++ b/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj @@ -6,6 +6,9 @@ Powertools for AWS Lambda (.NET) - Idempotency package. AWS.Lambda.Powertools.Idempotency AWS.Lambda.Powertools.Idempotency + true + + 0.0.29 @@ -14,13 +17,19 @@ - - false - runtime - - - false - runtime - + + + + + + + + + + + + JMESPath\%(RecursiveDir)%(Filename)%(Extension) + + diff --git a/libraries/src/AWS.Lambda.Powertools.Logging/AWS.Lambda.Powertools.Logging.csproj b/libraries/src/AWS.Lambda.Powertools.Logging/AWS.Lambda.Powertools.Logging.csproj index 03bdea7b..53d03f99 100644 --- a/libraries/src/AWS.Lambda.Powertools.Logging/AWS.Lambda.Powertools.Logging.csproj +++ b/libraries/src/AWS.Lambda.Powertools.Logging/AWS.Lambda.Powertools.Logging.csproj @@ -6,16 +6,14 @@ Powertools for AWS Lambda (.NET) - Logging package. AWS.Lambda.Powertools.Logging AWS.Lambda.Powertools.Logging + true - - - false - runtime - + + - + diff --git a/libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj b/libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj index b362b464..77ec07a3 100644 --- a/libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj +++ b/libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj @@ -5,13 +5,11 @@ Powertools for AWS Lambda (.NET) - Metrics package. AWS.Lambda.Powertools.Metrics AWS.Lambda.Powertools.Metrics + true - - false - runtime - + diff --git a/libraries/src/AWS.Lambda.Powertools.Parameters/AWS.Lambda.Powertools.Parameters.csproj b/libraries/src/AWS.Lambda.Powertools.Parameters/AWS.Lambda.Powertools.Parameters.csproj index 91f3408e..526f6694 100644 --- a/libraries/src/AWS.Lambda.Powertools.Parameters/AWS.Lambda.Powertools.Parameters.csproj +++ b/libraries/src/AWS.Lambda.Powertools.Parameters/AWS.Lambda.Powertools.Parameters.csproj @@ -8,6 +8,7 @@ Powertools for AWS Lambda (.NET) - Parameters package. AWS.Lambda.Powertools.Parameters AWS.Lambda.Powertools.Parameters + true @@ -19,10 +20,7 @@ - - false - runtime - + diff --git a/libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj b/libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj index 146418f8..9eb67d6c 100644 --- a/libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj +++ b/libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj @@ -6,6 +6,8 @@ Powertools for AWS Lambda (.NET) - Tracing package. AWS.Lambda.Powertools.Tracing AWS.Lambda.Powertools.Tracing + + true @@ -14,10 +16,7 @@ - - false - runtime - + diff --git a/libraries/src/Directory.Build.props b/libraries/src/Directory.Build.props index 8f412fa4..32a59a04 100644 --- a/libraries/src/Directory.Build.props +++ b/libraries/src/Directory.Build.props @@ -26,11 +26,23 @@ true true - + - - + + + + + + + + + + + + Common\%(RecursiveDir)%(Filename)%(Extension) + + - - + + \ No newline at end of file diff --git a/libraries/src/Directory.Build.targets b/libraries/src/Directory.Build.targets deleted file mode 100644 index c9cb609c..00000000 --- a/libraries/src/Directory.Build.targets +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - $(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage - - - - - <_ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))"/> - - - - - - - \ No newline at end of file From 198a53994693ccebdd90cf32a8fbbb0b407051b1 Mon Sep 17 00:00:00 2001 From: Henrique <999396+hjgraca@users.noreply.github.com> Date: Mon, 2 Sep 2024 14:57:47 +0100 Subject: [PATCH 2/2] remove version. --- .../AWS.Lambda.Powertools.Idempotency.csproj | 2 -- 1 file changed, 2 deletions(-) diff --git a/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj b/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj index 56d67057..00150b72 100644 --- a/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj +++ b/libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj @@ -7,8 +7,6 @@ AWS.Lambda.Powertools.Idempotency AWS.Lambda.Powertools.Idempotency true - - 0.0.29