From 432b288c34e241dcfd8fb80b1b0c1306a4b843ea Mon Sep 17 00:00:00 2001
From: Milan Hanajik <hanajikmilan@gmail.com>
Date: Sun, 6 Dec 2015 20:24:22 +0100
Subject: [PATCH] DB works OK, project changes, MessageBox when database cannot
 be open.

---
 Config/Config.csproj              | 11 +++++++++--
 Config/FluentCommon.cs            |  5 ++++-
 Config/Properties/AssemblyInfo.cs |  8 ++++----
 TestBenchFramework/TBF.csproj     |  7 +++++++
 clean.bat                         | 10 ++++++++++
 5 files changed, 34 insertions(+), 7 deletions(-)
 create mode 100644 clean.bat

diff --git a/Config/Config.csproj b/Config/Config.csproj
index b80913d41..02f999fb6 100644
--- a/Config/Config.csproj
+++ b/Config/Config.csproj
@@ -21,6 +21,7 @@
     <DefineConstants>TRACE;DEBUG;MUNICH</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -37,14 +38,20 @@
     <Reference Include="Iesi.Collections">
       <HintPath>..\packages\Iesi.Collections.3.2.0.4000\lib\Net35\Iesi.Collections.dll</HintPath>
     </Reference>
-    <Reference Include="MySql.Data">
+    <Reference Include="MySql.Data, Version=6.6.5.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.6.6.5\lib\net20\MySql.Data.dll</HintPath>
     </Reference>
-    <Reference Include="NHibernate">
+    <Reference Include="NHibernate, Version=3.3.1.4000, Culture=neutral, PublicKeyToken=aa95f207798dfdb4, processorArchitecture=MSIL">
       <HintPath>..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <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.Windows.Forms" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
diff --git a/Config/FluentCommon.cs b/Config/FluentCommon.cs
index 68c756d9c..a9c0419ad 100644
--- a/Config/FluentCommon.cs
+++ b/Config/FluentCommon.cs
@@ -2,6 +2,7 @@
 /// Copyright (c) 2013-2015 Sensus Metering Systems
 ///
 using System;
+using System.Windows.Forms;
 using FluentNHibernate.Cfg;
 using FluentNHibernate.Cfg.Db;
 using NHibernate;
@@ -121,8 +122,10 @@ namespace Config
                     return cfg.ExposeConfiguration(BuildSchema).BuildSessionFactory();
                 }
 			}
-			catch (Exception)
+			catch (Exception exc)
 			{
+				MessageBox.Show(string.Format("Cannot open database.\r\nReason:\r\n{0}", exc.Message),
+								"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
 				return null;
 			}
         }
diff --git a/Config/Properties/AssemblyInfo.cs b/Config/Properties/AssemblyInfo.cs
index b64071481..883d085d6 100644
--- a/Config/Properties/AssemblyInfo.cs
+++ b/Config/Properties/AssemblyInfo.cs
@@ -8,9 +8,9 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyTitle("Config")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyCompany("Sensus")]
 [assembly: AssemblyProduct("Config")]
-[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyCopyright("Copyright ©  2013 - 2015 Sensus Slovensko a.s.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("2.0.158.0")]
+[assembly: AssemblyFileVersion("2.0.158.0")]
diff --git a/TestBenchFramework/TBF.csproj b/TestBenchFramework/TBF.csproj
index 1290c1beb..f9f632a01 100644
--- a/TestBenchFramework/TBF.csproj
+++ b/TestBenchFramework/TBF.csproj
@@ -97,6 +97,10 @@
     <Reference Include="ControlComponent3Munich">
       <HintPath>..\packages\ControlBoard\Munich\ControlComponent3Munich.dll</HintPath>
     </Reference>
+    <Reference Include="FluentNHibernate, Version=1.3.0.733, Culture=neutral, PublicKeyToken=8aa435e3cb308880, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\FluentNHibernate.1.3.0.733\lib\FluentNHibernate.dll</HintPath>
+    </Reference>
     <Reference Include="GaugeIndicator">
       <HintPath>..\packages\ControlBoard\GaugeIndicator.dll</HintPath>
     </Reference>
@@ -110,6 +114,9 @@
     <Reference Include="Microsoft.VisualBasic">
       <Private>True</Private>
     </Reference>
+    <Reference Include="MySql.Data">
+      <HintPath>..\packages\MySql.Data.6.6.5\lib\net20\MySql.Data.dll</HintPath>
+    </Reference>
     <Reference Include="NHibernate">
       <HintPath>..\packages\NHibernate.3.3.3.4001\lib\Net35\NHibernate.dll</HintPath>
     </Reference>
diff --git a/clean.bat b/clean.bat
new file mode 100644
index 000000000..017db0897
--- /dev/null
+++ b/clean.bat
@@ -0,0 +1,10 @@
+rmdir /s /q Config\bin
+rmdir /s /q Config\obj
+rmdir /s /q Results\bin
+rmdir /s /q Results\obj
+rmdir /s /q ResultsBrowser\bin
+rmdir /s /q ResultsBrowser\obj
+rmdir /s /q TBFSetup\Debug
+rmdir /s /q TBFSetup\Release
+rmdir /s /q TestBenchFramework\bin
+rmdir /s /q TestBenchFramework\obj