Actually commit changes

timheuer · Aug 1, 2023 · 8d35f62 · 8d35f62
1 parent 4a5778d
commit 8d35f62
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 15 deletions.
diff --git a/AddActionsWorkflow/AddActionsWorkflow.csproj b/AddActionsWorkflow/AddActionsWorkflow.csproj
@@ -68,6 +68,10 @@
       <Generator>VsixManifestGenerator</Generator>
       <LastGenOutput>source.extension.cs</LastGenOutput>
     </None>
+    <Content Include="lib\win32\x64\git2-e632535.dll">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <IncludeInVSIX>true</IncludeInVSIX>
+    </Content>
     <Content Include="LICENSE.txt">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <IncludeInVSIX>true</IncludeInVSIX>
@@ -93,7 +97,7 @@
     <PackageReference Include="CliWrap">
       <Version>3.6.4</Version>
     </PackageReference>
-    <PackageReference Include="Community.VisualStudio.Toolkit.17">
+    <PackageReference Include="Community.VisualStudio.Toolkit.17" ExcludeAssets="runtime">
       <Version>17.0.507</Version>
     </PackageReference>
     <PackageReference Include="Community.VisualStudio.VSCT" Version="16.0.29.6" PrivateAssets="all" />

diff --git a/AddActionsWorkflow/AddActionsWorkflowPackage.cs b/AddActionsWorkflow/AddActionsWorkflowPackage.cs
@@ -20,10 +20,5 @@ public sealed class AddActionsWorkflowPackage : ToolkitPackage
     protected override async Task InitializeAsync(CancellationToken cancellationToken, IProgress<ServiceProgressData> progress)
     {
         await this.RegisterCommandsAsync();
-
-        // telemetry rating
-        RatingPrompt rating = new("TimHeuer.AddActionsWorkflow", Vsix.Name, await General.GetLiveInstanceAsync());
-        rating.RegisterSuccessfulUsage();
-        await rating.PromptAsync();
     }
 }
diff --git a/AddActionsWorkflow/Commands/AddWorkflowCommand.cs b/AddActionsWorkflow/Commands/AddWorkflowCommand.cs
@@ -1,8 +1,10 @@
 using AddActionsWorkflow.Options;
 using CliWrap;
 using LibGit2Sharp;
+using Microsoft;
 using System.Diagnostics;
 using System.IO;
+using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -48,12 +50,12 @@ protected override async Task ExecuteAsync(OleMenuCmdEventArgs e)
                 proj = await sln.AddSolutionFolderAsync(options.SolutionFolderName);
 
             _ = await proj?.AddExistingFilesAsync(Path.Combine(slnDir, @$".github\workflows\{finaleWorkflowname}.yaml"));
-            await VS.StatusBar.ShowMessageAsync("GitHub Actions Worklfow creation finished.");
+            await VS.StatusBar.ShowMessageAsync("GitHub Actions Workflow creation finished.");
         }
         else
         {
             // didn't happen, show an error
-            await VS.StatusBar.ShowMessageAsync("GitHub Actions Worklfow creation failed.");
+            await VS.StatusBar.ShowMessageAsync("GitHub Actions Workflow creation failed.");
         }
     }
 
@@ -89,14 +91,11 @@ internal async Task<String> GetGitRootDirAsync(string workingDirectory, bool use
         await VS.StatusBar.ShowMessageAsync("Establishing git root directory...");
         var rootGitDir = workingDirectory;
 
-        while (!Directory.Exists(Path.Combine(rootGitDir, ".git")))
-        {
-            rootGitDir = Path.GetFullPath(Path.Combine(rootGitDir, ".."));
-        }
+        FindGitFolder(rootGitDir, out string gitPath);
 
         try
         {
-            using (var repo = new Repository(rootGitDir))
+            using (var repo = new Repository(gitPath))
             {
                 if (useCurrentBranch) branchName = repo.Head.FriendlyName;
                 rootGitDir = repo.Info.WorkingDirectory;
@@ -109,4 +108,24 @@ internal async Task<String> GetGitRootDirAsync(string workingDirectory, bool use
 
         return rootGitDir;
     }
+
+    internal void FindGitFolder(string path, out string foundPath)
+    {
+        foundPath = null;
+        // Check if the current directory contains a .git folder
+        if (Directory.Exists(Path.Combine(path, ".git")))
+        {
+            foundPath = path;
+            return;
+        }
+        else
+        {
+            string parentPath = Directory.GetParent(path)?.FullName;
+            if (!string.IsNullOrEmpty(parentPath))
+            {
+                FindGitFolder(parentPath, out foundPath); // Recursively search the parent directory
+            }
+        }
+        return;
+    }
 }
diff --git a/AddActionsWorkflow/Options/General.cs b/AddActionsWorkflow/Options/General.cs
@@ -9,7 +9,7 @@ internal partial class OptionsProvider
     public class GeneralOptions : BaseOptionPage<General> { }
 }
 
-public class General : BaseOptionModel<General>, IRatingConfig
+public class General : BaseOptionModel<General>
 {
     [Category("Generator")]
     [DisplayName("Default file name")]

diff --git a/vs-publish.json b/vs-publish.json
@@ -7,5 +7,6 @@
   },
   "overview": "README.md",
   "publisher": "TimHeuer",
-  "repo": "https://github.com/timheuer/AddActionsWorkflow"
+  "repo": "https://github.com/timheuer/AddActionsWorkflow",
+  "qna": false
 }