michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-3' into feature/KameraKeyenceAdvance

Browse Source
This commit is contained in:
Michal Buzik 2024-10-11 10:46:32 +02:00
commit cbb3d4f735
8 changed files with 10 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitignore vendored
View File

@ -66,6 +66,16 @@ WorkflowConfigurator/bin/
WorkflowConfigurator/obj/
Workplace/bin/
Workplace/obj/
DataStreamInterfaceTest/bin/
DataStreamInterfaceTest/obj/
DataStreamMeter/bin/
DataStreamMeter/obj/
Events/bin/
Events/obj/
TracingDB/bin/
TracingDB/obj/
Users/bin/
Users/obj/
.vs/
.idea/
*.suo

4
TBF/Rig/DataEntry/S620/FormForMechanicalMeters.cs
View File

@ -7,11 +7,7 @@ using System.Drawing;
using System.Windows.Forms;
using log4net;
using NHibernate;
#if MANAGED
using Oracle.ManagedDataAccess.Client;
#else
using Oracle.DataAccess.Client;
#endif
using Common;
using TBF.Rig.Sequences;
using TBF.Resources;

4
TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs
View File

@ -7,11 +7,7 @@ using System.Drawing;
using System.Windows.Forms;
using log4net;
using NHibernate;
#if MANAGED
using Oracle.ManagedDataAccess.Client;
#else
using Oracle.DataAccess.Client;
#endif
using Common;
using SharedDatabase;
using SharedDatabase.Entities;

4
TBF/Rig/Output/DB/SensusOracle/Database.cs
View File

@ -6,11 +6,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Text;
using log4net;
#if MANAGED
using Oracle.ManagedDataAccess.Client;
#else
using Oracle.DataAccess.Client;
#endif
using Common;
using Config.Entities;
using Results.Output;

4
TBF/Rig/Output/DB/SensusOracle/VtPruefpunktSollSd.cs
View File

@ -5,11 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using log4net;
#if MANAGED
using Oracle.ManagedDataAccess.Client;
#else
using Oracle.DataAccess.Client;
#endif
using Common;
namespace TBF.Rig.Output.DB.SensusOracle

4
TBF/Rig/Output/DB/SensusOracle/VtWztypSd.cs
View File

@ -5,11 +5,7 @@ using System;
using System.Collections.Generic;
using System.Linq;
using log4net;
#if MANAGED
using Oracle.ManagedDataAccess.Client;
#else
using Oracle.DataAccess.Client;
#endif
using Common;
namespace TBF.Rig.Output.DB.SensusOracle

4
TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
View File

@ -6,11 +6,7 @@ using System.Collections.Generic;
using System.Text;
using System.Windows.Forms;
using log4net;
#if MANAGED
using Oracle.ManagedDataAccess.Client;
#else
using Oracle.DataAccess.Client;
#endif
using Common;
using Config.Entities;
using Results.Output;

4
TBF/UI/ResultsMI/DeleteFromOracleForm.cs
View File

@ -3,11 +3,7 @@ using System.Collections.Generic;
using System.Text;
using System.Windows.Forms;
using NHibernate;
#if MANAGED
using Oracle.ManagedDataAccess.Client;
#else
using Oracle.DataAccess.Client;
#endif
using Common;
using Config.Entities;
using TBF.Resources;