-
Notifications
You must be signed in to change notification settings - Fork 4.2k
Limit the FileSystemWatchers to one per drive root for DefaultFileChangeWatcher #82211
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
Merged
Merged
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
733cbe8
Limit the FileSystemWatchers to one per drive root for each SimpleFil…
JoeRobich 1d1ea98
Share root FileSystemWatchers between contexts
JoeRobich 475bf23
Simplify. Remove locks.
JoeRobich e9657ca
Fix renamed event firing on Windows
JoeRobich eaabbe7
Review feedback
JoeRobich fe3cca1
Simplify tracking of individual files
JoeRobich bbd6b75
Use named parameters
JoeRobich b3c1b1a
Attach and Detach from FileSystemWatcher using helpers.
JoeRobich File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -19,7 +19,35 @@ public sealed class TempRoot : IDisposable | |
|
|
||
| static TempRoot() | ||
| { | ||
| Root = Path.Combine(Path.GetTempPath(), "RoslynTests"); | ||
| var tempDirectory = new DirectoryInfo(Path.GetTempPath()); | ||
|
|
||
| #if NET | ||
| // When running on MacOS, `Path.GetTempPath()` will return "/var/folders/..." which is a symlink to "/private/var/folders/...". This | ||
| // can cause issues when watching files under the temp directory, as the FileSystemWatcher will report changes using the real path. | ||
| // So, we need to adjust this path by walking up the temp path until we find a directory that is a link and resolve it. | ||
|
|
||
| if (tempDirectory.LinkTarget != null) | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's unfortunate there's not an API we can just call that does this for us. |
||
| { | ||
| tempDirectory = (DirectoryInfo)Directory.ResolveLinkTarget(tempDirectory.FullName, returnFinalTarget: true); | ||
| } | ||
| else | ||
| { | ||
| var parentDirectory = tempDirectory.Parent; | ||
| while (parentDirectory != null && parentDirectory.LinkTarget == null) | ||
| { | ||
| parentDirectory = parentDirectory.Parent; | ||
| } | ||
|
|
||
| if (parentDirectory != null) | ||
| { | ||
| var relativePath = Path.GetRelativePath(parentDirectory.FullName, tempDirectory.FullName); | ||
| var realPath = Directory.ResolveLinkTarget(parentDirectory.FullName, returnFinalTarget: true).FullName; | ||
| tempDirectory = new DirectoryInfo(Path.GetFullPath(Path.Combine(realPath, relativePath))); | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
| Root = Path.Combine(tempDirectory.FullName, "RoslynTests"); | ||
| Directory.CreateDirectory(Root); | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.