From 554348a997014efd52be06668df12889043d3842 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Hellstr=C3=B6m?= Date: Mon, 7 Aug 2023 08:41:17 +0200 Subject: [PATCH 1/3] Added version information on code generation --- .../CodeGeneration/Generator.cs | 3 +-- .../Helpers/VersionHelper.cs | 20 +++++++++++++++++++ .../Program.cs | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) create mode 100644 src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs diff --git a/src/HassModel/NetDaemon.HassModel.CodeGenerator/CodeGeneration/Generator.cs b/src/HassModel/NetDaemon.HassModel.CodeGenerator/CodeGeneration/Generator.cs index 369d1d80a..151eb9dab 100644 --- a/src/HassModel/NetDaemon.HassModel.CodeGenerator/CodeGeneration/Generator.cs +++ b/src/HassModel/NetDaemon.HassModel.CodeGenerator/CodeGeneration/Generator.cs @@ -35,14 +35,13 @@ public static CompilationUnitSyntax BuildCompilationUnit(string namespaceName, p .NormalizeWhitespace(); } - private static readonly string GeneratorVersion = Assembly.GetAssembly(typeof(Generator))!.GetName().Version!.ToString(); private static SyntaxTrivia[] GetFileHeader() { string headerText = @$" //------------------------------------------------------------------------------ // - // Generated using NetDaemon CodeGenerator nd-codegen v{GeneratorVersion} + // Generated using NetDaemon CodeGenerator nd-codegen v{VersionHelper.GeneratorVersion} // At: {DateTime.Now:O} // // *** Make sure the version of the codegen tool and your nugets Joysoftware.NetDaemon.* have the same version.*** diff --git a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs new file mode 100644 index 000000000..ead4f857f --- /dev/null +++ b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs @@ -0,0 +1,20 @@ +using System.Reflection; + +namespace NetDaemon.HassModel.CodeGenerator.Helpers; + +/// +/// Returns current version of NetDaemon +/// +public class VersionHelper +{ + public static string GeneratorVersion { get; } = + Assembly.GetAssembly(typeof(Generator))!.GetName().Version!.ToString(); + + public static void PrintVersion() + { + Console.Write("Codegen version: "); + Console.ForegroundColor = ConsoleColor.Green; + Console.WriteLine(GeneratorVersion); + Console.ResetColor(); + } +} \ No newline at end of file diff --git a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Program.cs b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Program.cs index fe2bd356a..8032f9bc6 100644 --- a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Program.cs +++ b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Program.cs @@ -18,6 +18,7 @@ generationSettings.GenerateOneFilePerEntity = args.Any(arg => arg.ToLower(CultureInfo.InvariantCulture) == "-fpe"); var controller = new Controller(generationSettings, haSettings); +VersionHelper.PrintVersion(); await controller.RunAsync().ConfigureAwait(false); Console.WriteLine(); From 419a3816c1e9fe8b8afa3c942de728bc7f288e25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Hellstr=C3=B6m?= Date: Mon, 7 Aug 2023 09:03:16 +0200 Subject: [PATCH 2/3] Fixed warnings --- .../Helpers/VersionHelper.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs index ead4f857f..498c2c5a9 100644 --- a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs +++ b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs @@ -2,10 +2,12 @@ namespace NetDaemon.HassModel.CodeGenerator.Helpers; +#pragma warning disable CA1303 + /// /// Returns current version of NetDaemon /// -public class VersionHelper +public static class VersionHelper { public static string GeneratorVersion { get; } = Assembly.GetAssembly(typeof(Generator))!.GetName().Version!.ToString(); From 8097e19c3972e05b0939dd506edd04d995c1d99b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20Hellstr=C3=B6m?= Date: Mon, 7 Aug 2023 09:16:18 +0200 Subject: [PATCH 3/3] Fixed comments --- .../Helpers/VersionHelper.cs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs index 498c2c5a9..cab68af9e 100644 --- a/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs +++ b/src/HassModel/NetDaemon.HassModel.CodeGenerator/Helpers/VersionHelper.cs @@ -5,13 +5,19 @@ namespace NetDaemon.HassModel.CodeGenerator.Helpers; #pragma warning disable CA1303 /// -/// Returns current version of NetDaemon +/// Helper class for managing NetDaemon version tasks /// public static class VersionHelper { + /// + /// Returns current version of NetDaemon + /// public static string GeneratorVersion { get; } = Assembly.GetAssembly(typeof(Generator))!.GetName().Version!.ToString(); + /// + /// Pretty prints version information to console + /// public static void PrintVersion() { Console.Write("Codegen version: ");