Improve generator

- Now projects requiring Math NuGet packages are properly processed.
- Remove PackageGenerator as it's not required anymore.

Author: josesimoes

CodeGen/Generators/NanoFrameworkGen/PackageGenerator.cs

@@ -8,27 +8,25 @@ namespace CodeGen.Generators.NanoFrameworkGen
     class ProjectGenerator: GeneratorBase
     {
         private readonly Quantity _quantity;
-        private readonly string _nanoFrameworkPath;
 
-        public ProjectGenerator(Quantity quantity, string nanoFrameworkPath)
+        public ProjectGenerator(Quantity quantity)
         {
             _quantity = quantity ?? throw new ArgumentNullException(nameof(quantity));
-            _nanoFrameworkPath = nanoFrameworkPath;
         }
 
         public override string Generate()
         {
-            Writer.W($@"<?xml version=""1.0"" encoding=""utf-8""?>
+            Writer.WL($@"<?xml version=""1.0"" encoding=""utf-8""?>
 <Project ToolsVersion=""15.0"" DefaultTargets=""Build"" xmlns=""http://schemas.microsoft.com/developer/msbuild/2003"">
   <PropertyGroup Label=""Globals"">
-    <NanoFrameworkProjectSystemPath>{_nanoFrameworkPath}</NanoFrameworkProjectSystemPath>
+    <NanoFrameworkProjectSystemPath>$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\</NanoFrameworkProjectSystemPath>
   </PropertyGroup>
   <Import Project=""$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props"" Condition=""Exists('$(NanoFrameworkProjectSystemPath)NFProjectSystem.Default.props')"" />
   <PropertyGroup>
     <Configuration Condition="" '$(Configuration)' == '' "">Debug</Configuration>
     <Platform Condition="" '$(Platform)' == '' "">AnyCPU</Platform>
     <ProjectTypeGuids>{{11A8DD76-328B-46DF-9F39-F559912D0360}};{{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}}</ProjectTypeGuids>
-    <ProjectGuid>{Guid.NewGuid()}</ProjectGuid>
+    <ProjectGuid>{{{Guid.NewGuid()}}}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <FileAlignment>512</FileAlignment>
@@ -43,11 +41,23 @@ public override string Generate()
     <Compile Include=""..\Properties\AssemblyInfo.cs"" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include=""mscorlib, Version=1.10.3.0, Culture=neutral, PublicKeyToken=c07d481e9758c731"">
-      <HintPath>..\packages\nanoFramework.CoreLibrary.1.10.3-preview.7\lib\mscorlib.dll</HintPath>
+    <Reference Include=""mscorlib, Version={NanoFrameworkGenerator.MscorlibVersion}, Culture=neutral, PublicKeyToken=c07d481e9758c731"">
+      <HintPath>..\packages\nanoFramework.CoreLibrary.{NanoFrameworkGenerator.MscorlibNuGetVersion}\lib\mscorlib.dll</HintPath>
       <Private>True</Private>
       <SpecificVersion>True</SpecificVersion>
-    </Reference>  
+    </Reference>");
+
+    if(NanoFrameworkGenerator.ProjectsRequiringMath.Contains(_quantity.Name))
+    {
+                Writer.WL($@"
+    <Reference Include=""System.Math, Version={NanoFrameworkGenerator.MathVersion}, Culture=neutral, PublicKeyToken=c07d481e9758c731"">
+      <HintPath>..\packages\nanoFramework.System.Math.{NanoFrameworkGenerator.MathNuGetVersion}\lib\System.Math.dll</HintPath>
+      <Private>True</Private>
+      <SpecificVersion>True</SpecificVersion>
+    </Reference>");
+    }
+
+            Writer.WL(@"
   </ItemGroup>
   <ItemGroup>
     <None Include=""packages.config"" />

CodeGen/Generators/NanoFrameworkGen/ProjectGenerator.cs

@@ -6,6 +6,13 @@
 using CodeGen.Generators.NanoFrameworkGen;
 using CodeGen.JsonTypes;
 using Serilog;
+using NuGet.Common;
+using NuGet.Protocol;
+using NuGet.Protocol.Core.Types;
+using NuGet.Versioning;
+using System.Threading;
+using CodeGen.Helpers;
+using System.Linq;
 
 namespace CodeGen.Generators
 {
@@ -17,6 +24,23 @@ internal static class NanoFrameworkGenerator
     {
         private const int AlignPad = 35;
 
+        static internal string MscorlibVersion = "";
+        static internal string MscorlibNuGetVersion = "";
+        static internal string MathVersion = "";
+        static internal string MathNuGetVersion = "";
+
+        /// <summary>
+        /// These projects require inclusion of Math NuGet package.
+        /// </summary>
+        internal static readonly List<string> ProjectsRequiringMath = new()
+        {
+            "Angle",
+            "Frequency",
+            "Pressure",
+            "Turbidity",
+            "WarpingMomentOfInertia"
+        };
+
         /// <summary>
         /// Create the root folder NanoFramewok
         /// Create all the quantities unit and quantities file
@@ -28,6 +52,46 @@ internal static class NanoFrameworkGenerator
         /// <param name="quantities">The quantities to create</param>
         public static void Generate(string rootDir, Quantity[] quantities)
         {
+            // get latest version of .NET nanoFramework mscorlib
+            NuGet.Common.ILogger logger = NullLogger.Instance;
+            CancellationToken cancellationToken = CancellationToken.None;
+
+            SourceCacheContext cache = new SourceCacheContext();
+            SourceRepository repository = Repository.Factory.GetCoreV3("https://api.nuget.org/v3/index.json");
+            FindPackageByIdResource resource = repository.GetResourceAsync<FindPackageByIdResource>().Result;
+
+            // mscorlib
+            IEnumerable<NuGetVersion> packageVersions = resource.GetAllVersionsAsync(
+                "nanoFramework.CoreLibrary",
+                cache,
+                logger,
+                cancellationToken).Result;
+
+            // NuGet package Version
+            // including preview
+            var mscorlibPackage = packageVersions.Where(v => v.IsPrerelease).OrderByDescending(v => v.Version).First();
+            // stable only
+            //var mscorlibPackage = packageVersions.OrderByDescending(v => v.Version).First();
+
+            MscorlibVersion = mscorlibPackage.Version.ToString();
+            MscorlibNuGetVersion = mscorlibPackage.ToNormalizedString();
+
+            // Math
+            packageVersions = resource.GetAllVersionsAsync(
+                "nanoFramework.System.Math",
+                cache,
+                logger,
+                cancellationToken).Result;
+
+            // NuGet package Version
+            // including preview
+            var mathPackage = packageVersions.Where(v => v.IsPrerelease).OrderByDescending(v => v.Version).First();
+            // stable only
+            //var mathPackage = MathNuGetVersion = packageVersions.OrderByDescending(v => v.Version).First();
+
+            MathVersion = mathPackage.Version.ToString();
+            MathNuGetVersion = mathPackage.ToNormalizedString();
+
             var outputDir = Path.Combine(rootDir, "UnitsNet.NanoFramework", "GeneratedCode");
             var outputQuantitites = Path.Combine(outputDir, "Quantities");
             var outputUnits = Path.Combine(outputDir, "Units");
@@ -57,13 +121,14 @@ public static void Generate(string rootDir, Quantity[] quantities)
 
                 var projectPath = Path.Combine(outputDir, quantity.Name);
 
-                GeneratePackage(Path.Combine(projectPath, "packages.config"));
+                GeneratePackage(projectPath, quantity.Name);
+
                 Log.Information($"Package(OK)");
 
                 var sb = new StringBuilder($"{quantity.Name}:".PadRight(AlignPad));
                 GenerateUnitType(sb, quantity, Path.Combine(outputUnits, $"{quantity.Name}Unit.g.cs"));
                 GenerateQuantity(sb, quantity, Path.Combine(outputQuantitites, $"{quantity.Name}.g.cs"));
-                GenerateProject(sb, quantity, Path.Combine(projectPath, $"{quantity.Name}.nfproj"));
+                GenerateProject(sb, quantity, projectPath);
                 Log.Information(sb.ToString());
                 numberQuantity++;
             }
@@ -73,9 +138,11 @@ public static void Generate(string rootDir, Quantity[] quantities)
             Log.Information($"Total quantities generated: {numberQuantity}");
         }
 
-        private static void GeneratePackage(string filePath)
+        private static void GeneratePackage(string projectPath, string quantityName)
         {
-            var content = new PackageGenerator().Generate();
+            string filePath = Path.Combine(projectPath, "packages.config");
+
+            var content = Generate(quantityName);
             File.WriteAllText(filePath, content, Encoding.UTF8);
         }
 
@@ -105,9 +172,11 @@ private static void GenerateQuantity(StringBuilder sb, Quantity quantity, string
             sb.Append("quantity(OK) ");
         }
 
-        private static void GenerateProject(StringBuilder sb, Quantity quantity, string filePath)
+        private static void GenerateProject(StringBuilder sb, Quantity quantity, string projectPath)
         {
-            var content = new ProjectGenerator(quantity, @"$(MSBuildToolsPath)..\..\..\nanoFramework\v1.0\").Generate();
+            var filePath = Path.Combine(projectPath, $"{quantity.Name}.nfproj");
+
+            var content = new ProjectGenerator(quantity).Generate();
             File.WriteAllText(filePath, content, Encoding.UTF8);
             sb.Append("project(OK) ");
         }
@@ -120,5 +189,26 @@ private static void GenerateSolution(Quantity[] quantities, string outputDir)
 
             File.WriteAllText(filePath, content, Encoding.UTF8);
         }
+
+        private static string Generate(string quantityName)
+        {
+            MyTextWriter Writer = new MyTextWriter();
+
+            Writer.WL($@"
+<?xml version=""1.0"" encoding=""utf-8""?>
+<packages>
+  <package id=""nanoFramework.CoreLibrary"" version=""{MscorlibNuGetVersion}"" targetFramework=""netnanoframework10"" />");
+
+
+            if (NanoFrameworkGenerator.ProjectsRequiringMath.Contains(quantityName))
+            {
+                Writer.WL($@"
+  <package id=""nanoFramework.System.Math"" version=""{MathNuGetVersion}"" targetFramework=""netnanoframework10"" />");
+            }
+
+            Writer.WL($@"</packages>");
+
+            return Writer.ToString();
+        }
     }
 }