src/Spark.Web.Mvc.Tests/AspNetMvc.Tests.Views/Failure/Show.spark src/Spark.Web.Mvc.Tests/AspNetMvc.Tests.Views/Failure/_Failure.spark src/Spark.Web.Mvc.Tests/Controllers/FailureController.cs @@ -71,6 +71,7 @@ </ItemGroup> <ItemGroup> <Compile Include="Controllers\ComplexPrecompileController.cs" /> + <Compile Include="Controllers\FailureController.cs" /> <Compile Include="Controllers\SimplePrecompileController.cs" /> <Compile Include="Controllers\StubController.cs" /> <Compile Include="DescriptorBuildingTester.cs" /> @@ -101,6 +102,12 @@ <None Include="AspNetMvc.Tests.Views\Admin\Layouts\speciallayout.spark"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> + <None Include="AspNetMvc.Tests.Views\Failure\Show.spark"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> + <None Include="AspNetMvc.Tests.Views\Failure\_Failure.spark"> + <CopyToOutputDirectory>Always</CopyToOutputDirectory> + </None> <None Include="AspNetMvc.Tests.Views\Home\childview.spark"> <CopyToOutputDirectory>Always</CopyToOutputDirectory> </None> src/Spark.Web.Mvc.Tests/Spark.Web.Mvc.Tests.csproj @@ -12,7 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. // +using System; +using System.IO; using System.Linq; +using System.Linq.Expressions; +using System.Reflection; using NUnit.Framework; using Spark.FileSystem; using Spark.Web.Mvc.Tests.Controllers; @@ -52,6 +56,45 @@ namespace Spark.Web.Mvc.Tests Assert.AreEqual(3, assembly.GetTypes().Length); } + [Test] + public void CanHandleCSharpV3SyntaxWhenLoadedInAppDomainWithoutConfig() + { + AppDomainSetup setup = new AppDomainSetup + { + ApplicationBase = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location) + }; + AppDomain sandbox = null; + try + { + sandbox = AppDomain.CreateDomain("sandbox", null, setup); + var remoteRunner = (PrecompileRunner) sandbox.CreateInstanceAndUnwrap(Assembly.GetExecutingAssembly().FullName, + typeof(PrecompileRunner).FullName); + remoteRunner.Precompile(); + } + finally + { + if (sandbox != null) + { + AppDomain.Unload(sandbox); + } + } + } + + public class PrecompileRunner : MarshalByRefObject + { + public void Precompile() + { + var settings = new SparkSettings(); + + var factory = new SparkViewFactory(settings) { ViewFolder = new FileSystemViewFolder("AspNetMvc.Tests.Views") }; + + var batch = new SparkBatchDescriptor(); + + batch.For<FailureController>(); + + factory.Precompile(batch); + } + } [Test] public void DefaultMatchingRules() @@ -146,4 +189,12 @@ namespace Spark.Web.Mvc.Tests } } + + public static class FooExtensions + { + public static string FooFor<T>(this SparkView view, Expression<Action<T>> action) + { + return string.Format("Foo on lambda expression {0}", action); + } + } } \ No newline at end of file src/Spark.Web.Mvc.Tests/SparkBatchCompilerTester.cs @@ -15,8 +15,8 @@ using System; using System.CodeDom.Compiler; using System.Collections.Generic; +using System.Configuration; using System.IO; -using System.Linq; using System.Reflection; using System.Reflection.Emit; using System.Text; @@ -30,19 +30,44 @@ namespace Spark.Compiler public Assembly Compile(bool debug, string languageOrExtension, params string[] sourceCode) { - var all = CodeDomProvider.GetAllCompilerInfo(); - var language = languageOrExtension; if (CodeDomProvider.IsDefinedLanguage(languageOrExtension) == false && CodeDomProvider.IsDefinedExtension(languageOrExtension)) { language = CodeDomProvider.GetLanguageFromExtension(languageOrExtension); } - var compilerInfo = CodeDomProvider.GetCompilerInfo(language); - var codeProvider = CodeDomProvider.CreateProvider(language); + + CodeDomProvider codeProvider; + CompilerParameters compilerParameters; + + if (ConfigurationManager.GetSection("system.codedom") != null) + { + var compilerInfo = CodeDomProvider.GetCompilerInfo(language); + codeProvider = compilerInfo.CreateProvider(); + compilerParameters = compilerInfo.CreateDefaultCompilerParameters(); + } + else + { + if (!language.Equals("c#", StringComparison.OrdinalIgnoreCase) && + !language.Equals("cs", StringComparison.OrdinalIgnoreCase) && + !language.Equals("csharp", StringComparison.OrdinalIgnoreCase)) + { + throw new CompilerException( + string.Format("When running the {0} in an AppDomain without a system.codedom config section only the csharp language is supported. This happens if you are precompiling your views.", + typeof(BatchCompiler).FullName)); + } + + var providerOptions = new Dictionary<string, string> { { "CompilerVersion", "v3.5" } }; + codeProvider = new CSharpCodeProvider(providerOptions); + compilerParameters = new CompilerParameters(); + + // Note: Could make a map of compiler info objects (to support vb) and rewrite the following uncommented code. + //compilerParameters = new CompilerParameters { WarningLevel = 4 }; + //var compilerInfo = GetCompilerInfoWithoutReadingConfig(compilerParameters); + //codeProvider = CreateProviderForCSharpV3(compilerInfo); + } var extension = codeProvider.FileExtension; - var compilerParameters = compilerInfo.CreateDefaultCompilerParameters(); foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies()) { @@ -142,5 +167,52 @@ namespace Spark.Compiler return compilerResults.CompiledAssembly; } + + //private static CodeDomProvider CreateProviderForCSharpV3(CompilerInfo compilerInfo) + //{ + // CodeDomProvider codeProvider; + // var providerOptions = new Dictionary<string, string> { { "CompilerVersion", "v3.5" } }; + // codeProvider = compilerInfo.CreateProvider(providerOptions); + // return codeProvider; + //} + + //private static CompilerInfo GetCompilerInfoWithoutReadingConfig(CompilerParameters compilerParameters) + //{ + // var codeDomProviderTypeName = typeof(CSharpCodeProvider).AssemblyQualifiedName; + // var compilerLanguages = new[] { "c#", "cs", "csharp" }; + // var compilerExtensions = new[] { ".cs" }; + // var compilerInfo = CompilerInfoExtensions.CreateCompilerInfo(compilerParameters, codeDomProviderTypeName, compilerLanguages, compilerExtensions); + // return compilerInfo; + //} } + + //public static class CompilerInfoExtensions + //{ + // public static CompilerInfo CreateCompilerInfo(CompilerParameters compilerParams, string codeDomProviderTypeName, + // string[] compilerLanguages, string[] compilerExtensions) + // { + // var constructor = typeof (CompilerInfo).GetConstructor( + // BindingFlags.NonPublic, null, new[] { typeof (CompilerParameters), typeof (string), typeof (string[]), typeof (string[]) }, null); + + // if (constructor == null) + // { + // return null; + // } + + // return (CompilerInfo) constructor.Invoke(new object[] {compilerParams, codeDomProviderTypeName, compilerLanguages, compilerExtensions}); + // } + + // public static CodeDomProvider CreateProvider(this CompilerInfo compilerInfo, IDictionary<string, string> providerOptions) + // { + // if (providerOptions.Count > 0) + // { + // ConstructorInfo constructor = compilerInfo.CodeDomProviderType.GetConstructor(new [] { typeof(IDictionary<string, string>) }); + // if (constructor != null) + // { + // return (CodeDomProvider)constructor.Invoke(new object[] { providerOptions }); + // } + // } + // return (CodeDomProvider)Activator.CreateInstance(compilerInfo.CodeDomProviderType); + // } + //} } src/Spark/Compiler/BatchCompiler.cs 55eea63579579958a699b746e0870a2ae1fcceab maxild mmaxild@gmail.com http://github.com/loudej/spark/commit/dd45553925d8ee832e27e84582e120bed8777657 dd45553925d8ee832e27e84582e120bed8777657 2009-11-07T02:20:00-08:00 2009-11-06T05:58:38-08:00 Fixed issue with the BatchCompiler running without system.codedom config which is the case when precompiling views. 7695cb7a3d78c23d735ac8508b6dcce08f377e33 Louis DeJardin louis.dejardin@gmail.com