Author: mhutch
Date: 2008-02-06 17:00:35 -0500 (Wed, 06 Feb 2008)
New Revision: 95085
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/ChangeLog
branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectConfiguration.cs
Log:
2008-02-06 Michael Hutchinson <[EMAIL PROTECTED]>
* MonoDevelop.Projects/DotNetProjectConfiguration.cs: Update default
ClrVersion.
* MonoDevelop.Projects/DotNetProject.cs: Make sure that ClrVersion is
updated before saving begins; fixes "Bug 350628 - VB.NET binding
contains broken templates". Change some console writelines to log
messages.
Modified: branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/ChangeLog
===================================================================
--- branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/ChangeLog
2008-02-06 21:51:47 UTC (rev 95084)
+++ branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/ChangeLog
2008-02-06 22:00:35 UTC (rev 95085)
@@ -1,3 +1,12 @@
+2008-02-06 Michael Hutchinson <[EMAIL PROTECTED]>
+
+ * MonoDevelop.Projects/DotNetProjectConfiguration.cs: Update default
+ ClrVersion.
+ * MonoDevelop.Projects/DotNetProject.cs: Make sure that ClrVersion is
+ updated before saving begins; fixes "Bug 350628 - VB.NET binding
+ contains broken templates". Change some console writelines to log
+ messages.
+
2008-02-06 Lluis Sanchez Gual <[EMAIL PROTECTED]>
* MonoDevelop.Projects/DotNetProject.cs: Set 2.0 as the default runtime.
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
===================================================================
---
branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
2008-02-06 21:51:47 UTC (rev 95084)
+++
branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProject.cs
2008-02-06 22:00:35 UTC (rev 95085)
@@ -110,9 +110,11 @@
return suggestion;
}
}
+
return versions[0];
}
}
+
return suggestion;
}
@@ -189,6 +191,14 @@
}
}
+ protected override DataCollection Serialize (ITypeSerializer
handler)
+ {
+ //make sure clr version is sorted out before saving
+ ClrVersion v = this.ClrVersion;
+
+ return base.Serialize (handler);
+ }
+
protected override void Deserialize (ITypeSerializer handler,
DataCollection data)
{
base.Deserialize (handler, data);
@@ -375,7 +385,7 @@
{
resourceId = finfo.ResourceId;
if (resourceId == null) {
- Console.WriteLine (GettextCatalog.GetString
("Error: Unable to build ResourceId for {0}.", fname));
+ LoggingService.LogDebug
(GettextCatalog.GetString ("Error: Unable to build ResourceId for {0}.",
fname));
monitor.Log.WriteLine (GettextCatalog.GetString
("Error: Unable to build ResourceId for {0}.", fname));
return new CompilerError (fname, 0, 0,
String.Empty,
@@ -394,7 +404,7 @@
}
using (StringWriter sw = new StringWriter ()) {
- Console.WriteLine ("Compiling resources\n{0}$
{1} /compile {2}", Path.GetDirectoryName (fname), resgen, fname);
+ LoggingService.LogDebug ("Compiling
resources\n{0}$ {1} /compile {2}", Path.GetDirectoryName (fname), resgen,
fname);
monitor.Log.WriteLine (GettextCatalog.GetString
(
"Compiling resource {0} with {1}",
fname, resgen));
ProcessWrapper pw = null;
@@ -408,7 +418,7 @@
pw =
Runtime.ProcessService.StartProcess (info, sw, sw, null);
} catch (System.ComponentModel.Win32Exception
ex) {
- Console.WriteLine
(GettextCatalog.GetString (
+ LoggingService.LogDebug
(GettextCatalog.GetString (
"Error while trying to invoke
'{0}' to compile resource '{1}' :\n {2}", resgen, fname, ex.ToString ()));
monitor.Log.WriteLine
(GettextCatalog.GetString (
"Error while trying to invoke
'{0}' to compile resource '{1}' :\n {2}", resgen, fname, ex.Message));
@@ -423,7 +433,7 @@
fname = Path.ChangeExtension (fname,
".resources");
} else {
string output = sw.ToString ();
- Console.WriteLine
(GettextCatalog.GetString (
+ LoggingService.LogDebug
(GettextCatalog.GetString (
"Unable to compile ({0}) {1} to
.resources. \nReason: \n{2}\n",
resgen, fname, output));
monitor.Log.WriteLine
(GettextCatalog.GetString (
@@ -470,7 +480,7 @@
//generate assembly
string args = String.Format ("/t:lib
{0} \"/out:{1}\" /culture:{2}", pair.Value, outputFile, culture);
- Console.WriteLine ("Generating
satellite assembly for '{0}' culture.\n{1}$ {2} {3}", culture, satDir, al,
args);
+ LoggingService.LogDebug ("Generating
satellite assembly for '{0}' culture.\n{1}$ {2} {3}", culture, satDir, al,
args);
monitor.Log.WriteLine
(GettextCatalog.GetString (
"Generating satellite assembly
for '{0}' culture with {1}", culture, al));
ProcessWrapper pw = null;
@@ -481,7 +491,7 @@
pw =
Runtime.ProcessService.StartProcess (info, sw, sw, null);
} catch
(System.ComponentModel.Win32Exception ex) {
- Console.WriteLine
(GettextCatalog.GetString (
+ LoggingService.LogDebug
(GettextCatalog.GetString (
"Error while trying to
invoke '{0}' to generate satellite assembly for '{1}' culture:\n {2}", al,
culture, ex.ToString ()));
monitor.Log.WriteLine
(GettextCatalog.GetString (
"Error while trying to
invoke '{0}' to generate satellite assembly for '{1}' culture:\n {2}", al,
culture, ex.Message));
@@ -494,7 +504,7 @@
if (pw.ExitCode != 0) {
string output = sw.ToString ();
- Console.WriteLine
(GettextCatalog.GetString (
+ LoggingService.LogDebug
(GettextCatalog.GetString (
"Unable to generate
satellite assemblies for '{0}' culture with {1}.\nReason: \n{2}\n",
culture, al, output));
monitor.Log.WriteLine
(GettextCatalog.GetString (
Modified:
branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectConfiguration.cs
===================================================================
---
branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectConfiguration.cs
2008-02-06 21:51:47 UTC (rev 95084)
+++
branches/monodevelop/main/1.0/src/core/MonoDevelop.Projects/MonoDevelop.Projects/DotNetProjectConfiguration.cs
2008-02-06 22:00:35 UTC (rev 95085)
@@ -55,7 +55,7 @@
NetRuntime netRuntime = NetRuntime.MsNet;
[ItemProperty ("Execution/clr-version")]
- MonoDevelop.Core.ClrVersion clrVersion =
MonoDevelop.Core.ClrVersion.Net_1_1;
+ MonoDevelop.Core.ClrVersion clrVersion =
MonoDevelop.Core.ClrVersion.Net_2_0;
[ItemProperty ("Build/target")]
CompileTarget compiletarget = CompileTarget.Exe;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
