check user TFM input

dotnet · Mar 24, 2020 · ba22657 · ba22657
1 parent fbf3580
commit ba22657
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/src/MSBuild.Conversion.SDK/TargetFrameworkHelper.cs b/src/MSBuild.Conversion.SDK/TargetFrameworkHelper.cs
@@ -3,6 +3,7 @@
 using System.IO.Compression;
 using System.Linq;
 using System.Text.Json;
+using System.Text.RegularExpressions;
 
 using Microsoft.Build.Locator;
 
@@ -12,6 +13,9 @@ namespace MSBuild.Conversion.SDK
 {
     public static class TargetFrameworkHelper
     {
+        /// <summary>
+        /// Determine the TFM to use based on what is installed on the users machine
+        /// </summary>
         public static string FindHighestInstalledTargetFramework(bool usePreviewSDK)
         {
             // Finds SDK path
@@ -72,5 +76,11 @@ public static string FindHighestInstalledTargetFramework(bool usePreviewSDK)
             }
 
         }
+
+        /// <summary>
+        /// Regect obviously wrong TFM specifiers 
+        /// </summary>
+        public static bool IsValidTargetFramework(string tfm)
+            => !tfm.Contains("-") && !tfm.Contains(" ") && tfm.Contains("net") && Regex.Match(tfm, "[0-9]").Success;
     }
 }
diff --git a/src/try-convert/Program.cs b/src/try-convert/Program.cs
@@ -57,6 +57,15 @@ public static int Run(string project, string workspace, string msbuildPath, stri
                 {
                     tfm = TargetFrameworkHelper.FindHighestInstalledTargetFramework(allowPreviews);
                 }
+                else
+                {
+                    tfm = tfm.Trim();
+                    if(!TargetFrameworkHelper.IsValidTargetFramework(tfm))
+                    {
+                        Console.WriteLine($"Invalid framework specified for --target-framework: '{tfm}'");
+                        return -1;
+                    }
+                }
 
                 var currentDirectory = Environment.CurrentDirectory;
                 var workspacePath = string.Empty;