Skip to content

Commit d99a3e0

Browse files
hjgracahjgraca
authored
Merge pull request #643 from hjgraca/fix(dependencies)-Fix-Common-dependency
chore: Refactor and simplify Common dependency.
2 parents 63c740f + 198a539 commit d99a3e0

File tree

8 files changed

+45
-54
lines changed

8 files changed

+45
-54
lines changed

‎libraries/src/AWS.Lambda.Powertools.BatchProcessing/AWS.Lambda.Powertools.BatchProcessing.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,14 @@
55
<Description>Powertools for AWS Lambda (.NET) - BatchProcessing package.</Description>
66
<AssemblyName>AWS.Lambda.Powertools.BatchProcessing</AssemblyName>
77
<RootNamespace>AWS.Lambda.Powertools.BatchProcessing</RootNamespace>
8+
<IncludeCommonFiles>true</IncludeCommonFiles>
89
</PropertyGroup>
910
<ItemGroup>
1011
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
1112
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
1213
<PackageReference Include="Amazon.Lambda.DynamoDBEvents" />
1314
<PackageReference Include="Amazon.Lambda.KinesisEvents" />
1415
<PackageReference Include="Amazon.Lambda.SQSEvents" />
15-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
16-
<Private>false</Private>
17-
<ExcludeAssets>runtime</ExcludeAssets>
18-
</ProjectReference>
16+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
1917
</ItemGroup>
2018
</Project>

‎libraries/src/AWS.Lambda.Powertools.Idempotency/AWS.Lambda.Powertools.Idempotency.csproj‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
<Description>Powertools for AWS Lambda (.NET) - Idempotency package.</Description>
77
<AssemblyName>AWS.Lambda.Powertools.Idempotency</AssemblyName>
88
<RootNamespace>AWS.Lambda.Powertools.Idempotency</RootNamespace>
9+
<IncludeCommonFiles>true</IncludeCommonFiles>
910
</PropertyGroup>
1011

1112

@@ -14,13 +15,19 @@
1415
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
1516
<PackageReference Include="Amazon.Lambda.Core"/>
1617
<PackageReference Include="AWSSDK.DynamoDBv2"/>
17-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
18-
<Private>false</Private>
19-
<ExcludeAssets>runtime</ExcludeAssets>
20-
</ProjectReference>
21-
<ProjectReference Include="..\AWS.Lambda.Powertools.JMESPath\AWS.Lambda.Powertools.JMESPath.csproj">
22-
<Private>false</Private>
23-
<ExcludeAssets>runtime</ExcludeAssets>
24-
</ProjectReference>
18+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
19+
<ProjectReference Include="..\AWS.Lambda.Powertools.JMESPath\AWS.Lambda.Powertools.JMESPath.csproj" Condition="'$(Configuration)'=='Debug'"/>
20+
</ItemGroup>
21+
22+
<!-- Include JMESPath files in projects that reference AWS.Lambda.Powertools.JMESPath -->
23+
<!-- This is needed because of the way nuget expects dependencies to be nuget packages as well which is not what we want -->
24+
<ItemGroup Condition="'$(Configuration)'=='Release'">
25+
26+
<ProjectReference Remove="..\AWS.Lambda.Powertools.JMESPath\AWS.Lambda.Powertools.JMESPath.csproj"/>
27+
28+
<Compile Include="..\AWS.Lambda.Powertools.JMESPath\**\*.cs">
29+
<Link>JMESPath\%(RecursiveDir)%(Filename)%(Extension)</Link>
30+
</Compile>
31+
<Compile Remove="..\AWS.Lambda.Powertools.JMESPath\obj\**"/>
2532
</ItemGroup>
2633
</Project>

‎libraries/src/AWS.Lambda.Powertools.Logging/AWS.Lambda.Powertools.Logging.csproj‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,14 @@
66
<Description>Powertools for AWS Lambda (.NET) - Logging package.</Description>
77
<AssemblyName>AWS.Lambda.Powertools.Logging</AssemblyName>
88
<RootNamespace>AWS.Lambda.Powertools.Logging</RootNamespace>
9+
<IncludeCommonFiles>true</IncludeCommonFiles>
910
</PropertyGroup>
1011

1112
<ItemGroup>
1213
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
1314
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
14-
<PackageReference Include="Microsoft.Extensions.Logging" />
15-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
16-
<Private>false</Private>
17-
<ExcludeAssets>runtime</ExcludeAssets>
18-
</ProjectReference>
15+
<PackageReference Include="Microsoft.Extensions.Logging"/>
16+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
1917
</ItemGroup>
20-
18+
2119
</Project>

