fix exception handling in Program.cs

max-ieremenko · Oct 6, 2018 · 61568dd · 61568dd
1 parent 566f2c1
commit 61568dd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/Sources/GlobalAssemblyInfo.cs b/Sources/GlobalAssemblyInfo.cs
@@ -9,5 +9,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]
diff --git a/Sources/SqlDatabase/Program.cs b/Sources/SqlDatabase/Program.cs
@@ -36,19 +36,23 @@ public static int Main(string[] args)
 
         internal static bool ExecuteCommand(CommandLine cmd)
         {
-            if (cmd.Command == Command.Upgrade)
-            {
-                return DoUpgrade(cmd);
-            }
-
-            if (cmd.Command == Command.Create)
+            try
             {
-                return DoCreate(cmd);
+                switch (cmd.Command)
+                {
+                    case Command.Upgrade:
+                        return DoUpgrade(cmd);
+                    case Command.Create:
+                        return DoCreate(cmd);
+                    case Command.Execute:
+                        return DoExecute(cmd);
+                }
             }
-
-            if (cmd.Command == Command.Execute)
+            catch (Exception ex)
             {
-                return DoExecute(cmd);
+                Logger.Error(ex.Message);
+                Logger.Info(ex.ToString());
+                return false;
             }
 
             throw new NotImplementedException();

diff --git a/Sources/SqlDatabase/SqlDatabase.csproj b/Sources/SqlDatabase/SqlDatabase.csproj
@@ -13,10 +13,18 @@
     <AssemblyOriginatorKeyFile>..\SqlDatabase.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Remove="Configuration\CommandLine.txt" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\GlobalAssemblyInfo.cs" Link="Properties\GlobalAssemblyInfo.cs" />
   </ItemGroup>
 
+  <ItemGroup>
+    <EmbeddedResource Include="Configuration\CommandLine.txt" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="1.0.2">
       <PrivateAssets>all</PrivateAssets>