Skip to content

Commit 77bae31

Browse files
authored
Merge pull request #340 from hjgraca/fix-common-dependency
2 parents a36ebd9 + 01c99ff commit 77bae31

File tree

17 files changed

+179
-221
lines changed

17 files changed

+179
-221
lines changed
Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<!-- Remaining properties are defined in Directory.Build.props -->
55
<PackageId>AWS.Lambda.Powertools.Common</PackageId>
6-
<Version>0.0.1</Version>
7-
<Authors>Amazon Web Services</Authors>
8-
<Company>Amazon.com, Inc</Company>
9-
<LangVersion>default</LangVersion>
10-
<Title>Powertools for AWS Lambda (.NET)</Title>
116
<Description>Powertools for AWS Lambda (.NET) - Core package.</Description>
12-
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
13-
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
14-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
15-
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
16-
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
17-
<PackageIcon>AWSLogo128x128.png</PackageIcon>
18-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
197
<AssemblyName>AWS.Lambda.Powertools.Common</AssemblyName>
208
<RootNamespace>AWS.Lambda.Powertools.Common</RootNamespace>
9+
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
2110
</PropertyGroup>
2211

23-
<PropertyGroup>
24-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
25-
</PropertyGroup>
26-
27-
28-
<ItemGroup>
29-
<PackageReference Include="AspectInjector" Version="2.8.1" />
30-
</ItemGroup>
31-
3212
<ItemGroup>
33-
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
13+
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
14+
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
15+
<PackageReference Include="AspectInjector"/>
3416
</ItemGroup>
17+
3518
</Project>
Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<LangVersion>default</LangVersion>
4+
<!-- Remaining properties are defined in Directory.Build.props -->
65
<PackageId>AWS.Lambda.Powertools.Idempotency</PackageId>
7-
<Version>0.0.1</Version>
8-
<Authors>Amazon Web Services</Authors>
9-
<Company>Amazon.com, Inc</Company>
10-
<Title>AWS Lambda Powertools for .NET</Title>
11-
<Description>AWS Lambda Powertools for .NET - Idempotency package.</Description>
12-
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
13-
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
14-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
15-
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
16-
<PackageReadmeFile>README.md</PackageReadmeFile>
17-
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
18-
<PackageIcon>AWSLogo128x128.png</PackageIcon>
19-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6+
<Description>Powertools for AWS Lambda (.NET) - Idempotency package.</Description>
207
<AssemblyName>AWS.Lambda.Powertools.Idempotency</AssemblyName>
218
<RootNamespace>AWS.Lambda.Powertools.Idempotency</RootNamespace>
229
</PropertyGroup>
23-
24-
<PropertyGroup>
25-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
26-
</PropertyGroup>
10+
2711

2812
<ItemGroup>
29-
<None Include="README.md" Pack="true" PackagePath="\" />
13+
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
14+
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
15+
<PackageReference Include="Amazon.Lambda.Core" />
16+
<PackageReference Include="AWSSDK.DynamoDBv2"/>
17+
<PackageReference Include="JmesPath.Net"/>
18+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="all" />
3019
</ItemGroup>
31-
32-
<ItemGroup>
33-
<PackageReference Include="Amazon.Lambda.Core" Version="1.0.0" />
34-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.104.1" />
35-
<PackageReference Include="JmesPath.Net" Version="1.0.308" />
36-
</ItemGroup>
37-
38-
<ItemGroup>
39-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
40-
</ItemGroup>
41-
42-
<ItemGroup>
43-
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
44-
</ItemGroup>
45-
20+
4621
</Project>
Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<LangVersion>default</LangVersion>
4+
<!-- Remaining properties are defined in Directory.Build.props -->
65
<PackageId>AWS.Lambda.Powertools.Logging</PackageId>
7-
<Version>0.0.1</Version>
8-
<Authors>Amazon Web Services</Authors>
9-
<Company>Amazon.com, Inc</Company>
10-
<Title>Powertools for AWS Lambda (.NET)</Title>
116
<Description>Powertools for AWS Lambda (.NET) - Logging package.</Description>
12-
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
13-
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
14-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
15-
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
16-
<PackageReadmeFile>README.md</PackageReadmeFile>
17-
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
18-
<PackageIcon>AWSLogo128x128.png</PackageIcon>
19-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
207
<AssemblyName>AWS.Lambda.Powertools.Logging</AssemblyName>
218
<RootNamespace>AWS.Lambda.Powertools.Logging</RootNamespace>
229
</PropertyGroup>
2310

24-
<PropertyGroup>
25-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
26-
</PropertyGroup>
27-
2811
<ItemGroup>
29-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
30-
</ItemGroup>
31-
32-
<ItemGroup>
33-
<None Include="README.md" Pack="true" PackagePath="\" />
12+
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
13+
<!-- 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" PrivateAssets="All" />
3416
</ItemGroup>
3517

36-
<ItemGroup>
37-
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
38-
</ItemGroup>
39-
40-
<ItemGroup>
41-
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
42-
</ItemGroup>
4318
</Project>
Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
4-
<LangVersion>default</LangVersion>
3+
<!-- Remaining properties are defined in Directory.Build.props -->
54
<PackageId>AWS.Lambda.Powertools.Metrics</PackageId>
6-
<Version>0.0.1</Version>
7-
<Authors>Amazon Web Services</Authors>
8-
<Company>Amazon.com, Inc</Company>
9-
<Title>Powertools for AWS Lambda (.NET)</Title>
105
<Description>Powertools for AWS Lambda (.NET) - Metrics package.</Description>
11-
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
12-
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
13-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
14-
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
15-
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
16-
<PackageReadmeFile>README.md</PackageReadmeFile>
17-
<PackageIcon>AWSLogo128x128.png</PackageIcon>
18-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
196
<AssemblyName>AWS.Lambda.Powertools.Metrics</AssemblyName>
207
<RootNamespace>AWS.Lambda.Powertools.Metrics</RootNamespace>
218
</PropertyGroup>
229

23-
<PropertyGroup>
24-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
25-
</PropertyGroup>
26-
2710
<ItemGroup>
28-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
11+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
2912
</ItemGroup>
3013

3114
<ItemGroup>
3215
<Folder Include="Serializer\" />
3316
</ItemGroup>
34-
<ItemGroup>
35-
<None Include="README.md" Pack="true" PackagePath="\" />
36-
</ItemGroup>
37-
<ItemGroup>
38-
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
39-
</ItemGroup>
17+
4018
</Project>
Lines changed: 8 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,48 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<!-- Remaining properties are defined in Directory.Build.props -->
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
7-
<LangVersion>default</LangVersion>
87
<PackageId>AWS.Lambda.Powertools.Parameters</PackageId>
9-
<Version>0.0.1</Version>
10-
<Authors>Amazon Web Services</Authors>
11-
<Company>Amazon.com, Inc</Company>
12-
<Title>Powertools for AWS Lambda (.NET)</Title>
138
<Description>Powertools for AWS Lambda (.NET) - Parameters package.</Description>
14-
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
15-
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
16-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
17-
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
18-
<PackageReadmeFile>README.md</PackageReadmeFile>
19-
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
20-
<PackageIcon>AWSLogo128x128.png</PackageIcon>
21-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
229
<AssemblyName>AWS.Lambda.Powertools.Parameters</AssemblyName>
2310
<RootNamespace>AWS.Lambda.Powertools.Parameters</RootNamespace>
2411
</PropertyGroup>
2512

26-
<PropertyGroup>
27-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
28-
</PropertyGroup>
29-
3013
<ItemGroup>
31-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
32-
</ItemGroup>
33-
34-
<ItemGroup>
35-
<None Include="README.md" Pack="true" PackagePath="\" />
14+
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
15+
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
16+
<PackageReference Include="AWSSDK.DynamoDBv2"/>
17+
<PackageReference Include="AWSSDK.SecretsManager"/>
18+
<PackageReference Include="AWSSDK.SimpleSystemsManagement"/>
19+
<PackageReference Include="Microsoft.Extensions.Configuration"/>
20+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
3621
</ItemGroup>
3722

38-
<ItemGroup>
39-
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.104.1" />
40-
<PackageReference Include="AWSSDK.SecretsManager" Version="3.7.200.3" />
41-
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.104.29" />
42-
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
43-
</ItemGroup>
44-
45-
<ItemGroup>
46-
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
47-
</ItemGroup>
4823
</Project>
Lines changed: 9 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,21 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
5-
<LangVersion>default</LangVersion>
4+
<!-- Remaining properties are defined in Directory.Build.props -->
65
<PackageId>AWS.Lambda.Powertools.Tracing</PackageId>
7-
<Version>0.0.1</Version>
8-
<Authors>Amazon Web Services</Authors>
9-
<Company>Amazon.com, Inc</Company>
10-
<Title>Powertools for AWS Lambda (.NET)</Title>
116
<Description>Powertools for AWS Lambda (.NET) - Tracing package.</Description>
12-
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
13-
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
14-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
15-
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
16-
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
17-
<PackageReadmeFile>README.md</PackageReadmeFile>
18-
<PackageIcon>AWSLogo128x128.png</PackageIcon>
19-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
207
<AssemblyName>AWS.Lambda.Powertools.Tracing</AssemblyName>
218
<RootNamespace>AWS.Lambda.Powertools.Tracing</RootNamespace>
229
</PropertyGroup>
23-
24-
<PropertyGroup>
25-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
26-
</PropertyGroup>
27-
10+
2811
<ItemGroup>
29-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
12+
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
13+
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
14+
<PackageReference Include="AWSSDK.XRay"/>
15+
<PackageReference Include="AWSXRayRecorder.Core"/>
16+
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" />
17+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
3018
</ItemGroup>
3119

