Skip to content

Merge main to main-vs-deps #61884

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.

Sign up for GitHub

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

Merged
merged 24 commits into from
Jun 14, 2022
Merged

Merge main to main-vs-deps #61884

Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
539bd78
Localized file check-in by OneLocBuild Task: Build definition ID 327:…
dotnet-bot Jun 6, 2022
1f29863
Localized file check-in by OneLocBuild Task: Build definition ID 327:…
dotnet-bot Jun 6, 2022
7419db2
Localized file check-in by OneLocBuild Task: Build definition ID 327:…
dotnet-bot Jun 6, 2022
2706b52
Do not supress snippets, check for nested types and rename
DoctorKrolic Jun 12, 2022
3353844
Rename
DoctorKrolic Jun 12, 2022
404f7a1
Merge pull request #61735 from dotnet/locfiles/adb2a30a-9eba-4d45-955…
JoeRobich Jun 13, 2022
7641c77
Allow our statistic/histogram log aggregators to directly take TimeSpans
jasonmalinowski Jun 2, 2022
2417062
Merge remote-tracking branch 'origin/main' into merges/release/dev17.…
Jun 14, 2022
ef5a90a
Make our log aggregators generic on the key
jasonmalinowski Jun 2, 2022
49b0ad5
Rename LogAggregator to CountLogAggregator
jasonmalinowski Jun 7, 2022
fcfa678
Move the GetNextId method to it's own class
jasonmalinowski Jun 7, 2022
2ce3ef9
Move the helper for computing StatisticResults inside the type
jasonmalinowski Jun 8, 2022
42c5e0a
Rename the common IncreaseCount method to something more sensible
jasonmalinowski Jun 14, 2022
68d5511
Static lambda
DoctorKrolic Jun 14, 2022
1f7235f
Fix Rune access issue on AspNetCoreVirtualChar
JamesNK Jun 14, 2022
797b858
Merge branch 'dotnet:main' into async-suggestions-follow-up
DoctorKrolic Jun 14, 2022
8427645
PR feedback
JamesNK Jun 14, 2022
babbfb0
Merge pull request #61875 from dotnet/jamesnk/virtualchar-rune
CyrusNajmabadi Jun 14, 2022
6d15eeb
Merge pull request #61840 from DoctorKrolic/async-suggestions-follow-up
CyrusNajmabadi Jun 14, 2022
f129361
Use auto-properties for PropertyOverrides (#61107)
alrz Jun 14, 2022
ff8175f
Merge pull request #61870 from dotnet/merges/release/dev17.3-to-main
dotnet-bot Jun 14, 2022
1c13b39
Merge pull request #61669 from jasonmalinowski/log-aggregator-cleanups
jasonmalinowski Jun 14, 2022
8702538
Merge branch 'main-vs-deps' into merges/main-to-main-vs-deps
genlu Jun 14, 2022
1ee1527
Fix merge conflict
genlu Jun 14, 2022
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
1,071 changes: 277 additions & 794 deletions src/Compilers/CSharp/Portable/Generated/BoundNodes.xml.Generated.cs
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.cs.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.de.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.es.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions src/Compilers/CSharp/Portable/xlf/CSharpResources.fr.xlf
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading