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

Backport changes from main #23229

Merged
merged 2 commits into from
Jan 3, 2022
Merged

Backport changes from main #23229

merged 2 commits into from
Jan 3, 2022

Conversation

pranavkm
Copy link
Contributor

@pranavkm pranavkm commented Jan 3, 2022

PR: #23185
PR: 023b715

In a Blazor app, the apply-update capabilities are available after the app is up and running in the browser.
Occasionally it takes long for the app to start up and our baseline task times out. Currently we return an empty
list of capabilities which causes the compiler to produce no deltas. This PR bumps up the timeout ever so slightly
and returns baseline capabilities instead.

Fixes dotnet/aspnetcore#36723
…gs.json (#23184)

* Use project path instead of working directory to resolve launchSettings.json

Fixes dotnet/aspnetcore#35393

* Update DotNetWatcherTests.cs
@dotnet-issue-labeler dotnet-issue-labeler bot added the Area-AspNetCore RazorSDK, BlazorWebAssemblySDK, dotnet-watch label Jan 3, 2022
@pranavkm pranavkm changed the base branch from main to release/6.0.2xx January 3, 2022 19:22
Copy link
Contributor

@TanayParikh TanayParikh left a comment

Choose a reason for hiding this comment

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

Approving backport to 6.0.2xx

@pranavkm pranavkm enabled auto-merge (squash) January 3, 2022 19:48
@pranavkm pranavkm merged commit db89b04 into release/6.0.2xx Jan 3, 2022
@TanayParikh TanayParikh deleted the prkrishn/backport branch January 3, 2022 20:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-AspNetCore RazorSDK, BlazorWebAssemblySDK, dotnet-watch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants