* Upgrade to .NET core 3.1 and Blazor 3.2.

* Fix for #42.
jspuij · Oct 21, 2020 · 813718c · 813718c
1 parent 1b02a90
commit 813718c
Show file tree

Hide file tree

Showing 29 changed files with 268 additions and 152 deletions.
diff --git a/build/build.props b/build/build.props
@@ -6,7 +6,7 @@
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageProjectUrl>https://github.com/jspuij/Cortex.Net</PackageProjectUrl>
     <DisableFody>true</DisableFody>
-    <Version>0.3.1</Version>
+    <Version>0.4.0</Version>
     <NeutralLanguage>en-US</NeutralLanguage>
 </PropertyGroup>
 <PropertyGroup>

diff --git a/docs/pages/changelog.md b/docs/pages/changelog.md
@@ -2,6 +2,11 @@
 
 The changelog is found below:
 
+## 0.4.0
+
+* Upgrade some dependencies.
+* Fix for https://github.com/jspuij/Cortex.Net/issues/42.
+
 ## 0.3.1
 
 * Upgrade to Blazor final 3.2.0

diff --git a/samples/Cortex.Net.BlazorTodo/Cortex.Net.BlazorTodo.csproj b/samples/Cortex.Net.BlazorTodo/Cortex.Net.BlazorTodo.csproj
@@ -19,15 +19,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.1.2">
+    <PackageReference Include="Fody" Version="6.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview3.20168.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/samples/FlightFinder.Client/FlightFinder.Client.csproj b/samples/FlightFinder.Client/FlightFinder.Client.csproj
@@ -19,14 +19,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.1.2">
+    <PackageReference Include="Fody" Version="6.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Blazor.HttpClient" Version="3.2.0-preview3.20168.3" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="3.2.1" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/samples/FlightFinder.Client/Program.cs b/samples/FlightFinder.Client/Program.cs
@@ -26,7 +26,9 @@ namespace FlightFinder.Client
     /// <summary>
     /// The program class. Bootstraps the WASM application.
     /// </summary>
+#pragma warning disable RCS1102 // Make class static.
     public class Program
+#pragma warning restore RCS1102 // Make class static.
     {
         /// <summary>
         /// Main entry point for the WASM application.

diff --git a/samples/FlightFinder.Server/FlightFinder.Server.csproj b/samples/FlightFinder.Server/FlightFinder.Server.csproj
@@ -19,7 +19,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/samples/FlightFinder.Shared/FlightFinder.Shared.csproj b/samples/FlightFinder.Shared/FlightFinder.Shared.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.1.2">
+    <PackageReference Include="Fody" Version="6.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Cortex.Net.Blazor/Cortex.Net.Blazor.csproj b/src/Cortex.Net.Blazor/Cortex.Net.Blazor.csproj
@@ -19,9 +19,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fody" Version="6.1.2" PrivateAssets="None" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.4" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Fody" Version="6.3.0" PrivateAssets="None" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.1.9" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Cortex.Net.Blazor/ObserverObject.cs b/src/Cortex.Net.Blazor/ObserverObject.cs
@@ -57,12 +57,12 @@ public sealed class ObserverObject : IDisposable
         /// <summary>
         /// The next fragment Id.
         /// </summary>
-        private int nextFragmentId = 0;
+        private int nextFragmentId;
 
         /// <summary>
         /// Gets the current RenderFragment.
         /// </summary>
-        private RenderFragment current = null;
+        private RenderFragment current;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ObserverObject"/> class.

diff --git a/src/Cortex.Net.DynamicData/Cortex.Net.DynamicData.csproj b/src/Cortex.Net.DynamicData/Cortex.Net.DynamicData.csproj
@@ -20,8 +20,8 @@
 
   <ItemGroup>
     <PackageReference Include="DynamicData" Version="6.14.18" />
-    <PackageReference Include="Fody" Version="6.1.2" PrivateAssets="None" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="Fody" Version="6.3.0" PrivateAssets="None" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Cortex.Net.Fody/ActionWeaver.cs b/src/Cortex.Net.Fody/ActionWeaver.cs
@@ -305,15 +305,18 @@ private void WeaveMethod(MethodDefinition methodDefinition)
 
             // push IL code for initialization of action members to the queue to emit in the ISharedState setter.
             this.processorQueue.SharedStateAssignmentQueue.Enqueue(
-                (declaringType,
-                false,
-                (processor, sharedStateBackingField) => this.EmitSharedStateSetter(
+                new SharedAssignmentQueueEntry
+                {
+                    ReactiveObjectTypeDefinition = declaringType,
+                    AddInjectAttribute = false,
+                    ProcessorAction = (processor, sharedStateBackingField) => this.EmitSharedStateSetter(
                     processor,
                     sharedStateBackingField,
                     methodDefinition,
                     actionName,
                     actionType,
-                    actionFieldDefinition)));
+                    actionFieldDefinition),
+                });
 
             // extend the action method body.
             ExtendActionMethodBody(methodDefinition, actionType, entranceCounterDefinition, actionFieldDefinition);
