Git extension integration in Repository Management.

common/TelemetryEvents/DevHomeDatabase/DevHomeDatabaseContextEvent.cs

@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Diagnostics.Tracing;
+using DevHome.Telemetry;
+using Microsoft.Diagnostics.Telemetry.Internal;
+
+namespace DevHome.Common.TelemetryEvents.DevHomeDatabase;
+
+[EventData]
+public class DevHomeDatabaseContextEvent : EventBase
+{
+    public override PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
+
+    public string Step { get; } = string.Empty;
+
+    public int HResult { get; }
+
+    public string ExceptionMessage { get; } = string.Empty;
+
+    public DevHomeDatabaseContextEvent(string step)
+    {
+        Step = step;
+    }
+
+    public DevHomeDatabaseContextEvent(string step, Exception ex)
+    {
+        Step = step;
+        HResult = ex.HResult;
+        ExceptionMessage = ex.Message;
+    }
+
+    public override void ReplaceSensitiveStrings(Func<string, string> replaceSensitiveStrings)
+    {
+        // no sensitive strings to replace.
+    }
+}

common/TelemetryEvents/DevHomeDatabase/DevHomeDatabaseEvent.cs

@@ -0,0 +1,38 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Diagnostics.Tracing;
+using DevHome.Telemetry;
+using Microsoft.Diagnostics.Telemetry.Internal;
+
+namespace DevHome.Common.TelemetryEvents.DevHomeDatabase;
+
+[EventData]
+public class DevHomeDatabaseEvent : EventBase
+{
+    public override PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
+
+    public string Step { get; } = string.Empty;
+
+    public int HResult { get; }
+
+    public string ExceptionMessage { get; } = string.Empty;
+
+    public DevHomeDatabaseEvent(string step)
+    {
+        Step = step;
+    }
+
+    public DevHomeDatabaseEvent(string step, Exception ex)
+    {
+        Step = step;
+        HResult = ex.HResult;
+        ExceptionMessage = ex.Message;
+    }
+
+    public override void ReplaceSensitiveStrings(Func<string, string> replaceSensitiveStrings)
+    {
+        // No sensitive strings to replace.
+    }
+}

common/TelemetryEvents/RepositoryManagement/EnhanceRepositoryErrorEvent.cs

@@ -0,0 +1,36 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+using System;
+using System.Diagnostics.Tracing;
+using DevHome.Telemetry;
+using Microsoft.Diagnostics.Telemetry.Internal;
+
+namespace DevHome.Common.TelemetryEvents.RepositoryManagement;
+
+[EventData]
+public class EnhanceRepositoryErrorEvent : EventBase
+{
+    public override PartA_PrivTags PartA_PrivTags => PartA_PrivTags.ProductAndServicePerformance;
+
+    public string Action { get; } = string.Empty;
+
+    public int Hresult { get; }
+
+    public string ErrorMessage { get; } = string.Empty;
+
+    public string RepositoryName { get; } = string.Empty;
+
+    public EnhanceRepositoryErrorEvent(string action, int hresult, string errorMessage, string repositoryName)
+    {
+        Action = action;
+        Hresult = hresult;
+        ErrorMessage = errorMessage;
+        RepositoryName = repositoryName;
+    }
+
+    public override void ReplaceSensitiveStrings(Func<string, string> replaceSensitiveStrings)
+    {
+        // No sensitive strings to replace
+    }
+}

database/DevHome.Database/DatabaseModels/RepositoryManagement/Repository.cs

@@ -30,6 +30,10 @@ public class Repository
     // This causes any fluent API statements to get ignored.
     public string? RepositoryUri { get; set; }
 
+    public Guid? SourceControlClassId { get; set; }
+
+    public bool HasAssignedSourceControlProvider => SourceControlClassId == null ? false : SourceControlClassId.Value != Guid.Empty;
+
     public DateTime? CreatedUTCDate { get; set; }
 
     public DateTime? UpdatedUTCDate { get; set; }

database/DevHome.Database/DevHomeDatabaseContext.cs

@@ -55,6 +55,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 repositoryEntity.Property(x => x.CreatedUTCDate).HasDefaultValueSql("datetime()");
                 repositoryEntity.Property(x => x.UpdatedUTCDate).HasDefaultValueSql("datetime()");
                 repositoryEntity.Property(x => x.RepositoryUri).HasDefaultValue(string.Empty);
+                repositoryEntity.Property(x => x.SourceControlClassId).HasDefaultValue(Guid.Empty);
                 repositoryEntity.ToTable("Repository");
             }
         }

database/DevHome.Database/Migrations/20240919221355_InitialMigration.cs → database/DevHome.Database/Migrations/20240920200626_InitialMigration.cs

@@ -27,6 +27,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 IsHidden = table.Column<bool>(type: "INTEGER", nullable: false),
                 ConfigurationFileLocation = table.Column<string>(type: "TEXT", nullable: true, defaultValue: string.Empty),
                 RepositoryUri = table.Column<string>(type: "TEXT", nullable: true, defaultValue: string.Empty),
