Packaging fixes

Author: nblumhardt

README.md

@@ -1,4 +1,4 @@
-# _Serilog Expressions_ [![Build status](https://ci.appveyor.com/api/projects/status/2wg3tsdybwmf8tp1/branch/dev?svg=true)](https://ci.appveyor.com/project/NicholasBlumhardt/serilog-expressions/branch/dev)
+# _Serilog Expressions_ [![Build status](https://ci.appveyor.com/api/projects/status/2wg3tsdybwmf8tp1/branch/dev?svg=true)](https://ci.appveyor.com/project/NicholasBlumhardt/serilog-expressions/branch/dev) [![NuGet Package](https://img.shields.io/nuget/vpre/serilog.expressions)](https://nuget.org/packages/serilog.expressions)
 
 An embeddable mini-language for filtering, enriching, and formatting Serilog 
 events, ideal for use with JSON or XML configuration.

assets/icon.png

@@ -13,9 +13,9 @@
     <SignAssembly>true</SignAssembly>
     <PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
     <PackageTags>serilog</PackageTags>
-    <PackageIconUrl>https://serilog.net/images/serilog-extension-nuget.png</PackageIconUrl>
     <PackageProjectUrl>https://github.com/serilog/serilog-expressions</PackageProjectUrl>
-    <PackageLicenseUrl>https://www.apache.org/licenses/LICENSE-2.0</PackageLicenseUrl>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/serilog/serilog-expressions</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <LangVersion>8</LangVersion>
@@ -26,5 +26,9 @@
     <PackageReference Include="Serilog" Version="2.10.0" />
     <PackageReference Include="Superpower" Version="2.3.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
+  </ItemGroup>
 
 </Project>

src/Serilog.Expressions/Serilog.Expressions.csproj

@@ -185,7 +185,6 @@ User.Name                            ⇶ 'nblumhardt'
 [1,2,3][*] > 2                       ⇶ false
 
 // Structural
-[]                                   ⇶ []
 [1]                                  ⇶ [1]
 [[1]]                                ⇶ [[1]]
 

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

@@ -23,12 +23,12 @@ static IEnumerable<object[]> ReadCases(string filename)
             }
         }
 
-        public static IEnumerable<object[]> EphemeralExpressionEvaluationCases =>
+        public static IEnumerable<object[]> ExpressionEvaluationCases =>
             ReadCases("expression-evaluation-cases.asv");
 
         [Theory]
-        [MemberData(nameof(EphemeralExpressionEvaluationCases))]
-        public void EphemeralExpressionsAreCorrectlyEvaluated(string expr, string result)
+        [MemberData(nameof(ExpressionEvaluationCases))]
+        public void ExpressionsAreCorrectlyEvaluated(string expr, string result)
         {
             var evt = Some.InformationEvent();