Author: lluis
Date: 2008-02-20 11:12:38 -0500 (Wed, 20 Feb 2008)
New Revision: 96266

Modified:
   branches/monodevelop/main/1.0/src/addins/NUnit/ChangeLog
   branches/monodevelop/main/1.0/src/addins/NUnit/Makefile.am
   branches/monodevelop/main/1.0/src/addins/NUnit/MonoDevelop.NUnit.mdp
   branches/monodevelop/main/1.0/src/addins/NUnit/MonoDevelopNUnit.addin.xml
   branches/monodevelop/main/1.0/src/addins/NUnit/Services/NUnitService.cs
Log:
2008-02-20  Lluis Sanchez Gual <[EMAIL PROTECTED]> 

        * MonoDevelop.NUnit.mdp, Makefile.am: Fix references.
        * MonoDevelopNUnit.addin.xml, Services/NUnitService.cs: Register nunit
          packages using the extension point, instead of doing it by conde in 
the
          nunit service (since that code won't be run unless the service is
          explicitely loaded). Fixes bug #



Modified: branches/monodevelop/main/1.0/src/addins/NUnit/ChangeLog
===================================================================
--- branches/monodevelop/main/1.0/src/addins/NUnit/ChangeLog    2008-02-20 
16:09:44 UTC (rev 96265)
+++ branches/monodevelop/main/1.0/src/addins/NUnit/ChangeLog    2008-02-20 
16:12:38 UTC (rev 96266)
@@ -1,3 +1,11 @@
+2008-02-20  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
+
+       * MonoDevelop.NUnit.mdp, Makefile.am: Fix references.
+       * MonoDevelopNUnit.addin.xml, Services/NUnitService.cs: Register nunit
+         packages using the extension point, instead of doing it by conde in 
the
+         nunit service (since that code won't be run unless the service is
+         explicitely loaded). Fixes bug #
+
 2008-02-05  Lluis Sanchez Gual <[EMAIL PROTECTED]> 
 
        * templates/NUnitProject.xpt.xml: Fix nunit versions referenced in the

Modified: branches/monodevelop/main/1.0/src/addins/NUnit/Makefile.am
===================================================================
--- branches/monodevelop/main/1.0/src/addins/NUnit/Makefile.am  2008-02-20 
16:09:44 UTC (rev 96265)
+++ branches/monodevelop/main/1.0/src/addins/NUnit/Makefile.am  2008-02-20 
16:12:38 UTC (rev 96266)
@@ -3,6 +3,7 @@
 ASSEMBLY = $(ADDIN_BUILD)/MonoDevelop.NUnit.dll
 REFS =  \
        $(GLADE_SHARP_LIBS) \
+       $(GLIB_SHARP_LIBS) \
        $(GTK_SHARP_LIBS) \
        $(MONO_ADDINS_LIBS) \
        -r:$(top_builddir)/build/bin/MonoDevelop.Components.dll \

Modified: branches/monodevelop/main/1.0/src/addins/NUnit/MonoDevelop.NUnit.mdp
===================================================================
--- branches/monodevelop/main/1.0/src/addins/NUnit/MonoDevelop.NUnit.mdp        
2008-02-20 16:09:44 UTC (rev 96265)
+++ branches/monodevelop/main/1.0/src/addins/NUnit/MonoDevelop.NUnit.mdp        
2008-02-20 16:12:38 UTC (rev 96266)
@@ -73,17 +73,18 @@
     <ProjectReference type="Assembly" localcopy="True" 
refto="lib/nunit.framework.dll" />
     <ProjectReference type="Gac" localcopy="False" refto="System, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
     <ProjectReference type="Gac" localcopy="False" refto="System.Xml, 
Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
-    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Core" />
     <ProjectReference type="Project" localcopy="False" refto="MonoDevelop.Ide" 
/>
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Projects" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Core.Gui" />
     <ProjectReference type="Project" localcopy="False" 
refto="MonoDevelop.Components" />
     <ProjectReference type="Gac" localcopy="True" refto="Mono.Addins, 
Version=0.3.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756" />
+    <ProjectReference type="Gac" localcopy="True" refto="glade-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="pango-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="atk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gdk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="gtk-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+    <ProjectReference type="Gac" localcopy="True" refto="glib-sharp, 
Version=2.8.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
   </References>
   <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="True" 
RelativeMakefileName="./Makefile.am" BuildTargetName="" CleanTargetName="" 
SyncReferences="True" IsAutotoolsProject="True" 
RelativeConfigureInPath="../../../">
     <BuildFilesVar Sync="True" Name="FILES" />

Modified: 
branches/monodevelop/main/1.0/src/addins/NUnit/MonoDevelopNUnit.addin.xml
===================================================================
--- branches/monodevelop/main/1.0/src/addins/NUnit/MonoDevelopNUnit.addin.xml   
2008-02-20 16:09:44 UTC (rev 96265)
+++ branches/monodevelop/main/1.0/src/addins/NUnit/MonoDevelopNUnit.addin.xml   
2008-02-20 16:12:38 UTC (rev 96266)
@@ -69,6 +69,13 @@
                <Class id = "NUnitService" class = 
"MonoDevelop.NUnit.NUnitService" insertafter = "CommandService"/>
        </Extension>
 
+       <Extension path="/MonoDevelop/Core/SupportPackages">
+               <Package name="nunit" version="2.2.9.0" clrVersion="Default">
+                       <Assembly file="nunit.core.dll" />
+                       <Assembly file="nunit.framework.dll" />
+               </Package>
+       </Extension>
+
        <Extension path = "/MonoDevelop/Ide/Pads">
                <SolutionPad id = "MonoDevelop.NUnit.TestPad" defaultPlacement 
= "Left" _label = "Unit Tests" icon = "nunit-pad-icon" class = 
"MonoDevelop.NUnit.TestPad">
                        <PadOption id = "ShowTestTime" _label = "Show Test 
Time" defaultValue = "False" />

Modified: 
branches/monodevelop/main/1.0/src/addins/NUnit/Services/NUnitService.cs
===================================================================
--- branches/monodevelop/main/1.0/src/addins/NUnit/Services/NUnitService.cs     
2008-02-20 16:09:44 UTC (rev 96265)
+++ branches/monodevelop/main/1.0/src/addins/NUnit/Services/NUnitService.cs     
2008-02-20 16:12:38 UTC (rev 96266)
@@ -47,17 +47,6 @@
                ArrayList providers = new ArrayList ();
                UnitTest rootTest;
                
-               public NUnitService ()
-               {
-                       if (Runtime.SystemAssemblyService.GetPackage ("nunit") 
== null) {
-                               string basePath = Path.GetDirectoryName 
(GetType().Assembly.Location);
-                               Runtime.SystemAssemblyService.RegisterPackage 
("nunit", "2.2.9.0", "NUnit", ClrVersion.Default, null,
-                                       Path.Combine (basePath, 
"nunit.core.dll"),
-                                       Path.Combine (basePath, 
"nunit.framework.dll")
-                               );
-                       }
-               }
-               
                public override void InitializeService ()
                {
                        IdeApp.ProjectOperations.CombineOpened += 
(CombineEventHandler) DispatchService.GuiDispatch (new CombineEventHandler 
(OnOpenCombine));

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to