From 84b6dd5cae272e0b40877eedcea7512ddc7b5a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B8ineslien?= <jonasro@gmail.com>
Date: Tue, 29 Oct 2013 20:54:49 +0100
Subject: [PATCH 1/2] fix issue 35

---
 Castle.Core.sln                                 |  2 +-
 .../Castle.Core.Tests-SL.csproj                 | 17 ++++++++++++-----
 src/Castle.Core.Tests/Castle.Core.Tests.csproj  |  1 +
 .../ClassProxyWithDefaultValuesTestCase.cs      | 12 ++++++++++++
 .../Generators/Emitters/MethodEmitter.cs        |  2 +-
 5 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/Castle.Core.sln b/Castle.Core.sln
index 9e6312f9fc..87eb7b32cf 100644
--- a/Castle.Core.sln
+++ b/Castle.Core.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.20827.3
+VisualStudioVersion = 12.0.21005.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8C53C104-3557-4C1A-B653-C4E6C46DB48E}"
 	ProjectSection(SolutionItems) = preProject
diff --git a/src/Castle.Core.Tests-SL/Castle.Core.Tests-SL.csproj b/src/Castle.Core.Tests-SL/Castle.Core.Tests-SL.csproj
index 7c8464710e..3f3b3ed4b1 100644
--- a/src/Castle.Core.Tests-SL/Castle.Core.Tests-SL.csproj
+++ b/src/Castle.Core.Tests-SL/Castle.Core.Tests-SL.csproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(MSBuildToolsVersion)' == '3.5'">
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
   </PropertyGroup>
@@ -7,7 +10,9 @@
     <RootPath Condition=" '$(RootPath)' == '' ">$(MSBuildProjectDirectory)\..\..</RootPath>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
-    <UpgradeBackupLocation />
+    <UpgradeBackupLocation>
+    </UpgradeBackupLocation>
+    <TargetFrameworkVersion>v5.0</TargetFrameworkVersion>
   </PropertyGroup>
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">SL50-Debug</Configuration>
@@ -100,7 +105,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>  
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'NET45-Debug|AnyCPU'">
     <OutputPath>bin\NET45-Debug\</OutputPath>
     <DefineConstants>TRACE;SILVERLIGHT</DefineConstants>
@@ -152,13 +157,15 @@
     <ApplicationDefinition Include="App.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
     </ApplicationDefinition>
   </ItemGroup>
   <ItemGroup>
     <None Include="Properties\AppManifest.xml" />
   </ItemGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v4.0\Microsoft.Silverlight.CSharp.targets" Condition="$(MSBuildTargets) == 'Silverlight 4.0'" />
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v5.0\Microsoft.Silverlight.CSharp.targets" Condition="$(MSBuildTargets) == 'Silverlight 5.0'" />  
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Silverlight\$(SilverlightVersion)\Microsoft.Silverlight.CSharp.targets" Condition="$(MSBuildTargets) == 'Silverlight 4.0'" />
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\Silverlight\v5.0\Microsoft.Silverlight.CSharp.targets" Condition="$(MSBuildTargets) == 'Silverlight 5.0'" />
   <Import Project="$(RootPath)\Settings.proj" />
   <Import Project="$(BuildScriptsPath)\Castle.Common.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Castle.Core.Tests/Castle.Core.Tests.csproj b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
index b2cd9142fb..cc6dbcc80e 100644
--- a/src/Castle.Core.Tests/Castle.Core.Tests.csproj
+++ b/src/Castle.Core.Tests/Castle.Core.Tests.csproj
@@ -251,6 +251,7 @@
     <Compile Include="BugsReported\DynProxy159.cs" />
     <Compile Include="BugsReported\DynProxy145_SynchronizationContext.cs" />
     <Compile Include="DynamicProxy.Tests\Classes\ClassWithMethodWithParameterWithDefaultValue.cs" />
+    <Compile Include="DynamicProxy.Tests\Classes\ClassWithMethodWithParameterWithNullDefaultValue.cs" />
     <Compile Include="DynamicProxy.Tests\ClassProxyWithDefaultValuesTestCase.cs" />
     <Compile Include="DynamicProxy.Tests\GenericInterfaceWithGenericMethod.cs" />
     <Compile Include="MultipleSavedAssembliesTestCase.cs" />
diff --git a/src/Castle.Core.Tests/DynamicProxy.Tests/ClassProxyWithDefaultValuesTestCase.cs b/src/Castle.Core.Tests/DynamicProxy.Tests/ClassProxyWithDefaultValuesTestCase.cs
index 43bca5343e..bbc35f67e6 100644
--- a/src/Castle.Core.Tests/DynamicProxy.Tests/ClassProxyWithDefaultValuesTestCase.cs
+++ b/src/Castle.Core.Tests/DynamicProxy.Tests/ClassProxyWithDefaultValuesTestCase.cs
@@ -18,6 +18,8 @@ namespace Castle.DynamicProxy.Tests
 
 	using Castle.DynamicProxy.Tests.Classes;
 
