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 2.9.x to master #4532

Merged
merged 3 commits into from
Dec 8, 2020
Merged

Merge 2.9.x to master #4532

merged 3 commits into from
Dec 8, 2020

Conversation

dotnet-bot
Copy link
Contributor

This is an automatically generated pull request from 2.9.x into master.

Once all conflicts are resolved and all the tests pass, you are free to merge the pull request. 🐯

Troubleshooting conflicts

Identify authors of changes which introduced merge conflicts

Scroll to the bottom, then for each file containing conflicts copy its path into the following searches:

Usually the most recent change to a file between the two branches is considered to have introduced the conflicts, but sometimes it will be necessary to look for the conflicting lines and check the blame in each branch. Generally the author whose change introduced the conflicts should pull down this PR, fix the conflicts locally, then push up a commit resolving the conflicts.

Resolve merge conflicts using your local repo

Sometimes merge conflicts may be present on GitHub but merging locally will work without conflicts. This is due to differences between the merge algorithm used in local git versus the one used by GitHub.

git fetch --all
git checkout merges/2.9.x-to-master
git reset --hard upstream/master
git merge upstream/2.9.x
# Fix merge conflicts
git commit
git push upstream merges/2.9.x-to-master --force

…t ASP.NET MVC Controller property setter parameters as tainted
Find tainted data parameter SyntaxNodes more robustly, and don't treat ASP.NET MVC Controller property setter parameters as tainted
@codecov
Copy link

codecov bot commented Dec 8, 2020

Codecov Report

Merging #4532 (861e6d9) into master (30180a5) will increase coverage by 0.04%.
The diff coverage is 72.41%.

@@            Coverage Diff             @@
##           master    #4532      +/-   ##
==========================================
+ Coverage   95.79%   95.84%   +0.04%     
==========================================
  Files        1174     1177       +3     
  Lines      266952   268158    +1206     
  Branches    16081    16192     +111     
==========================================
+ Hits       255737   257022    +1285     
+ Misses       9152     9066      -86     
- Partials     2063     2070       +7     
Flag Coverage Δ
Debug 95.84% <72.41%> (+0.04%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...TaintedDataAnalysis.TaintedDataOperationVisitor.cs 89.25% <33.33%> (-1.45%) ⬇️
...y/ReviewCodeForSqlInjectionVulnerabilitiesTests.cs 99.16% <100.00%> (+<0.01%) ⬆️
...is/Analysis/TaintedDataAnalysis/WebInputSources.cs 99.73% <100.00%> (+<0.01%) ⬆️
...GlobalFlowStateAnalysis/GlobalFlowStateAnalysis.cs 93.61% <0.00%> (-6.39%) ⬇️
...rp/Analyzers/CallSiteImplicitAllocationAnalyzer.cs 92.85% <0.00%> (-5.81%) ⬇️
...lysis/ValueContentAnalysis/ValueContentAnalysis.cs 87.75% <0.00%> (-3.74%) ⬇️
...lities/Compiler/Extensions/DiagnosticExtensions.cs 63.56% <0.00%> (-3.11%) ⬇️
...Security/SourceTriggeredTaintedDataAnalyzerBase.cs 85.77% <0.00%> (-2.76%) ⬇️
...ntainability/AvoidUninstantiatedInternalClasses.cs 90.24% <0.00%> (-2.17%) ⬇️
.../Compiler/Extensions/ImmutableHashSetExtensions.cs 93.54% <0.00%> (-1.62%) ⬇️
... and 122 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ed4a12c...861e6d9. Read the comment docs.

@mavasani mavasani merged commit 464a808 into master Dec 8, 2020
@mavasani mavasani deleted the merges/2.9.x-to-master branch December 8, 2020 16:45
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 8, 2020 18:06
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 8, 2020 18:06
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 8, 2020 21:09
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 8, 2020 21:09
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 9, 2020 00:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 9, 2020 00:06
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 9, 2020 03:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 9, 2020 03:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 9, 2020 06:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 9, 2020 06:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 9, 2020 09:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 9, 2020 09:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 9, 2020 12:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 9, 2020 12:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 9, 2020 15:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 9, 2020 15:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 9, 2020 18:06
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 9, 2020 18:06
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 9, 2020 21:06
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 9, 2020 21:06
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 13, 2020 00:06
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 13, 2020 00:06
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 13, 2020 03:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 13, 2020 03:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 13, 2020 06:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 13, 2020 09:06
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 13, 2020 12:06
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 13, 2020 12:06
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 13, 2020 15:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 13, 2020 15:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 13, 2020 18:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 13, 2020 18:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 13, 2020 21:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 13, 2020 21:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 14, 2020 00:06
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 14, 2020 00:06
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 14, 2020 03:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 14, 2020 03:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 14, 2020 06:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 14, 2020 06:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 14, 2020 09:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 14, 2020 09:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 14, 2020 12:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 14, 2020 12:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 14, 2020 15:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 14, 2020 15:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 14, 2020 18:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 14, 2020 18:05
@dotnet-bot dotnet-bot restored the merges/2.9.x-to-master branch December 14, 2020 21:05
@dotnet-bot dotnet-bot deleted the merges/2.9.x-to-master branch December 14, 2020 21:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants