From 5ab6285ab110249eb7cc55ae16b2a41eef418883 Mon Sep 17 00:00:00 2001
From: Eric Johnson <ericjohnson327@gmail.com>
Date: Thu, 10 Oct 2024 14:38:56 -0700
Subject: [PATCH 1/2] User/ejohn/net test (#3937)

* Test fix for .net break

* Test fix for .net break
---
 Directory.Build.props              | 1 +
 extensionsdk/Directory.Build.props | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index e887dc5493..fe01fa7fc2 100644
--- 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
index 275497c199..3120f6f26e 100644
--- 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>

From ff2f0783cbadb0d6ac625f1ea54214843e286c82 Mon Sep 17 00:00:00 2001
From: ssparach <128866445+ssparach@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:05:22 -0700
Subject: [PATCH 2/2] [Dev Home][File Explorer][Version Control Selection
 Dropdown] Dropdown selector should include "Unassigned" as an option (#3932)

* add unassigned menu item

* address PR feedback
---
 .../ViewModels/FileExplorerViewModel.cs       |  7 +++++++
 .../Views/AddRepositoriesView.xaml.cs         | 19 ++++++++++++++++++-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs b/tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs
index 56b4321711..77516af617 100644
--- 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
index c3665cb807..b52902078f 100644
--- a/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml.cs
+++ b/tools/Customization/DevHome.Customization/Views/AddRepositoriesView.xaml.cs
@@ -43,6 +43,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)
@@ -54,10 +55,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);
         }
     }