diff options
| author | Michael Hutchinson <mhutchinson@novell.com> | 2009-06-16 03:39:24 +0400 |
|---|---|---|
| committer | Michael Hutchinson <mhutchinson@novell.com> | 2009-06-16 03:39:24 +0400 |
| commit | e6a58a50a1aeaa0623ad91f5719cf5559e6ebde4 (patch) | |
| tree | 10d1dc6e33a8e9f263c082ab342c436272d34b7c /main/src/addins/prj2make-sharp-lib | |
| parent | 739d1c80f649b53cdb7b951fedd741d90ffacc71 (diff) | |
* main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/SystemAssembly.cs:
Make assembly name consistent with "normalized" names.
* main/src/core/MonoDevelop.Projects/MonoDevelop.Projects/ProjectReference.cs:
* main/src/core/MonoDevelop.Core/MonoDevelop.Core.Assemblies/TargetRuntime.cs:
Use TargetFramework for assembly lookups. Prioritize framework
assemblies over GAC assemblies.
* main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs:
* main/src/addins/MonoDevelop.Autotools/MakefileData.cs:
* main/src/addins/AspNetAddIn/MonoDevelop.AspNet/AspNetAppProject.cs:
* main/src/addins/AspNetAddIn/MonoDevelop.AspNet/AspNetToolboxLoader.cs:
* main/src/addins/AspNetAddIn/MonoDevelop.AspNet/AspNetToolboxProvider.cs:
* main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore/ReferenceManager.cs:
* main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/ToolboxLoader.cs:
* main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderView.cs:
* main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom.Parser/IParserDatabase.cs:
* main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom.Parser/ProjectDomService.cs:
* main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.GuiBuilder/GuiBuilderService.cs:
* main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Templates/SingleFileDescriptionTemplate.cs:
* main/src/addins/MonoDevelop.DesignerSupport/MonoDevelop.DesignerSupport/ToolboxService.cs:
* main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom.Serialization/ParserDatabase.cs:
* main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom.MemoryDatabase/MemoryDatabase.cs:
* main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs:
* main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ReferenceFolderNodeBuilder.cs:
* main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom.Serialization/ProjectCodeCompletionDatabase.cs:
* main/src/core/MonoDevelop.Projects/MonoDevelop.Projects.Dom.Serialization/AssemblyCodeCompletionDatabase.cs:
Track assembly lookup APIs.
* main/src/addins/AspNetAddIn/MonoDevelop.AspNet/WebTypeManager.cs:
Track assembly lookup APIs. Fix bad logic that could cause NRE.
svn path=/trunk/monodevelop/; revision=136178
Diffstat (limited to 'main/src/addins/prj2make-sharp-lib')
| -rw-r--r-- | main/src/addins/prj2make-sharp-lib/ChangeLog | 4 | ||||
| -rw-r--r-- | main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/main/src/addins/prj2make-sharp-lib/ChangeLog b/main/src/addins/prj2make-sharp-lib/ChangeLog index d55ad87e97..d4020974f3 100644 --- a/main/src/addins/prj2make-sharp-lib/ChangeLog +++ b/main/src/addins/prj2make-sharp-lib/ChangeLog @@ -1,3 +1,7 @@ +2009-06-15 Michael Hutchinson <mhutchinson@novell.com> + + * MsPrjHelper.cs: Track assembly lookup APIs. + 2009-05-19 Lluis Sanchez Gual <lluis@novell.com> * VS2003ProjectFileFormat.cs: Use the new FilePath class for diff --git a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs b/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs index 3c5c060abe..08cc9448ea 100644 --- a/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs +++ b/main/src/addins/prj2make-sharp-lib/MsPrjHelper.cs @@ -13,6 +13,8 @@ using MonoDevelop.Core; using MonoDevelop.Ide.Gui; using CSharpBinding; +using MonoDevelop.Core.Assemblies; + namespace MonoDevelop.Prj2Make { @@ -27,6 +29,8 @@ namespace MonoDevelop.Prj2Make private bool m_bIsUnix; private bool m_bIsMcs; private bool m_bIsUsingLib; + + TargetFramework fx = Runtime.SystemAssemblyService.GetTargetFramework ("1.1"); // Flag use to determine if the LIB variable will be used in // the Makefile that prj2make generates @@ -326,7 +330,7 @@ namespace MonoDevelop.Prj2Make if (rname == "System.XML") rname = "System.Xml"; - string oref = Runtime.SystemAssemblyService.DefaultRuntime.GetAssemblyFullName (rname); + string oref = Runtime.SystemAssemblyService.DefaultRuntime.GetAssemblyFullName (rname, fx); if (oref == null) { monitor.ReportWarning (GettextCatalog.GetString ("Assembly reference could not be imported: ") + rf.AssemblyName); continue; @@ -384,7 +388,7 @@ namespace MonoDevelop.Prj2Make // Test to see if file exist in GAC location if (System.IO.File.Exists (strRefFileName)) { - ProjectReference rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Gac, Runtime.SystemAssemblyService.DefaultRuntime.GetAssemblyFullName (strRefFileName)); + ProjectReference rfOut = new ProjectReference (MonoDevelop.Projects.ReferenceType.Gac, Runtime.SystemAssemblyService.DefaultRuntime.GetAssemblyFullName (strRefFileName, fx)); rfOut.LocalCopy = true; return rfOut; } |