Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/PRoCon.Console/PRoCon.Console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,43 @@
<OutputPath>bin\Release\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="mscorlib" />
<Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
<HintPath>..\packages\MySqlConnector.2.4.0\lib\net462\MySqlConnector.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\VersionInfo.cs">
Expand Down
11 changes: 11 additions & 0 deletions src/PRoCon.Console/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,16 @@
<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7" /></startup>
<runtime>

<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">

<dependentAssembly>

<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />

<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />

</dependentAssembly>

</assemblyBinding>
</runtime>
</configuration>
12 changes: 11 additions & 1 deletion src/PRoCon.Console/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net47"/>
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net47" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.2" targetFramework="net47" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.2" targetFramework="net47" />
<package id="MySqlConnector" version="2.4.0" targetFramework="net47" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net47" />
<package id="System.Buffers" version="4.5.1" targetFramework="net47" />
<package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net47" />
<package id="System.Memory" version="4.5.5" targetFramework="net47" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net47" />
<package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net47" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net47" />
</packages>
16 changes: 16 additions & 0 deletions src/PRoCon.Core/PRoCon.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -76,18 +76,30 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\ziplib\Ionic.Zip.Reduced.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis, Version=4.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.Common.4.7.0\lib\netstandard2.0\Microsoft.CodeAnalysis.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeAnalysis.CSharp, Version=4.7.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeAnalysis.CSharp.4.7.0\lib\netstandard2.0\Microsoft.CodeAnalysis.CSharp.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.2, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.2\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="mscorlib"/>
<Reference Include="MySql.data, Version=6.6.4.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\mysql\connector\6.4.4\MySql.Data.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="MySqlConnector, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d33d3e53aa5f8c92, processorArchitecture=MSIL">
<HintPath>..\packages\MySqlConnector.2.4.0\lib\net462\MySqlConnector.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
Expand All @@ -107,6 +119,9 @@
</Reference>
<Reference Include="System.Core"/>
<Reference Include="System.Data" />
<Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
</Reference>
<Reference Include="System.Diagnostics.FileVersionInfo, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.FileVersionInfo.4.3.0\lib\net46\System.Diagnostics.FileVersionInfo.dll</HintPath>
</Reference>
Expand Down Expand Up @@ -182,6 +197,7 @@
<Reference Include="System.Threading.Thread, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Thread.4.3.0\lib\net46\System.Threading.Thread.dll</HintPath>
</Reference>
<Reference Include="System.Transactions" />
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.ValueTuple.4.5.0\lib\net47\System.ValueTuple.dll</HintPath>
</Reference>
Expand Down
31 changes: 29 additions & 2 deletions src/PRoCon.Core/Plugin/PluginManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,16 @@ private void PreparePluginsDirectory()

File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PRoCon.Core.dll"), Path.Combine(PluginBaseDirectory, "PRoCon.Core.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "MySql.Data.dll"), Path.Combine(PluginBaseDirectory, "MySql.Data.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Microsoft.Bcl.AsyncInterfaces.dll"), Path.Combine(PluginBaseDirectory, "Microsoft.Bcl.AsyncInterfaces.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "System.Buffers.dll"), Path.Combine(PluginBaseDirectory, "System.Buffers.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "System.Memory.dll"), Path.Combine(PluginBaseDirectory, "System.Memory.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "System.Numerics.Vectors.dll"), Path.Combine(PluginBaseDirectory, "System.Numerics.Vectors.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "System.Runtime.CompilerServices.Unsafe.dll"), Path.Combine(PluginBaseDirectory, "System.Runtime.CompilerServices.Unsafe.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Microsoft.Extensions.Logging.Abstractions.dll"), Path.Combine(PluginBaseDirectory, "Microsoft.Extensions.Logging.Abstractions.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Microsoft.Extensions.DependencyInjection.Abstractions.dll"), Path.Combine(PluginBaseDirectory, "Microsoft.Extensions.DependencyInjection.Abstractions.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "System.Diagnostics.DiagnosticSource.dll"), Path.Combine(PluginBaseDirectory, "System.Diagnostics.DiagnosticSource.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "System.Threading.Tasks.Extensions.dll"), Path.Combine(PluginBaseDirectory, "System.Threading.Tasks.Extensions.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "MySqlConnector.dll"), Path.Combine(PluginBaseDirectory, "MySqlConnector.dll"), true);
File.Copy(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "PRoCon.Core.pdb"), Path.Combine(PluginBaseDirectory, "PRoCon.Core.pdb"), true);

// Clean up temp directory
Expand Down Expand Up @@ -643,7 +653,23 @@ private IEnumerable<MetadataReference> GetCSharpCompilationReferences()
MetadataReference.CreateFromFile(string.Format(dotnetRuntimePath, "System.Xml")),

MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "MySql.Data")),
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "PRoCon.Core"))
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "PRoCon.Core")),

// MySqlConnector dependencies of dependencies
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "Microsoft.Bcl.AsyncInterfaces")),
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "System.Buffers")),
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "System.Memory")),
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "System.Numerics.Vectors")),
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "System.Runtime.CompilerServices.Unsafe")),

// MySqlConnector dependencies
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "Microsoft.Extensions.Logging.Abstractions")),
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "Microsoft.Extensions.DependencyInjection.Abstractions")),
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "System.Diagnostics.DiagnosticSource")),
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "System.Threading.Tasks.Extensions")),

// MySQL Connector
MetadataReference.CreateFromFile(string.Format(proconRuntimePath, "MySqlConnector")),
};
}

Expand Down Expand Up @@ -946,7 +972,8 @@ public void CompilePlugins(PermissionSet pluginSandboxPermissions, List<String>
var hostEvidence = new Evidence();
hostEvidence.AddHost(new Zone(SecurityZone.MyComputer));

AppDomainSandbox = AppDomain.CreateDomain(ProconClient.HostName + ProconClient.Port + "Engine", hostEvidence, domainSetup, pluginSandboxPermissions, PluginManager.GetStrongName(AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(assembly => assembly.GetName().Name == "MySql.Data")));
// ignore... this logic for mysql connector
AppDomainSandbox = AppDomain.CreateDomain(ProconClient.HostName + ProconClient.Port + "Engine", hostEvidence, domainSetup, pluginSandboxPermissions, PluginManager.GetStrongName(AppDomain.CurrentDomain.GetAssemblies().FirstOrDefault(assembly => assembly.GetName().Name == "MySql.Data" || assembly.GetName().Name == "MySqlConnector")));

WritePluginConsole("Configuring sandbox..");
// create the factory class in the secondary app-domain
Expand Down
Loading