+                SourceControlClassId = table.Column<Guid>(type: "TEXT", nullable: true, defaultValue: Guid.Empty),
                 CreatedUTCDate = table.Column<DateTime>(type: "TEXT", nullable: true, defaultValueSql: "datetime()"),
                 UpdatedUTCDate = table.Column<DateTime>(type: "TEXT", nullable: true, defaultValueSql: "datetime()"),
             },

database/DevHome.Database/Migrations/DevHomeDatabaseContextModelSnapshot.cs

@@ -53,6 +53,11 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     .HasColumnType("TEXT")
                     .HasDefaultValue(string.Empty);
 
+                b.Property<Guid?>("SourceControlClassId")
+                    .ValueGeneratedOnAdd()
+                    .HasColumnType("TEXT")
+                    .HasDefaultValue(Guid.Empty);
+
                 b.Property<DateTime?>("UpdatedUTCDate")
                     .ValueGeneratedOnAdd()
                     .HasColumnType("TEXT")

database/DevHome.Database/Services/RepositoryManagementDataAccessService.cs

@@ -21,7 +21,8 @@ public class RepositoryManagementDataAccessService
 
     private readonly DevHomeDatabaseContextFactory _databaseContextFactory;
 
-    public RepositoryManagementDataAccessService(DevHomeDatabaseContextFactory databaseContextFactory)
+    public RepositoryManagementDataAccessService(
+        DevHomeDatabaseContextFactory databaseContextFactory)
     {
         _databaseContextFactory = databaseContextFactory;
     }
@@ -30,20 +31,23 @@ public RepositoryManagementDataAccessService(DevHomeDatabaseContextFactory datab
     /// Makes a new Repository entity with the provided name and location then saves it
     /// to the database.
     /// </summary>
-    /// <param name="repositoryName">The name of the repository to add.</param>
-    /// <param name="cloneLocation">The local location the repository is cloned to.</param>
     /// <returns>The new repository.  Can return null if the database threw an exception.</returns>
-    public Repository? MakeRepository(string repositoryName, string cloneLocation, Uri repositoryUri)
+    public Repository MakeRepository(string repositoryName, string cloneLocation, string repositoryUri)
     {
         return MakeRepository(repositoryName, cloneLocation, string.Empty, repositoryUri);
     }
 
-    public Repository? MakeRepository(string repositoryName, string cloneLocation, string configurationFileLocationAndName, Uri repositoryUri)
+    public Repository MakeRepository(string repositoryName, string cloneLocation, string configurationFileLocationAndName, string repositoryUri)
+    {
+        return MakeRepository(repositoryName, cloneLocation, configurationFileLocationAndName, repositoryUri, Guid.Empty);
+    }
+
+    public Repository MakeRepository(string repositoryName, string cloneLocation, string configurationFileLocationAndName, string repositoryUri, Guid sourceControlProviderClassId)
     {
         var existingRepository = GetRepository(repositoryName, cloneLocation);
         if (existingRepository != null)
         {
-            _log.Warning($"A Repository with name {repositoryName} and clone location {cloneLocation} exists in the repository already.");
+            _log.Information($"A Repository with name {repositoryName} and clone location {cloneLocation} exists in the repository already.");
             return existingRepository;
         }
 
@@ -52,6 +56,7 @@ public RepositoryManagementDataAccessService(DevHomeDatabaseContextFactory datab
             RepositoryName = repositoryName,
             RepositoryClonePath = cloneLocation,
             RepositoryUri = repositoryUri.ToString(),
+            SourceControlClassId = sourceControlProviderClassId,
         };
 
         if (!string.IsNullOrEmpty(configurationFileLocationAndName))
@@ -78,7 +83,7 @@ public RepositoryManagementDataAccessService(DevHomeDatabaseContextFactory datab
             TelemetryFactory.Get<ITelemetry>().Log(
                 "DevHome_Database_Event",
                 LogLevel.Critical,
-                new DatabaseEvent(nameof(MakeRepository), ex));
+                new DevHomeDatabaseEvent(nameof(MakeRepository), ex));
             return new Repository();
         }
 
@@ -142,8 +147,6 @@ public bool UpdateCloneLocation(Repository repository, string newLocation)
                 return false;
             }
 
-            // TODO: Figure out a method to update the entity in the database and
-            // the entity in memory.
             // Maybe update the tracking information on repository.  This way
             // EF will catch the change.
             repository.RepositoryClonePath = newLocation;
@@ -173,6 +176,38 @@ public bool UpdateCloneLocation(Repository repository, string newLocation)
         return true;
     }
 
