Browse Source

Fix build errors after merge.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6320 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 15 years ago
parent
commit
df3be24a76
  1. 5
      src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs
  2. 5
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs
  3. 2
      src/Main/GlobalAssemblyInfo.template

5
src/AddIns/BackendBindings/Ruby/RubyBinding/Test/Utils/MockViewContent.cs

@ -225,5 +225,10 @@ namespace RubyBinding.Tests.Utils @@ -225,5 +225,10 @@ namespace RubyBinding.Tests.Utils
throw new NotImplementedException();
}
}
public object GetService(Type serviceType)
{
return null;
}
}
}

5
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Test/Designer/MockViewContend.cs

@ -225,5 +225,10 @@ namespace ICSharpCode.Reports.Addin.Test.Designer @@ -225,5 +225,10 @@ namespace ICSharpCode.Reports.Addin.Test.Designer
throw new NotImplementedException();
}
}
public object GetService(Type serviceType)
{
return null;
}
}
}

2
src/Main/GlobalAssemblyInfo.template

@ -34,5 +34,5 @@ internal static class RevisionClass @@ -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;
}

Loading…
Cancel
Save