Merge branch 'master' into rider

# Conflicts: # azure-pipelines.yml
Abc-Arbitrage · Jul 2, 2019 · dc5d778 · dc5d778
2 parents fefb204 + ac37e80
commit dc5d778
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -4,7 +4,7 @@
 # https://docs.microsoft.com/azure/devops/pipelines/apps/windows/dot-net
 
 trigger:
-- master
+- '*'
 
 pool:
   vmImage: 'windows-2019'
@@ -32,4 +32,4 @@ steps:
     platform: '$(buildPlatform)'
     configuration: '$(buildConfiguration)'
     pathtoCustomTestAdapters: 'Abc.MoqComplete/CustomAdapter/nunittestadapter'
-    testAssemblyVer2: '**/Abc.MoqComplete.Tests.dll'
+    testAssemblyVer2: '**/bin/**/Abc.MoqComplete.Tests.dll'