+	using CastleTests.DynamicProxy.Tests.Classes;
+
 	using NUnit.Framework;
 
 	[TestFixture]
@@ -34,6 +36,16 @@ public void MethodParameterWithDefaultValue_DefaultValueIsSetOnProxiedMethodAsWe
 			Assert.True(parameter.HasDefaultValue);
 			Assert.AreEqual(3, parameter.DefaultValue);
 		}
+
+	    [Test]
+	    public void MethodParameterWithDefaultValue_DefaultValueNullIsSetOnProxiedMethodAsWell()
+	    {
+            var proxiedType = generator.CreateClassProxy<ClassWithMethodWithParameterWithNullDefaultValue>().GetType();
+
+            var parameter = proxiedType.GetMethod("Method").GetParameters().Single(paramInfo => paramInfo.Name == "value");
+
+            Assert.False(parameter.HasDefaultValue);
+	    }
 #endif
 	}
 }
\ No newline at end of file
diff --git a/src/Castle.Core/DynamicProxy/Generators/Emitters/MethodEmitter.cs b/src/Castle.Core/DynamicProxy/Generators/Emitters/MethodEmitter.cs
index a7a873a011..a25d158457 100644
--- a/src/Castle.Core/DynamicProxy/Generators/Emitters/MethodEmitter.cs
+++ b/src/Castle.Core/DynamicProxy/Generators/Emitters/MethodEmitter.cs
@@ -157,7 +157,7 @@ private void DefineParameters(ParameterInfo[] parameters)
 					parameterBuilder.SetCustomAttribute(attribute);
 				}
 #if DOTNET45
-				if (parameter.HasDefaultValue)
+				if (parameter.HasDefaultValue && parameter.DefaultValue != null)
 				{
 					parameterBuilder.SetConstant(parameter.DefaultValue);
 				}

From 5ab532ca7fd2497e47bd83d6286af153e1f40ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B8ineslien?= <jonasro@gmail.com>
Date: Mon, 11 Nov 2013 14:57:19 +0100
Subject: [PATCH 2/2] Added test for issue #35

---
 .../ClassProxyWithDefaultValuesTestCase.cs    | 10 ++++++++
 ...MethodWithParameterWithNullDefaultValue.cs | 24 +++++++++++++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 src/Castle.Core.Tests/DynamicProxy.Tests/Classes/ClassWithMethodWithParameterWithNullDefaultValue.cs

diff --git a/src/Castle.Core.Tests/DynamicProxy.Tests/ClassProxyWithDefaultValuesTestCase.cs b/src/Castle.Core.Tests/DynamicProxy.Tests/ClassProxyWithDefaultValuesTestCase.cs
index bbc35f67e6..77eea4011c 100644
--- a/src/Castle.Core.Tests/DynamicProxy.Tests/ClassProxyWithDefaultValuesTestCase.cs
+++ b/src/Castle.Core.Tests/DynamicProxy.Tests/ClassProxyWithDefaultValuesTestCase.cs
@@ -44,8 +44,18 @@ public void MethodParameterWithDefaultValue_DefaultValueNullIsSetOnProxiedMethod
 
             var parameter = proxiedType.GetMethod("Method").GetParameters().Single(paramInfo => paramInfo.Name == "value");
 
+
             Assert.False(parameter.HasDefaultValue);
 	    }
+
+	    [Test]
+	    public void MethodParameterWithDefaultValue_UseNullDefaultValue()
+	    {
+	        var proxiedType = generator.CreateClassProxy<ClassWithMethodWithParameterWithNullDefaultValue>();
+	        var result = proxiedType.Method();
+
+            Assert.IsTrue(result);
+	    }
 #endif
 	}
 }
\ No newline at end of file
diff --git a/src/Castle.Core.Tests/DynamicProxy.Tests/Classes/ClassWithMethodWithParameterWithNullDefaultValue.cs b/src/Castle.Core.Tests/DynamicProxy.Tests/Classes/ClassWithMethodWithParameterWithNullDefaultValue.cs
new file mode 100644
index 0000000000..52e21bee90
--- /dev/null
+++ b/src/Castle.Core.Tests/DynamicProxy.Tests/Classes/ClassWithMethodWithParameterWithNullDefaultValue.cs
@@ -0,0 +1,24 @@
+// Copyright 2004-2013 Castle Project - http://www.castleproject.org/
+// 
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// 
+//     http://www.apache.org/licenses/LICENSE-2.0
+// 
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+namespace CastleTests.DynamicProxy.Tests.Classes
+{
+    public class ClassWithMethodWithParameterWithNullDefaultValue
+    {
+        public virtual bool Method(int? value = null)
+        {
+            return value == null;
+        }
+    }
+}