Tests & fixes

Author: nblumhardt

src/Serilog.Expressions/Serilog.Expressions.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>An embeddable mini-language for filtering, enriching, and formatting Serilog
       events, ideal for use with JSON or XML configuration.</Description>
-    <VersionPrefix>1.1.2</VersionPrefix>
+    <VersionPrefix>2.0.0</VersionPrefix>
     <Authors>Serilog Contributors</Authors>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

src/Serilog.Expressions/Templates/Compilation/TemplateCompiler.cs

@@ -20,7 +20,7 @@ public static CompiledTemplate Compile(Template template, NameResolver nameResol
                 Conditional conditional => new CompiledConditional(
                     ExpressionCompiler.Compile(conditional.Condition, nameResolver),
                     Compile(conditional.Consequent, nameResolver),
-                    conditional.Alternative == null ? null : Compile(conditional.Consequent, nameResolver)),
+                    conditional.Alternative == null ? null : Compile(conditional.Alternative, nameResolver)),
                 _ => throw new NotSupportedException()
             };
         }

test/Serilog.Expressions.Tests/Cases/template-evaluation-cases.asv

@@ -13,5 +13,11 @@ Aligned {42,4}!                          ⇶ Aligned   42!
 Left {42,-4}!                            ⇶ Left 42  !
 Under width {42,0}!                      ⇶ Under width 42!
 {@m}                                     ⇶ Hello, nblumhardt!
-Hello, {#if 1 = 1}world{#end}!           ⇶ Hello, world!
-Hello, {#if true}world{#else}there{#end}! ⇶ Hello, world!
+Hello, {#if true}world{#end}!            ⇶ Hello, world!
+Hello, {#if true}w{42}d{#end}!           ⇶ Hello, w42d!
+Hello, {#if 1 = 1}world{#else}there{#end}!           ⇶ Hello, world!
+Hello, {#if 1 = 2}world{#else}there{#end}!           ⇶ Hello, there!
+Hello, {#if undefined()}world{#else}there{#end}!     ⇶ Hello, there!
+A{#if false}B{#else if false}C{#else if true}D{#else}E{#end} ⇶ AD
+A{#if false}B{#else if true}C{#end}                  ⇶ AC
+{#if true}A{#if false}B{#else}C{#end}D{#end}         ⇶ ACD