Author: jpobst
Date: 2007-12-03 13:07:36 -0500 (Mon, 03 Dec 2007)
New Revision: 90572
Modified:
trunk/moma/ChangeLog
trunk/moma/DefinitionDownloader.cs
trunk/moma/MainForm.Designer.cs
trunk/moma/MainForm.cs
trunk/moma/MoMAExtractor/Program.cs
Log:
12-03-2007 Jonathan Pobst <[EMAIL PROTECTED]>
* DefinitionDownloader.cs: Fix an error message.
* MainForm.cs: Fix an error message.
* MainForm.Designer.cs: Bump version to 1.2.6.
* Extractor/Program.cs: Hardcode the assemblies we are interested in to
add
3.0/3.5 assemblies which are in different places.
Modified: trunk/moma/ChangeLog
===================================================================
--- trunk/moma/ChangeLog 2007-12-03 18:06:24 UTC (rev 90571)
+++ trunk/moma/ChangeLog 2007-12-03 18:07:36 UTC (rev 90572)
@@ -1,5 +1,13 @@
12-03-2007 Jonathan Pobst <[EMAIL PROTECTED]>
+ * DefinitionDownloader.cs: Fix an error message.
+ * MainForm.cs: Fix an error message.
+ * MainForm.Designer.cs: Bump version to 1.2.6.
+ * Extractor/Program.cs: Hardcode the assemblies we are interested in to
add
+ 3.0/3.5 assemblies which are in different places.
+
+12-03-2007 Jonathan Pobst <[EMAIL PROTECTED]>
+
* Method.cs: Fix a parser bug found in the 3.0/3.5 classes.
08-02-2007 Jonathan Pobst <[EMAIL PROTECTED]>
Modified: trunk/moma/DefinitionDownloader.cs
===================================================================
--- trunk/moma/DefinitionDownloader.cs 2007-12-03 18:06:24 UTC (rev 90571)
+++ trunk/moma/DefinitionDownloader.cs 2007-12-03 18:07:36 UTC (rev 90572)
@@ -96,7 +96,7 @@
DownloadSpinner.Image = Image.FromFile
(Path.Combine (image_directory, "spinner.gif"));
}
catch (Exception ex) {
- MessageBox.Show ("There was an error loading
resources for MoMA, please try downloading a new copy.\nError: {0}",
ex.ToString ());
+ MessageBox.Show (string.Format ("There was an
error loading resources for MoMA, please try downloading a new copy.\nError:
{0}", ex.ToString ()));
}
}
}
Modified: trunk/moma/MainForm.Designer.cs
===================================================================
--- trunk/moma/MainForm.Designer.cs 2007-12-03 18:06:24 UTC (rev 90571)
+++ trunk/moma/MainForm.Designer.cs 2007-12-03 18:07:36 UTC (rev 90572)
@@ -352,7 +352,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size (72, 14);
this.label2.TabIndex = 32;
- this.label2.Text = "Version 1.2.5";
+ this.label2.Text = "Version 1.2.6";
//
// MonoVersionCombo
//
Modified: trunk/moma/MainForm.cs
===================================================================
--- trunk/moma/MainForm.cs 2007-12-03 18:06:24 UTC (rev 90571)
+++ trunk/moma/MainForm.cs 2007-12-03 18:07:36 UTC (rev 90572)
@@ -429,7 +429,7 @@
failed_image = Image.FromFile (Path.Combine
(image_directory, "dialog-warning.png"));
}
catch (Exception ex) {
- MessageBox.Show ("There was an error loading
resources for MoMA, please try downloading a new copy.\nError: {0}",
ex.ToString ());
+ MessageBox.Show (string.Format ("There was an
error loading resources for MoMA, please try downloading a new copy.\nError:
{0}", ex.ToString ()));
}
}
}
Modified: trunk/moma/MoMAExtractor/Program.cs
===================================================================
--- trunk/moma/MoMAExtractor/Program.cs 2007-12-03 18:06:24 UTC (rev 90571)
+++ trunk/moma/MoMAExtractor/Program.cs 2007-12-03 18:07:36 UTC (rev 90572)
@@ -13,13 +13,12 @@
{
// I'm just interested in getting the files needed for
MoMA
// right now, this may only work on my machine :)
-
- string mono_path = @"C:\Program
Files\Mono-1.2.4\lib\mono\2.0";
- string ms_path =
@"C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727";
+
+ string mono_path = @"C:\Program Files
(x86)\Mono-1.2.5\lib\mono\2.0";
string output_path = Path.GetDirectoryName
(Application.ExecutablePath);
List<string> mono_assemblies = GetMonoAssemblies
(mono_path);
- List<string> ms_assemblies = GetMicrosoftAssemblies
(ms_path);
+ List<string> ms_assemblies = GetMicrosoftAssemblies ();
SortedList<string, Method> ms_all = new
SortedList<string, Method> ();
SortedList<string, Method> missing = new
SortedList<string, Method> ();
@@ -75,19 +74,93 @@
return assemblies;
}
- private static List<string> GetMicrosoftAssemblies (string
directory)
+ private static List<string> GetMicrosoftAssemblies ()
{
+ string ms_path_20 =
@"C:\WINDOWS\Microsoft.NET\Framework\v2.0.50727";
+ string ms_path_30 = @"C:\Program Files (x86)\Reference
Assemblies\Microsoft\Framework\v3.0";
+ string ms_path_35 = @"C:\Program Files (x86)\Reference
Assemblies\Microsoft\Framework\v3.5";
+
// Find all of Microsoft's assemblies
List<string> assemblies = new List<string> ();
- foreach (string filepath in Directory.GetFiles
(directory, "*.dll")) {
- string f = Path.GetFileName (filepath);
+ // 2.0 Assemblies
+ assemblies.Add (Path.Combine (ms_path_20,
"Accessibility.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"Microsoft.Build.Engine.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"Microsoft.Build.Framework.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"Microsoft.Build.Tasks.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"Microsoft.Build.Utilities.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"Microsoft.JScript.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"Microsoft.VisualBasic.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"Microsoft.VisualC.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"Microsoft.Vsa.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"mscorlib.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Configuration.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Configuration.Install.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Data.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Data.OracleClient.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Design.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.DirectoryServices.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Drawing.Design.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Drawing.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.EnterpriseServices.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Management.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Messaging.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Runtime.Remoting.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Runtime.Serialization.Formatters.Soap.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Security.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.ServiceProcess.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Transactions.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Web.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Web.Services.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Windows.Forms.dll"));
+ assemblies.Add (Path.Combine (ms_path_20,
"System.Xml.dll"));
- if ((f.Contains ("Accessibility") || f.Contains
("System") || f.Contains ("mscorlib") || f.Contains ("Microsoft")) &&
!(f.Contains ("_")) && !(f.Contains ("Thunk")) && !(f.Contains ("Wrapper")))
- if (!f.Contains
("Microsoft.Build.Conversion") && !f.Contains ("Microsoft.Build.VisualJSharp")
&& !f.Contains ("Microsoft.VisualBasic.Compatibility.Data") && !f.Contains
("Microsoft.VisualBasic.Compatibility") && !f.Contains
("Microsoft.VisualBasic.Vsa") && !f.Contains
("Microsoft.Vsa.Vb.CodeDOMProcessor"))
- if (!f.Contains
("System.Data.SqlXml") && !f.Contains ("System.Deployment.dll") && !f.Contains
("System.DirectoryServices.Protocols") && !f.Contains ("System.Web.Mobile") &&
!f.Contains ("System.Web.RegularExpressions"))
- assemblies.Add
(filepath);
- }
+ // 3.0 Assemblies
+ assemblies.Add (Path.Combine (ms_path_30,
"PresentationBuildTasks.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"PresentationCore.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"PresentationFramework.Aero.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"PresentationFramework.Classic.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"PresentationFramework.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"PresentationFramework.Luna.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"PresentationFramework.Royale.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"ReachFramework.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.IdentityModel.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.IdentityModel.Selectors.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.IO.Log.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.Printing.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.Runtime.Serialization.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.ServiceModel.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.Speech.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.Workflow.Activities.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.Workflow.ComponentModel.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"System.Workflow.Runtime.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"UIAutomationClient.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"UIAutomationClientsideProviders.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"UIAutomationProvider.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"UIAutomationTypes.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"WindowsBase.dll"));
+ assemblies.Add (Path.Combine (ms_path_30,
"WindowsFormsIntegration.dll"));
+
+ // 3.5 Assemblies
+ assemblies.Add (Path.Combine (ms_path_35,
"Microsoft.Build.Conversion.v3.5.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"Microsoft.Build.Engine.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"Microsoft.Build.Framework.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"Microsoft.Build.Utilities.v3.5.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"Microsoft.VisualC.STLCLR.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.AddIn.Contract.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.AddIn.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.Core.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.Data.DataSetExtensions.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.Data.Linq.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.DirectoryServices.AccountManagement.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.Management.Instrumentation.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.Net.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.ServiceModel.Web.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.Web.Extensions.Design.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.Web.Extensions.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.Windows.Presentation.dll"));
+ assemblies.Add (Path.Combine (ms_path_35,
"System.WorkflowServices.dll"));
return assemblies;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches