Merge branch 'master' into release/Genbu

SteveGilham · Jan 24, 2021 · fbfe245 · fbfe245
2 parents 484aac5 + d6b301b
commit fbfe245
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj b/AltCover.Monitor.Tests/AltCover.Monitor.Tests.fsproj
@@ -12,9 +12,9 @@
     <OutputPath>$(SolutionDir)_Binaries/$(AssemblyName)/$(Configuration)+$(Platform)/</OutputPath>
     <IntermediateOutputPath>$(SolutionDir)_Intermediate/$(AssemblyName)/$(Configuration)+$(Platform)/</IntermediateOutputPath>
     <OtherFlags>--keyfile:$(ProjectDir)..\Build\Infrastructure.snk</OtherFlags>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants Condition="'$(APPVEYOR)' == ''">DEBUG;TRACE;CODE_ANALYSIS;Monitor</DefineConstants>
+    <DefineConstants Condition="'$(APPVEYOR)' != ''">DEBUG;TRACE;CODE_ANALYSIS;Monitor;BUILD_ON_APPVEYOR</DefineConstants>
     <RollForward>Major</RollForward>
-    <DefineConstants>TRACE;DEBUG;CODE_ANALYSIS;Monitor</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/AltCover.Monitor.Tests/MonitorTest.fs b/AltCover.Monitor.Tests/MonitorTest.fs
@@ -37,4 +37,8 @@ module MonitorTests =
     test'<@ a && a0 @> "should be running under AltCover"
     let code = b.Code
     let branch = b.Branch
-    test <@ (code, branch) = (137, 34) @>
+#if BUILD_ON_APPVEYOR
+    test <@ (code, branch) = (70, 9) @>
+#else
+    test <@ (code, branch) = (137, 34) @>
+#endif
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -2,7 +2,7 @@ Q. Never mind the fluff -- how do I get started?
 
 A. Start with the Quick Start guide : https://github.com/SteveGilham/altcover/wiki/QuickStart-Guide
 
-# 7.6.810 (Genbu series release 15)
+# 7.6.812 (Genbu series release 15)
 * [VISUALIZER] Move the global tool to the new 0.10 AvaloniaUI release
 * Monitor API
   * [BUGFIX] Harden the monitor API `TryGetVisitTotals` against race conditions in multi-threaded tests