update plugin core version + added label & file attribute

Ginger-Automation · Jul 3, 2019 · cadc114 · cadc114
1 parent bfa8491
commit cadc114
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 55 deletions.
diff --git a/GingerPythonPluginConsole/Ginger.PluginPackage.Actions.json b/GingerPythonPluginConsole/Ginger.PluginPackage.Actions.json
diff --git a/GingerPythonPluginConsole/Ginger.PluginPackage.json b/GingerPythonPluginConsole/Ginger.PluginPackage.json
@@ -1,6 +1,6 @@
 {
   "Id": "Python",
-  "Version": "v1.1.0",
+  "Version": "v1.2",
   "ProjectUrl": "https://github.com/Ginger-Automation/Ginger-Python-Plugin",
   "Description": "Execute Python script",
   "Summary": "Python...",

diff --git a/GingerPythonPluginConsole/GingerPythonPluginConsole.csproj b/GingerPythonPluginConsole/GingerPythonPluginConsole.csproj
@@ -11,8 +11,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Ginger.Plugin.Core" Version="3.3.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Ginger.Plugin.Core" Version="3.3.4" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
 
   <ItemGroup>
@@ -22,9 +22,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="Ginger.PluginPackage.Actions.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
     <None Update="Ginger.PluginPackage.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

diff --git a/GingerPythonPluginConsole/GingerPythonService.cs b/GingerPythonPluginConsole/GingerPythonService.cs
@@ -11,11 +11,14 @@ namespace GingerPythonPlugin
     public class GingerPythonService 
     {
 
-        
+
 
         [GingerAction("RunScript", "Run Script")]
-        public void RunScript(IGingerAction GA, string scriptContent,List<Arg> args=null)  
-        {
+        public void RunScript(IGingerAction GA, 
+            string scriptContent, 
+            [Label("Python Parameters")]
+            List<Arg> args)  
+            {
             Console.WriteLine("start RunPythonScript");
 
             PythonProcess p = PythonProcess.Builder();
@@ -40,7 +43,13 @@ public void RunScript(IGingerAction GA, string scriptContent,List<Arg> args=null
         }
 
         [GingerAction("RunScriptFile", "Run Script file")]
-        public void RunScriptFile(IGingerAction GA, string scriptFileName,  List<Arg> args=null)
+        public void RunScriptFile(IGingerAction GA, 
+            [Browse(true)]
+            [BrowseType(BrowseType =BrowseTypeAttribute.eBrowseType.File)]
+            [FileType(".py")]
+            string scriptFileName,  
+            [Label("Python Parameters")]
+            List<Arg> args)
         {
             Console.WriteLine("start RunPythonScript");
 

diff --git a/GingerPythonPluginConsole/Properties/PublishProfiles/FolderProfile.pubxml b/GingerPythonPluginConsole/Properties/PublishProfiles/FolderProfile.pubxml
@@ -8,6 +8,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <PublishDir>bin\Debug\netcoreapp2.1\publish\</PublishDir>
+    <PublishDir>C:\Work\Python\Publish</PublishDir>
+    <SelfContained>false</SelfContained>
+    <_IsPortable>true</_IsPortable>
   </PropertyGroup>
 </Project>
diff --git a/GingerPythonPluginTest/Properties/PublishProfiles/FolderProfile.pubxml b/GingerPythonPluginTest/Properties/PublishProfiles/FolderProfile.pubxml
@@ -8,7 +8,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <Configuration>Release</Configuration>
     <Platform>Any CPU</Platform>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <PublishDir>bin\Debug\netcoreapp2.1\publish\</PublishDir>
+    <PublishDir>C:\Work\Python\Publish</PublishDir>
     <SelfContained>false</SelfContained>
     <_IsPortable>true</_IsPortable>
   </PropertyGroup>

diff --git a/GingerPythonPluginTest/UnitTest1.cs b/GingerPythonPluginTest/UnitTest1.cs
@@ -30,7 +30,7 @@ public void RunScript1()
 sum=a+b
 print('sum=' + str(sum))";
             //Act
-            service.RunScript(GA, script1);
+            service.RunScript(GA, script1, null);
 
 
             //Assert