This commit is contained in:
Kukks
2023-06-05 09:31:47 +02:00
parent 68a291c705
commit c4451cb3d2
5 changed files with 18 additions and 14 deletions

View File

@@ -1,8 +1,8 @@
<component name="ProjectRunConfigurationManager"> <component name="ProjectRunConfigurationManager">
<configuration default="false" name="ConfigBuilder" type="DotNetProject" factoryName=".NET Project"> <configuration default="false" name="ConfigBuilder" type="DotNetProject" factoryName=".NET Project">
<option name="EXE_PATH" value="$PROJECT_DIR$/ConfigBuilder/bin/Altcoins-Debug/net6.0/ConfigBuilder.exe" /> <option name="EXE_PATH" value="$PROJECT_DIR$/ConfigBuilder/bin/Debug/net6.0/ConfigBuilder.exe" />
<option name="PROGRAM_PARAMETERS" value="" /> <option name="PROGRAM_PARAMETERS" value="" />
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/ConfigBuilder/bin/Altcoins-Debug/net6.0" /> <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/ConfigBuilder/bin/Debug/net6.0" />
<option name="PASS_PARENT_ENVS" value="1" /> <option name="PASS_PARENT_ENVS" value="1" />
<option name="USE_EXTERNAL_CONSOLE" value="0" /> <option name="USE_EXTERNAL_CONSOLE" value="0" />
<option name="USE_MONO" value="0" /> <option name="USE_MONO" value="0" />

View File

@@ -1,4 +1,5 @@
using System.Text.Json; using System.Reflection;
using System.Text.Json;
var plugins = Directory.GetDirectories("../../../../Plugins"); var plugins = Directory.GetDirectories("../../../../Plugins");
var p = ""; var p = "";
@@ -6,15 +7,18 @@ foreach (var plugin in plugins)
{ {
try try
{ {
var assemblyConfigurationAttribute = typeof(Program).Assembly.GetCustomAttribute<AssemblyConfigurationAttribute>();
var buildConfigurationName = assemblyConfigurationAttribute?.Configuration;
var x = Directory.GetDirectories(Path.Combine(plugin, "bin")); var x = Directory.GetDirectories(Path.Combine(plugin, "bin"));
if (x.Any(s => s.EndsWith("Altcoins-Debug")))
{ p += $"{Path.GetFullPath(plugin)}/bin/{buildConfigurationName}/net6.0/{Path.GetFileName(plugin)}.dll;";
p += $"{Path.GetFullPath(plugin)}/bin/Altcoins-Debug/net6.0/{Path.GetFileName(plugin)}.dll;"; // if (x.Any(s => s.EndsWith("Altcoins-Debug")))
} // {
else // p += $"{Path.GetFullPath(plugin)}/bin/Altcoins-Debug/net6.0/{Path.GetFileName(plugin)}.dll;";
{ // }
p += $"{Path.GetFullPath(plugin)}/bin/Debug/net6.0/{Path.GetFileName(plugin)}.dll;"; // else
} // {
// }
} }
catch (Exception e) catch (Exception e)
{ {

View File

@@ -13,7 +13,7 @@
<PropertyGroup> <PropertyGroup>
<Product>Wabisabi Coinjoin</Product> <Product>Wabisabi Coinjoin</Product>
<Description>Allows you to integrate your btcpayserver store with coinjoins.</Description> <Description>Allows you to integrate your btcpayserver store with coinjoins.</Description>
<Version>1.0.44</Version> <Version>1.0.45</Version>
</PropertyGroup> </PropertyGroup>
<!-- Plugin development properties --> <!-- Plugin development properties -->

View File

@@ -20,7 +20,7 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
{ {
public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } = public override IBTCPayServerPlugin.PluginDependency[] Dependencies { get; } =
{ {
new() { Identifier = nameof(BTCPayServer), Condition = ">=1.8.0" } new() { Identifier = nameof(BTCPayServer), Condition = ">=1.10.0" }
}; };
public override void Execute(IServiceCollection applicationBuilder) public override void Execute(IServiceCollection applicationBuilder)
{ {