Skip to content

Commit

Permalink
Merge pull request #340 from hjgraca/fix-common-dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
hjgraca authored Sep 13, 2023
2 parents a36ebd9 + 01c99ff commit 77bae31
Show file tree
Hide file tree
Showing 17 changed files with 179 additions and 221 deletions.
Original file line number Diff line number Diff line change
@@ -1,35 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<!-- Remaining properties are defined in Directory.Build.props -->
<PackageId>AWS.Lambda.Powertools.Common</PackageId>
<Version>0.0.1</Version>
<Authors>Amazon Web Services</Authors>
<Company>Amazon.com, Inc</Company>
<LangVersion>default</LangVersion>
<Title>Powertools for AWS Lambda (.NET)</Title>
<Description>Powertools for AWS Lambda (.NET) - Core package.</Description>
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
<PackageIcon>AWSLogo128x128.png</PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyName>AWS.Lambda.Powertools.Common</AssemblyName>
<RootNamespace>AWS.Lambda.Powertools.Common</RootNamespace>
<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
</PropertyGroup>

<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>


<ItemGroup>
<PackageReference Include="AspectInjector" Version="2.8.1" />
</ItemGroup>

<ItemGroup>
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
<PackageReference Include="AspectInjector"/>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,46 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>default</LangVersion>
<!-- Remaining properties are defined in Directory.Build.props -->
<PackageId>AWS.Lambda.Powertools.Idempotency</PackageId>
<Version>0.0.1</Version>
<Authors>Amazon Web Services</Authors>
<Company>Amazon.com, Inc</Company>
<Title>AWS Lambda Powertools for .NET</Title>
<Description>AWS Lambda Powertools for .NET - Idempotency package.</Description>
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
<PackageIcon>AWSLogo128x128.png</PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Powertools for AWS Lambda (.NET) - Idempotency package.</Description>
<AssemblyName>AWS.Lambda.Powertools.Idempotency</AssemblyName>
<RootNamespace>AWS.Lambda.Powertools.Idempotency</RootNamespace>
</PropertyGroup>

<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>


<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="\" />
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
<PackageReference Include="Amazon.Lambda.Core" />
<PackageReference Include="AWSSDK.DynamoDBv2"/>
<PackageReference Include="JmesPath.Net"/>
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="all" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Amazon.Lambda.Core" Version="1.0.0" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.104.1" />
<PackageReference Include="JmesPath.Net" Version="1.0.308" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>


</Project>
Original file line number Diff line number Diff line change
@@ -1,43 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>default</LangVersion>
<!-- Remaining properties are defined in Directory.Build.props -->
<PackageId>AWS.Lambda.Powertools.Logging</PackageId>
<Version>0.0.1</Version>
<Authors>Amazon Web Services</Authors>
<Company>Amazon.com, Inc</Company>
<Title>Powertools for AWS Lambda (.NET)</Title>
<Description>Powertools for AWS Lambda (.NET) - Logging package.</Description>
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
<PackageIcon>AWSLogo128x128.png</PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyName>AWS.Lambda.Powertools.Logging</AssemblyName>
<RootNamespace>AWS.Lambda.Powertools.Logging</RootNamespace>
</PropertyGroup>

<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="\" />
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
<PackageReference Include="Microsoft.Extensions.Logging" />
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,40 +1,18 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>default</LangVersion>
<!-- Remaining properties are defined in Directory.Build.props -->
<PackageId>AWS.Lambda.Powertools.Metrics</PackageId>
<Version>0.0.1</Version>
<Authors>Amazon Web Services</Authors>
<Company>Amazon.com, Inc</Company>
<Title>Powertools for AWS Lambda (.NET)</Title>
<Description>Powertools for AWS Lambda (.NET) - Metrics package.</Description>
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>AWSLogo128x128.png</PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyName>AWS.Lambda.Powertools.Metrics</AssemblyName>
<RootNamespace>AWS.Lambda.Powertools.Metrics</RootNamespace>
</PropertyGroup>

<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<Folder Include="Serializer\" />
</ItemGroup>
<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,48 +1,23 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<!-- Remaining properties are defined in Directory.Build.props -->
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<LangVersion>default</LangVersion>
<PackageId>AWS.Lambda.Powertools.Parameters</PackageId>
<Version>0.0.1</Version>
<Authors>Amazon Web Services</Authors>
<Company>Amazon.com, Inc</Company>
<Title>Powertools for AWS Lambda (.NET)</Title>
<Description>Powertools for AWS Lambda (.NET) - Parameters package.</Description>
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
<PackageIcon>AWSLogo128x128.png</PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyName>AWS.Lambda.Powertools.Parameters</AssemblyName>
<RootNamespace>AWS.Lambda.Powertools.Parameters</RootNamespace>
</PropertyGroup>

<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="\" />
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
<PackageReference Include="AWSSDK.DynamoDBv2"/>
<PackageReference Include="AWSSDK.SecretsManager"/>
<PackageReference Include="AWSSDK.SimpleSystemsManagement"/>
<PackageReference Include="Microsoft.Extensions.Configuration"/>
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.7.104.1" />
<PackageReference Include="AWSSDK.SecretsManager" Version="3.7.200.3" />
<PackageReference Include="AWSSDK.SimpleSystemsManagement" Version="3.7.104.29" />
<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
</ItemGroup>

<ItemGroup>
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -1,43 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<LangVersion>default</LangVersion>
<!-- Remaining properties are defined in Directory.Build.props -->
<PackageId>AWS.Lambda.Powertools.Tracing</PackageId>
<Version>0.0.1</Version>
<Authors>Amazon Web Services</Authors>
<Company>Amazon.com, Inc</Company>
<Title>Powertools for AWS Lambda (.NET)</Title>
<Description>Powertools for AWS Lambda (.NET) - Tracing package.</Description>
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIcon>AWSLogo128x128.png</PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AssemblyName>AWS.Lambda.Powertools.Tracing</AssemblyName>
<RootNamespace>AWS.Lambda.Powertools.Tracing</RootNamespace>
</PropertyGroup>

<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>


<ItemGroup>
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
<PackageReference Include="AWSSDK.XRay"/>
<PackageReference Include="AWSXRayRecorder.Core"/>
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" />
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.XRay" Version="3.7.200.34" />
<PackageReference Include="AWSXRayRecorder.Core" Version="2.14.0" />
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
</ItemGroup>
<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>

</Project>
29 changes: 29 additions & 0 deletions libraries/src/Directory.Build.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project>
<PropertyGroup>

<TargetFramework>net6.0</TargetFramework>
<LangVersion>default</LangVersion>
<!-- Version is generated when packaging the individual csproj -->
<Version>0.0.1</Version>
<Authors>Amazon Web Services</Authors>
<Company>Amazon.com, Inc</Company>
<Title>Powertools for AWS Lambda (.NET)</Title>
<Copyright>Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.</Copyright>
<RepositoryUrl>https://github.com/aws-powertools/powertools-lambda-dotnet</RepositoryUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageTags>AWS;Amazon;Lambda;Powertools</PackageTags>
<PackageReadmeFile>README.md</PackageReadmeFile>
<PackageIconUrl>https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png</PackageIconUrl>
<PackageIcon>AWSLogo128x128.png</PackageIcon>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<GenerateDocumentationFile>true</GenerateDocumentationFile>

</PropertyGroup>

<ItemGroup>
<None Include="README.md" Pack="true" PackagePath="\" />
<None Include="../../AWSLogo128x128.png" Pack="true" Visible="false" PackagePath="" />
</ItemGroup>


</Project>
15 changes: 15 additions & 0 deletions libraries/src/Directory.Build.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<Project>

<ItemGroup Condition="'$(MSBuildProjectName)' != 'AWS.Lambda.Powertools.Common' AND '$(Configuration)'=='Release'">

<ProjectReference Remove="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />

<PackageReference Include="AspectInjector" />

<Compile Include="..\AWS.Lambda.Powertools.Common\**\*.cs">
<Link>Common\%(RecursiveDir)%(Filename)%(Extension)</Link>
</Compile>
<Compile Remove="..\AWS.Lambda.Powertools.Common\obj\**" />
</ItemGroup>

</Project>
18 changes: 18 additions & 0 deletions libraries/src/Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<Project>
<PropertyGroup>
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="AspectInjector" Version="2.8.2" />
<PackageVersion Include="Amazon.Lambda.Core" Version="2.1.0" />
<PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.201.7" />
<PackageVersion Include="AWSXRayRecorder.Handlers.AwsSdk" Version="2.12.0" />
<PackageVersion Include="JmesPath.Net" Version="1.0.308" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="7.0.0" />
<PackageVersion Include="AWSSDK.SecretsManager" Version="3.7.201.21" />
<PackageVersion Include="AWSSDK.SimpleSystemsManagement" Version="3.7.200.36" />
<PackageVersion Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
<PackageVersion Include="AWSSDK.XRay" Version="3.7.200.36" />
<PackageVersion Include="AWSXRayRecorder.Core" Version="2.14.0" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0">
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
<PackageReference Include="coverlet.collector">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
<PackageReference Include="NSubstitute" Version="5.0.0" />
<PackageReference Include="xunit" Version="2.5.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
<PackageReference Include="Microsoft.NET.Test.Sdk" />
<PackageReference Include="NSubstitute" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
Expand Down
Loading

0 comments on commit 77bae31

Please sign in to comment.