Multiple Modernizations

src/GitTfs/Commands/CheckinOptions.cs → src/GitTfs.Core/Commands/CheckinOptions.cs

@@ -1,10 +1,8 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using NDesk.Options;
-using GitTfs.Util;
 
 namespace GitTfs.Commands
 {
-    [StructureMapSingleton]
     public class CheckinOptions
     {
         public OptionSet OptionSet => new OptionSet

src/GitTfs/Commands/RemoteOptions.cs → src/GitTfs.Core/Commands/RemoteOptions.cs

@@ -1,9 +1,7 @@
-using GitTfs.Util;
 using NDesk.Options;
 
 namespace GitTfs.Commands
 {
-    [StructureMapSingleton]
     public class RemoteOptions
     {
         public OptionSet OptionSet => new OptionSet

src/GitTfs/Core/Bootstrapper.cs → src/GitTfs.Core/Core/Bootstrapper.cs

@@ -1,4 +1,5 @@
-using GitTfs.Commands; // ToGitRefName() and RemoteOptions
+using GitTfs.Commands; // RemoteOptions
+using GitTfs.Util; // ToGitRefName()
 using System.Diagnostics;
 
 namespace GitTfs.Core

src/GitTfs/Core/Janitor.cs → src/GitTfs.Core/Core/Janitor.cs

@@ -1,10 +1,7 @@
-using GitTfs.Util;
-
 using System.Diagnostics;
 
 namespace GitTfs.Core
 {
-    [StructureMapSingleton]
     public class Janitor : IDisposable
     {
         private readonly Queue<Action> _actions = new Queue<Action>();

src/GitTfs.Core/GitTfs.Core.csproj

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <ItemGroup>
+    <Compile Include="..\CommonAssemblyInfo.cs">
+      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <None Include="Core\TfsInterop\README.txt" />
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="LibGit2Sharp" Version="0.31.0" />
+    <PackageReference Include="StructureMap" Version="4.7.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\NDesk.Options\NDesk.Options.csproj" />
+  </ItemGroup>
+</Project>

src/GitTfs/Globals.cs → src/GitTfs.Core/Globals.cs

@@ -1,11 +1,9 @@
 using System.Diagnostics;
 using NDesk.Options;
 using GitTfs.Core;
-using GitTfs.Util;
 
 namespace GitTfs
 {
-    [StructureMapSingleton]
     public class Globals
     {
         public OptionSet OptionSet => new OptionSet

src/GitTfs/Util/AuthorsFile.cs → src/GitTfs.Core/Util/AuthorsFile.cs

@@ -1,4 +1,4 @@
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 using GitTfs.Core;
 using System.Diagnostics;
 
@@ -35,7 +35,7 @@ public Author(string tfsUserId, string name, string email)
         #endregion
     }
 
-    [StructureMapSingleton]
+
     public class AuthorsFile
     {
         private readonly Dictionary<string, Author> _authorsByTfsUserId = new Dictionary<string, Author>(StringComparer.OrdinalIgnoreCase);

src/GitTfs/Util/ConfigPropertyLoader.cs → src/GitTfs.Core/Util/ConfigPropertyLoader.cs

@@ -1,7 +1,6 @@
 namespace GitTfs.Util
 {
     // Manages configurable values.
-    [StructureMapSingleton]
     public class ConfigPropertyLoader
     {
         private readonly Globals _globals;

src/GitTfs/Util/InspectExtensions.cs → src/GitTfs.Core/Util/InspectExtensions.cs

@@ -1,7 +1,7 @@
-using System.Collections;
+using System.Collections;
 using System.Text.RegularExpressions;
 
-namespace GitTfs.Extensions
+namespace GitTfs.Util
 {
     public static class InspectExtensions
     {

src/GitTfs.Core/Util/StringExtensions.cs

@@ -0,0 +1,76 @@
+
+using System.Text.RegularExpressions;
+
+using GitTfs.Core;
+
+namespace GitTfs.Util
+{
+    public static class StringExtensions
+    {
+        private static readonly Regex ValidTfsPath = new Regex("^\\$/.+");
+        public static bool IsValidTfsPath(this string tfsPath) => ValidTfsPath.IsMatch(tfsPath);
+
+        public static void AssertValidTfsPathOrRoot(this string tfsPath)
+        {
+            if (tfsPath == GitTfsConstants.TfsRoot)
+                return;
+            AssertValidTfsPath(tfsPath);
+        }
+
+        public static void AssertValidTfsPath(this string tfsPath)
+        {
+            if (!ValidTfsPath.IsMatch(tfsPath))
+                throw new GitTfsException("TFS repository can not be root and must start with \"$/\".", SuggestPaths(tfsPath));
+        }
+
+        private static IEnumerable<string> SuggestPaths(string tfsPath)
+        {
+            if (tfsPath == "$" || tfsPath == "$/")
+                yield return "Cloning an entire TFS repository is not supported. Try using a subdirectory of the root (e.g. $/MyProject).";
+            else if (tfsPath.StartsWith("$"))
+                yield return "Try using $/" + tfsPath.Substring(1);
+            else
+                yield return "Try using $/" + tfsPath;
+        }
+
+        public static string ToGitRefName(this string expectedRefName)
+        {
+            expectedRefName = Regex.Replace(expectedRefName, @"[!~$?[*^: \\]", string.Empty);
+            expectedRefName = expectedRefName.Replace("@{", string.Empty);
+            expectedRefName = expectedRefName.Replace("..", string.Empty);
+            expectedRefName = expectedRefName.Replace("//", string.Empty);
+            expectedRefName = expectedRefName.Replace("/.", "/");
+            expectedRefName = expectedRefName.TrimEnd('.', '/');
+            return expectedRefName.Trim('/');
+        }
+
+        public static string ToGitBranchNameFromTfsRepositoryPath(this string tfsRepositoryPath, bool includeTeamProjectName = false)
+        {
+            if (includeTeamProjectName)
+            {
+                return tfsRepositoryPath
+                    .Replace("$/", string.Empty)
+                    .ToGitRefName();
+            }
+
+            string gitBranchNameExpected = tfsRepositoryPath.IndexOf("$/") == 0
+                ? tfsRepositoryPath.Remove(0, tfsRepositoryPath.IndexOf('/', 2) + 1)
+                : tfsRepositoryPath;
+
+            return gitBranchNameExpected.ToGitRefName();
+        }
+
+        public static string ToTfsTeamProjectRepositoryPath(this string tfsRepositoryPath)
+        {
+            if (!tfsRepositoryPath.StartsWith("$/"))
+            {
+                return tfsRepositoryPath;
+            }
+
+            var index = tfsRepositoryPath.IndexOf('/', 2);
+            return index == -1 ? tfsRepositoryPath : tfsRepositoryPath.Remove(index, tfsRepositoryPath.Length - index);
+        }
+
+        public static string ToLocalGitRef(this string refName) => "refs/heads/" + refName;
+    }
+}

src/GitTfs.Vs2019/GitTfs.Vs2019.csproj

@@ -25,10 +25,12 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GitTfs\GitTfs.csproj" />
+    <ProjectReference Include="..\GitTfs.Core\GitTfs.Core.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="paket.references" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="20.256.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Settings.15.0" Version="17.10.34916.79" />
+    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Windows.Forms" />
@@ -37,5 +39,4 @@
     <Exec Command="xcopy /y /I &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)GitTfs\$(OutDir)$(ProjectName)&quot; /EXCLUDE:..\build\files_to_ignore_during_post_build_copy.txt" />
     <Exec Command="xcopy /y /I &quot;$(TargetDir)*.pdb&quot; &quot;$(SolutionDir)GitTfs\$(OutDir)$(ProjectName)&quot; /EXCLUDE:..\build\files_to_ignore_during_post_build_copy.txt" />
   </Target>
-  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>

src/GitTfs.Vs2022/GitTfs.Vs2022.csproj

@@ -24,11 +24,13 @@
       <Link>Wrappers.cs</Link>
     </Compile>
   </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\GitTfs.Core\GitTfs.Core.csproj" />
+    </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GitTfs\GitTfs.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="paket.references" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="20.256.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Settings.15.0" Version="17.10.34916.79" />
+    <PackageReference Include="Microsoft.VisualStudio.Setup.Configuration.Interop" Version="3.14.2075" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="System.Windows.Forms" />
@@ -37,5 +39,4 @@
     <Exec Command="xcopy /y /I &quot;$(TargetDir)*.dll&quot; &quot;$(SolutionDir)GitTfs\$(OutDir)$(ProjectName)&quot; /EXCLUDE:..\build\files_to_ignore_during_post_build_copy.txt" />
     <Exec Command="xcopy /y /I &quot;$(TargetDir)*.pdb&quot; &quot;$(SolutionDir)GitTfs\$(OutDir)$(ProjectName)&quot; /EXCLUDE:..\build\files_to_ignore_during_post_build_copy.txt" />
   </Target>
-  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>

src/GitTfs.VsCommon/TfsHelper.Common.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Net;
 using System.Reflection;
 using Microsoft.TeamFoundation.Client;
@@ -8,7 +8,6 @@
 using GitTfs.Commands;
 using GitTfs.Core;
 using GitTfs.Core.TfsInterop;
-using GitTfs.Extensions;
 using GitTfs.Util;
 using StructureMap;
 using StructureMap.Attributes;

src/GitTfs.VsFake/GitTfs.VsFake.csproj

@@ -6,10 +6,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\GitTfs\GitTfs.csproj" />
+    <ProjectReference Include="..\GitTfs.Core\GitTfs.Core.csproj" />
   </ItemGroup>
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
     <Exec Command="xcopy /y /I &quot;$(TargetPath)&quot; &quot;$(SolutionDir)GitTfs\$(OutDir)*&quot;" />
   </Target>
-  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>