Fix binding validation (#41)

* Fixed binding validation

.github/workflows/build.yaml

@@ -1,4 +1,10 @@
-on: [push, pull_request]
+on:
+  push:
+    branches:    
+      - master
+  pull_request:
+    branches:
+      - master
 
 name: Build
 
@@ -14,7 +20,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@master
       with:
-        dotnet-version: '3.1.300'
+        dotnet-version: '5.0.x'
 
     - name: Build
       run: dotnet build --configuration Release src

.github/workflows/release.yaml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@master
       with:
-        dotnet-version: '3.1.300'
+        dotnet-version: '5.0.x'
 
     - name: Build
       run: dotnet build --configuration Release src

README.md

@@ -168,9 +168,3 @@ This sample tries to incorporate a ports and adapters architectural approach and
 
 As an example the weather forecast view model just references the interface of the service that is responsible to gather data. For Blazor serverside, it directly populates it, for Blazor serverside it gathers them from an api. The advantages of such patterns will especially get interesting when Blazor Native and Blazor Embedded will be available.
 
-## Known projects
-These projects are know to use `MvvmBlazor`. They can be used as a reference for different implementation scenarios that go beyond the samples.
-
-- [BlazorPlanningPoker](https://github.com/brandon-james105/BlazorPlanningPoker)
-
-If you want to see your project here, just create an issue.

samples/BlazorClientsideSample.Server/BlazorClientsideSample.Server.csproj

@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>7.3</LangVersion>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

samples/BlazorServersideSample/BlazorServersideSample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

src/MvvmBlazor.Tests/Components/MvvmComponentBaseTests.cs

@@ -112,24 +112,21 @@ public void AddBinding_Throws_WhenBindingMemberIsAField()
             var wemf = new Mock<IWeakEventManagerFactory>();
             var wem = new Mock<IWeakEventManager>();
             var bindingFactory = new Mock<IBindingFactory>();
-            var binding = new Mock<IBinding>();
             serviceProvider.Setup(x => x.GetService(typeof(IWeakEventManagerFactory))).Returns(wemf.Object)
                 .Verifiable();
             serviceProvider.Setup(x => x.GetService(typeof(IBindingFactory))).Returns(bindingFactory.Object)
                 .Verifiable();
             wemf.Setup(x => x.Create()).Returns(wem.Object).Verifiable();
-            bindingFactory.Setup(x => x.Create(It.IsAny<INotifyPropertyChanged>(), It.IsAny<PropertyInfo>(),
-                It.IsAny<IWeakEventManager>())).Returns(binding.Object).Verifiable();
 
             var component = new TestComponent(serviceProvider.Object);
             Should.Throw<BindingException>(() => component.AddBinding(viewModel, x => x._testProperty));
 
             serviceProvider.Verify();
             wemf.Verify();
-            serviceProvider.VerifyNoOtherCalls();
+
             wemf.VerifyNoOtherCalls();
+            serviceProvider.VerifyNoOtherCalls();
             bindingFactory.VerifyNoOtherCalls();
-            binding.VerifyNoOtherCalls();
             wem.VerifyNoOtherCalls();
         }
 
@@ -141,24 +138,21 @@ public void AddBinding_Throws_WhenBindingMemberIsAMethod()
             var wemf = new Mock<IWeakEventManagerFactory>();
             var wem = new Mock<IWeakEventManager>();
             var bindingFactory = new Mock<IBindingFactory>();
-            var binding = new Mock<IBinding>();
             serviceProvider.Setup(x => x.GetService(typeof(IWeakEventManagerFactory))).Returns(wemf.Object)
                 .Verifiable();
             serviceProvider.Setup(x => x.GetService(typeof(IBindingFactory))).Returns(bindingFactory.Object)
                 .Verifiable();
             wemf.Setup(x => x.Create()).Returns(wem.Object).Verifiable();
-            bindingFactory.Setup(x => x.Create(It.IsAny<INotifyPropertyChanged>(), It.IsAny<PropertyInfo>(),
-                It.IsAny<IWeakEventManager>())).Returns(binding.Object).Verifiable();
 
             var component = new TestComponent(serviceProvider.Object);
             Should.Throw<BindingException>(() => component.AddBinding(viewModel, x => x.ShouldRender()));
 
             serviceProvider.Verify();
             wemf.Verify();
+
             serviceProvider.VerifyNoOtherCalls();
             wemf.VerifyNoOtherCalls();
             bindingFactory.VerifyNoOtherCalls();
-            binding.VerifyNoOtherCalls();
             wem.VerifyNoOtherCalls();
         }
 
@@ -170,54 +164,47 @@ public void AddBinding_Throws_WhenPropertyExpressionIsNull()
             var wemf = new Mock<IWeakEventManagerFactory>();
             var wem = new Mock<IWeakEventManager>();
             var bindingFactory = new Mock<IBindingFactory>();
-            var binding = new Mock<IBinding>();
             serviceProvider.Setup(x => x.GetService(typeof(IWeakEventManagerFactory))).Returns(wemf.Object)
                 .Verifiable();
             serviceProvider.Setup(x => x.GetService(typeof(IBindingFactory))).Returns(bindingFactory.Object)
                 .Verifiable();
             wemf.Setup(x => x.Create()).Returns(wem.Object).Verifiable();
