MissingMethodException on getting ResourceInstance from ODataResourceSerializer

src/Microsoft.AspNet.OData.Shared/Query/Expressions/SelectExpandBinder.cs

@@ -293,9 +293,10 @@ internal Expression ProjectElement(Expression source, SelectExpandClause selectE
                 LinqParameterContainer.Parameterize(typeof(string), _modelID) :
                 Expression.Constant(_modelID);
             wrapperTypeMemberAssignments.Add(Expression.Bind(wrapperProperty, wrapperPropertyValueExpression));
-
+            bool instanseOfWrapperClassWasSet = false;
             if (IsSelectAll(selectExpandClause))
             {
+                instanseOfWrapperClassWasSet = true;
                 // Initialize property 'Instance' on the wrapper class
                 wrapperProperty = wrapperType.GetProperty("Instance");
                 wrapperTypeMemberAssignments.Add(Expression.Bind(wrapperProperty, source));
@@ -349,7 +350,11 @@ internal Expression ProjectElement(Expression source, SelectExpandClause selectE
 
             Type wrapperGenericType = GetWrapperGenericType(isInstancePropertySet, isTypeNamePropertySet, isContainerPropertySet);
             wrapperType = wrapperGenericType.MakeGenericType(elementType);
-            return Expression.MemberInit(Expression.New(wrapperType), wrapperTypeMemberAssignments);
+
+            if (instanseOfWrapperClassWasSet)
+                return Expression.MemberInit(Expression.New(wrapperType), wrapperTypeMemberAssignments);
+            ConstructorInfo constructorWithInstanse = wrapperType.GetConstructors().Single(c => c.GetParameters().Length == 1);
+            return Expression.MemberInit(Expression.New(constructorWithInstanse, source), wrapperTypeMemberAssignments);
         }
 
         /// <summary>
@@ -1243,18 +1248,54 @@ property selection combination possible. */
 
         private class SelectAllAndExpand<TEntity> : SelectExpandWrapper<TEntity>
         {
+            public SelectAllAndExpand(TEntity entity) : base(entity)
+            {
+
+            }
+
+            public SelectAllAndExpand()
+            {
+
+            }
         }
 
         private class SelectAll<TEntity> : SelectExpandWrapper<TEntity>
         {
+            public SelectAll(TEntity entity) : base(entity)
+            {
+
+            }
+
+            public SelectAll()
+            {
+
+            }
         }
 
         private class SelectSomeAndInheritance<TEntity> : SelectExpandWrapper<TEntity>
         {
+            public SelectSomeAndInheritance(TEntity entity) : base(entity)
+            {
+
+            }
+
+            public SelectSomeAndInheritance()
+            {
+
+            }
         }
 
         private class SelectSome<TEntity> : SelectAllAndExpand<TEntity>
         {
+            public SelectSome(TEntity entity) : base(entity)
+            {
+
+            }
+
+            public SelectSome()
+            {
+
+            }
         }
     }
 }

src/Microsoft.AspNet.OData.Shared/Query/Expressions/SelectExpandWrapperOfT.cs

@@ -17,6 +17,16 @@ namespace Microsoft.AspNet.OData.Query.Expressions
     [JsonConverter(typeof(SelectExpandWrapperConverter))]
     internal class SelectExpandWrapper<TElement> : SelectExpandWrapper
     {
+        public SelectExpandWrapper(TElement element)
+        {
+            Instance = element;
+        }
+
+        public SelectExpandWrapper()
+        {
+
+        }
+
         /// <summary>
         /// Gets or sets the instance of the element being selected and expanded.
         /// </summary>

test/UnitTest/Microsoft.AspNet.OData.Test.Shared/Query/Expressions/SelectExpandBinderTest.cs

@@ -109,10 +109,12 @@ public void Bind_GeneratedExpression_ContainsExpandedObject()
 
             // Assert
             IEnumerator enumerator = queryable.GetEnumerator();
+            IEnumerator _querableEnumerator = _queryable.GetEnumerator();
             Assert.True(enumerator.MoveNext());
+            Assert.True(_querableEnumerator.MoveNext());
             var partialCustomer = Assert.IsAssignableFrom<SelectExpandWrapper<QueryCustomer>>(enumerator.Current);
             Assert.False(enumerator.MoveNext());
-            Assert.Null(partialCustomer.Instance);
+            Assert.Equal(_querableEnumerator.Current, partialCustomer.Instance);
             Assert.Equal("Microsoft.AspNet.OData.Test.Query.Expressions.QueryCustomer", partialCustomer.InstanceType);
             IEnumerable<SelectExpandWrapper<QueryOrder>> innerOrders = partialCustomer.Container
                 .ToDictionary(PropertyMapper)["Orders"] as IEnumerable<SelectExpandWrapper<QueryOrder>>;
@@ -464,7 +466,7 @@ public void ProjectAsWrapper_Element_ProjectedValueContainsInstance_IfSelectionI
         }
 
         [Fact]
-        public void ProjectAsWrapper_Element_ProjectedValueDoesNotContainInstance_IfSelectionIsPartial()
+        public void ProjectAsWrapper_Element_ProjectedValueShouldContainInstance_IfSelectionIsPartial()
         {
             // Arrange
             string select = "Id,Orders";
@@ -486,7 +488,7 @@ public void ProjectAsWrapper_Element_ProjectedValueDoesNotContainInstance_IfSele
             Assert.Empty((projection as MemberInitExpression).Bindings.Where(p => p.Member.Name == "Instance"));
             Assert.NotEmpty((projection as MemberInitExpression).Bindings.Where(p => p.Member.Name == "InstanceType"));
             SelectExpandWrapper<QueryCustomer> customerWrapper = Expression.Lambda(projection).Compile().DynamicInvoke() as SelectExpandWrapper<QueryCustomer>;
-            Assert.Null(customerWrapper.Instance);
+            Assert.Equal(aCustomer, customerWrapper.Instance);
             Assert.Equal("Microsoft.AspNet.OData.Test.Query.Expressions.QueryCustomer", customerWrapper.InstanceType);
         }
 