32-
<ItemGroup>
33-
<PackageReference Include="AWSSDK.XRay" Version="3.7.200.34" />
34-
<PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
35-
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
36-
</ItemGroup>
37-
<ItemGroup>
38-
<None Include="README.md" Pack="true" PackagePath="\" />
39-
</ItemGroup>
40-
<ItemGroup>
41-
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
42-
</ItemGroup>
20+
4321
</Project>

libraries/src/Directory.Build.props

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<Project>
2+
<PropertyGroup>
3+
4+
<TargetFramework>net6.0</TargetFramework>
5+
<LangVersion>default</LangVersion>
6+
<!-- Version is generated when packaging the individual csproj -->
7+
<Version>0.0.1</Version>
8+
<Authors>Amazon Web Services</Authors>
9+
<Company>Amazon.com, Inc</Company>
10+
<Title>Powertools for AWS Lambda (.NET)</Title>
11+
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
12+
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
13+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
14+
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
15+
<PackageReadmeFile>README.md</PackageReadmeFile>
16+
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
17+
<PackageIcon>AWSLogo128x128.png</PackageIcon>
18+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
19+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
20+
21+
</PropertyGroup>
22+
23+
<ItemGroup>
24+
<None Include="README.md" Pack="true" PackagePath="\" />
25+
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
26+
</ItemGroup>
27+
28+
29+
</Project>

libraries/src/Directory.Build.targets

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<Project>
2+
3+
<ItemGroup Condition="'$(MSBuildProjectName)' != 'AWS.Lambda.Powertools.Common' AND '$(Configuration)'=='Release'">
4+
5+
<ProjectReference Remove="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
6+
7+
<PackageReference Include="AspectInjector" />
8+
9+
<Compile Include="..\AWS.Lambda.Powertools.Common\**\*.cs">
10+
<Link>Common\%(RecursiveDir)%(Filename)%(Extension)</Link>
11+
</Compile>
12+
<Compile Remove="..\AWS.Lambda.Powertools.Common\obj\**" />
13+
</ItemGroup>
14+
15+
</Project>
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<Project>
2+
<PropertyGroup>
3+
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
4+
</PropertyGroup>
5+
<ItemGroup>
6+
<PackageVersion Include="AspectInjector" Version="2.8.2" />
7+
<PackageVersion Include="Amazon.Lambda.Core" Version="2.1.0" />
8+
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.201.7" />
9+
<PackageVersion Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
10+
<PackageVersion Include="JmesPath.Net" Version="1.0.308" />
11+
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
12+
<PackageVersion Include="AWSSDK.SecretsManager" Version="3.7.201.21" />
13+
<PackageVersion Include="AWSSDK.SimpleSystemsManagement" Version="3.7.200.36" />
14+
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
15+
<PackageVersion Include="AWSSDK.XRay" Version="3.7.200.36" />
16+
<PackageVersion Include="AWSXRayRecorder.Core" Version="2.14.0" />
17+
</ItemGroup>
18+
</Project>

libraries/tests/AWS.Lambda.Powertools.Common.Tests/AWS.Lambda.Powertools.Common.Tests.csproj

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="coverlet.collector" Version="6.0.0">
10+
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
11+
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
12+
<PackageReference Include="coverlet.collector">
1113
<PrivateAssets>all</PrivateAssets>
1214
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1315
</PackageReference>
14-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
15-
<PackageReference Include="NSubstitute" Version="5.0.0" />
16-
<PackageReference Include="xunit" Version="2.5.0" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
16+
<PackageReference Include="Microsoft.NET.Test.Sdk" />
17+
<PackageReference Include="NSubstitute" />
18+
<PackageReference Include="xunit" />
19+
<PackageReference Include="xunit.runner.visualstudio">
1820
<PrivateAssets>all</PrivateAssets>
1921
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2022
</PackageReference>

0 commit comments

Comments
 (0)