Navigation Menu

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

Merge shared files #734

Merged
merged 2 commits into from Oct 6, 2020
Merged

Merge shared files #734

merged 2 commits into from Oct 6, 2020

Conversation

Wraith2
Copy link
Contributor

@Wraith2 Wraith2 commented Sep 20, 2020

Merge of more identical or similar files.

The only notable difference is in SignatureVerificationCache.cs
netcore: _cache.Set(cacheLookupKey, result, DateTimeOffset.UtcNow.AddDays(10));
netfx: _cache.Set(cacheLookupKey, result, DateTimeOffset.UtcNow.AddHours(8));

I chose the 10 days but I think this needs consideration before merging.

@cheenamalhotra cheenamalhotra added this to In progress in SqlClient v2.1 via automation Sep 29, 2020
@cheenamalhotra cheenamalhotra added this to the 2.1.0-preview2 milestone Sep 29, 2020
@karinazhou
Copy link
Member

I don't see any troubles using 10 days for both .net framework and .net core. I have re-run the failing pipelines and the previously failing tests look like random ones.

SqlClient v2.1 automation moved this from In progress to Reviewer approved Oct 6, 2020
@cheenamalhotra cheenamalhotra merged commit 6a9e4f1 into dotnet:master Oct 6, 2020
SqlClient v2.1 automation moved this from Reviewer approved to Done Oct 6, 2020
@Wraith2 Wraith2 deleted the combine6 branch October 8, 2020 17:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants