Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/src/Core/AWSXRayRecorder.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.25.1" />
<PackageReference Include="AWSSDK.XRay" Version="3.3.3" />
<PackageReference Include="AWSSDK.Core" Version="[3.3.25.1,4.0)" />
<PackageReference Include="AWSSDK.XRay" Version="[3.3.3,4.0)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
<NoWarn>1701;1702;1705;1591;1587;1572;1573</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.25.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\AWSXRayRecorder.Core.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
<ItemGroup Condition="'$(TargetFramework)' != 'net45'">
<Compile Remove="AWSSdkTracingHandler.cs" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.25.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\AWSXRayRecorder.Core.csproj" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
<NoWarn>1701;1702;1705;1591;1587;1572;1573</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.25.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\AWSXRayRecorder.Core.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@
<NoWarn>1701;1702;1705;1591;1587;1572;1573</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.25.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\Core\AWSXRayRecorder.Core.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.25.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.13.1" />
<PackageReference Include="AWSSDK.Lambda" Version="3.3.15.1" />
<PackageReference Include="AWSSDK.S3" Version="3.3.21.1" />
<PackageReference Include="AWSSDK.XRay" Version="3.3.3.0" />
<PackageReference Include="AWSSDK.Core" Version="3.5.1.23" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.5.1.1" />
<PackageReference Include="AWSSDK.Lambda" Version="3.5.0.25" />
<PackageReference Include="AWSSDK.S3" Version="3.5.3.1" />
<PackageReference Include="AWSSDK.XRay" Version="3.5.2.16" />
<PackageReference Include="Moq" Version="4.7.137" />
</ItemGroup>
<ItemGroup>
Expand Down
10 changes: 5 additions & 5 deletions sdk/test/UnitTests/AWSXRayRecorder.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.3.25.1" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.3.13.1" />
<PackageReference Include="AWSSDK.Lambda" Version="3.3.15.5" />
<PackageReference Include="AWSSDK.S3" Version="3.3.21.1" />
<PackageReference Include="AWSSDK.XRay" Version="3.3.3.0" />
<PackageReference Include="AWSSDK.Core" Version="3.5.1.23" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.5.1.1" />
<PackageReference Include="AWSSDK.Lambda" Version="3.5.0.25" />
<PackageReference Include="AWSSDK.S3" Version="3.5.3.1" />
<PackageReference Include="AWSSDK.XRay" Version="3.5.2.16" />
<PackageReference Include="Moq" Version="4.7.137" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
Expand Down
23 changes: 23 additions & 0 deletions sdk/test/UnitTests/Tools/MockHttpRequest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
using System.IO;
using System.Linq;
using System.Net;
using System.Threading;
using System.Threading.Tasks;
using Amazon.Runtime;
using Amazon.Runtime.Internal;
Expand Down Expand Up @@ -146,5 +147,27 @@ private HttpWebResponse CreateResponse(MockHttpRequest request)

}
}

public Task<Stream> GetRequestContentAsync(CancellationToken cancellationToken)
{
return Task.FromResult<Stream>(new MemoryStream());
}

public Task WriteToRequestBodyAsync(Stream requestContent, Stream contentStream, IDictionary<string, string> contentHeaders, IRequestContext requestContext)
{
Assert.IsNotNull(requestContent);
Assert.IsNotNull(contentStream);
Assert.IsNotNull(contentHeaders);
Assert.IsNotNull(requestContext);
return Task.FromResult(0);
}

public Task WriteToRequestBodyAsync(Stream requestContent, byte[] requestData, IDictionary<string, string> headers, CancellationToken cancellationToken)
{
Assert.IsNotNull(requestContent);
Assert.IsNotNull(requestData);
Assert.IsNotNull(headers);
return Task.FromResult(0);
}
}
}