13468797469

Committed 19 Feb 2025 08:05PM UTC coverage: 84.158% (+0.5%) from 83.694%

Build # 13468797469

Build Type

push

github

Committed by

web-flow

Commit Message

Use MSBuild to load projects, instead of manual parsing (#1266)

For users (like me) who use a property to specify all their netdaemon versions, instead of individual versions, the existing checks are too simple. I've updated it to instead use msbuild to actually load the project file and determine the real version that nuget will see.

Run Details

844 of 1125 branches covered (75.02%)

Branch coverage included in aggregate %.

5 of 6 new or added lines in 2 files covered. (83.33%)

1 existing line in 1 file now uncovered.

3342 of 3849 relevant lines covered (86.83%)

313.98 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

0.0

/src/HassModel/NetDaemon.HassModel.CodeGenerator/Program.cs

﻿using System.Globalization;
using Microsoft.Build.Locator;
using Microsoft.Extensions.Configuration;
using NetDaemon.Client.Settings;

#pragma warning disable CA1303

var configurationRoot = GetConfigurationRoot();
var haSettings = configurationRoot.GetSection("HomeAssistant").Get<HomeAssistantSettings>() ?? new HomeAssistantSettings();
var generationSettings = configurationRoot.GetSection("CodeGeneration").Get<CodeGenerationSettings>() ?? new CodeGenerationSettings();

if (args.Any(arg => arg.ToLower(CultureInfo.InvariantCulture) == "-help"))
{
    ShowUsage();
    return 0;
}

//This is used as a command line switch rather than a configuration key. There is no key value following it to interpret.
generationSettings.GenerateOneFilePerEntity = args.Any(arg => arg.ToLower(CultureInfo.InvariantCulture) == "-fpe");

MSBuildLocator.RegisterDefaults();
VersionHelper.PrintVersion();
await VersionValidator.ValidateLatestVersion();
VersionValidator.ValidatePackageReferences();

var controller = new Controller(generationSettings, haSettings);
await controller.RunAsync().ConfigureAwait(false);

Console.WriteLine();
Console.WriteLine("Code Generated successfully!");

return 0;

IConfigurationRoot GetConfigurationRoot()
{
    var env = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT");
    var builder = new ConfigurationBuilder()
        // default path is the folder of the currently executing root assembly
        .AddJsonFile("appsettings.json", true, true)
        .AddJsonFile($"appsettings.{env}.json", true, true)

        // Also look in the current directory which will typically be the project folder
        // of the users code and have a appsettings.development.json with the correct HA connection settings
        .SetBasePath(Environment.CurrentDirectory)
        .AddJsonFile("appsettings.json", true, true)
        .AddJsonFile("appsettings.development.json", true, true)
        .AddUserSecrets<Program>()

        // finally override with Environment vars or commandline
        .AddEnvironmentVariables()
        .AddCommandLine(args, new Dictionary<string, string>
        {
            ["-o"] = "CodeGeneration:OutputFile",
            ["-f"] = "CodeGeneration:OutputFolder",
            ["-ns"] = "CodeGeneration:Namespace",
            ["-host"] = "HomeAssistant:Host",
            ["-port"] = "HomeAssistant:Port",
            ["-ssl"] = "HomeAssistant:Ssl",
            ["-token"] = "HomeAssistant:Token",
            ["-bypass-cert"] = "HomeAssistant:InsecureBypassCertificateErrors",
        });

    return builder.Build();
}

void ShowUsage()
{
    Console.WriteLine(@"
    Usage: nd-codegen [options] -ns namespace -o outfile
    Options:
        -f           : Name of folder to output files (folder name only)
        -fpe         : Create separate file per entity (ignores -o option)
        -host        : Host of the netdaemon instance
        -port        : Port of the NetDaemon instance
        -ssl         : true if NetDaemon instance use ssl
        -token       : A long lived HomeAssistant token
        -bypass-cert : Ignore certificate errors (insecure)

    These settings is valid when installed codegen as global dotnet tool.
            ");
}

1	using System.Globalization;
2	using Microsoft.Build.Locator;
3	using Microsoft.Extensions.Configuration;
4	using NetDaemon.Client.Settings;
5
6	#pragma warning disable CA1303
7
8	var configurationRoot = GetConfigurationRoot();	×
9	var haSettings = configurationRoot.GetSection("HomeAssistant").Get<HomeAssistantSettings>() ?? new HomeAssistantSettings();	×
10	var generationSettings = configurationRoot.GetSection("CodeGeneration").Get<CodeGenerationSettings>() ?? new CodeGenerationSettings();	×
11
12	if (args.Any(arg => arg.ToLower(CultureInfo.InvariantCulture) == "-help"))	×
13	{
14	ShowUsage();	×
15	return 0;	×
16	}
17
18	//This is used as a command line switch rather than a configuration key. There is no key value following it to interpret.
19	generationSettings.GenerateOneFilePerEntity = args.Any(arg => arg.ToLower(CultureInfo.InvariantCulture) == "-fpe");	×
20
NEW 21	MSBuildLocator.RegisterDefaults();	×
22	VersionHelper.PrintVersion();	×
23	await VersionValidator.ValidateLatestVersion();	×
24	VersionValidator.ValidatePackageReferences();	×
25
26	var controller = new Controller(generationSettings, haSettings);	×
27	await controller.RunAsync().ConfigureAwait(false);	×
28
29	Console.WriteLine();	×
30	Console.WriteLine("Code Generated successfully!");	×
31
32	return 0;	×
33
34	IConfigurationRoot GetConfigurationRoot()
35	{
36	var env = Environment.GetEnvironmentVariable("DOTNET_ENVIRONMENT");	×
37	var builder = new ConfigurationBuilder()	×
38	// default path is the folder of the currently executing root assembly	×
39	.AddJsonFile("appsettings.json", true, true)	×
40	.AddJsonFile($"appsettings.{env}.json", true, true)	×
41		×
42	// Also look in the current directory which will typically be the project folder	×
43	// of the users code and have a appsettings.development.json with the correct HA connection settings	×
44	.SetBasePath(Environment.CurrentDirectory)	×
45	.AddJsonFile("appsettings.json", true, true)	×
46	.AddJsonFile("appsettings.development.json", true, true)	×
47	.AddUserSecrets<Program>()	×
48		×
49	// finally override with Environment vars or commandline	×
50	.AddEnvironmentVariables()	×
51	.AddCommandLine(args, new Dictionary<string, string>	×
52	{	×
53	["-o"] = "CodeGeneration:OutputFile",	×
54	["-f"] = "CodeGeneration:OutputFolder",	×
55	["-ns"] = "CodeGeneration:Namespace",	×
56	["-host"] = "HomeAssistant:Host",	×
57	["-port"] = "HomeAssistant:Port",	×
58	["-ssl"] = "HomeAssistant:Ssl",	×
59	["-token"] = "HomeAssistant:Token",	×
60	["-bypass-cert"] = "HomeAssistant:InsecureBypassCertificateErrors",	×
61	});	×
62
63	return builder.Build();	×
64	}
65
66	void ShowUsage()
67	{
68	Console.WriteLine(@"	×
69	Usage: nd-codegen [options] -ns namespace -o outfile	×
70	Options:	×
71	-f : Name of folder to output files (folder name only)	×
72	-fpe : Create separate file per entity (ignores -o option)	×
73	-host : Host of the netdaemon instance	×
74	-port : Port of the NetDaemon instance	×
75	-ssl : true if NetDaemon instance use ssl	×
76	-token : A long lived HomeAssistant token	×
77	-bypass-cert : Ignore certificate errors (insecure)	×
78		×
79	These settings is valid when installed codegen as global dotnet tool.	×
80	");	×
81	}	×

net-daemon / netdaemon / 13468797469

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous