From 6b53763d8e410a437d5982594b90153f27e6f18d Mon Sep 17 00:00:00 2001 From: Tomas Jansson Date: Thu, 13 Mar 2014 23:23:54 +0100 Subject: [PATCH 1/3] add exe to assembly scan --- src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs | 2 +- src/Simple.Web.Razor/RazorTypeBuilderContext.cs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs b/src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs index 59668ff..aaebb86 100644 --- a/src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs +++ b/src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs @@ -52,7 +52,7 @@ public Task Write(IContent content, Stream outputStream) { if (content.Model != null) { - var linkConverters = LinkConverter.CreateForGraph(typeof(T), KnownTypes.Value, + var linkConverters = LinkConverter.CreateForGraph(content.Model.GetType(), KnownTypes.Value, LinkHelper.GetLinksForModel, Settings.ContractResolver); var settings = new JsonSerializerSettings { diff --git a/src/Simple.Web.Razor/RazorTypeBuilderContext.cs b/src/Simple.Web.Razor/RazorTypeBuilderContext.cs index b822501..ab885b5 100644 --- a/src/Simple.Web.Razor/RazorTypeBuilderContext.cs +++ b/src/Simple.Web.Razor/RazorTypeBuilderContext.cs @@ -56,7 +56,8 @@ private static IEnumerable ScanFolderForAssemblies() var uri = new Uri(Assembly.GetCallingAssembly().EscapedCodeBase); var file = new FileInfo(uri.LocalPath); var currentDirectory = file.Directory; - var assemblyFiles = currentDirectory.GetFiles("*.dll"); + var assemblyFiles = currentDirectory.GetFiles("*.dll") + .Concat(currentDirectory.GetFiles("*.exe")); var assemblies = assemblyFiles.Select(y => Assembly.LoadFile(y.FullName)); return assemblies; } From d23f9dcf0e2cbbf5c7a64ccc3d09b559e474ebf0 Mon Sep 17 00:00:00 2001 From: Tomas Jansson Date: Thu, 13 Mar 2014 23:23:54 +0100 Subject: [PATCH 2/3] add exe to assembly scan --- src/Simple.Web.Razor/RazorTypeBuilderContext.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Simple.Web.Razor/RazorTypeBuilderContext.cs b/src/Simple.Web.Razor/RazorTypeBuilderContext.cs index b822501..ab885b5 100644 --- a/src/Simple.Web.Razor/RazorTypeBuilderContext.cs +++ b/src/Simple.Web.Razor/RazorTypeBuilderContext.cs @@ -56,7 +56,8 @@ private static IEnumerable ScanFolderForAssemblies() var uri = new Uri(Assembly.GetCallingAssembly().EscapedCodeBase); var file = new FileInfo(uri.LocalPath); var currentDirectory = file.Directory; - var assemblyFiles = currentDirectory.GetFiles("*.dll"); + var assemblyFiles = currentDirectory.GetFiles("*.dll") + .Concat(currentDirectory.GetFiles("*.exe")); var assemblies = assemblyFiles.Select(y => Assembly.LoadFile(y.FullName)); return assemblies; } From cac12bb96507caf7c0665d3a8e77bfb2f7ffeb4b Mon Sep 17 00:00:00 2001 From: Tomas Jansson Date: Thu, 13 Mar 2014 23:30:23 +0100 Subject: [PATCH 3/3] fixed typo --- src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs b/src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs index aaebb86..59668ff 100644 --- a/src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs +++ b/src/Simple.Web.JsonNet/JsonMediaTypeHandlerWithDeepLinks.cs @@ -52,7 +52,7 @@ public Task Write(IContent content, Stream outputStream) { if (content.Model != null) { - var linkConverters = LinkConverter.CreateForGraph(content.Model.GetType(), KnownTypes.Value, + var linkConverters = LinkConverter.CreateForGraph(typeof(T), KnownTypes.Value, LinkHelper.GetLinksForModel, Settings.ContractResolver); var settings = new JsonSerializerSettings {