Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Actions Migration #3977

Closed
wants to merge 4 commits into from
Closed

Actions Migration #3977

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d3eabe8
Actions Migration
Oct 28, 2024
f311c76
System.speech nugget used
Oct 28, 2024
684631c
Merge branch 'master' into Enhancement/ActionsMigration
Oct 28, 2024
2698ceb
Merge branch 'master' into Enhancement/ActionsMigration
Maheshkale447 Oct 28, 2024
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
4 changes: 2 additions & 2 deletions Ginger/GingerCore/Actions/ActSendKeys.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#region License
#region License
/*
Copyright © 2014-2024 European Support Limited

Expand Down Expand Up @@ -318,4 +318,4 @@ UIAuto.AutomationElement GetWindow(string LocValCal) //*******
}
}

}
}
142 changes: 0 additions & 142 deletions Ginger/GingerCore/Animations/Animations.cs
View file
Open in desktop

This file was deleted.

51 changes: 12 additions & 39 deletions Ginger/GingerCore/GingerCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,16 @@
<PropertyGroup>
<PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup>
<ItemGroup>
<EmbeddedResource Remove="Actions\REST\**" />
<EmbeddedResource Remove="Actions\WebServices\**" />
<EmbeddedResource Remove="Environments\**" />
<EmbeddedResource Remove="Plugins\**" />
<None Remove="Actions\REST\**" />
<None Remove="Actions\WebServices\**" />
<None Remove="Environments\**" />
<None Remove="Plugins\**" />
</ItemGroup>
<ItemGroup>
<Reference Include="ACL_Data_Contract">
<HintPath>DLLs\ACL_Data_Contract.dll</HintPath>
Expand Down Expand Up @@ -184,43 +194,19 @@
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="Actions\ActCreatePDFChart.cs" />
<Compile Include="Actions\ActSendKeys.cs" />
<Compile Include="Actions\ActSikuli.cs" />
<Compile Include="Actions\RobotFramework\ActRobot.cs" />
<Compile Include="Actions\RobotFramework\RobotTestCase.cs" />
<Compile Include="Actions\RobotFramework\GingerParam.cs" />
<Compile Include="Actions\Common\ActMedia.cs" />
<Compile Include="Actions\Common\ActBattery.cs" />
<Compile Include="Actions\Common\ActPhone.cs" />
<Compile Include="Actions\Common\ActDevice.cs" />
<Compile Include="Actions\ActDemoPage.cs" />
<Compile Include="Actions\Common\ElementConfigControl.cs" />
<Compile Include="Actions\JSON\ActJSONTagValidation.cs" />
<Compile Include="Actions\ActImage.cs" />
<Compile Include="Actions\ActLowLevelClicks.cs" />
<Compile Include="Actions\ActCreatePDFChart.cs" />
<Compile Include="Actions\ActActivateRow.cs" />
<Compile Include="Actions\ActGetMsgboxText.cs" />
<Compile Include="Actions\ActConsoleCommand.cs" />
<Compile Include="Actions\ActFunction.cs" />
<Compile Include="Actions\ActASCFControl.cs" />
<Compile Include="Actions\ActLaunchJavaWSApplication.cs" />
<Compile Include="Actions\ActGenerateFileFromTemplate.cs" />
<Compile Include="Actions\ActionFlowControl.cs" />
<Compile Include="Actions\ActPBControl.cs" />
<Compile Include="Actions\ActCompareImgs.cs" />
<Compile Include="Actions\ActSendKeys.cs" />
<Compile Include="Actions\ActSetConfig.cs" />
<Compile Include="Actions\ActMenuItem.cs" />
<Compile Include="Actions\ActTextSpeech.cs" />
<Compile Include="Actions\ActWindow.cs" />
<Compile Include="Actions\Common\ActDeviceButton.cs" />
<Compile Include="Actions\ASCF\ActASCFBrowserElement.cs" />
<Compile Include="Actions\Java\ActJavaElement.cs" />
<Compile Include="Actions\Java\ActJavaEXE.cs" />
<Compile Include="Actions\ActTableElement.cs" />
<Compile Include="Actions\MainFrame\ActMainframeGetDetails.cs" />
<Compile Include="Actions\MainFrame\ActMainframeSendKey.cs" />
<Compile Include="Actions\MainFrame\ActMainframeSetText.cs" />
<Compile Include="Actions\ScreenCapture\LocatorImageCaptureWindow.xaml.cs">
<DependentUpon>LocatorImageCaptureWindow.xaml</DependentUpon>
</Compile>
Expand All @@ -229,7 +215,6 @@
</Compile>
<Compile Include="Actions\ScreenCapture\SnippingTool.Designer.cs" />
<Compile Include="Actions\UIAutomation\UIAElementInfo.cs" />
<Compile Include="Actions\Windows\ActWindowsControl.cs" />
<Compile Include="Actions\ScreenCapture\ScreenCaptureWindow.xaml.cs">
<DependentUpon>ScreenCaptureWindow.xaml</DependentUpon>
</Compile>
Expand All @@ -251,10 +236,6 @@
<Compile Include="Actions\UIAutomation\UIA_ActionRecorder.xaml.cs">
<DependentUpon>UIA_ActionRecorder.xaml</DependentUpon>
</Compile>
<Compile Include="Actions\XML\ActXMLTagValidation.cs" />
<Compile Include="Actions\XML\ActXMLProcessing.cs" />
<Compile Include="Actions\XML\XMLProcessor.cs" />
<Compile Include="ActOcr.cs" />
<Compile Include="ALM\QtestCore.cs" />
<Compile Include="ALM\Qtest\ImportFromQtest.cs" />
<Compile Include="ALM\QCRestAPICore.cs" />
Expand Down Expand Up @@ -325,17 +306,14 @@
<Compile Include="GeneralLib\ComboEnumItem.cs" />
<Compile Include="GeneralLib\ComboGroupedEnumItem.cs" />
<Compile Include="GeneralLib\ComboItem.cs" />
<Compile Include="GeneralLib\CommonLib.cs" />
<Compile Include="GeneralLib\FrameControlExtensions.cs" />
<Compile Include="GeneralLib\JSONHelper.cs" />
<Compile Include="Extensions\Screenshot.cs" />
<Compile Include="DataSource\AccessDataSource.cs" />
<Compile Include="GeneralLib\ComboBoxWindow.xaml.cs">
<DependentUpon>ComboBoxWindow.xaml</DependentUpon>
</Compile>
<Compile Include="GeneralLib\MarshalExtension.cs" />
<Compile Include="GeneralLib\ProcessExtension.cs" />
<Compile Include="GingerOCR\GingerOcrOperations.cs" />
<Compile Include="Helpers\HTMLHelper.cs" />
<Compile Include="Properties\Annotations.cs" />
<Compile Include="Properties\Resources.Designer.cs">
Expand All @@ -350,7 +328,6 @@
<Compile Include="UserControls\ucTextDicResource.xaml.cs">
<DependentUpon>ucTextDicResource.xaml</DependentUpon>
</Compile>
<Compile Include="Animations\Animations.cs" />
<Compile Include="DragDrop\VisualDrag.xaml.cs">
<DependentUpon>VisualDrag.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -440,14 +417,10 @@
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Folder Include="Actions\REST\" />
<Folder Include="Actions\WebServices\" />
<Folder Include="ALM\RQM\RQMServerConfigurationsPackage\RQM_Export\CCM\fa1qm1\" />
<Folder Include="ALM\RQM\RQMServerConfigurationsPackage\RQM_Export\RM\" />
<Folder Include="ALM\RQM\RQMServerConfigurationsPackage\RQM_Fields\" />
<Folder Include="Drivers\JavaDriverLib\GingerJavaAgent\bin\com\amdocs\ginger\ASCFPack\" />
<Folder Include="Environments\" />
<Folder Include="Plugins\Jenkins\" />
</ItemGroup>
<ItemGroup>
<Resource Include="Resources\Const.png" />
Expand Down
0 Ginger/GingerCore/ActOcr.cs → Ginger/GingerCoreNET/ActOcr.cs
View file
Open in desktop
File renamed without changes.
0 ...ore/Actions/ASCF/ActASCFBrowserElement.cs → .../ActionsLib/ASCF/ActASCFBrowserElement.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/Actions/ActASCFControl.cs → ...ingerCoreNET/ActionsLib/ActASCFControl.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/Actions/ActActivateRow.cs → ...ingerCoreNET/ActionsLib/ActActivateRow.cs
View file
Open in desktop
File renamed without changes.
0 ...r/GingerCore/Actions/ActConsoleCommand.cs → ...erCoreNET/ActionsLib/ActConsoleCommand.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/Actions/ActFunction.cs → ...r/GingerCoreNET/ActionsLib/ActFunction.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/Actions/ActTableElement.cs → ...ngerCoreNET/ActionsLib/ActTableElement.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/Actions/ActTextSpeech.cs → ...GingerCoreNET/ActionsLib/ActTextSpeech.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/Actions/ActWindow.cs → Ginger/GingerCoreNET/ActionsLib/ActWindow.cs
View file
Open in desktop
File renamed without changes.
0 ...r/GingerCore/Actions/ActionFlowControl.cs → ...erCoreNET/ActionsLib/ActionFlowControl.cs
View file
Open in desktop
File renamed without changes.
0 ...r/GingerCore/Actions/Common/ActBattery.cs → ...erCoreNET/ActionsLib/Common/ActBattery.cs
View file
Open in desktop
File renamed without changes.
0 ...er/GingerCore/Actions/Common/ActDevice.cs → ...gerCoreNET/ActionsLib/Common/ActDevice.cs
View file
Open in desktop
File renamed without changes.
0 ...gerCore/Actions/Common/ActDeviceButton.cs → ...eNET/ActionsLib/Common/ActDeviceButton.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/Actions/Common/ActMedia.cs → ...ngerCoreNET/ActionsLib/Common/ActMedia.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/Actions/Common/ActPhone.cs → ...ngerCoreNET/ActionsLib/Common/ActPhone.cs
View file
Open in desktop
File renamed without changes.
0 ...re/Actions/Common/ElementConfigControl.cs → ...ActionsLib/Common/ElementConfigControl.cs
View file
Open in desktop
File renamed without changes.
0 ...Core/Actions/JSON/ActJSONTagValidation.cs → ...T/ActionsLib/JSON/ActJSONTagValidation.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/Actions/Java/ActJavaEXE.cs → ...ngerCoreNET/ActionsLib/Java/ActJavaEXE.cs
View file
Open in desktop
File renamed without changes.
0 ...GingerCore/Actions/Java/ActJavaElement.cs → ...CoreNET/ActionsLib/Java/ActJavaElement.cs
View file
Open in desktop
File renamed without changes.
0 ...tions/MainFrame/ActMainframeGetDetails.cs → ...nsLib/MainFrame/ActMainframeGetDetails.cs
View file
Open in desktop
File renamed without changes.
0 .../Actions/MainFrame/ActMainframeSendKey.cs → ...tionsLib/MainFrame/ActMainframeSendKey.cs
View file
Open in desktop
File renamed without changes.
0 .../Actions/MainFrame/ActMainframeSetText.cs → ...tionsLib/MainFrame/ActMainframeSetText.cs
View file
Open in desktop
File renamed without changes.
0 ...erCore/Actions/RobotFramework/ActRobot.cs → ...NET/ActionsLib/RobotFramework/ActRobot.cs
View file
Open in desktop
File renamed without changes.
0 ...ore/Actions/RobotFramework/GingerParam.cs → .../ActionsLib/RobotFramework/GingerParam.cs
View file
Open in desktop
File renamed without changes.
0 ...e/Actions/RobotFramework/RobotTestCase.cs → ...ctionsLib/RobotFramework/RobotTestCase.cs
View file
Open in desktop
File renamed without changes.
0 ...Core/Actions/Windows/ActWindowsControl.cs → ...T/ActionsLib/Windows/ActWindowsControl.cs
View file
Open in desktop
File renamed without changes.
0 ...ingerCore/Actions/XML/ActXMLProcessing.cs → ...oreNET/ActionsLib/XML/ActXMLProcessing.cs
View file
Open in desktop
File renamed without changes.
0 ...erCore/Actions/XML/ActXMLTagValidation.cs → ...NET/ActionsLib/XML/ActXMLTagValidation.cs
View file
Open in desktop
File renamed without changes.
0 ...er/GingerCore/Actions/XML/XMLProcessor.cs → ...gerCoreNET/ActionsLib/XML/XMLProcessor.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/GeneralLib/CommonLib.cs → Ginger/GingerCoreNET/GeneralLib/CommonLib.cs
View file
Open in desktop
File renamed without changes.
0 Ginger/GingerCore/GeneralLib/JSONHelper.cs → ...er/GingerCoreNET/GeneralLib/JSONHelper.cs
View file
Open in desktop
File renamed without changes.
17 changes: 16 additions & 1 deletion Ginger/GingerCoreNET/GingerCoreNET.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,16 @@
</ItemGroup>

<ItemGroup>

<PackageReference Include="System.Speech" Version="8.0.0" />
<PackageReference Include="Tabula">
<Version>0.1.2</Version>
</PackageReference>
<PackageReference Include="Tesseract">
<Version>4.1.1</Version>
</PackageReference>
<PackageReference Include="Freeware.Pdf2Png">
<Version>1.0.1</Version>
</PackageReference>
Comment on lines +229 to +238
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Consider cross-platform compatibility and standardize package version format.

  1. System.Speech is Windows-specific and may impact cross-platform compatibility. Consider using a cross-platform alternative like Microsoft.CognitiveServices.Speech.
  2. Package version formats are inconsistent:

Apply this diff to standardize version format:

-  <PackageReference Include="System.Speech" Version="8.0.0" />
-  <PackageReference Include="Tabula">
-    <Version>0.1.2</Version>
-  </PackageReference>
+  <PackageReference Include="Tabula" Version="0.1.2" />

Committable suggestion was skipped due to low confidence.

<PackageReference Include="Appium.WebDriver" Version="5.1.0" />

<PackageReference Include="Azure.Identity" Version="1.12.0" />
Expand Down Expand Up @@ -392,6 +401,12 @@
<Reference Include="OctaneStdSDK">
<HintPath>DLLS\OctaneStdSDK.dll</HintPath>
</Reference>
<Reference Include="Open3270">
<HintPath>..\Ginger\DLLs\Open3270.dll</HintPath>
</Reference>
<Reference Include="PresentationCore">
<HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\PresentationCore.dll</HintPath>
</Reference>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Improve framework reference configuration for better portability.

The current framework references have several issues:

  1. Absolute paths to framework assemblies make the project less portable
  2. Windows-specific dependencies (PresentationCore, System.Speech, System.Windows.Forms) may impact cross-platform compatibility

Replace absolute paths with SDK references:

-<Reference Include="PresentationCore">
-  <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\PresentationCore.dll</HintPath>
-</Reference>
+<FrameworkReference Include="Microsoft.WindowsDesktop.App" />

-<Reference Include="System.Speech">
-  <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Speech.dll</HintPath>
-</Reference>
-<Reference Include="System.Windows.Forms">
-  <HintPath>..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.8\System.Windows.Forms.dll</HintPath>
-</Reference>

Consider:

  1. Extracting Windows-specific functionality into a separate assembly
  2. Using platform-agnostic alternatives where possible
  3. Implementing proper platform checks for Windows-specific features

Also applies to: 424-429

<Reference Include="protobuf-net">
<HintPath>DLLS\protobuf-net.dll</HintPath>
</Reference>
Expand Down
0 ...ngerCore/GingerOCR/GingerOcrOperations.cs → ...rCoreNET/GingerOCR/GingerOcrOperations.cs
View file
Open in desktop
File renamed without changes.