Add .NET Core build support

1 files changed, 17 insertions, 12 deletions

diff --git a/csharp/test/Ice/plugin/Client.cs b/csharp/test/Ice/plugin/Client.cs
index 8918bc57f23..72f27e692fc 100644
--- a/csharp/test/Ice/plugin/Client.cs
+++ b/csharp/test/Ice/plugin/Client.cs
@@ -28,6 +28,11 @@ public class Client
 
     public static int Main(string[] args)
     {
+#if NET45
+        string pluginPath = "plugins/Plugin.dll";
+#else
+        string pluginPath = "msbuild/netstandard/plugin/bin/netcoreapp2.0/Plugin.dll";
+#endif
         Ice.Communicator communicator = null;
         Console.Write("testing a simple plug-in... ");
         Console.Out.Flush();
@@ -36,7 +41,7 @@ public class Client
             Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = Ice.Util.createProperties();
             initData.properties.setProperty("Ice.Plugin.Test",
-                                            "plugins/Plugin.dll:PluginFactory 'C:\\Program Files\\' --DatabasePath " +
+                                            pluginPath + ":PluginFactory 'C:\\Program Files\\' --DatabasePath " +
                                             "'C:\\Program Files\\Application\\db'");
             communicator = Ice.Util.initialize(ref args, initData);
             communicator.destroy();
@@ -55,7 +60,7 @@ public class Client
         {
             Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Plugin.Test", "plugins/Plugin.dll:PluginInitializeFailFactory");
+            initData.properties.setProperty("Ice.Plugin.Test", pluginPath + ":PluginInitializeFailFactory");
             communicator = Ice.Util.initialize(ref args, initData);
             test(false);
         }
@@ -72,9 +77,9 @@ public class Client
         {
             Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Plugin.PluginOne", "plugins/Plugin.dll:PluginOneFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwo", "plugins/Plugin.dll:PluginTwoFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree", "plugins/Plugin.dll:PluginThreeFactory");
+            initData.properties.setProperty("Ice.Plugin.PluginOne", pluginPath + ":PluginOneFactory");
+            initData.properties.setProperty("Ice.Plugin.PluginTwo", pluginPath + ":PluginTwoFactory");
+            initData.properties.setProperty("Ice.Plugin.PluginThree", pluginPath + ":PluginThreeFactory");
             initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOne, PluginTwo"); // Exclude PluginThree
             communicator = Ice.Util.initialize(ref args, initData);
             communicator.destroy();
@@ -92,10 +97,10 @@ public class Client
         {
             Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = Ice.Util.createProperties();
-            initData.properties.setProperty("Ice.Plugin.PluginOne", "plugins/Plugin.dll:PluginOneFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginTwo", "plugins/Plugin.dll:PluginTwoFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree", "plugins/Plugin.dll:PluginThreeFactory");
-            initData.properties.setProperty("Ice.Plugin.PluginThree", "plugins/Plugin.dll:PluginThreeFactory");
+            initData.properties.setProperty("Ice.Plugin.PluginOne", pluginPath + ":PluginOneFactory");
+            initData.properties.setProperty("Ice.Plugin.PluginTwo", pluginPath + ":PluginTwoFactory");
+            initData.properties.setProperty("Ice.Plugin.PluginThree", pluginPath + ":PluginThreeFactory");
+            initData.properties.setProperty("Ice.Plugin.PluginThree", pluginPath + ":PluginThreeFactory");
             initData.properties.setProperty("Ice.InitPlugins", "0");
             communicator = Ice.Util.initialize(ref args, initData);
 
@@ -131,11 +136,11 @@ public class Client
             Ice.InitializationData initData = new Ice.InitializationData();
             initData.properties = Ice.Util.createProperties();
             initData.properties.setProperty("Ice.Plugin.PluginOneFail",
-                                            "plugins/Plugin.dll:PluginOneFailFactory");
+                                            pluginPath + ":PluginOneFailFactory");
             initData.properties.setProperty("Ice.Plugin.PluginTwoFail",
-                                            "plugins/Plugin.dll:PluginTwoFailFactory");
+                                            pluginPath + ":PluginTwoFailFactory");
             initData.properties.setProperty("Ice.Plugin.PluginThreeFail",
-                                            "plugins/Plugin.dll:PluginThreeFailFactory");
+                                            pluginPath + ":PluginThreeFailFactory");
             initData.properties.setProperty("Ice.PluginLoadOrder", "PluginOneFail, PluginTwoFail, PluginThreeFail");
             communicator = Ice.Util.initialize(ref args, initData);
         }