-
Notifications
You must be signed in to change notification settings - Fork 323
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 feature/fileexplorer-sourcecontrol-integration into main #3542
Merged
DefaultRyan
merged 26 commits into
main
from
feature/fileexplorer-sourcecontrol-integration
Aug 6, 2024
Merged
Merge feature/fileexplorer-sourcecontrol-integration into main #3542
DefaultRyan
merged 26 commits into
main
from
feature/fileexplorer-sourcecontrol-integration
Aug 6, 2024
Conversation
This file contains 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
This reverts commit f30055f.
**Summary of the pull request** This PR contains implementation changes for the File Explorer Source Control Integration experimental feature. This feature will allow File Explorer to obtain property information from source control technologies for display (image attached below): **Detailed description of the pull request / Additional comments** This PR contains the following changes: - Reference official Dev Home SDK version (that defines APIs for File Explorer Source Control Integration) - Declare FileExplorerSourceControlIntegration as an experimental feature - The FileExplorerSourceControlIntegration project which creates a COM Server used to communicate information with File Explorer - The FileExplorerGitIntegration project which allows Dev Home to come with an inbox extension that understands git - Basic Unit Tests **Validation steps performed** SDK and MSIX local builds Tested Git Integration File Explorer behavior inside VM Related work items: #48431506
…ntrol extensions inside Dev Home (#2984) * changes to write/read data (extension information + root path) from json * address PR comments * revert line endings * address PR comments
* fix * move nullable property in csproj * fix format
* declare appextension for git, find all source control extensions, UI changes, SDK changes, get extension information to use for mapping * changes to map extension to registered root paths, add validation to git implementation * changes after testing * use serilog in validation code * reorder using * use published SDK version * address PR feedback * address PR feedback * address PR feedback * Minor cleanup of RepositoryTracking.cs --------- Co-authored-by: Ryan Shepherd <ryansh@microsoft.com>
* basic remove UI * address feedback
* detect git and invoke functionality * address PR comments * address PR feedback * address style comments
* WARP SPEED COMMIT HISTORY. Rooted out and worked around a major bottleneck inside LibGit2Sharp * Better status * Introduce RepositoryWrapper to lock access to Repository * Update unit test to reflect new repo status * Check cache before calling Repository.IsValid
…inside Dev Home (#3484) * proposed telemetry changes for add/remove repository * remove unrequired using statements * address PR feedback * address PR feedback * adjust comment * add count of repos tracked inside Dev Home to event
… flavors in appxmanifest
* reset branch to 548d868 * Revert "reset branch to 548d868" This reverts commit f30055f. * Merged PR 10695071: Move to feature branch in preparation for GitHub **Summary of the pull request** This PR contains implementation changes for the File Explorer Source Control Integration experimental feature. This feature will allow File Explorer to obtain property information from source control technologies for display (image attached below): **Detailed description of the pull request / Additional comments** This PR contains the following changes: - Reference official Dev Home SDK version (that defines APIs for File Explorer Source Control Integration) - Declare FileExplorerSourceControlIntegration as an experimental feature - The FileExplorerSourceControlIntegration project which creates a COM Server used to communicate information with File Explorer - The FileExplorerGitIntegration project which allows Dev Home to come with an inbox extension that understands git - Basic Unit Tests **Validation steps performed** SDK and MSIX local builds Tested Git Integration File Explorer behavior inside VM Related work items: #48431506 * Mapping of extensions to repository paths in DevHome core (#3230) * declare appextension for git, find all source control extensions, UI changes, SDK changes, get extension information to use for mapping * changes to map extension to registered root paths, add validation to git implementation * changes after testing * use serilog in validation code * reorder using * use published SDK version * address PR feedback * address PR feedback * address PR feedback * Minor cleanup of RepositoryTracking.cs --------- Co-authored-by: Ryan Shepherd <ryansh@microsoft.com> * save state * save state * save state * save state * save state * implement button actions * changes * address PR feedback * address PR feedback * rebased user branch, made fixes, validated functionality on VM * cleanup UI changes, tested on VM * fix proj references to match dev home feed and unblock PR pipeline --------- Co-authored-by: Ryan Shepherd <ryansh@microsoft.com>
* fix class ids * remaining modifications for ClassId change
ssparach
changed the title
Feature/fileexplorer sourcecontrol integration
Merge feature/fileexplorer sourcecontrol integration into main
Aug 5, 2024
ssparach
changed the title
Merge feature/fileexplorer sourcecontrol integration into main
Merge feature/fileexplorer-sourcecontrol-integration into main
Aug 5, 2024
krschau
reviewed
Aug 5, 2024
.../GitExtension/FileExplorerGitIntegration.UnitTest/FileExplorerGitIntegration.UnitTest.csproj
Show resolved
Hide resolved
.../GitExtension/FileExplorerGitIntegration.UnitTest/FileExplorerGitIntegration.UnitTest.csproj
Outdated
Show resolved
Hide resolved
extensions/GitExtension/FileExplorerGitIntegration/FileExplorerGitIntegration.csproj
Outdated
Show resolved
Hide resolved
extensions/GitExtension/FileExplorerGitIntegration/Models/RepositoryWrapper.cs
Outdated
Show resolved
Hide resolved
extensions/GitExtension/FileExplorerGitIntegration/Models/RepositoryWrapper.cs
Outdated
Show resolved
Hide resolved
tools/Customization/DevHome.Customization/Views/FileExplorerPage.xaml
Outdated
Show resolved
Hide resolved
tools/Customization/DevHome.FileExplorerSourceControlIntegration/Program.cs
Outdated
Show resolved
Hide resolved
krschau
approved these changes
Aug 6, 2024
DefaultRyan
approved these changes
Aug 6, 2024
Good |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary of the pull request
This PR adds the File Explorer Source Control Integration functionality to DevHome (as an experimental feature). This functionality allows a user to add a repository path inside DevHome for which the user can then view source control metadata (such as commit author, file status etc.) inside File Explorer
References and relevant issues
Detailed description of the pull request / Additional comments
Below is a brief summary of the changes made:
- DevHome Git Extension
- File Explorer Source Control Integration Project
- DevHome.Customization
UX to add repositories inside Dev Home and choose source control extension
The PR also adds unit tests, logging and telemetry
Validation steps performed
MSIX build
Manual testing inside VM
Unit testing
PR checklist