Resolved issues the ASP Net Core work had introduced into fsharp

JamesRandall · Feb 6, 2020 · 17740ad · 17740ad
1 parent c8a80c7
commit 17740ad
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,5 @@
 <Project>
  <PropertyGroup>
-   <CommonPackageVersion>4.0.38-beta.4</CommonPackageVersion>
+   <CommonPackageVersion>4.0.39-beta.4</CommonPackageVersion>
  </PropertyGroup>
 </Project>
diff --git a/Source/FunctionMonkey.Abstractions/Builders/Model/AbstractFunctionDefinition.cs b/Source/FunctionMonkey.Abstractions/Builders/Model/AbstractFunctionDefinition.cs
@@ -48,6 +48,7 @@ protected AbstractFunctionDefinition(string namePrefix, Type commandType, Type e
             Name = string.Concat(namePrefix,commandType.GetFunctionName());
             CommandType = commandType;
             _explicitCommandResultType = explicitCommandResultType;
+            CommandResultType = explicitCommandResultType;
         }
 
         public IReadOnlyCollection<ImmutableTypeConstructorParameter> ImmutableTypeConstructorParameters { get; set; }

diff --git a/Source/FunctionMonkey.Abstractions/Builders/Model/AbstractOutputBinding.cs b/Source/FunctionMonkey.Abstractions/Builders/Model/AbstractOutputBinding.cs
@@ -16,6 +16,6 @@ protected AbstractOutputBinding(string commandResultTypeItemName)
             _commandResultTypeItemName = commandResultTypeItemName;
         }
 
-        public string CommandResultItemTypeName => _associatedFunctionDefinition.CommandResultItemTypeName ?? _commandResultTypeItemName;
+        public string CommandResultItemTypeName => _associatedFunctionDefinition?.CommandResultItemTypeName ?? _commandResultTypeItemName;
     }
 }
diff --git a/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec b/Source/FunctionMonkey.Compiler/FunctionMonkey.Compiler.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2012/06/nuspec.xsd">
   <metadata>
     <id>FunctionMonkey.Compiler</id>
-    <version>4.0.38-beta.4</version>
+    <version>4.0.39-beta.4</version>
     <authors>James Randall</authors>
     <description>Generates Azure Functions from command registrations</description>
     <licenseUrl>https://raw.githubusercontent.com/JamesRandall/FunctionMonkey/master/LICENSE</licenseUrl>

diff --git a/Source/FunctionMonkey/RuntimeInstance.cs b/Source/FunctionMonkey/RuntimeInstance.cs
@@ -124,7 +124,7 @@ public RuntimeInstance(Assembly functionAppConfigurationAssembly,
                 compileTarget = functionCompilerMetadata.CompilerOptions.HttpTarget;
             }
 
-            RegisterCoreDependencies(builder.MediatorType, FunctionDefinitions, compileTarget);
+            RegisterCoreDependencies(builder?.MediatorType ?? typeof(DefaultMediatorDecorator), FunctionDefinitions, compileTarget);
 
             RegisterTimerCommandFactories(FunctionDefinitions);
 

diff --git a/pack.sh b/pack.sh
@@ -11,3 +11,4 @@ dotnet pack ./Source/FunctionMonkey.Testing/FunctionMonkey.Testing.csproj --outp
 dotnet pack ./Source/FunctionMonkey.TokenValidator/FunctionMonkey.TokenValidator.csproj --output ./ --configuration Release
 dotnet pack ./Source/FunctionMonkey.AspNetCore/FunctionMonkey.AspNetCore.csproj --output ./ --configuration Release
 dotnet pack ./Source/FunctionMonkey.FSharp/FunctionMonkey.FSharp.fsproj --output ./ --configuration Release
+dotnet pack ./Source/FunctionMonkey.MediatR/FunctionMonkey.MediatR.fsproj --output ./ --configuration Release