Merge remote-tracking branch 'upstream/master'

src/AddIns/Analysis/CodeQuality/Gui/MainView.xaml.cs

@@ -19,6 +19,7 @@
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -72,7 +73,7 @@ namespace ICSharpCode.CodeQuality.Gui
 				return;
 			
 			string fileName = ProjectService.CurrentProject.OutputAssemblyFullPath;
-			if (string.IsNullOrEmpty(fileName))
+			if (!File.Exists(fileName))
 			{
 				MessageBox.Show("Project output assembly not found! Please build it first!");
 				return;

src/Main/GlobalAssemblyInfo.cs.template

@@ -46,7 +46,7 @@ internal static class RevisionClass
 	public const string Minor = "0";
 	public const string Build = "0";
 	public const string Revision = "$INSERTREVISION$";
-	public const string VersionName = "Beta 1"; // "" is not valid for no version name, you have to use null if you don't want a version name (eg "Beta 1")
+	public const string VersionName = "Beta 2"; // "" is not valid for no version name, you have to use null if you don't want a version name (eg "Beta 1")
 	
 	public const string FullVersion = Major + "." + Minor + "." + Build + ".$INSERTREVISION$$INSERTBRANCHPOSTFIX$$INSERTVERSIONNAMEPOSTFIX$";
 }