Merge branch 'main' into user/ssparach/moreAccessibilityBugFixes

microsoft · Oct 10, 2024 · ab99110 · ab99110
2 parents 04e0512 + ff2f078
commit ab99110
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -14,6 +14,7 @@
     <PlatformTarget>$(Platform)</PlatformTarget>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
     <Configurations>Debug;Release;Debug_FailFast</Configurations>
+    <WindowsSdkPackageVersion>10.0.22621.34</WindowsSdkPackageVersion>
   </PropertyGroup>
 
 <!--

diff --git a/extensionsdk/Directory.Build.props b/extensionsdk/Directory.Build.props
@@ -12,6 +12,7 @@
     <EnableNETAnalyzers>true</EnableNETAnalyzers>
     <AnalysisMode>Recommended</AnalysisMode>
     <PlatformTarget>$(Platform)</PlatformTarget>
+    <WindowsSdkPackageVersion>10.0.19041.34</WindowsSdkPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs b/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs
@@ -306,4 +306,11 @@ private void AdjustFocus(object sender)
             _log.Information($"Set focus to add reposiotry card result: {isFocusSet}");
         }
     }
+
+    public void UnassignSourceControlProviderFromRepository(string repositoryRootPath)
+    {
+        ExtraFolderPropertiesWrapper.Unregister(repositoryRootPath);
+        RepoTracker.ModifySourceControlProviderForTrackedRepository(_unassigned, repositoryRootPath);
+        RefreshTrackedRepositories();
+    }
 }
diff --git a/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml.cs b/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml.cs
@@ -45,6 +45,7 @@ private void SourceControlProviderMenuFlyout_Opening(object sender, object e)
     {
         if (sender is MenuFlyout menuFlyout)
         {
+            var stringResource = new StringResource("DevHome.Customization.pri", "DevHome.Customization/Resources");
             menuFlyout.Items.Clear();
 
             foreach (var extension in ViewModel.ExtensionService.GetInstalledExtensionsAsync(ProviderType.LocalRepository).Result)
@@ -56,10 +57,26 @@ private void SourceControlProviderMenuFlyout_Opening(object sender, object e)
                 };
                 menuItem.Click += AssignSourceControlProviderButton_Click;
 
-                var stringResource = new StringResource("DevHome.Customization.pri", "DevHome.Customization/Resources");
                 ToolTipService.SetToolTip(menuItem, stringResource.GetLocalized("PrefixForDevHomeVersion", extension.PackageDisplayName));
                 menuFlyout.Items.Add(menuItem);
             }
+
+            var unassignMenuItem = new MenuFlyoutItem
+            {
+                Text = stringResource.GetLocalized("MenuFlyoutUnregisteredRepository_Content"),
+            };
+            unassignMenuItem.Click += UnassignFolderButton_Click;
+            menuFlyout.Items.Add(unassignMenuItem);
+        }
+    }
+
+    public void UnassignFolderButton_Click(object sender, RoutedEventArgs e)
+    {
+        // Extract relevant data from view and give to view model for unassign
+        MenuFlyoutItem menuItem = (MenuFlyoutItem)sender;
+        if (menuItem.DataContext is RepositoryInformation repoInfo)
+        {
+            ViewModel.UnassignSourceControlProviderFromRepository(repoInfo.RepositoryRootPath);
         }
     }