Finish fixing those pesky generics bugs

Syrus666 · Apr 7, 2015 · ec958df · ec958df
1 parent aae9e2e
commit ec958df
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/Nuget/ReactiveUIFody.nuspec b/Nuget/ReactiveUIFody.nuspec
@@ -2,12 2,12 @@
 <package >
  <metadata>
  <id>ReactiveUI.Fody</id>
- <version>1.0.33</version>
  <version>1.0.36</version>
  <authors>kirk</authors>
  <owners>kirk</owners>
  <projectUrl>https://github.com/kswoll/ReactiveUI.Fody</projectUrl>
  <licenseUrl>http://www.opensource.org/licenses/mit-license.php</licenseUrl>
- <releaseNotes>Fix bug when using auto property initializers on reactive properties.</releaseNotes>
  <releaseNotes>Fix some other bugs around properties in generic types.</releaseNotes>
  <requireLicenseAcceptance>false</requireLicenseAcceptance>
  <description>Fody extension to generate RaisePropertyChange notifications for properties and ObservableAsPropertyHelper properties.</description>
  <copyright>Copyright 2015</copyright>

diff --git a/ReactiveUI.Fody/CecilExtensions.cs b/ReactiveUI.Fody/CecilExtensions.cs
@@ -66,7 66,7 @@ public static MethodReference Bind(this MethodReference method, GenericInstanceT
 
  return reference;
  }
-
  /*
  public static MethodReference BindDefinition(this MethodReference method, TypeReference genericTypeDefinition)
  {
  if (!genericTypeDefinition.HasGenericParameters)
@@ -87,7 87,7 @@ public static MethodReference BindDefinition(this MethodReference method, TypeRe
 
  return reference;
  }
-
  */
  public static FieldReference BindDefinition(this FieldReference field, TypeReference genericTypeDefinition)
  {
  if (!genericTypeDefinition.HasGenericParameters)

diff --git a/ReactiveUI.Fody/ReactiveUIPropertyWeaver.cs b/ReactiveUI.Fody/ReactiveUIPropertyWeaver.cs
@@ -75,10 75,20 @@ public void Execute()
  il.Emit(OpCodes.Ret); // Return the field value that is lying on the stack
  });
 
- var genericRaiseAndSetIfChangedMethod = raiseAndSetIfChangedMethod.MakeGenericMethod(targetType, property.PropertyType);
  TypeReference genericTargetType = targetType;
  if (targetType.HasGenericParameters)
  {
  var genericDeclaration = new GenericInstanceType(targetType);
  foreach (var parameter in targetType.GenericParameters)
  {
  genericDeclaration.GenericArguments.Add(parameter);
  }
  genericTargetType = genericDeclaration;
  }
 
  var methodReference = raiseAndSetIfChangedMethod.MakeGenericMethod(genericTargetType, property.PropertyType);
 
  // Build out the setter which fires the RaiseAndSetIfChanged method
- var methodReference = genericRaiseAndSetIfChangedMethod.BindDefinition(targetType);
  property.SetMethod.Body = new MethodBody(property.SetMethod);
  property.SetMethod.Body.Emit(il =>
  {