1 files changed, 7 insertions, 2 deletions
diff --git a/dir.props b/dir.props
index b3b81a0dc..9ff9c1446 100644
--- a/dir.props
+++ b/dir.props
@@ -149,7 +149,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <SupplementalTestData Include="$(RuntimePath)*.dll" />
+    <SupplementalTestData Include="$(RuntimePath)*" />
   </ItemGroup>
 
   <!-- initialize all the targets variables to false as they should only be set below -->
@@ -254,7 +254,7 @@
 
   <PropertyGroup>
     <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
-    <NuGetTargetMoniker Condition="'$(NuGetTargetFramework)' == ''">.NETCoreApp,Version=v2.0</NuGetTargetMoniker>
+    <NuGetTargetMoniker Condition="'$(NuGetTargetFramework)' == ''">.NETCoreApp,Version=v2.1</NuGetTargetMoniker>
     <BuildPackageLibraryReferences>false</BuildPackageLibraryReferences>
   </PropertyGroup>
 
@@ -263,6 +263,11 @@
     <SkipTests Condition="'$(SkipTests)'=='' and ('$(OsEnvironment)'=='Windows_NT' and '$(TargetsWindows)'!='true')">true</SkipTests>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- On Windows fallback to ILAsm from the framework for now -->
+    <IlasmToolPath Condition="'$(OSEnvironment)'=='Windows_NT'">%WINDIR%\Microsoft.NET\Framework\v4.0.30319\ilasm.exe</IlasmToolPath>
+  </PropertyGroup>
+
   <!-- Use Roslyn Compilers to build -->
   <Import Project="$(RoslynPropsFile)" Condition="Exists('$(RoslynPropsFile)')" />
 </Project>