Merge pull request dotnet#21048 from joperezr/FixMemoryMappedFiles

Updating version of UAP test tools and referencing the package from myget
dotnet-bot · Jun 14, 2017 · 615f7a2 · 615f7a2
2 parents 401118e + 5457041
commit 615f7a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj
@@ -86,6 +86,16 @@
     <PackageToInclude Include="$(XUnitRunnerPackageId)" />
   </ItemGroup>
 
+  <PropertyGroup Condition="'$(TargetGroup)' == 'uap'">
+    <UAPToolsPackageVersion>1.0.7</UAPToolsPackageVersion>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(TargetGroup)' == 'uap'">
+    <PackageReference Include="Microsoft.DotNet.UAP.TestTools">
+      <Version>$(UAPToolsPackageVersion)</Version>
+    </PackageReference>
+  </ItemGroup>
+
   <!-- System.Data.SqlClient tests require sni.dll in the test folder -->
   <ItemGroup Condition="'$(TargetGroup)' == 'uapaot'">
     <PackageReference Include="runtime.native.System.Data.SqlClient.sni">
@@ -114,7 +124,6 @@
           Condition="'$(TargetGroup)'=='uap'" >
 
     <PropertyGroup>
-      <UAPToolsPackageVersion>1.0.2</UAPToolsPackageVersion>
       <UAPToolsPackageName>microsoft.dotnet.uap.testtools</UAPToolsPackageName>
 
       <UAPToolsFolder Condition="'$(UAPToolsFolder)'==''">$(PackagesDir)$(UAPToolsPackageName)\$(UAPToolsPackageVersion)\Tools</UAPToolsFolder>

diff --git a/external/test-runtime/optional.json b/external/test-runtime/optional.json
@@ -3,7 +3,6 @@
     "net45": {
       "dependencies": {
         "Microsoft.DotNet.IBCMerge": "4.6.0-alpha-00001",
-        "Microsoft.DotNet.UAP.TestTools": "1.0.2",
         "TestILC.amd64ret": "1.0.0-beta-25413-00",
         "TestILC.armret": "1.0.0-beta-25413-00",
         "TestILC.x86ret": "1.0.0-beta-25413-00"