User: xtoff
Date: 2009/12/20 05:05 AM
Modified:
/InversionOfControl/trunk/src/Castle.Windsor.Tests/Adapters/ComponentModel/
ContainerAdapterTestCase.cs
/InversionOfControl/trunk/src/Castle.Windsor/Adapters/ComponentModel/
ContainerWrapper.cs, IContainerAdapter.cs, ServiceCreatorCallbackActivator.cs
Log:
- excluded elements of System.ComponentModel.Design from Silverlight build
File Changes:
Directory: /InversionOfControl/trunk/src/Castle.Windsor/Adapters/ComponentModel/
================================================================================
File [modified]: ContainerWrapper.cs
Delta lines: +13 -1
===================================================================
---
InversionOfControl/trunk/src/Castle.Windsor/Adapters/ComponentModel/IContainerAdapter.cs
2009-12-20 11:22:16 UTC (rev 6497)
+++
InversionOfControl/trunk/src/Castle.Windsor/Adapters/ComponentModel/IContainerAdapter.cs
2009-12-20 12:05:38 UTC (rev 6498)
@@ -17,6 +17,7 @@
using System.ComponentModel;
using System.ComponentModel.Design;
+#if (!SILVERLIGHT)
/// <summary>
/// Integrates the <see cref="WindsorContainer"/> to the
System.ComponentModel
/// and System.ComponentMode.Design infrastructure.
@@ -24,7 +25,18 @@
/// <seealso cref="IComponent"/>
/// <seealso cref="IContainer"/>
/// <seealso cref="IServiceContainer"/>
- public interface IContainerAdapter : IComponent, IContainer,
IServiceContainer, IContainerAccessor
+ public interface IContainerAdapter : IComponent, IContainer,
+ IServiceContainer,
+#else
+ /// <summary>
+ /// Integrates the <see cref="WindsorContainer"/> to the
System.ComponentModel
+ /// and System.ComponentMode.Design infrastructure.
+ /// </summary>
+ /// <seealso cref="IComponent"/>
+ /// <seealso cref="IContainer"/>
+ public interface IContainerAdapter : IComponent, IContainer,
+#endif
+ IContainerAccessor
{
}
File [modified]: IContainerAdapter.cs
Delta lines: +2 -0
===================================================================
---
InversionOfControl/trunk/src/Castle.Windsor/Adapters/ComponentModel/ServiceCreatorCallbackActivator.cs
2009-12-20 11:22:16 UTC (rev 6497)
+++
InversionOfControl/trunk/src/Castle.Windsor/Adapters/ComponentModel/ServiceCreatorCallbackActivator.cs
2009-12-20 12:05:38 UTC (rev 6498)
@@ -14,6 +14,7 @@
namespace Castle.Windsor.Adapters.ComponentModel
{
+#if (!SILVERLIGHT)
using System;
using System.ComponentModel.Design;
@@ -62,4 +63,5 @@
// Nothing to do
}
}
+#endif
File [modified]: ServiceCreatorCallbackActivator.cs
Delta lines: +8 -3
===================================================================
---
InversionOfControl/trunk/src/Castle.Windsor.Tests/Adapters/ComponentModel/ContainerAdapterTestCase.cs
2009-12-20 11:22:16 UTC (rev 6497)
+++
InversionOfControl/trunk/src/Castle.Windsor.Tests/Adapters/ComponentModel/ContainerAdapterTestCase.cs
2009-12-20 12:05:38 UTC (rev 6498)
@@ -17,6 +17,7 @@
using System;
using System.ComponentModel;
using System.ComponentModel.Design;
+
using Castle.MicroKernel;
using Castle.Windsor.Adapters.ComponentModel;
using Castle.Windsor.Tests.Components;
@@ -47,7 +48,9 @@
public void GetIntrinsicServices()
{
Assert.IsNotNull(container.GetService(typeof(IContainer)));
+#if (!SILVERLIGHT)
Assert.IsNotNull(container.GetService(typeof(IServiceContainer)));
+#endif
Assert.IsNotNull(container.GetService(typeof(IWindsorContainer)));
Assert.IsNotNull(container.GetService(typeof(IKernel)));
}
@@ -219,6 +222,7 @@
container.AddService(typeof(ICalcService), new
CalculatorService());
}
+#if (!SILVERLIGHT)
[Test]
public void AddServiceCreatorCallback()
{
@@ -257,7 +261,7 @@
Assert.IsNull(child.GetService(typeof(ICalcService)));
Assert.AreSame(container.GetService(typeof(ICalcService)), service);
}
-
+#endif
[Test]
public void RemoveServiceInstance()
{
@@ -328,13 +332,14 @@
container.Container.Dispose();
Assert.IsTrue(disposed);
}
-
+
+#if (!SILVERLIGHT)
private object CreateCalculatorService(IServiceContainer
container, Type serviceType)
{
++calledCount;
return new CalculatorService();
}
-
+#endif
private void Container_Disposed(object source, EventArgs args)
{
Directory:
/InversionOfControl/trunk/src/Castle.Windsor.Tests/Adapters/ComponentModel/
======================================================================================
File [modified]: ContainerAdapterTestCase.cs
Delta lines: +0 -0
===================================================================
--
You received this message because you are subscribed to the Google Groups
"Castle Project Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/castle-project-commits?hl=en.