test/UnitTest/Microsoft.AspNet.OData.Test.Shared/Query/Expressions/SelectExpandWrapperTest.cs

@@ -76,10 +76,10 @@ public void TryGetValue_ReturnsValueFromPropertyContainer_IfPresent()
             MockPropertyContainer container = new MockPropertyContainer();
             container.Properties.Add("SampleProperty", expectedPropertyValue);
             SelectExpandWrapper<TestEntity> wrapper = new SelectExpandWrapper<TestEntity>
-                {
-                    ModelID = _modelID,
-                    Container = container
-                };
+            {
+                ModelID = _modelID,
+                Container = container
+            };
             wrapper.Instance = new TestEntity();
 
             object value;
@@ -95,10 +95,10 @@ public void TryGetValue_ReturnsValueFromInstance_IfNotPresentInContainer()
             object expectedPropertyValue = new object();
             MockPropertyContainer container = new MockPropertyContainer();
             SelectExpandWrapper<TestEntity> wrapper = new SelectExpandWrapper<TestEntity>
-                {
-                    ModelID = _modelID,
-                    Container = container
-                };
+            {
+                ModelID = _modelID,
+                Container = container
+            };
             wrapper.Instance = new TestEntity { SampleProperty = expectedPropertyValue };
             wrapper.UseInstanceForProperties = true;
 
@@ -133,7 +133,7 @@ public void TryGetValue_PropertyAliased_IfAnnotationSet()
                 _model.CustomerName,
                 new ClrPropertyInfoAnnotation(typeof(TestEntityWithAlias).GetProperty("SampleProperty")));
             object expectedPropertyValue = new object();
-            SelectExpandWrapper<TestEntityWithAlias> wrapper = new SelectExpandWrapper<TestEntityWithAlias> { ModelID = _modelID };
+            SelectExpandWrapper<TestEntityWithAlias> wrapper = new SelectExpandWrapper<TestEntityWithAlias>() { ModelID = _modelID };
             wrapper.Instance = new TestEntityWithAlias { SampleProperty = expectedPropertyValue };
             wrapper.UseInstanceForProperties = true;
 
@@ -248,7 +248,7 @@ public void ToDictionary_Throws_IfMapperProvider_ReturnsNullPropertyMapper()
                 (IEdmModel m, IEdmStructuredType t) => null;
 
             // Act & Assert
-            ExceptionAssert.Throws<InvalidOperationException>(() => 
+            ExceptionAssert.Throws<InvalidOperationException>(() =>
                 wrapper.ToDictionary(mapperProvider: mapperProvider),
                 "The mapper provider must return a valid 'Microsoft.AspNet.OData.Query.IPropertyMapper' instance for the given 'NS.Name' IEdmType.");
         }
@@ -261,12 +261,12 @@ public void ToDictionary_Throws_IfMappingIsNullOrEmpty_ForAGivenProperty(string
             // Arrange
             EdmEntityType entityType = new EdmEntityType("NS", "Name");
             entityType.AddStructuralProperty("SampleProperty", EdmPrimitiveTypeKind.Int32);
-            
+
             EdmModel model = new EdmModel();
             model.AddElement(entityType);
             model.SetAnnotationValue(entityType, new ClrTypeAnnotation(typeof(TestEntity)));
             IEdmTypeReference edmType = new EdmEntityTypeReference(entityType, isNullable: false);
-            
+
             SelectExpandWrapper<TestEntity> testWrapper = new SelectExpandWrapper<TestEntity>
             {
                 Instance = new TestEntity { SampleProperty = 42 },
@@ -281,7 +281,7 @@ public void ToDictionary_Throws_IfMappingIsNullOrEmpty_ForAGivenProperty(string
 
             // Act & Assert
             ExceptionAssert.Throws<InvalidOperationException>(() =>
-                testWrapper.ToDictionary(mapperProvider), 
+                testWrapper.ToDictionary(mapperProvider),
                 "The key mapping for the property 'SampleProperty' can't be null or empty.");
         }
 
@@ -291,19 +291,19 @@ public void ToDictionary_AppliesMappingToAllProperties_IfInstanceIsNotNull()
             // Arrange
             EdmEntityType entityType = new EdmEntityType("NS", "Name");
             entityType.AddStructuralProperty("SampleProperty", EdmPrimitiveTypeKind.Int32);
-            
+
             EdmModel model = new EdmModel();
             model.AddElement(entityType);
             model.SetAnnotationValue(entityType, new ClrTypeAnnotation(typeof(TestEntity)));
             IEdmTypeReference edmType = new EdmEntityTypeReference(entityType, isNullable: false);
-            
+
             SelectExpandWrapper<TestEntity> testWrapper = new SelectExpandWrapper<TestEntity>
             {
                 Instance = new TestEntity { SampleProperty = 42 },
                 ModelID = ModelContainer.GetModelID(model),
                 UseInstanceForProperties = true,
             };
-            
+
             Mock<IPropertyMapper> mapperMock = new Mock<IPropertyMapper>();
             mapperMock.Setup(m => m.MapProperty("SampleProperty")).Returns("Sample");
             Func<IEdmModel, IEdmStructuredType, IPropertyMapper> mapperProvider =