From df3be24a76c3eb000b6b44517acd7d55741bb6bd Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Thu, 29 Jul 2010 20:38:57 +0000 Subject: [PATCH] Fix build errors after merge. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6320 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Ruby/RubyBinding/Test/Utils/MockViewContent.cs | 5 +++++ .../Test/Designer/MockViewContend.cs | 5 +++++ src/Main/GlobalAssemblyInfo.template | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs index a4349cbba4..a800c2b8c3 100644 --- a/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs +++ b/src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs @@ -225,5 +225,10 @@ namespace RubyBinding.Tests.Utils throw new NotImplementedException(); } } + + public object GetService(Type serviceType) + { + return null; + } } } diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs index 39823fdb7c..1d0edb2852 100644 --- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs +++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs @@ -225,5 +225,10 @@ namespace ICSharpCode.Reports.Addin.Test.Designer throw new NotImplementedException(); } } + + public object GetService(Type serviceType) + { + return null; + } } } diff --git a/src/Main/GlobalAssemblyInfo.template b/src/Main/GlobalAssemblyInfo.template index 05b8dbf938..5ddb81e4f9 100644 --- a/src/Main/GlobalAssemblyInfo.template +++ b/src/Main/GlobalAssemblyInfo.template @@ -34,5 +34,5 @@ internal static class RevisionClass public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; - public const string BranchName = "wpfdesigner"; + public const string BranchName = null; }