Rewrite pyRevit configurations

dev/Directory.Build.targets

@@ -2,7 +2,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
         <NetFolder Condition="'$(TargetFramework)' == 'net48'">netfx</NetFolder>
-        <NetFolder Condition="'$(TargetFramework)' == 'net8.0-windows'">netcore</NetFolder>
+        <NetFolder Condition="'$(TargetFramework.StartsWith(net8.0))'">netcore</NetFolder>
     </PropertyGroup>
 
     <PropertyGroup>

dev/pyRevitLabs/pyRevitCLI/PyRevitCLIExtensionCmds.cs

@@ -171,23 +171,23 @@ internal static void
         }
 
         internal static void
-        ToggleExtension(bool enable, string cloneName, string extName) {
+        ToggleExtension(string revitVersion, bool enable, string cloneName, string extName) {
             if (extName != null) {
                 PyRevitClone clone = null;
                 if (cloneName != null)
                     clone = PyRevitClones.GetRegisteredClone(cloneName);
 
                 if (enable) {
                     if (clone != null)
-                        PyRevitExtensions.EnableShippedExtension(clone, extName);
+                        PyRevitExtensions.EnableShippedExtension(revitVersion, clone, extName);
                     else
-                        PyRevitExtensions.EnableInstalledExtension(extName);
+                        PyRevitExtensions.EnableInstalledExtension(revitVersion, extName);
                 }
                 else {
                     if (clone != null)
-                        PyRevitExtensions.DisableShippedExtension(clone, extName);
+                        PyRevitExtensions.DisableShippedExtension(revitVersion, clone, extName);
                     else
-                        PyRevitExtensions.DisableInstalledExtension(extName);
+                        PyRevitExtensions.DisableInstalledExtension(revitVersion, extName);
                 }
             }
         }

dev/pyRevitLabs/pyRevitCLI/Resources/UsagePatterns.txt

@@ -74,36 +74,36 @@ Usage:
 	pyrevit config (-h | --help)
 	pyrevit config --from=<template_config_path> [--log=<log_file>]
 	pyrevit configs (-h | --help)
-	pyrevit configs bincache [(enable | disable)] [--log=<log_file>]
-	pyrevit configs checkupdates [(enable | disable)] [--log=<log_file>]
-	pyrevit configs autoupdate [(enable | disable)] [--log=<log_file>]
-	pyrevit configs rocketmode [(enable | disable)] [--log=<log_file>]
-	pyrevit configs logs [(none | verbose | debug)] [--log=<log_file>]
-	pyrevit configs filelogging [(enable | disable)] [--log=<log_file>]
-	pyrevit configs startuptimeout [<timeout>] [--log=<log_file>]
-	pyrevit configs loadbeta [(enable | disable)] [--log=<log_file>]
-	pyrevit configs cpyversion [<cpy_version>] [--log=<log_file>]
-	pyrevit configs usercanupdate [(yes | no)] [--log=<log_file>]
-	pyrevit configs usercanextend [(yes | no)] [--log=<log_file>]
-	pyrevit configs usercanconfig [(yes | no)] [--log=<log_file>]
-	pyrevit configs colordocs [(enable | disable)] [--log=<log_file>]
-	pyrevit configs tooltipdebuginfo [(enable | disable)] [--log=<log_file>]
+	pyrevit configs bincache [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs checkupdates [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs autoupdate [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs rocketmode [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs logs [(none | verbose | debug)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs filelogging [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs startuptimeout [<timeout>] [<revit_year>] [--log=<log_file>]
+	pyrevit configs loadbeta [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs cpyversion [<cpy_version>] [<revit_year>] [--log=<log_file>]
+	pyrevit configs usercanupdate [(yes | no)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs usercanextend [(yes | no)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs usercanconfig [(yes | no)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs colordocs [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs tooltipdebuginfo [(enable | disable)] [<revit_year>] [--log=<log_file>]
 	pyrevit configs routes [(-h | --help)]
-	pyrevit configs routes [(enable | disable)] [--log=<log_file>]
-	pyrevit configs routes port [<port_number>] [--log=<log_file>]
-	pyrevit configs routes coreapi [(enable | disable)] [--log=<log_file>]
+	pyrevit configs routes [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs routes port [<port_number>] [<revit_year>] [--log=<log_file>]
+	pyrevit configs routes coreapi [(enable | disable)] [<revit_year>] [--log=<log_file>]
 	pyrevit configs telemetry [(-h | --help)]
-	pyrevit configs telemetry [(enable | disable)] [--log=<log_file>]
-	pyrevit configs telemetry utc [(yes | no)] [--log=<log_file>]
-	pyrevit configs telemetry (file | server) [<dest_path>] [--log=<log_file>]
-	pyrevit configs telemetry hooks [(yes | no)] [--log=<log_file>]
-	pyrevit configs apptelemetry [(enable | disable)] [--log=<log_file>]
-	pyrevit configs apptelemetry flags [<flags>] [--log=<log_file>]
-	pyrevit configs apptelemetry server [<server_path>] [--log=<log_file>]
-	pyrevit configs outputcss [<css_path>] [--log=<log_file>]
+	pyrevit configs telemetry [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs telemetry utc [(yes | no)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs telemetry (file | server) [<dest_path>] [<revit_year>] [--log=<log_file>]
+	pyrevit configs telemetry hooks [(yes | no)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs apptelemetry [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs apptelemetry flags [<flags>] [<revit_year>] [--log=<log_file>]
+	pyrevit configs apptelemetry server [<server_path>] [<revit_year>] [--log=<log_file>]
+	pyrevit configs outputcss [<css_path>] [<revit_year>] [--log=<log_file>]
 	pyrevit configs seed [--lock] [--log=<log_file>]
-	pyrevit configs <option_path> [(enable | disable)] [--log=<log_file>]
-	pyrevit configs <option_path> [<option_value>] [--log=<log_file>]
+	pyrevit configs <option_path> [(enable | disable)] [<revit_year>] [--log=<log_file>]
+	pyrevit configs <option_path> [<option_value>] [<revit_year>] [--log=<log_file>]
     pyrevit doctor (-h | --help)
     pyrevit doctor [--list]
     pyrevit doctor <doctor_command> [--dryrun]

dev/pyRevitLabs/pyRevitLabs.Common/pyRevitLabs.Common.csproj

@@ -17,9 +17,6 @@
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.10.0"/>
         <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="4.10.0"/>
 
-        <PackageReference Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" Include="MadMilkman.Ini" Version="1.0.6"/>
-        <PackageReference Condition="'$(TargetFrameworkIdentifier)' == '.NetCoreApp'" Include="MadMilkman.Ini.Unofficial" Version="1.0.1"/>
-
         <Reference Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'" Include="System.Management"/>
         <PackageReference Condition="'$(TargetFrameworkIdentifier)' == '.NetCoreApp'" Include="System.Management" Version="8.0.0"/>
     </ItemGroup>
@@ -36,7 +33,6 @@
         <Copy SourceFiles="$(OutDir)\DotNetVersionFinder.dll" DestinationFolder="$(PyRevitBinDir)"/>
         <Copy SourceFiles="$(OutDir)\LibGit2Sharp.dll" DestinationFolder="$(PyRevitBinDir)"/>
         <Copy SourceFiles="@(LibGit2SharpNative)" DestinationFolder="$(PyRevitBinDir)"/>
-        <Copy SourceFiles="$(OutDir)\MadMilkman.Ini.dll" DestinationFolder="$(PyRevitBinDir)"/>
         <Copy SourceFiles="$(OutDir)\OpenMcdf.dll" DestinationFolder="$(PyRevitBinDir)"/>
         <Copy SourceFiles="$(OutDir)\YamlDotNet.dll" DestinationFolder="$(PyRevitBinDir)"/>
         <Copy SourceFiles="$(OutDir)\Microsoft.CodeAnalysis.dll" DestinationFolder="$(PyRevitBinDir)"/>

dev/pyRevitLabs/pyRevitLabs.Configurations.Ini/Extensions/IniConfigurationExtensions.cs

@@ -0,0 +1,19 @@
+namespace pyRevitLabs.Configurations.Ini.Extensions;
+
+public static class IniConfigurationExtensions
+{
+    public static ConfigurationBuilder AddIniConfiguration(
+        this ConfigurationBuilder builder, string configurationPath, string conigurationName, bool readOnly = default)
+    {
+        if (builder == null)
+            throw new ArgumentNullException(nameof(builder));
+
+        if (string.IsNullOrWhiteSpace(configurationPath))
+            throw new ArgumentException("Value cannot be null or whitespace.", nameof(configurationPath));
+
+        if (string.IsNullOrWhiteSpace(conigurationName))
+            throw new ArgumentException("Value cannot be null or empty.", nameof(conigurationName));
+
+        return builder.AddConfigurationSource(conigurationName, IniConfiguration.Create(configurationPath, readOnly));
+    }
+}

dev/pyRevitLabs/pyRevitLabs.Configurations.Ini/IniConfiguration.cs

@@ -0,0 +1,100 @@
+using System.Text;
+using IniParser;
+using IniParser.Model;
+using pyRevitLabs.Configurations.Abstractions;
+using pyRevitLabs.Configurations.Exceptions;
+using pyRevitLabs.Json;
+
+namespace pyRevitLabs.Configurations.Ini;
+
+public sealed class IniConfiguration : ConfigurationBase
+{
+    public static readonly string DefaultFileExtension = ".ini";
+    public static readonly Encoding DefaultFileEncoding = new UTF8Encoding(false);
+
+    private readonly IniData _iniFile;
+    private readonly FileIniDataParser _parser;
+
+    /// <summary>
+    /// Create ini configuration instance.
+    /// </summary>
+    /// <param name="configurationPath">Configuration path.</param>
+    /// <param name="readOnly">Admin configurations </param>
+    private IniConfiguration(string configurationPath, bool readOnly)
+        : base(configurationPath, readOnly)
+    {
+        _parser = new FileIniDataParser();
+        _iniFile = !File.Exists(configurationPath)
+            ? new IniData()
+            : _parser.ReadFile(_configurationPath, DefaultFileEncoding);
+    }
+
+    /// <summary>
+    /// Creates IniConfiguration.
+    /// </summary>
+    /// <param name="configurationPath">Configuration file path.</param>
+    /// <param name="readOnly">Mark file is readonly.</param>
+    /// <returns>Return new IniConfiguration.</returns>
+    /// <exception cref="ArgumentNullException">When configurationPath is null.</exception>
+    public static IConfiguration Create(string configurationPath, bool readOnly = default)
+    {
+        if (configurationPath is null)
+            throw new ArgumentNullException(nameof(configurationPath));
+
+        return new IniConfiguration(configurationPath, readOnly);
+    }
+
+    /// <inheritdoc />
+    protected override void SaveConfigurationImpl()
+    {
+        SaveConfigurationImpl(_configurationPath);
+    }
+
+    /// <inheritdoc />
+    protected override void SaveConfigurationImpl(string configurationPath)
+    {
+        _parser.WriteFile(configurationPath, _iniFile, DefaultFileEncoding);
+    }
+
+    /// <inheritdoc />
+    protected override bool HasSectionImpl(string sectionName)
+    {
+        return _iniFile.Sections.ContainsSection(sectionName);
+    }
+
+    /// <inheritdoc />
+    protected override bool HasSectionKeyImpl(string sectionName, string keyName)
+    {
+        return HasSection(sectionName)
+               && _iniFile.Sections[sectionName].ContainsKey(keyName);
+    }
+
+    /// <inheritdoc />
+    protected override bool RemoveValueImpl(string sectionName, string keyName)
+    {
+        return _iniFile[sectionName].RemoveKey(keyName);
+    }
+
+    /// <inheritdoc />
+    protected override void SetValueImpl<T>(string sectionName, string keyName, T value)
+    {
+        if (!HasSection(sectionName))
+        {
+            _iniFile.Sections.AddSection(sectionName);
+        }
+
+        if (!HasSectionKey(sectionName, keyName))
+        {
+            _iniFile[sectionName].AddKey(keyName);
+        }
+
+        _iniFile[sectionName][keyName] = JsonConvert.SerializeObject(value);
+    }
+
+    /// <inheritdoc />
+    protected override object GetValueImpl(Type typeObject, string sectionName, string keyName)
+    {
+        return JsonConvert.DeserializeObject(_iniFile[sectionName][keyName], typeObject)
+               ?? throw new ConfigurationException("Cannot deserialize value using the specified key.");
+    }
+}

dev/pyRevitLabs/pyRevitLabs.Configurations.Ini/pyRevitLabs.Configurations.Ini.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFrameworks>net48;net8.0</TargetFrameworks>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+        <LangVersion>12</LangVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
+        <Reference Include="pyRevitLabs.Json" HintPath="$(PyRevitDevLibsDir)\pyRevitLabs.Json.dll" Private="false"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\pyRevitLabs.Configurations\pyRevitLabs.Configurations.csproj" />
+    </ItemGroup>
+
+</Project>

dev/pyRevitLabs/pyRevitLabs.Configurations.Json/Extensions/JsonConfigurationExtensions.cs

@@ -0,0 +1,19 @@
+namespace pyRevitLabs.Configurations.Json.Extensions;
+
+public static class JsonConfigurationExtensions
+{
+    public static ConfigurationBuilder AddJsonConfiguration(
+        this ConfigurationBuilder builder, string configurationPath, string conigurationName, bool readOnly = default)
+    {
+        if (builder == null)
+            throw new ArgumentNullException(nameof(builder));
+
+        if (string.IsNullOrWhiteSpace(configurationPath))
+            throw new ArgumentException("Value cannot be null or whitespace.", nameof(configurationPath));
+
+        if (string.IsNullOrWhiteSpace(conigurationName))
+            throw new ArgumentException("Value cannot be null or whitespace.", nameof(conigurationName));
+
+        return builder.AddConfigurationSource(conigurationName, JsonConfiguration.Create(configurationPath, readOnly));
+    }
+}