'Config', 'Results' projects added, includes iPerl opto logging bug-fixes, builds OK, cannot open DB, version 2.0.158.

This commit is contained in:
Milan Hanajik
2015-12-05 14:18:36 +01:00
parent 29ece2f91c
commit f6cec9d769
360 changed files with 6406 additions and 4091 deletions
+7 -72
View File
@@ -97,9 +97,6 @@
<Reference Include="ControlComponent3Munich">
<HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
</Reference>
<Reference Include="FluentNHibernate">
<HintPath>..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll</HintPath>
</Reference>
<Reference Include="GaugeIndicator">
<HintPath>..\packages\ControlBoard\GaugeIndicator.dll</HintPath>
</Reference>
@@ -113,11 +110,7 @@
<Reference Include="Microsoft.VisualBasic">
<Private>True</Private>
</Reference>
<Reference Include="MySql.Data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
<Private>True</Private>
<HintPath>..\packages\MySql.Data.6.6.5\lib\net20\MySql.Data.dll</HintPath>
</Reference>
<Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
<Reference Include="NHibernate">
<HintPath>..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
</Reference>
<Reference Include="Oracle.DataAccess, Version=4.121.1.0, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=x86">
@@ -126,12 +119,6 @@
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Data.SQLite">
<HintPath>..\packages\System.Data.SQLite.1.0.90.0\lib\net40\System.Data.SQLite.dll</HintPath>
</Reference>
<Reference Include="System.Data.SQLite.Linq">
<HintPath>..\packages\System.Data.SQLite.1.0.90.0\lib\net40\System.Data.SQLite.Linq.dll</HintPath>
</Reference>
<Reference Include="System.Deployment" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
@@ -953,11 +940,6 @@
<Compile Include="Boxes\FloatBox.cs" />
<Compile Include="Boxes\IBox.cs" />
<Compile Include="Boxes\IntBox.cs" />
<Compile Include="Entities\IHasValves.cs" />
<Compile Include="Entities\TransitionSequence.cs" />
<Compile Include="Entities\TransitionStep.cs" />
<Compile Include="Entities\VirtualBenchSequence.cs" />
<Compile Include="Entities\VirtualBenchStep.cs" />
<Compile Include="Forms\ClosingProgram.cs">
<SubType>Form</SubType>
</Compile>
@@ -989,10 +971,6 @@
<Compile Include="Forms\TabNameDlg.Designer.cs">
<DependentUpon>TabNameDlg.cs</DependentUpon>
</Compile>
<Compile Include="Mappings\TransitionSequenceMap.cs" />
<Compile Include="Mappings\TransitionStepMap.cs" />
<Compile Include="Mappings\VirtualBenchSequenceMap.cs" />
<Compile Include="Mappings\VirtualBenchStepMap.cs" />
<Compile Include="Resources\Strings.cs.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -1085,17 +1063,6 @@
<Compile Include="ComponentsManagerDlg.Designer.cs">
<DependentUpon>ComponentsManagerDlg.cs</DependentUpon>
</Compile>
<Compile Include="DBSettings.cs" />
<Compile Include="Entities\Component.cs" />
<Compile Include="Entities\ComponentProcedure.cs" />
<Compile Include="Entities\ComponentTest.cs" />
<Compile Include="Entities\IHasItemNr.cs" />
<Compile Include="Entities\MeasurementCorrection.cs" />
<Compile Include="Entities\MeterTestResult.cs" />
<Compile Include="Entities\FeedingPath.cs" />
<Compile Include="Entities\OutputPath.cs" />
<Compile Include="Entities\BenchPath.cs" />
<Compile Include="Entities\Test.cs" />
<Compile Include="ErrorHandler.cs" />
<Compile Include="Forms\AboutDlg.cs">
<SubType>Form</SubType>
@@ -1108,7 +1075,6 @@
<Compile Include="BenchControl\GenericDevices\IValveControl.cs" />
<Compile Include="BenchControl\Operations\EmptyBalanceTankOp.cs" />
<Compile Include="BenchControl\Operations\OpTemplate.cs" />
<Compile Include="DatabaseSettings.cs" />
<Compile Include="BenchControl\Operations\ClearResultsOp.cs" />
<Compile Include="BenchControl\Sequences\MainSeq.cs" />
<Compile Include="BenchControl\Elde\ControlBoardDev.cs" />
@@ -1122,19 +1088,6 @@
<Compile Include="BenchesDlg.Designer.cs">
<DependentUpon>BenchesDlg.cs</DependentUpon>
</Compile>
<Compile Include="DatabaseSettingsDlg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="DatabaseSettingsDlg.Designer.cs">
<DependentUpon>DatabaseSettingsDlg.cs</DependentUpon>
</Compile>
<Compile Include="Entities\Watermeter.cs" />
<Compile Include="Entities\WMType.cs" />
<Compile Include="Entities\Enums.cs" />
<Compile Include="Entities\MetersPath.cs" />
<Compile Include="Entities\Procedure.cs" />
<Compile Include="Entities\ProcedureHistory.cs" />
<Compile Include="Entities\TestResult.cs" />
<Compile Include="Forms\EditUsers.cs">
<SubType>Form</SubType>
</Compile>
@@ -1159,16 +1112,6 @@
<Compile Include="Forms\NoBenchOrDatabaseDlg.Designer.cs">
<DependentUpon>NoBenchOrDatabaseDlg.cs</DependentUpon>
</Compile>
<Compile Include="Mappings\ComponentMap.cs" />
<Compile Include="Mappings\ComponentProcedureMap.cs" />
<Compile Include="Mappings\ComponentTestMap.cs" />
<Compile Include="Mappings\MeasurementCorrectionMap.cs" />
<Compile Include="Mappings\MeterTestResultMap.cs" />
<Compile Include="Mappings\FeedingPathMap.cs" />
<Compile Include="Mappings\OutputPathMap.cs" />
<Compile Include="Mappings\BenchPathMap.cs" />
<Compile Include="Mappings\TestMap.cs" />
<Compile Include="Mappings\TestResultMap.cs" />
<Compile Include="MetrologyDlg.cs">
<SubType>Form</SubType>
</Compile>
@@ -1181,16 +1124,6 @@
<Compile Include="PathsDlg.Designer.cs">
<DependentUpon>PathsDlg.cs</DependentUpon>
</Compile>
<Compile Include="FluentCommon.cs" />
<Compile Include="Mappings\WatermeterMap.cs" />
<Compile Include="Mappings\WMTypeMap.cs" />
<Compile Include="Entities\Group.cs" />
<Compile Include="Mappings\GroupMap.cs" />
<Compile Include="Entities\User.cs" />
<Compile Include="Mappings\MetersPathMap.cs" />
<Compile Include="Mappings\ProcedureMap.cs" />
<Compile Include="Mappings\UserMap.cs" />
<Compile Include="Grp.cs" />
<Compile Include="LoginDlgWithBenchSelection.cs">
<SubType>Form</SubType>
</Compile>
@@ -1742,10 +1675,6 @@
<SubType>Designer</SubType>
<DependentUpon>BenchesDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="DatabaseSettingsDlg.resx">
<SubType>Designer</SubType>
<DependentUpon>DatabaseSettingsDlg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Forms\EditUsers.resx">
<DependentUpon>EditUsers.cs</DependentUpon>
</EmbeddedResource>
@@ -1948,6 +1877,12 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Config\Config.csproj">
<Project>{743DF7DB-C7B6-42EB-986D-0F485E5588E4}</Project>
<Name>Config</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.