Fix .NET Framework builds

Author: nblumhardt

Build.ps1

@@ -30,7 +30,7 @@ foreach ($src in gci src/*) {
     } else {
         & dotnet pack -c Release --include-source --no-build -o ../../artifacts
     }
-    if($LASTEXITCODE -ne 0) { exit 1 }
+    if($LASTEXITCODE -ne 0) { throw "build failed" }
 
     Pop-Location
 }
@@ -41,7 +41,7 @@ foreach ($test in gci test/*.Tests) {
 	echo "build: Testing project in $test"
 
     & dotnet test -c Release
-    if($LASTEXITCODE -ne 0) { exit 3 }
+    if($LASTEXITCODE -ne 0) { throw "test failed" }
 
     Pop-Location
 }
@@ -52,7 +52,7 @@ foreach ($test in ls test/*.PerformanceTests) {
 	echo "build: Building performance test project in $test"
 
     & dotnet build -c Release
-    if($LASTEXITCODE -ne 0) { exit 2 }
+    if($LASTEXITCODE -ne 0) { throw "perf test build failed" }
 
     Pop-Location
 }

src/Serilog.Expressions/Expressions/Helpers.cs

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#if NETSTANDARD2_0
+#if NO_CI_STRING_CONTAINS
 
 namespace Serilog.Expressions
 {

src/Serilog.Expressions/Expressions/Runtime/Coerce.cs

@@ -60,7 +60,7 @@ public static bool IsTrue(LogEventPropertyValue? value)
         return Boolean(value, out var b) && b;
     }
 
-    public static bool String(LogEventPropertyValue? value, [MaybeNullWhen(false)] out string str)
+    public static bool String(LogEventPropertyValue? value, [NotNullWhen(true)] out string? str)
     {
         if (value is ScalarValue sv)
         {

src/Serilog.Expressions/Expressions/Runtime/RuntimeOperators.cs

@@ -206,6 +206,7 @@ static bool UnboxedEqualHelper(StringComparison sc, LogEventPropertyValue? left,
             for (var i = 0; i < arr.Elements.Count; ++i)
             {
                 var element = arr.Elements[i];
+                // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
                 if (element != null && UnboxedEqualHelper(sc, element, item))
                     return ConstantTrue;
             }
@@ -350,6 +351,7 @@ public static LogEventPropertyValue IsDefined(LogEventPropertyValue? value)
         {
             // The lack of eager numeric type coercion means that here, `sv` may logically equal one
             // of the keys, but not be equal according to the dictionary's `IEqualityComparer`.
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
             var entry = dict.Elements.FirstOrDefault(kv => kv.Key != null && UnboxedEqualHelper(sc, kv.Key, sv));
             return entry.Value; // KVP is a struct; default is a pair of nulls.
         }

src/Serilog.Expressions/Serilog.Expressions.csproj

@@ -22,12 +22,21 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <DefineConstants>$(DefineConstants);NO_CI_STRING_CONTAINS</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net471' ">
+    <DefineConstants>$(DefineConstants);NO_CI_STRING_CONTAINS</DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net462' ">
+    <DefineConstants>$(DefineConstants);NO_CI_STRING_CONTAINS</DefineConstants>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Serilog" Version="4.0.0" />
     <PackageReference Include="Nullable" Version="1.3.1" PrivateAssets="All" />
-  </ItemGroup>
-
-  <ItemGroup>
     <None Include="..\..\assets\icon.png" Pack="true" Visible="false" PackagePath="" />
     <None Include="..\..\README.md" Pack="true" Visible="false" PackagePath="" />
   </ItemGroup>