-            bindingFactory.Setup(x => x.Create(It.IsAny<INotifyPropertyChanged>(), It.IsAny<PropertyInfo>(),
-                It.IsAny<IWeakEventManager>())).Returns(binding.Object).Verifiable();
 
             var component = new TestComponent(serviceProvider.Object);
             Should.Throw<BindingException>(() => component.AddBinding<TestViewModel, string>(viewModel, null));
 
             serviceProvider.Verify();
             wemf.Verify();
+
             serviceProvider.VerifyNoOtherCalls();
             wemf.VerifyNoOtherCalls();
             bindingFactory.VerifyNoOtherCalls();
-            binding.VerifyNoOtherCalls();
             wem.VerifyNoOtherCalls();
         }
 
         [Fact]
         public void AddBinding_Throws_WhenViewModelIsNull()
         {
-            var viewModel = new TestViewModel();
             var serviceProvider = new Mock<IServiceProvider>();
             var wemf = new Mock<IWeakEventManagerFactory>();
             var wem = new Mock<IWeakEventManager>();
             var bindingFactory = new Mock<IBindingFactory>();
-            var binding = new Mock<IBinding>();
             serviceProvider.Setup(x => x.GetService(typeof(IWeakEventManagerFactory))).Returns(wemf.Object)
                 .Verifiable();
             serviceProvider.Setup(x => x.GetService(typeof(IBindingFactory))).Returns(bindingFactory.Object)
                 .Verifiable();
             wemf.Setup(x => x.Create()).Returns(wem.Object).Verifiable();
-            bindingFactory.Setup(x => x.Create(It.IsAny<INotifyPropertyChanged>(), It.IsAny<PropertyInfo>(),
-                It.IsAny<IWeakEventManager>())).Returns(binding.Object).Verifiable();
 
             var component = new TestComponent(serviceProvider.Object);
             Should.Throw<BindingException>(() =>
-                component.AddBinding<TestViewModel, string>(null, x => x.TestProperty));
+                component.AddBinding<TestViewModel, string>(null!, x => x.TestProperty));
 
             serviceProvider.Verify();
             wemf.Verify();
+
             serviceProvider.VerifyNoOtherCalls();
             wemf.VerifyNoOtherCalls();
             bindingFactory.VerifyNoOtherCalls();
-            binding.VerifyNoOtherCalls();
             wem.VerifyNoOtherCalls();
         }
 
@@ -264,6 +251,8 @@ public void Binding_BindingValueChanged_GetsInvoked()
                 It.IsAny<IWeakEventManager>())).Returns(binding.Object).Verifiable();
             binding.Setup(x => x.GetValue()).Returns("Test").Verifiable();
             binding.Setup(x => x.Initialize()).Verifiable();
+            binding.SetupAdd(m => m.BindingValueChanged += It.IsAny<EventHandler>()).Verifiable();
+
 
             var bindingChangedInvoked = false;
             var component = new TestComponent(serviceProvider.Object)

src/MvvmBlazor.Tests/MvvmBlazor.Tests.csproj

@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>net5.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Moq" Version="4.13.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
-    <PackageReference Include="Shouldly" Version="3.0.2" />
+    <PackageReference Include="Moq" Version="4.15.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Include="Shouldly" Version="4.0.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

src/MvvmBlazor/Components/MvvmComponentBase.cs

@@ -34,9 +34,9 @@ protected MvvmComponentBase()
 
         private void InitializeDependencies()
         {
-            _weakEventManagerFactory ??= ServiceProvider.GetRequiredService<IWeakEventManagerFactory>();
-            _bindingFactory ??= ServiceProvider.GetRequiredService<IBindingFactory>();
-            _weakEventManager ??= _weakEventManagerFactory.Create();
+            _weakEventManagerFactory = ServiceProvider.GetRequiredService<IWeakEventManagerFactory>();
+            _bindingFactory = ServiceProvider.GetRequiredService<IBindingFactory>();
+            _weakEventManager = _weakEventManagerFactory.Create();
         }
 
         protected internal TValue Bind<TViewModel, TValue>(TViewModel viewModel,
@@ -87,8 +87,8 @@ protected static PropertyInfo ValidateAndResolveBindingContext<TViewModel, TValu
 
             if (!(m.Member is PropertyInfo p))
                 throw new BindingException("Binding member needs to be a property");
-
-            if (p.DeclaringType != viewModel.GetType())
+            
+            if (typeof(TViewModel).GetProperty(p.Name) is null)
                 throw new BindingException($"Cannot find property {p.Name} in type {viewModel.GetType().FullName}");
 
             return p;

src/MvvmBlazor/MvvmBlazor.csproj

@@ -14,15 +14,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="IDisposableAnalyzers" Version="3.3.9">
+    <PackageReference Include="IDisposableAnalyzers" Version="3.4.6">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNetCore.Components" Version="3.1.6" />
     <PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.1">
       <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
   </ItemGroup>