Browse Source

Allow opening VS 2010 solutions.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/dotnet4@4099 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
2d25fd022a
  1. 4
      src/Main/Base/Project/Src/Project/Solution/Solution.cs
  2. 2
      src/Main/Base/Project/Src/Util/WpfSynchronizeInvoke.cs

4
src/Main/Base/Project/Src/Project/Solution/Solution.cs

@ -30,6 +30,7 @@ namespace ICSharpCode.SharpDevelop.Project
{ {
public const int SolutionVersionVS2005 = 9; public const int SolutionVersionVS2005 = 9;
public const int SolutionVersionVS2008 = 10; public const int SolutionVersionVS2008 = 10;
public const int SolutionVersionVS2010 = 11;
/// <summary>contains &lt;GUID, (IProject/ISolutionFolder)&gt; pairs.</summary> /// <summary>contains &lt;GUID, (IProject/ISolutionFolder)&gt; pairs.</summary>
Dictionary<string, ISolutionFolder> guidDictionary = new Dictionary<string, ISolutionFolder>(); Dictionary<string, ISolutionFolder> guidDictionary = new Dictionary<string, ISolutionFolder>();
@ -368,6 +369,8 @@ namespace ICSharpCode.SharpDevelop.Project
sw.WriteLine("# Visual Studio 2005"); sw.WriteLine("# Visual Studio 2005");
} else if (versionNumber == SolutionVersionVS2008) { } else if (versionNumber == SolutionVersionVS2008) {
sw.WriteLine("# Visual Studio 2008"); sw.WriteLine("# Visual Studio 2008");
} else if (versionNumber == SolutionVersionVS2010) {
sw.WriteLine("# Visual Studio 10");
} }
sw.WriteLine("# SharpDevelop " + RevisionClass.FullVersion); sw.WriteLine("# SharpDevelop " + RevisionClass.FullVersion);
sw.Write(projectSection.ToString()); sw.Write(projectSection.ToString());
@ -480,6 +483,7 @@ namespace ICSharpCode.SharpDevelop.Project
break; break;
case "9.00": case "9.00":
case "10.00": case "10.00":
case "11.00":
break; break;
default: default:
MessageService.ShowErrorFormatted("${res:SharpDevelop.Solution.UnknownSolutionVersion}", match.Result("${Version}")); MessageService.ShowErrorFormatted("${res:SharpDevelop.Solution.UnknownSolutionVersion}", match.Result("${Version}"));

2
src/Main/Base/Project/Src/Util/WpfSynchronizeInvoke.cs

@ -35,7 +35,7 @@ namespace ICSharpCode.SharpDevelop
public IAsyncResult BeginInvoke(Delegate method, object[] args) public IAsyncResult BeginInvoke(Delegate method, object[] args)
{ {
DispatcherOperation op; DispatcherOperation op;
if (args.Length == 0) if (args == null || args.Length == 0)
op = dispatcher.BeginInvoke(DispatcherPriority.Normal, method); op = dispatcher.BeginInvoke(DispatcherPriority.Normal, method);
else if (args.Length == 1) else if (args.Length == 1)
op = dispatcher.BeginInvoke(DispatcherPriority.Normal, method, args[0]); op = dispatcher.BeginInvoke(DispatcherPriority.Normal, method, args[0]);

Loading…
Cancel
Save