Let's try this again

- update `BaselineGenerator` to get it working in 5.0 for realz

Author: dougbu

eng/tools/BaselineGenerator/BaselineGenerator.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
-    <StartArguments>--default-netcore-target-framework $(DefaultNetCoreTargetFramework)</StartArguments>
     <StartWorkingDirectory>$(MSBuildThisFileDirectory)../../</StartWorkingDirectory>
   </PropertyGroup>
 

eng/tools/BaselineGenerator/Program.cs

@@ -30,17 +30,12 @@ static void Main(string[] args)
             new Program().Execute(args);
         }
 
-        private readonly CommandOption _defaultTarget;
         private readonly CommandOption _source;
         private readonly CommandOption _output;
         private readonly CommandOption _update;
 
         public Program()
         {
-            _defaultTarget = Option(
-                "--default-netcore-target-framework <TFM>",
-                "The default .NET Core TFM.",
-                CommandOptionType.SingleValue);
             _source = Option(
                 "-s|--package-source <SOURCE>",
                 "The NuGet source of packages to fetch",
@@ -59,12 +54,6 @@ private async Task<int> Run()
                 return 1;
             }
 
-            if (!_defaultTarget.HasValue())
-            {
-                await Error.WriteLineAsync("--default-netcore-target-framework is required.");
-                return 2;
-            }
-
             var inputPath = Path.Combine(Directory.GetCurrentDirectory(), "Baseline.xml");
             var input = XDocument.Load(inputPath);
             var source = _source.HasValue() ? _source.Value().TrimEnd('/') : "https://api.nuget.org/v3/index.json";
@@ -101,14 +90,18 @@ private async Task<int> Run()
 
             var baselineVersion = input.Root.Attribute("Version").Value;
 
+            // Baseline and .NET Core versions always align in non-preview releases.
+            var parsedVersion = Version.Parse(baselineVersion);
+            var defaultTarget = ((parsedVersion.Major < 5) ? "netcoreapp" : "net") +
+                $"{parsedVersion.Major}.{parsedVersion.Minor}";
+
             var doc = new XDocument(
                 new XComment(" Auto generated. Do not edit manually, use eng/tools/BaselineGenerator/ to recreate. "),
                 new XElement("Project",
                     new XElement("PropertyGroup",
                         new XElement("MSBuildAllProjects", "$(MSBuildAllProjects);$(MSBuildThisFileFullPath)"),
                         new XElement("AspNetCoreBaselineVersion", baselineVersion))));
 
-            var defaultTarget = _defaultTarget.Value();
             var client = new HttpClient();
             foreach (var pkg in input.Root.Descendants("Package"))
             {