+    public bool SetSourceControlId(Repository repository, Guid sourceControlId)
+    {
+        try
+        {
+            using var dbContext = _databaseContextFactory.GetNewContext();
+            var repositoryToUpdate = dbContext.Repositories.Find(repository.RepositoryId);
+            if (repositoryToUpdate == null)
+            {
+                _log.Warning($"{nameof(UpdateCloneLocation)} was called with a RepositoryId of {repository.RepositoryId} and it does not exist in the database.");
+                return false;
+            }
+
+            // TODO: Figure out a method to update the entity in the database and
+            // the entity in memory.
+            repository.SourceControlClassId = sourceControlId;
+            repositoryToUpdate.SourceControlClassId = sourceControlId;
+
+            dbContext.SaveChanges();
+        }
+        catch (Exception ex)
+        {
+            _log.Error(ex, "Exception when updating the clone location.");
+            TelemetryFactory.Get<ITelemetry>().Log(
+                "DevHome_Database_Event",
+                LogLevel.Critical,
+                new DatabaseEvent(nameof(UpdateCloneLocation), ex));
+            return false;
+        }
+
+        return true;
+    }
+
     public void SetIsHidden(Repository repository, bool isHidden)
     {
         try
@@ -214,7 +249,6 @@ public void RemoveRepository(Repository repository)
             }
 
             dbContext.Repositories.Remove(repositoryToRemove);
-
             dbContext.SaveChanges();
         }
         catch (Exception ex)

src/App.xaml.cs

@@ -100,9 +100,6 @@ public App()
         }).
         ConfigureServices((context, services) =>
         {
-            // Add databse connection
-            services.AddDatabase(context);
-
             // Add Serilog logging for ILogger.
             services.AddLogging(lb => lb.AddSerilog(dispose: true));
 

test/Database/RepositoryTests.cs

@@ -11,14 +11,16 @@ namespace DevHome.Test.Database;
 [TestClass]
 public class RepositoryTests
 {
-    private const string ConfigurationFileLocation = @"The\Best\Configuration\Location";
-
-    private const string CloneLocation = @"The\Best\File\Location";
+    private const string CloneLocation = @"TestSource\repos";
 
     private const string RepositoryName = "DevHome";
 
+    private const string ConfigurationFileLocation = @".configurations\configuration.dsc.yaml";
+
     private const string RepositoryUri = "https://www.github.com/microsoft/devhome";
 
+    private readonly string _repositoryCloneLocation = Path.Join(CloneLocation, RepositoryName);
+
     [TestInitialize]
     public void ResetDatabase()
     {
@@ -33,6 +35,26 @@ public void ResetDatabase()
 
         dbContext.Database.EnsureDeleted();
         dbContext.Database.EnsureCreated();
+
+        if (Directory.Exists(_repositoryCloneLocation))
+        {
+            // Cumbersome, but needed to remove read-only files.
+            foreach (var repositoryFile in Directory.EnumerateFiles(_repositoryCloneLocation, "*", SearchOption.AllDirectories))
+            {
+                File.SetAttributes(repositoryFile, FileAttributes.Normal);
+                File.Delete(repositoryFile);
+            }
+
+            foreach (var repositoryDirectory in Directory.GetDirectories(_repositoryCloneLocation, "*", SearchOption.AllDirectories).Reverse())
+            {
+                Directory.Delete(repositoryDirectory);
+            }
+
+            File.SetAttributes(_repositoryCloneLocation, FileAttributes.Normal);
+            Directory.Delete(_repositoryCloneLocation, false);
+        }
+
+        LibGit2Sharp.Repository.Clone(RepositoryUri, _repositoryCloneLocation);
     }
 
     [TestMethod]
@@ -86,5 +108,6 @@ public void MakefilledInRepository()
         Assert.IsTrue(savedRepository.IsHidden);
         Assert.IsTrue(savedRepository.HasAConfigurationFile);
         Assert.AreEqual(RepositoryUri, savedRepository.RepositoryUri);
+        Assert.IsTrue(savedRepository.HasAConfigurationFile);
     }
 }

tools/Customization/DevHome.Customization/ViewModels/FileExplorerViewModel.cs

@@ -156,14 +156,14 @@ public bool ShowRepositoryStatus
     }
 
     [RelayCommand]
-    public async Task AddFolderClick()
+    public async Task<string> AddFolderClick()
     {
+        StorageFolder? repoRootFolder = null;
         if (IsFeatureEnabled)
         {
             await Task.Run(async () =>
             {
                 using var folderDialog = new WindowOpenFolderDialog();
-                StorageFolder? repoRootFolder = null;
 
                 try
                 {
@@ -186,6 +186,14 @@ await Task.Run(async () =>
             });
             RefreshTrackedRepositories();
         }
+
+        return repoRootFolder == null ? string.Empty : repoRootFolder.Path;
+    }
+
+    public void AddRepositoryAlreadyOnMachine(string path)
+    {
+        RepoTracker.AddRepositoryPath(_unassigned, path);
+        RefreshTrackedRepositories();
     }
 
     public void RemoveTrackedRepositoryFromDevHome(string rootPath)