From c4451cb3d20ab1f9c667ea69ad59733e030c037f Mon Sep 17 00:00:00 2001
From: Kukks <evilkukka@gmail.com>
Date: Mon, 5 Jun 2023 09:31:47 +0200
Subject: [PATCH] uod

---
 .run/ConfigBuilder.run.xml                    |  4 ++--
 ConfigBuilder/Program.cs                      | 22 +++++++++++--------
 .../BTCPayServer.Plugins.Wabisabi.csproj      |  2 +-
 .../WabisabiPlugin.cs                         |  2 +-
 submodules/btcpayserver                       |  2 +-
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.run/ConfigBuilder.run.xml b/.run/ConfigBuilder.run.xml
index 05ea4b0..be4a30f 100644
--- a/.run/ConfigBuilder.run.xml
+++ b/.run/ConfigBuilder.run.xml
@@ -1,8 +1,8 @@
 <component name="ProjectRunConfigurationManager">
   <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="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="USE_EXTERNAL_CONSOLE" value="0" />
     <option name="USE_MONO" value="0" />
diff --git a/ConfigBuilder/Program.cs b/ConfigBuilder/Program.cs
index eae2d6a..63f3652 100644
--- a/ConfigBuilder/Program.cs
+++ b/ConfigBuilder/Program.cs
@@ -1,4 +1,5 @@
-using System.Text.Json;
+using System.Reflection;
+using System.Text.Json;
 
 var plugins = Directory.GetDirectories("../../../../Plugins");
 var p = "";
@@ -6,15 +7,18 @@ foreach (var plugin in plugins)
 {
     try
     {
+        var assemblyConfigurationAttribute = typeof(Program).Assembly.GetCustomAttribute<AssemblyConfigurationAttribute>();
+        var buildConfigurationName = assemblyConfigurationAttribute?.Configuration;
         var x = Directory.GetDirectories(Path.Combine(plugin, "bin"));
-        if (x.Any(s => s.EndsWith("Altcoins-Debug")))
-        {
-            p += $"{Path.GetFullPath(plugin)}/bin/Altcoins-Debug/net6.0/{Path.GetFileName(plugin)}.dll;";
-        }
-        else
-        {
-            p += $"{Path.GetFullPath(plugin)}/bin/Debug/net6.0/{Path.GetFileName(plugin)}.dll;";
-        }
+        
+        p += $"{Path.GetFullPath(plugin)}/bin/{buildConfigurationName}/net6.0/{Path.GetFileName(plugin)}.dll;";
+        // if (x.Any(s => s.EndsWith("Altcoins-Debug")))
+        // {
+        //     p += $"{Path.GetFullPath(plugin)}/bin/Altcoins-Debug/net6.0/{Path.GetFileName(plugin)}.dll;";
+        // }
+        // else
+        // {
+        // }
     }
     catch (Exception e)
     {
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
index b36e0f9..37aea0f 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/BTCPayServer.Plugins.Wabisabi.csproj
@@ -13,7 +13,7 @@
     <PropertyGroup>
         <Product>Wabisabi Coinjoin</Product>
         <Description>Allows you to integrate your btcpayserver store with coinjoins.</Description>
-        <Version>1.0.44</Version>
+        <Version>1.0.45</Version>
     </PropertyGroup>
 
     <!-- Plugin development properties -->
diff --git a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
index 9723c31..b7b340a 100644
--- a/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
+++ b/Plugins/BTCPayServer.Plugins.Wabisabi/WabisabiPlugin.cs
@@ -20,7 +20,7 @@ public class WabisabiPlugin : BaseBTCPayServerPlugin
 {
     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)
     {
diff --git a/submodules/btcpayserver b/submodules/btcpayserver
index 9ce1e3b..fcd50a3 160000
--- a/submodules/btcpayserver
+++ b/submodules/btcpayserver
@@ -1 +1 @@
-Subproject commit 9ce1e3bb08b3e272de2384363e71e2b77cd3a503
+Subproject commit fcd50a3f6fb2ae6f525c7e0477ed477219c84038