Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

3.x #244

Open
wants to merge 43 commits into
base: 3.x
Choose a base branch
from
Open

3.x #244

wants to merge 43 commits into from

Conversation

jon-armen
Copy link
Contributor

Issue #, if available:

Description of changes:

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

srprash and others added 30 commits June 10, 2020 00:08
* Bump AWSSDK.Core dependency version

* Bumped AWSSDK.Core version as range.

* Removed redundant dependency
* 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

* Adding doc ref for AsyncLocal
To avoid concurrent thread access to the dictionary causing an exception
* Enable tracing S3 id pairs and fix SNS naming issue.

* Changed AWSSDK.Core version

* Changed parameter names and updated comments.

* Set parameters as default
* Added support for EntityFramework 6 for .NET framework.
* Added release workflow

* Added space line

* Update configuration
* Switching out AppVeyor for GH workflow

* Running workflow on linux as well. building wth release config
* Add smoke test of distribution channel

* Updated AWSXRayRecorder.sln

* Points to the latest version
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>
Increase monitoring frequency to 30 minutes
Increase continuous monitoring to 10 minutes
Add a target framework moniker for .NET Core 3.1.
willarmiros and others added 12 commits November 8, 2021 16:02
…eference

Add netcoreapp3.1 target framework
* Update appveyor.yml

* Update appveyor.yml
* Update continuous-monitoring.yml

* Update netcoreapp version in .csproj file

* Update continuous-monitoring.yml

* Update AWSXRayRecorder.SmokeTests.csproj
* Add Source Link support for enhanced debugging experience

* NetFramework does not support embedded pdb

Co-authored-by: Jon Armen <[email protected]>
Co-authored-by: Jon Armen <[email protected]>
@jon-armen jon-armen requested a review from a team as a code owner April 15, 2022 05:24
@jon-armen
Copy link
Contributor Author

jon-armen commented Apr 15, 2022

@srprash , I believe when I last submitted the PR to merge into 3.x it went thru as a Merge and squashed changes into 3.x, rather than rebasing to keep a clean history. My forked 3.x should have a clean history w/o that extra merge operation. I'm not sure what your processes are around merging / rebasing, but we may want to take the 3.x on this fork and force overwrite if it helps cleanup the history.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants