From b2fc3967d3d89fb877d8130b79a9d0579aa489c4 Mon Sep 17 00:00:00 2001
From: Dimitrij <kvarkas@gmail.com>
Date: Sun, 12 Dec 2021 19:36:47 +0000
Subject: [PATCH] update to move dll and lang to subfolders, not supported
 fully in net 6.0

---
 Tools/postbuild_mremoteng.ps1 | 16 ++++++++++++++++
 mRemoteNG/app.config          |  8 +++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/Tools/postbuild_mremoteng.ps1 b/Tools/postbuild_mremoteng.ps1
index 91aa91ff..af52e108 100644
--- a/Tools/postbuild_mremoteng.ps1
+++ b/Tools/postbuild_mremoteng.ps1
@@ -37,6 +37,22 @@ Format-Table -AutoSize -Wrap -InputObject @{
     "ExcludeFromSigning" = $ExcludeFromSigning
 }
 
+# Move dlls resurses into folder
+#Remove-Item -Path "$TargetDir\libs" -Recurse -ErrorAction Ignore
+#New-Item -ItemType "directory" -Force -Path $TargetDir -Name "libs"
+#Move-Item -Path "$TargetDir\*.dll" -Destination "$TargetDir\libs" -force
+
+
+###
+
+# Move lang resurses into folder
+#Remove-Item -Path "$TargetDir\languages" -Recurse -ErrorAction Ignore
+#New-Item -ItemType "directory" -Force -Path $TargetDir -Name "languages"
+#"cs-CZ,de,el,en-US,es-AR,es,fr,hu,it,lt,ja-JP,ko-KR,nb-NO,nl,pt,pt-BR,pl,ru,uk,tr-TR,zh-CN,zh-TW,fi-FI".Split(",") | ForEach {
+#    Move-Item -Path "$TargetDir\$_" -Destination "$TargetDir\languages" -force
+# }
+###
+
 & "$PSScriptRoot\set_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
 & "$PSScriptRoot\verify_LargeAddressAware.ps1" -TargetDir $TargetDir -TargetFileName $TargetFileName
 & "$PSScriptRoot\tidy_files_for_release.ps1" -TargetDir $TargetDir -ConfigurationName $ConfigurationName
diff --git a/mRemoteNG/app.config b/mRemoteNG/app.config
index d9d62c1d..6432b540 100644
--- a/mRemoteNG/app.config
+++ b/mRemoteNG/app.config
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+        <probing privatePath="languages;bin;"/>
+    </assemblyBinding>
+  </runtime>
   <configSections>
     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net" />
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -825,7 +830,4 @@
       </setting>
     </mRemoteNG.applicationSettings>
   </applicationSettings>
-  <runtime>
-    <generatePublisherEvidence enabled="false" />
-  </runtime>
 </configuration>
\ No newline at end of file