Skip to content

Commit 91d8182

Browse files
hjgracahjgraca
authored
Merge pull request #642 from aws-powertools/develop
chore: sync main with dev for release 1.13
2 parents f281cfe + 63c740f commit 91d8182

File tree

7 files changed

+45
-20
lines changed

7 files changed

+45
-20
lines changed

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
<PackageReference Include="Amazon.Lambda.DynamoDBEvents" />
1313
<PackageReference Include="Amazon.Lambda.KinesisEvents" />
1414
<PackageReference Include="Amazon.Lambda.SQSEvents" />
15-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="all" />
15+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
16+
<Private>false</Private>
17+
<ExcludeAssets>runtime</ExcludeAssets>
18+
</ProjectReference>
1619
</ItemGroup>
1720
</Project>

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,20 @@
77
<AssemblyName>AWS.Lambda.Powertools.Idempotency</AssemblyName>
88
<RootNamespace>AWS.Lambda.Powertools.Idempotency</RootNamespace>
99
</PropertyGroup>
10-
10+
1111

1212
<ItemGroup>
1313
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
1414
<!-- 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-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="all" />
18-
<ProjectReference Include="..\AWS.Lambda.Powertools.JMESPath\AWS.Lambda.Powertools.JMESPath.csproj" PrivateAssets="all"/>
15+
<PackageReference Include="Amazon.Lambda.Core"/>
16+
<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>
1925
</ItemGroup>
2026
</Project>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
<!-- Package versions are Centrally managed in Directory.Packages.props file -->
1313
<!-- More info https://learn.microsoft.com/en-us/nuget/consume-packages/central-package-management -->
1414
<PackageReference Include="Microsoft.Extensions.Logging" />
15-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
15+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
16+
<Private>false</Private>
17+
<ExcludeAssets>runtime</ExcludeAssets>
18+
</ProjectReference>
1619
</ItemGroup>
1720

1821
</Project>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,10 @@
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
11+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
12+
<Private>false</Private>
13+
<ExcludeAssets>runtime</ExcludeAssets>
14+
</ProjectReference>
1215
</ItemGroup>
1316

1417
<ItemGroup>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919
<PackageReference Include="AWSSDK.SecretsManager" />
2020
<PackageReference Include="AWSSDK.SimpleSystemsManagement" />
2121
<PackageReference Include="Microsoft.Extensions.Configuration" />
22-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
22+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
23+
<Private>false</Private>
24+
<ExcludeAssets>runtime</ExcludeAssets>
25+
</ProjectReference>
2326
</ItemGroup>
2427

2528
</Project>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@
1414
<PackageReference Include="AWSSDK.XRay" />
1515
<PackageReference Include="AWSXRayRecorder.Core" />
1616
<PackageReference Include="AWSXRayRecorder.Handlers.AwsSdk" />
17-
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" PrivateAssets="All" />
17+
<ProjectReference Include="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj">
18+
<Private>false</Private>
19+
<ExcludeAssets>runtime</ExcludeAssets>
20+
</ProjectReference>
1821
</ItemGroup>
1922

2023

‎libraries/src/Directory.Build.targets

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
<Project>
2-
3-
<ItemGroup Condition="'$(MSBuildProjectName)' != 'AWS.Lambda.Powertools.Common' AND '$(MSBuildProjectName)' != 'AWS.Lambda.Powertools.JMESPath' AND '$(Configuration)'=='Release'">
4-
5-
<ProjectReference Remove="..\AWS.Lambda.Powertools.Common\AWS.Lambda.Powertools.Common.csproj" />
6-
2+
<ItemGroup>
73
<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\**" />
134
</ItemGroup>
145

6+
<PropertyGroup>
7+
<TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
8+
</PropertyGroup>
9+
10+
<Target Name="CopyProjectReferencesToPackage" DependsOnTargets="BuildOnlySettings;ResolveReferences">
11+
<ItemGroup>
12+
<_ReferenceCopyLocalPaths Include="@(ReferenceCopyLocalPaths->WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')->WithMetadataValue('PrivateAssets', 'All'))"/>
13+
</ItemGroup>
14+
15+
<ItemGroup>
16+
<BuildOutputInPackage Include="@(_ReferenceCopyLocalPaths)" TargetPath="%(_ReferenceCopyLocalPaths.DestinationSubDirectory)"/>
17+
</ItemGroup>
18+
</Target>
1519
</Project>

0 commit comments

Comments
 (0)