User: johnsimons
Date: 2009/12/21 03:46 PM
Modified:
/InversionOfControl/trunk/src/Castle.MicroKernel/
Castle.MicroKernel-vs2008.csproj
/InversionOfControl/trunk/src/Castle.Windsor.Tests/
SmartProxyTestCase.cs
/InversionOfControl/trunk/src/Castle.Windsor/
Castle.Windsor-vs2008-SL.csproj, WindsorContainer.cs
/InversionOfControl/trunk/src/Castle.Windsor/Proxy/
DefaultProxyFactory.cs, ProxyGenerationHookAdapter.cs
Log:
Fixed all silverlight tests
File Changes:
Directory: /InversionOfControl/trunk/src/Castle.MicroKernel/
============================================================
File [modified]: Castle.MicroKernel-vs2008.csproj
Delta lines: +4 -0
===================================================================
--- InversionOfControl/trunk/src/Castle.Windsor/Castle.Windsor-vs2008-SL.csproj
2009-12-21 22:11:24 UTC (rev 6514)
+++ InversionOfControl/trunk/src/Castle.Windsor/Castle.Windsor-vs2008-SL.csproj
2009-12-21 22:46:52 UTC (rev 6515)
@@ -41,6 +41,10 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\lib\silverlight-3.0\Castle.Core.dll</HintPath>
</Reference>
+ <Reference Include="Castle.DynamicProxy2, Version=2.2.0.0,
Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\lib\silverlight-3.0\Castle.DynamicProxy2.dll</HintPath>
+ </Reference>
<Reference Include="System.Windows" />
<Reference Include="mscorlib" />
Directory: /InversionOfControl/trunk/src/Castle.Windsor/
========================================================
File [modified]: Castle.Windsor-vs2008-SL.csproj
Delta lines: +5 -5
===================================================================
--- InversionOfControl/trunk/src/Castle.Windsor/Proxy/DefaultProxyFactory.cs
2009-12-21 22:11:24 UTC (rev 6514)
+++ InversionOfControl/trunk/src/Castle.Windsor/Proxy/DefaultProxyFactory.cs
2009-12-21 22:46:52 UTC (rev 6515)
@@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#if !SILVERLIGHT
namespace Castle.Windsor.Proxy
{
@@ -24,6 +23,9 @@
using Castle.DynamicProxy;
using Castle.MicroKernel;
using Castle.MicroKernel.Proxy;
+#if (SILVERLIGHT)
+ using Castle.DynamicProxy.SilverlightExtensions;
+#endif
/// <summary>
/// This implementation of <see cref="IProxyFactory"/> relies
@@ -124,12 +126,12 @@
{
proxyGenOptions.Selector =
proxyOptions.Selector;
}
-
+#if (!SILVERLIGHT)
if (proxyOptions.UseMarshalByRefAsBaseClass)
{
proxyGenOptions.BaseTypeForInterfaceProxy =
typeof(MarshalByRefObject);
}
-
+#endif
foreach (object mixIn in proxyOptions.MixIns)
{
proxyGenOptions.AddMixinInstance(mixIn);
@@ -203,5 +205,3 @@
}
}
}
-
-#endif
File [modified]: WindsorContainer.cs
Delta lines: +1 -0
===================================================================
--- InversionOfControl/trunk/src/Castle.Windsor.Tests/SmartProxyTestCase.cs
2009-12-21 22:11:24 UTC (rev 6514)
+++ InversionOfControl/trunk/src/Castle.Windsor.Tests/SmartProxyTestCase.cs
2009-12-21 22:46:52 UTC (rev 6515)
@@ -15,6 +15,7 @@
namespace Castle.Windsor.Tests
{
using System.Runtime.Remoting;
+ using System.Diagnostics;
using Castle.Core.Interceptor;
using Castle.Windsor.Tests.Components;
Directory: /InversionOfControl/trunk/src/Castle.Windsor.Tests/
==============================================================
File [modified]: SmartProxyTestCase.cs
Delta lines: +0 -0
===================================================================
Directory: /InversionOfControl/trunk/src/Castle.Windsor/Proxy/
==============================================================
File [modified]: DefaultProxyFactory.cs
Delta lines: +0 -3
===================================================================
---
InversionOfControl/trunk/src/Castle.Windsor/Proxy/ProxyGenerationHookAdapter.cs
2009-12-21 22:11:24 UTC (rev 6514)
+++
InversionOfControl/trunk/src/Castle.Windsor/Proxy/ProxyGenerationHookAdapter.cs
2009-12-21 22:46:52 UTC (rev 6515)
@@ -12,7 +12,6 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#if !SILVERLIGHT
namespace Castle.Windsor.Proxy
{
@@ -51,5 +50,3 @@
}
}
}
-
-#endif
File [modified]: ProxyGenerationHookAdapter.cs
Delta lines: +1 -3
===================================================================
--- InversionOfControl/trunk/src/Castle.Windsor/WindsorContainer.cs
2009-12-21 22:11:24 UTC (rev 6514)
+++ InversionOfControl/trunk/src/Castle.Windsor/WindsorContainer.cs
2009-12-21 22:46:52 UTC (rev 6515)
@@ -148,9 +148,7 @@
this.name = name;
this.kernel = kernel;
-#if !SILVERLIGHT
this.kernel.ProxyFactory = new
Proxy.DefaultProxyFactory();
-#endif
this.installer = installer;
}
@@ -164,7 +162,7 @@
kernel = new DefaultKernel(proxyFactory);
- installer = new Installer.DefaultComponentInstaller();
+ installer = new DefaultComponentInstaller();
}
--
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.
