Merge branch 'master' into aspnet-project-wizard

Conflicts:
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	main/tests/UnitTests/UnitTests.csproj

3 files changed, 115 insertions, 0 deletions

diff --git a/main/tests/UserInterfaceTests/Exceptions/CreateProjectException.cs b/main/tests/UserInterfaceTests/Exceptions/CreateProjectException.cs
new file mode 100644
index 0000000000..0e91464f13
--- /dev/null
+++ b/main/tests/UserInterfaceTests/Exceptions/CreateProjectException.cs
@@ -0,0 +1,37 @@
+//
+// CreateProjectException.cs
+//
+// Author:
+//       Manish Sinha <manish.sinha@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace UserInterfaceTests
+{
+	public class CreateProjectException : Exception
+	{
+		public CreateProjectException (string message): base (message)
+		{
+		}
+	}
+}
+
diff --git a/main/tests/UserInterfaceTests/Exceptions/NuGetException.cs b/main/tests/UserInterfaceTests/Exceptions/NuGetException.cs
new file mode 100644
index 0000000000..935dc6d3b4
--- /dev/null
+++ b/main/tests/UserInterfaceTests/Exceptions/NuGetException.cs
@@ -0,0 +1,41 @@
+//
+// NuGetException.cs
+//
+// Author:
+//       Manish Sinha <manish.sinha@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace UserInterfaceTests
+{
+	public class NuGetException : Exception
+	{
+		public NuGetException (string message) : base (message)
+		{
+		}
+
+		public NuGetException (string message, Exception innerExceotion) : base (message, innerExceotion)
+		{
+		}
+	}
+}
+
diff --git a/main/tests/UserInterfaceTests/Exceptions/TemplateSelectionException.cs b/main/tests/UserInterfaceTests/Exceptions/TemplateSelectionException.cs
new file mode 100644
index 0000000000..041f4bb5e5
--- /dev/null
+++ b/main/tests/UserInterfaceTests/Exceptions/TemplateSelectionException.cs
@@ -0,0 +1,37 @@
+//
+// TemplateSelectionException.cs
+//
+// Author:
+//       Manish Sinha <manish.sinha@xamarin.com>
+//
+// Copyright (c) 2015 Xamarin Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+using System;
+
+namespace UserInterfaceTests
+{
+	public class TemplateSelectionException : Exception
+	{
+		public TemplateSelectionException (string message) : base (message)
+		{
+		}
+	}
+}
+