Skip to content

Commit

Permalink
3.x merge from master (aws#236)
Browse files Browse the repository at this point in the history
* Create stale.yml (aws#136)

* Release commit for v2.9.0 (aws#137)

* Added 2 seconds timeout for EC2 metadata requests (aws#138)

* Update NOTICE so it only has third party licenses and no proprietary notice (aws#139)

* Fixing link to EFCore usage section (aws#143)

* Added EF Core installation instruction step (aws#145)

* Fixing race condition for initializing and running timer in RulePoller (aws#154)

* Bump AWSSDK.Core dependency version (aws#155)

* Bump AWSSDK.Core dependency version

* Bumped AWSSDK.Core version as range.

* Removed redundant dependency

* Applied HttpClient to get sampling info (aws#159)

* Applied HttpWebRequest to get sampling info and removed dependency on AWSSDK.XRay

* Fixed lock issue and switched to HttpClient

* Added and modified documentations.

* Added documentations.

* Set ExpectContinue header as false by default

* Adding limitation for EFCore with multiple DbCommandInterceptor (aws#164)

* Adding limitation for EFCore with multiple DbCommandInterceptor

* Adding doc ref for AsyncLocal

* Updated xraycontext to use a concurrent dictionary (aws#157)

To avoid concurrent thread access to the dictionary causing an exception

* Enable tracing S3 id pairs and fix SNS naming issue. (aws#168)

* Enable tracing S3 id pairs and fix SNS naming issue.

* Changed AWSSDK.Core version

* Changed parameter names and updated comments.

* Set parameters as default

* Fixed appvoyer building configuration issue. (aws#173)

* Add tracing support for EntityFramework 6 (.NET Framework) (aws#171)

* Added support for EntityFramework 6 for .NET framework.

* Added release workflow (aws#179)

* Added release workflow

* Added space line

* Update configuration

* Switching out AppVeyor for GH workflow (aws#181)

* Switching out AppVeyor for GH workflow

* Running workflow on linux as well. building wth release config

* Revert "Switching out AppVeyor for GH workflow (aws#181)" (aws#185)

This reverts commit 34134f0.

* Added public key token (aws#186)

* Release commit for v2.10.0 (aws#187)

* Updated API Doc (aws#188)

* Add smoke test of distribution channel (aws#189)

* Add smoke test of distribution channel

* Updated AWSXRayRecorder.sln

* Points to the latest version

* Publish metric on distribution availability (aws#190)

* Run test on ubuntu (aws#191)

* Bump System.Net.Http from 4.3.3 to 4.3.4 in /sdk/src/Core (aws#193)

Bumps System.Net.Http from 4.3.3 to 4.3.4.

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Release commit for v2.10.1 (aws#194)

* Update continuous-monitoring.yml

* Increase continuous monitoring to 10 minutes

* Add netcoreapp3.1 target framework

Add a target framework moniker for .NET Core 3.1.

* Create CODEOWNERS

* Update appveyor.yml (aws#226)

* Update appveyor.yml

* Update appveyor.yml

* Update .netappcore version for smoke tests (aws#228)

* Update continuous-monitoring.yml

* Update netcoreapp version in .csproj file

* Update continuous-monitoring.yml

* Update AWSXRayRecorder.SmokeTests.csproj

* Use GitHub workflow for CI on PRs and master builds (aws#231)

* Update continuous-monitoring.yml

* Add Source Link support for enhanced debugging experience (aws#229)

* Add Source Link support for enhanced debugging experience

* NetFramework does not support embedded pdb

Co-authored-by: Jon Armen <[email protected]>

* Finding the same exception in different subsegments should reuse the same cause id (aws#210)

Co-authored-by: Jon Armen <[email protected]>

* Removed blocking call which was producing deadlocks from EC2Plugin. (aws#234)

* Adding 3.x for continous build

Co-authored-by: srprash <[email protected]>
Co-authored-by: Anuraag Agrawal <[email protected]>
Co-authored-by: Lu Peng <[email protected]>
Co-authored-by: Stephen D'Olier <[email protected]>
Co-authored-by: Bhautik Pipaliya <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: William Armiros <[email protected]>
Co-authored-by: martincostello <[email protected]>
Co-authored-by: Jon Armen <[email protected]>
Co-authored-by: Scott Munro <[email protected]>
  • Loading branch information
11 people committed Apr 15, 2022
1 parent d4773aa commit 6cd55ac
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ on:
push:
branches:
- master
- 3.x
pull_request:
branches:
- master
- 3.x

jobs:
build-test:
Expand Down
9 changes: 9 additions & 0 deletions sdk/test/UnitTests/AWSXRayRecorder.UnitTests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,15 @@
<DefineConstants>TRACE;DEBUG</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netcoreapp3.1|AnyCPU'">
<DefineConstants>TRACE;DEBUG</DefineConstants>
<NoWarn>0618;1701;1702;1705</NoWarn>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netcoreapp3.1|AnyCPU'">
<NoWarn>0618;1701;1702;1705</NoWarn>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AWSSDK.Core" Version="3.5.1.23" />
<PackageReference Include="AWSSDK.DynamoDBv2" Version="3.5.1.1" />
Expand Down

0 comments on commit 6cd55ac

Please sign in to comment.