Merge pull request #1410 from jkotas/vs2015-buildtools

Update buildtools version to fix VS2015 build

7 files changed, 28 insertions, 29 deletions

diff --git a/dir.props b/dir.props
index c004378884..8ea2a29fca 100644
--- a/dir.props
+++ b/dir.props
@@ -9,7 +9,7 @@
   
   <!-- Build Tools Versions -->
   <PropertyGroup>
-    <BuildToolsVersion>1.0.25-prerelease-00056</BuildToolsVersion>
+    <BuildToolsVersion>1.0.25-prerelease-00079</BuildToolsVersion>
     <BuildToolsCoreCLRVersion>1.0.3-prerelease</BuildToolsCoreCLRVersion>
     <DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-beta5-12101</DnxVersion>
     <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta5-12101</DnxVersion>
diff --git a/src/.nuget/packages.Unix.config b/src/.nuget/packages.Unix.config
index 0f758ef11f..8c182aea91 100644
--- a/src/.nuget/packages.Unix.config
+++ b/src/.nuget/packages.Unix.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00056" />
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00079" />
   <package id="Microsoft.DotNet.BuildTools.CoreCLR" version="1.0.3-prerelease" />
   <package id="dnx-mono" version="1.0.0-beta5-12101" />
   <package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc3-20150510-01" />
diff --git a/src/.nuget/packages.Windows_NT.config b/src/.nuget/packages.Windows_NT.config
index 6379b7954b..8f0f774b0b 100644
--- a/src/.nuget/packages.Windows_NT.config
+++ b/src/.nuget/packages.Windows_NT.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00056" />
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00079" />
   <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
   <package id="Microsoft.DotNet.BuildTools.CoreCLR" version="1.0.3-prerelease" />
 </packages>
diff --git a/tests/dir.props b/tests/dir.props
index 4ca119e5b3..8c89905ee3 100644
--- a/tests/dir.props
+++ b/tests/dir.props
@@ -9,7 +9,7 @@
   
   <!-- Build Tools Versions -->
   <PropertyGroup>
-    <BuildToolsVersion>1.0.25-prerelease-00056</BuildToolsVersion>
+    <BuildToolsVersion>1.0.25-prerelease-00079</BuildToolsVersion>
     <BuildToolsCoreCLRVersion>1.0.2-prerelease</BuildToolsCoreCLRVersion>
     <DnxVersion Condition="'$(OsEnvironment)'!='Unix'">1.0.0-beta5-12101</DnxVersion>
     <DnxVersion Condition="'$(OsEnvironment)'=='Unix'">1.0.0-beta5-12101</DnxVersion>
diff --git a/tests/publishdependency.targets b/tests/publishdependency.targets
index f8dd96f6b3..afab45e2c2 100644
--- a/tests/publishdependency.targets
+++ b/tests/publishdependency.targets
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-  <UsingTask TaskName="ResolveNuGetPackageAssets" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
-  
+  <UsingTask TaskName="PrereleaseResolveNuGetPackageAssets" AssemblyFile="$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll"/>
+
   <ItemGroup>
     <TestTargetFramework Include="DNXCore,Version=v5.0">
       <Folder>dnxcore50</Folder>
     </TestTargetFramework>
   </ItemGroup>
-  
+
   <ItemGroup>
     <AllProjectJsonLockFiles Include="$(SourceDir)**\*\project.lock.json"/>
   </ItemGroup>
@@ -28,20 +28,19 @@
       <ProjectLockJsonFiles Include="@(AllProjectJsonLockFiles)"  Exclude="@(ProjectJsonLockFileExclude)"/>
     </ItemGroup>
     
-    <!-- This will use the overridden ResolveNuGetPackageAssets, which outputs copy local items
+    <!-- This will use the overridden PrereleaseResolveNuGetPackageAssets, which outputs copy local items
          for the xunit wrapper projects -->
-    <ResolveNuGetPackageAssets  Architecture="$(PlatformTarget)"
-                                Configuration="$(Configuration)"
-                                Language="$(Language)"
-                                PackageRoot="$(PackagesDir)"
-                                ProjectLockFile="%(ProjectLockJsonFiles.Identity)"
-                                TargetFrameworkMonikers="@(TestTargetFramework)"
-                                TargetPlatformMonikers="$(TargetPlatformMoniker)">
-
+    <PrereleaseResolveNuGetPackageAssets AllowFallbackOnTargetSelection="true"
+                                         IncludeFrameworkReferences="false"
+                                         NuGetPackagesDirectory="$(PackagesDir)"
+                                         RuntimeIdentifier="dotnet"
+                                         ProjectLanguage="$(Language)"
+                                         ProjectLockFile="%(ProjectLockJsonFiles.Identity)"
+                                         TargetMonikers="@(TestTargetFramework)">
       <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" />
       <Output TaskParameter="ResolvedReferences" ItemName="Reference" />
       <Output TaskParameter="ResolvedCopyLocalItems" ItemName="RunTimeCopyLocal" />
-    </ResolveNuGetPackageAssets>
+    </PrereleaseResolveNuGetPackageAssets>
 
     <ItemGroup>
       <RunTimeDependecyExclude Include="$(CORE_ROOT)\**\*.*"  />
diff --git a/tests/src/.nuget/packages.Windows_NT.config b/tests/src/.nuget/packages.Windows_NT.config
index 84282b3e18..44a1c19c70 100644
--- a/tests/src/.nuget/packages.Windows_NT.config
+++ b/tests/src/.nuget/packages.Windows_NT.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00056" />
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00079" />
   <package id="dnx-coreclr-win-x86" version="1.0.0-beta5-12101" />
 </packages>
diff --git a/tests/xunitwrapper.targets b/tests/xunitwrapper.targets
index 2794d4666b..fbc1481f33 100644
--- a/tests/xunitwrapper.targets
+++ b/tests/xunitwrapper.targets
@@ -4,20 +4,20 @@
      to the core_root directory -->
 
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Target Name="ResolveNuGetPackages" Condition="'$(ResolveNuGetPackages)'=='true'">
-    
-    <ResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))"
-                               Architecture="$(PlatformTarget)"
-                               Configuration="$(Configuration)"
-                               Language="$(Language)"
-                               PackageRoot="$(PackagesDir)"
-                               ProjectLockFile="$(ProjectLockJson)"
-                               TargetFrameworkMonikers="$(NugetTargetFrameworkMoniker)"
-                               TargetPlatformMonikers="$(TargetPlatformMoniker)">
+  <Target Name="ResolveNuGetPackages">
+
+    <PrereleaseResolveNuGetPackageAssets Condition="Exists($(ProjectLockJson))"
+                                         AllowFallbackOnTargetSelection="true"
+                                         IncludeFrameworkReferences="false"
+                                         NuGetPackagesDirectory="$(PackagesDir)"
+                                         RuntimeIdentifier="dotnet"
+                                         ProjectLanguage="$(Language)"
+                                         ProjectLockFile="$(ProjectLockJson)"
+                                         TargetMonikers="$(NugetTargetFrameworkMoniker)">
       <Output TaskParameter="ResolvedAnalyzers" ItemName="Analyzer" />
       <Output TaskParameter="ResolvedReferences" ItemName="Reference" />
       <Output TaskParameter="ResolvedCopyLocalItems" ItemName="CopyLocal" />
-    </ResolveNuGetPackageAssets>
+    </PrereleaseResolveNuGetPackageAssets>
 
     <!-- We may have an indirect package reference that we want to replace with a project reference -->
     <ItemGroup>