Author: mhutch
Date: 2007-12-31 16:49:53 -0500 (Mon, 31 Dec 2007)
New Revision: 92077
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
Log:
* MonoDevelop.Projects/DotNetProject.cs: Fix logic error in last commit
that downgraded 2.0 projects to 1.1 projects.
Modified: trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
===================================================================
--- trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
2007-12-31 21:31:18 UTC (rev 92076)
+++ trunk/monodevelop/main/src/core/MonoDevelop.Projects/ChangeLog
2007-12-31 21:49:53 UTC (rev 92077)
@@ -1,5 +1,10 @@
2007-12-31 Michael Hutchinson <[EMAIL PROTECTED]>
+ * MonoDevelop.Projects/DotNetProject.cs: Fix logic error in last commit
that
+ downgraded 2.0 projects to 1.1 projects.
+
+2007-12-31 Michael Hutchinson <[EMAIL PROTECTED]>
+
* MonoDevelop.Projects/DotNetProject.cs: Make sure that ClrVersion is
something that the language binding can handle. Fixes some compilation
problems with VB.NET.
Modified:
trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
===================================================================
---
trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
2007-12-31 21:31:18 UTC (rev 92076)
+++
trunk/monodevelop/main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
2007-12-31 21:49:53 UTC (rev 92077)
@@ -95,12 +95,13 @@
//if possible, find a ClrVersion that the language binding can
handle
ClrVersion GetValidClrVersion (ClrVersion suggestion)
{
- if (languageBinding == null)
- return ClrVersion.Default;
+ if (suggestion == ClrVersion.Default) {
+ if (languageBinding == null)
+ return ClrVersion.Default;
+ else
+ suggestion = ClrVersion.Net_1_1;
+ }
- if (suggestion == ClrVersion.Default)
- suggestion = ClrVersion.Net_1_1;
-
if (languageBinding != null) {
ClrVersion[] versions =
languageBinding.GetSupportedClrVersions ();
if (versions != null && versions.Length > 0) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