‎libraries/src/AWS.Lambda.Powertools.Metrics/AWS.Lambda.Powertools.Metrics.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,11 @@
55
<Description>Powertools for AWS Lambda (.NET) - Metrics package.</Description>
66
<AssemblyName>AWS.Lambda.Powertools.Metrics</AssemblyName>
77
<RootNamespace>AWS.Lambda.Powertools.Metrics</RootNamespace>
8+
<IncludeCommonFiles>true</IncludeCommonFiles>
89
</PropertyGroup>
910

1011
<ItemGroup>
11-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
12-
<Private>false</Private>
13-
<ExcludeAssets>runtime</ExcludeAssets>
14-
</ProjectReference>
12+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
1513
</ItemGroup>
1614

1715
<ItemGroup>

‎libraries/src/AWS.Lambda.Powertools.Parameters/AWS.Lambda.Powertools.Parameters.csproj‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
<Description>Powertools for AWS Lambda (.NET) - Parameters package.</Description>
99
<AssemblyName>AWS.Lambda.Powertools.Parameters</AssemblyName>
1010
<RootNamespace>AWS.Lambda.Powertools.Parameters</RootNamespace>
11+
<IncludeCommonFiles>true</IncludeCommonFiles>
1112
</PropertyGroup>
1213

1314
<ItemGroup>
@@ -19,10 +20,7 @@
1920
<PackageReference Include="AWSSDK.SecretsManager" />
2021
<PackageReference Include="AWSSDK.SimpleSystemsManagement" />
2122
<PackageReference Include="Microsoft.Extensions.Configuration" />
22-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
23-
<Private>false</Private>
24-
<ExcludeAssets>runtime</ExcludeAssets>
25-
</ProjectReference>
23+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
2624
</ItemGroup>
2725

2826
</Project>

‎libraries/src/AWS.Lambda.Powertools.Tracing/AWS.Lambda.Powertools.Tracing.csproj‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<Description>Powertools for AWS Lambda (.NET) - Tracing package.</Description>
77
<AssemblyName>AWS.Lambda.Powertools.Tracing</AssemblyName>
88
<RootNamespace>AWS.Lambda.Powertools.Tracing</RootNamespace>
9+
10+
<IncludeCommonFiles>true</IncludeCommonFiles>
911
</PropertyGroup>
1012

1113
<ItemGroup>
@@ -14,10 +16,7 @@
1416
<PackageReference Include="AWSSDK.XRay" />
1517
<PackageReference Include="AWSXRayRecorder.Core" />
1618
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" />
17-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
18-
<Private>false</Private>
19-
<ExcludeAssets>runtime</ExcludeAssets>
20-
</ProjectReference>
19+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" Condition="'$(Configuration)'=='Debug'"/>
2120
</ItemGroup>
2221

2322

‎libraries/src/Directory.Build.props‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,23 @@
2626
<EnableTrimAnalyzer>true</EnableTrimAnalyzer>
2727
<IsAotCompatible>true</IsAotCompatible>
2828
</PropertyGroup>
29-
29+
3030
<ItemGroup>
31-
<None Include="README.md" Pack="true" PackagePath="\" />
32-
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
31+
<None Include="README.md" Pack="true" PackagePath="\"/>
32+
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath=""/>
33+
</ItemGroup>
34+
35+
<!-- Include Common files in projects that reference AWS.Lambda.Powertools.Common -->
36+
<!-- This is needed because of the way nuget expects dependencies to be nuget packages as well which is not what we want -->
37+
<ItemGroup Condition="'$(IncludeCommonFiles)' == 'true' AND '$(Configuration)'=='Release'">
38+
39+
<ProjectReference Remove="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj"/>
40+
<PackageReference Include="AspectInjector"/>
41+
<Compile Include="..\AWS.Lambda.Powertools.Common\**\*.cs">
42+
<Link>Common\%(RecursiveDir)%(Filename)%(Extension)</Link>
43+
</Compile>
44+
<Compile Remove="..\AWS.Lambda.Powertools.Common\obj\**"/>
3345
</ItemGroup>
34-
35-
46+
47+
3648
</Project>

‎libraries/src/Directory.Build.targets‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

0 commit comments

Comments
 (0)