@@ -349,31 +352,37 @@ private void WeaveAsyncMethod(MethodDefinition methodDefinition)
 
             // push IL code for initialization of action members to the queue to emit in the ISharedState setter.
             this.processorQueue.SharedStateAssignmentQueue.Enqueue(
-                (stateMachineType,
-                false,
-                (processor, sharedStateBackingField) =>
-                {
-                    stateMachineSharedStateBackingField = sharedStateBackingField;
-                    if (declaringTypeSharedStateBackingField != null)
+                 new SharedAssignmentQueueEntry
+                 {
+                    ReactiveObjectTypeDefinition = stateMachineType,
+                    AddInjectAttribute = false,
+                    ProcessorAction = (processor, sharedStateBackingField) =>
                     {
-                        this.ExtendMoveNextMethodBody(moveNextMethod, methodDefinition, stateMachineSharedStateBackingField);
-                        this.ExtendAsyncMethodBody(methodDefinition, declaringTypeSharedStateBackingField, innerType);
-                    }
-                }));
+                        stateMachineSharedStateBackingField = sharedStateBackingField;
+                        if (declaringTypeSharedStateBackingField != null)
+                        {
+                            this.ExtendMoveNextMethodBody(moveNextMethod, methodDefinition, stateMachineSharedStateBackingField);
+                            this.ExtendAsyncMethodBody(methodDefinition, declaringTypeSharedStateBackingField, innerType);
+                        }
+                    },
+                 });
 
             // push IL code for initialization of IShared State of inner struct / class for async.
             this.processorQueue.SharedStateAssignmentQueue.Enqueue(
-                (declaringType,
-                false,
-                (processor, sharedStateBackingField) =>
-                {
-                    declaringTypeSharedStateBackingField = sharedStateBackingField;
-                    if (stateMachineSharedStateBackingField != null)
+                 new SharedAssignmentQueueEntry
+                 {
+                    ReactiveObjectTypeDefinition = declaringType,
+                    AddInjectAttribute = false,
+                    ProcessorAction = (processor, sharedStateBackingField) =>
                     {
-                        this.ExtendMoveNextMethodBody(moveNextMethod, methodDefinition, stateMachineSharedStateBackingField);
-                        this.ExtendAsyncMethodBody(methodDefinition, declaringTypeSharedStateBackingField, innerType);
-                    }
-                }));
+                        declaringTypeSharedStateBackingField = sharedStateBackingField;
+                        if (stateMachineSharedStateBackingField != null)
+                        {
+                            this.ExtendMoveNextMethodBody(moveNextMethod, methodDefinition, stateMachineSharedStateBackingField);
+                            this.ExtendAsyncMethodBody(methodDefinition, declaringTypeSharedStateBackingField, innerType);
+                        }
+                    },
+                 });
         }
 
         /// <summary>

diff --git a/src/Cortex.Net.Fody/BlazorObserverWeaver.cs b/src/Cortex.Net.Fody/BlazorObserverWeaver.cs
@@ -148,12 +148,18 @@ private void WeaveClass(TypeDefinition decoratedClass)
                 }
             }
 
-            this.processorQueue.SharedStateAssignmentQueue.Enqueue((decoratedClass, true, (processor, sharedStateBackingField) => this.EmitObserverObjectInit(
-                processor,
-                observerName,
-                innerObserverObjectField,
-                buildRenderTreeMethod,
-                stateHasChangedMethod)));
+            this.processorQueue.SharedStateAssignmentQueue.Enqueue(
+                new SharedAssignmentQueueEntry
+                {
+                    ReactiveObjectTypeDefinition = decoratedClass,
+                    AddInjectAttribute = true,
+                    ProcessorAction = (processor, sharedStateBackingField) => this.EmitObserverObjectInit(
+                        processor,
+                        observerName,
+                        innerObserverObjectField,
+                        buildRenderTreeMethod,
+                        stateHasChangedMethod),
+                });
 
             // add entrance counter field.
             var entranceCounterDefinition = decoratedType.CreateField(module.TypeSystem.Int32, $"{InnerCounterFieldPrefix}BuildRenderTree_EntranceCount", this.weavingContext, FieldAttributes.Private);

