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 main into features/extract-to-component #10948

Conversation

ryzngard
Copy link
Contributor

@ryzngard ryzngard commented Oct 1, 2024

No description provided.

dotnet-maestro bot and others added 30 commits August 23, 2024 12:13
This pull request updates the following dependencies

[marker]: <> (Begin:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2)
## From https://github.com/dotnet/arcade
- **Subscription**: aa7f5ce7-ed24-46a1-195c-08dc952fc8a2
- **Build**: 20240821.4
- **Date Produced**: August 21, 2024 6:41:26 PM UTC
- **Commit**: 4460b755f3c7c89e9660d9580ff79afc4218dd85
- **Branch**: refs/heads/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.SourceBuild.Intermediate.arcade**: [from
8.0.0-beta.24413.2 to 8.0.0-beta.24421.4][44]
- **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24413.2 to
8.0.0-beta.24421.4][44]

[44]: dotnet/arcade@51321b7...4460b75

[DependencyUpdate]: <> (End)


[marker]: <> (End:aa7f5ce7-ed24-46a1-195c-08dc952fc8a2)
…823.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.24421.7 -> To Version 9.0.0-beta.24423.2
…ence-packages build 20240821.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 10.0.0-alpha.1.24419.1 -> To Version 10.0.0-alpha.1.24421.1
* When @Inject is missing the member name, generate a syntactically valid c# identifier so we get intellisense
* Emit an empty section when there is no typename
* Add tests and update baselines
Since the end of last week, these tests have been failing. Seems like
something changed on the platform side, perhaps a default value of a
setting. Have started a thread with the editor team to see if we need to
do more.
merge main into release/dev17.12 to update for 17.12 P2. Main is 17.12
P3.
This is an automatically generated pull request from release/dev17.12
into main.


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:
- https://github.com/dotnet/razor/find/release/dev17.12
- https://github.com/dotnet/razor/find/main

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.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.12-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.12
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.12-to-main --force
```
… Build ID 2524803 (dotnet#10790)

This is the pull request automatically created by the OneLocBuild task
in the build process to check-in localized files generated based upon
translation source files (.lcl files) handed-back from the downstream
localization pipeline. If there are issues in translations, visit
https://aka.ms/icxLocBug and log bugs for fixes. The OneLocBuild wiki is
https://aka.ms/onelocbuild and the localization process in general is
documented at https://aka.ms/AllAboutLoc.
A few integration tests to investigate, but the guts are here.

I'm _slightly_ worried this might cause us to recompile files more
often, but there is also the chance this fixes a bunch of bugs by
recompiling files more often :)

Commit-at-a-time review is highly recommended, as there are lots of flow
on effects of API changes
…826.3

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
 From Version 9.0.0-beta.24423.2 -> To Version 9.0.0-beta.24426.3
* Use more obvious SuppressUniqueIds value
* Update baselines
- Use pooled `ImmutableArray<RazorDiagnostic>.Builder` internally
- Don't request pooled builder until first error is added
- Make ErrorSink disposable to return builder to pool
- Add GetErrorsAndClear() method to returns an `ImmutableArray<RazorDiagnostic>` and clears out the sink.
- Add 'ParserContext.PushNewErrorScope(...)` to handle the temporary ErrorSinks used by CSharpCodeParser
This change cleans up ParserContext a bit and uses pooled collections within it.
ryzngard and others added 19 commits September 22, 2024 15:03
…ence-packages build 20240917.1

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 10.0.0-alpha.1.24459.1 -> To Version 10.0.0-alpha.1.24467.1
* Add tests
* Emit the attribute in runtime code, even if it has errors
* Update test baseline
This pull request updates the following dependencies

[marker]: <> (Begin:761d0bec-2526-451d-fdf9-08dcc6cdae74)
## From https://github.com/dotnet/arcade
- **Subscription**: 761d0bec-2526-451d-fdf9-08dcc6cdae74
- **Build**: 20240916.2
- **Date Produced**: September 16, 2024 6:20:31 PM UTC
- **Commit**: 04b9022eba9c184a8036328af513c22e6949e8b6
- **Branch**: refs/heads/release/9.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
- **Microsoft.SourceBuild.Intermediate.arcade**: [from
9.0.0-beta.24463.2 to 9.0.0-beta.24466.2][2]
- **Microsoft.DotNet.Arcade.Sdk**: [from 9.0.0-beta.24463.2 to
9.0.0-beta.24466.2][2]

[2]: dotnet/arcade@bcba693...04b9022

[DependencyUpdate]: <> (End)


[marker]: <> (End:761d0bec-2526-451d-fdf9-08dcc6cdae74)
dotnet#10910)

This pull request updates the following dependencies

[marker]: <> (Begin:011df26a-fbd1-45b0-94b9-08db3601dcca)
## From https://github.com/dotnet/source-build-reference-packages
- **Subscription**: 011df26a-fbd1-45b0-94b9-08db3601dcca
- **Build**: 20240917.1
- **Date Produced**: September 17, 2024 2:02:23 PM UTC
- **Commit**: 38a050f3b80b4dfdd0e8f6c772a3e9835674d3b4
- **Branch**: refs/heads/main

[DependencyUpdate]: <> (Begin)

- **Updates**:
-
**Microsoft.SourceBuild.Intermediate.source-build-reference-packages**:
[from 10.0.0-alpha.1.24459.1 to 10.0.0-alpha.1.24467.1][1]

[1]:
dotnet/source-build-reference-packages@08649fe...38a050f

[DependencyUpdate]: <> (End)


[marker]: <> (End:011df26a-fbd1-45b0-94b9-08db3601dcca)
* More hardening of the completion test

We not wait for a specific item in the actual shown completion UI, and also wait for the correct text in the editor post-commit to account for actions such as OnAutoInsert

* Switch the other "commit tag name" test to the new way of waiting for completion

* PR feedback
Helps remove AssumeNotNull from the fault parameters and blame something in our code stack instead
This is an automatically generated pull request from release/dev17.12
into main.


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:
- https://github.com/dotnet/razor/find/release/dev17.12
- https://github.com/dotnet/razor/find/main

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.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.12-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.12
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.12-to-main --force
```
* Add test
* Change how we parse runtime whitespace for using directives
* Update added test
* Update baselines
* Update parsing doc
…ence-packages build 20240923.1 (dotnet#10942)

Microsoft.SourceBuild.Intermediate.source-build-reference-packages
 From Version 10.0.0-alpha.1.24467.1 -> To Version 10.0.0-alpha.1.24473.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
@ryzngard ryzngard requested review from a team as code owners October 1, 2024 21:56
Copy link
Contributor

@davidwengier davidwengier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You could totally just have pushed this directly :P

@ryzngard
Copy link
Contributor Author

ryzngard commented Oct 2, 2024

You could totally just have pushed this directly :P

Yea, I mostly wanted to run CI and see what work was ahead for getting to green. I also fixed the horrible generated description....

@ryzngard ryzngard merged commit 17dbcdb into dotnet:features/extract-to-component Oct 5, 2024
12 checks passed
@ryzngard ryzngard deleted the features/extract-to-component branch October 15, 2024 00:09
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.