Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24321.3 -> To Version 8.0.0-beta.24324.1
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
This is an automatically generated pull request from release/dev17.10
into release/dev17.11.
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.10
- https://github.com/dotnet/razor/find/release/dev17.11
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.10-to-release/dev17.11
git reset --hard upstream/release/dev17.11
git merge upstream/release/dev17.10
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.10-to-release/dev17.11 --force
```
* Update dependencies from https://github.com/dotnet/arcade build 20240621.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3
* Update dependencies from https://github.com/dotnet/arcade build 20240621.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/arcade build 20240621.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3
* Update dependencies from https://github.com/dotnet/arcade build 20240621.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24321.3
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
In order to allow downstream consumers to have the freedom to move to
System.Text.Json, we have to update our public API to not rely on
JToken, and move to generics.
I thought tackling https://github.com/dotnet/razor/issues/6955 might be
a good use of a Thursday night, and help paint a clearer picture for
cohosting, and then I found that OnAutoInsert was really the only
offender that would actually impact cohosting, so I just cleaned it up a
bit instead.
As part of the move towards using the Roslyn lexer, we will need to stop operating on ITextDocument and ITextBuffer, as they abstract away source texts. The Roslyn lexer will need that source text; rather than update these abstractions to know about them, I've opted to remove them, as the abstraction doesn't actually serve any purpose for us.
Due to our custom message target stuff, which lives in the LSP client,
there are a couple of places where we rely on knowing exactly what
serializer our delegated servers (ie, Roslyn and Web Tools) are using in
order to process their responses. This effectively blocks them from
moving to System.Text.Json, as they'd break us. This PR is an attempt
for us to be resilient to one of them moving to System.Text.Json, so
that hopefully we can all do it without dual or triple insertions.
Testing is sadly manual (chicken and egg, Roslyn hasn't moved to STJ so
can't test in CI, but Roslyn can't move until this is done) but basic
functionality works, and code actions and completion are the only two
things I can think of where we need to inspect json objects directly, so
I'm hoping that anything else that is weird at least round-trips
successfully.
This is an automatically generated pull request from release/dev17.11
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.11
- 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.11-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.11
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.11-to-main --force
```
This is an automatically generated pull request from release/dev17.10
into release/dev17.11.
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.10
- https://github.com/dotnet/razor/find/release/dev17.11
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.10-to-release/dev17.11
git reset --hard upstream/release/dev17.11
git merge upstream/release/dev17.10
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.10-to-release/dev17.11 --force
```
* Update dependencies from https://github.com/dotnet/arcade build 20240611.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24310.5 -> To Version 8.0.0-beta.24311.3
* Update dependencies from https://github.com/dotnet/arcade build 20240611.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24310.5 -> To Version 8.0.0-beta.24311.3
* Update dependencies from https://github.com/dotnet/arcade build 20240611.3
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk
From Version 8.0.0-beta.24310.5 -> To Version 8.0.0-beta.24311.3
---------
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
The way we use the nupkg is to restore all required bits in a single package to unpack in the repo. This fixes our devkit package to include the telemetry dll so it will work when restored and unpacked.
Jan Jones
David Wengier
dotnet-maestro[bot]
dotnet bot
Andrew Hall
Matt Mitchell
Fred Silberberg
Dustin Campbell
Chris Sienkiewicz