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

Non UI Actions Migration from GingerCore to GingerCoreNet #3979

Merged
merged 3 commits into from
Oct 28, 2024
Merged

Non UI Actions Migration from GingerCore to GingerCoreNet #3979

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a51e5a0
Actions
Oct 28, 2024
a3088da
non ui related changes
Oct 28, 2024
7915e48
Merge branch 'master' into Enhancement/GingerCoreActionsMigration
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
142 changes: 0 additions & 142 deletions Ginger/GingerCore/Animations/Animations.cs
View file
Open in desktop

This file was deleted.

33 changes: 5 additions & 28 deletions Ginger/GingerCore/GingerCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,12 @@
<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>
Expand Down Expand Up @@ -194,24 +198,13 @@
</ItemGroup>
<ItemGroup>
<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" />
Expand All @@ -221,15 +214,8 @@
<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\Common\ElementConfigControl.cs" />
<Compile Include="Actions\ScreenCapture\LocatorImageCaptureWindow.xaml.cs">
<DependentUpon>LocatorImageCaptureWindow.xaml</DependentUpon>
</Compile>
Expand All @@ -238,7 +224,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 @@ -260,9 +245,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="DataSource\DataSourceTableColumn.cs" />
<Compile Include="Common\Devices\DeviceConfig.cs" />
Expand Down Expand Up @@ -296,9 +278,7 @@
<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">
Expand All @@ -320,7 +300,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 @@ -397,8 +376,6 @@
<AppDesigner Include="Properties\" />
</ItemGroup>
<ItemGroup>
<Folder Include="Actions\REST\" />
<Folder Include="Actions\WebServices\" />
<Folder Include="Drivers\JavaDriverLib\GingerJavaAgent\bin\com\amdocs\ginger\ASCFPack\" />
</ItemGroup>
<ItemGroup>
Expand Down
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/ActFunction.cs → ...r/GingerCoreNET/ActionsLib/ActFunction.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/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 ...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.
Binary file removed Ginger/GingerCoreNET/DLLS/PresentationCore.dll
View file
Open in desktop
Binary file not shown.
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.
8 changes: 7 additions & 1 deletion Ginger/GingerCoreNET/GingerCoreNET.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -383,7 +383,7 @@
<HintPath>DLLS\ALM_CommonStd.dll</HintPath>
</Reference>
<Reference Include="AzureDevOpsRepo">
<HintPath>..\..\..\..\ALMInteraction\AzureRepositoryStd\bin\Debug\net8.0\AzureDevOpsRepo.dll</HintPath>
<HintPath>DLLS\AzureDevOpsRepo.dll</HintPath>
</Reference>
<Reference Include="GingerExternal">
<HintPath>DLLS\GingerExternal.dll</HintPath>
Expand Down Expand Up @@ -415,6 +415,12 @@
<Reference Include="Octane_Repository">
<HintPath>DLLS\Octane_Repository.dll</HintPath>
</Reference>
<Reference Include="Open3270">
<HintPath>..\Ginger\DLLs\Open3270.dll</HintPath>
</Reference>
<Reference Include="PresentationCore">
<HintPath>DLLS\PresentationCore.dll</HintPath>
</Reference>
Comment on lines +418 to +423
Copy link
Contributor

Choose a reason for hiding this comment

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

🛠️ Refactor suggestion

Standardize the Open3270.dll reference path

The Open3270.dll reference uses a different path pattern (..\Ginger\DLLs) compared to other references in the project. Consider moving it to the standard DLLS folder and updating the path to maintain consistency:

-    <Reference Include="Open3270">
-      <HintPath>..\Ginger\DLLs\Open3270.dll</HintPath>
-    </Reference>
+    <Reference Include="Open3270">
+      <HintPath>DLLS\Open3270.dll</HintPath>
+    </Reference>
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<Reference Include="Open3270">
<HintPath>..\Ginger\DLLs\Open3270.dll</HintPath>
</Reference>
<Reference Include="PresentationCore">
<HintPath>DLLS\PresentationCore.dll</HintPath>
</Reference>
<Reference Include="Open3270">
<HintPath>DLLS\Open3270.dll</HintPath>
</Reference>
<Reference Include="PresentationCore">
<HintPath>DLLS\PresentationCore.dll</HintPath>
</Reference>

<Reference Include="protobuf-net">
<HintPath>DLLS\protobuf-net.dll</HintPath>
</Reference>
Expand Down
Loading