diff --git a/src/Cortex.Net.Fody/ComputedWeaver.cs b/src/Cortex.Net.Fody/ComputedWeaver.cs
@@ -53,15 +53,15 @@ public ComputedWeaver(ModuleWeaver parentWeaver, ISharedStateAssignmentILProcess
         internal void Execute()
         {
             var decoratedProperties = from t in this.ParentWeaver.ModuleDefinition.GetTypes()
-                                   from m in t.Properties
-                                   where
-                                      t != null &&
-                                      t.IsClass &&
-                                      t.BaseType != null &&
-                                      m != null &&
-                                      m.CustomAttributes != null &&
-                                      m.CustomAttributes.Any(x => x.AttributeType.FullName == this.WeavingContext.CortexNetApiComputedAttribute.FullName)
-                                   select m;
+                                      from m in t.Properties
+                                      where
+                                         t != null &&
+                                         t.IsClass &&
+                                         t.BaseType != null &&
+                                         m != null &&
+                                         m.CustomAttributes != null &&
+                                         m.CustomAttributes.Any(x => x.AttributeType.FullName == this.WeavingContext.CortexNetApiComputedAttribute.FullName)
+                                      select m;
 
             foreach (var decoratedProperty in decoratedProperties.ToList())
             {
@@ -144,17 +144,20 @@ private void WeaveProperty(PropertyDefinition propertyDefinition)
 
                 // push IL code for initialization of a computed member to the queue to emit in the ISharedState setter.
                 this.ProcessorQueue.SharedStateAssignmentQueue.Enqueue(
-                    (declaringType,
-                    false,
-                    (processor, sharedStateBackingField) => this.EmitComputedMemberAdd(
-                        processor,
-                        computedName,
-                        methodDefinition,
-                        propertyDefinition.SetMethod,
-                        equalityComparerType,
-                        requiresReaction,
-                        keepAlive,
-                        observableObjectField)));
+                    new SharedAssignmentQueueEntry
+                    {
+                        ReactiveObjectTypeDefinition = declaringType,
+                        AddInjectAttribute = false,
+                        ProcessorAction = (processor, sharedStateBackingField) => this.EmitComputedMemberAdd(
+                           processor,
+                           computedName,
+                           methodDefinition,
+                           propertyDefinition.SetMethod,
+                           equalityComparerType,
+                           requiresReaction,
+                           keepAlive,
+                           observableObjectField),
+                    });
 
                 var fieldAttributes = FieldAttributes.Private;
                 if (methodDefinition.IsStatic)
@@ -312,17 +315,20 @@ private void WeaveMethod(MethodDefinition methodDefinition)
 
             // push IL code for initialization of a computed member to the queue to emit in the ISharedState setter.
             this.ProcessorQueue.SharedStateAssignmentQueue.Enqueue(
-                (declaringType,
-                false,
-                (processor, sharedStateBackingField) => this.EmitComputedMemberAdd(
-                    processor,
-                    computedName,
-                    methodDefinition,
-                    null,
-                    equalityComparerType,
-                    requiresReaction,
-                    keepAlive,
-                    observableObjectField)));
+                 new SharedAssignmentQueueEntry
+                 {
+                     ReactiveObjectTypeDefinition = declaringType,
+                     AddInjectAttribute = false,
+                     ProcessorAction = (processor, sharedStateBackingField) => this.EmitComputedMemberAdd(
+                     processor,
+                     computedName,
+                     methodDefinition,
+                     null,
+                     equalityComparerType,
+                     requiresReaction,
+                     keepAlive,
+                     observableObjectField),
+                 });
 
             var fieldAttributes = FieldAttributes.Private;
             if (methodDefinition.IsStatic)
@@ -354,14 +360,17 @@ private FieldDefinition CreateObservableObjectField(TypeDefinition declaringType
 
                 // push IL code for initialization of observableObject to the queue to emit in the ISharedState setter.
                 this.ProcessorQueue.SharedStateAssignmentQueue.Enqueue(
-                    (declaringType,
-                    false,
-                    (processor, sharedStateBackingField) => this.EmitObservableObjectInit(
+                    new SharedAssignmentQueueEntry
+                    {
+                        ReactiveObjectTypeDefinition = declaringType,
+                        AddInjectAttribute = false,
+                        ProcessorAction = (processor, sharedStateBackingField) => this.EmitObservableObjectInit(
                         processor,
                         declaringType.Name,
                         defaultEhancerType,
                         sharedStateBackingField,
-                        observableObjectField)));
+                        observableObjectField),
+                    });
             }
 
             return observableObjectField;

diff --git a/src/Cortex.Net.Fody/Cortex.Net.Fody.csproj b/src/Cortex.Net.Fody/Cortex.Net.Fody.csproj
@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="FodyHelpers" Version="6.1.2" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
+    <PackageReference Include="FodyHelpers" Version="6.3.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/Cortex.Net.Fody/Cortex.Net.Fody.xml b/src/Cortex.Net.Fody/Cortex.Net.Fody.xml