Merge pull request #1669 from joperezr/UseNewBclRewriter

Using DotNetCore version of BclRewriter in mscorlib build

5 files changed, 12 insertions, 10 deletions

diff --git a/src/.nuget/packages.Unix.config b/src/.nuget/packages.Unix.config
index 8c182aea91..eba577c778 100644
--- a/src/.nuget/packages.Unix.config
+++ b/src/.nuget/packages.Unix.config
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00079" />
-  <package id="Microsoft.DotNet.BuildTools.CoreCLR" version="1.0.3-prerelease" />
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00105" />
   <package id="dnx-mono" version="1.0.0-beta5-12101" />
   <package id="Microsoft.Net.ToolsetCompilers" version="1.0.0-rc3-20150510-01" />
 </packages>
diff --git a/src/.nuget/packages.Windows_NT.config b/src/.nuget/packages.Windows_NT.config
index 8f0f774b0b..1c9236e18e 100644
--- a/src/.nuget/packages.Windows_NT.config
+++ b/src/.nuget/packages.Windows_NT.config
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00079" />
+  <package id="Microsoft.DotNet.BuildTools" version="1.0.25-prerelease-00105" />
   <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/src/NuGet.Config b/src/NuGet.Config
index 4c82b8f2f7..e821d142f2 100644
--- a/src/NuGet.Config
+++ b/src/NuGet.Config
@@ -6,6 +6,7 @@
   <packageSources>
     <add key="myget.org dotnet-buildtools" value="https://www.myget.org/F/dotnet-buildtools/" />
     <add key="nuget.org" value="https://www.nuget.org/api/v2/" />
+    <add key="myget.org dotnet-core" value="https://www.myget.org/F/dotnet-core/" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />
diff --git a/src/mscorlib/Tools/BclRewriter/BclRewriter.targets b/src/mscorlib/Tools/BclRewriter/BclRewriter.targets
index 3588a7750b..5299852611 100644
--- a/src/mscorlib/Tools/BclRewriter/BclRewriter.targets
+++ b/src/mscorlib/Tools/BclRewriter/BclRewriter.targets
@@ -5,30 +5,30 @@
   <!-- ********************************************************************************************* -->
 
   <PropertyGroup>
-    <BclRewriterCommand Condition="'$(BclRewriterCommand)'==''">$(CoreCLRToolsDir)\BclRewriter.exe</BclRewriterCommand>
     <BclRewriterModelFile>$(MscorlibDir)model.xml</BclRewriterModelFile>
     <BclRewriterWorkDir>$(IntermediateOutputPath)\BclRewriter</BclRewriterWorkDir>
     <BclRewriterSymbolOutput>$(IntermediateOutputPath)\BclRewriter\$(TargetName).pdb</BclRewriterSymbolOutput>
     <BclRewriterOutput>$(IntermediateOutputPath)\BclRewriter\$(TargetName)$(TargetExt)</BclRewriterOutput>
   </PropertyGroup>
-
+  
   <ItemGroup>
     <RewrittenAssembly Include="$(BclRewriterOutput)" />
   </ItemGroup>
   
   <Target Name="RewriteWithBclRewriter" 
-          Inputs="@(AnnotatedAssembly)" Outputs="@(RewrittenAssembly)">
+          Inputs="@(AnnotatedAssembly)" Outputs="@(RewrittenAssembly)" DependsOnTargets="$(BclRewriterDependencyTargets)">
 
     <PropertyGroup>
       <OSPlatform Condition="'$(TargetsWindows)' == 'true'">win</OSPlatform>
       <OSPlatform Condition="'$(TargetsWindows)' != 'true'">unix</OSPlatform>
+      <BclRewriterCommand Condition="'$(BclRewriterCommand)'==''">"$(ToolRuntimePath)$(ToolHost)" "$(ToolsDir)BclRewriter.exe"</BclRewriterCommand>
     </PropertyGroup>
    
-    <Exec Command="&quot;$(BclRewriterCommand)&quot; -in:&quot;@(AnnotatedAssembly)&quot; -out:&quot;$(BclRewriterOutput)&quot; -include:&quot;$(BclRewriterModelFile)&quot; -platform:$(OSPlatform) -architecture:$(Platform) -flavor:$(_BuildType) -define:&quot;$(DefineConstants)&quot; -keepTempFiles+" StandardOutputImportance="Normal" />
+    <Exec Command="$(BclRewriterCommand) -in:&quot;@(AnnotatedAssembly)&quot; -out:&quot;$(BclRewriterOutput)&quot; -include:&quot;$(BclRewriterModelFile)&quot; -platform:$(OSPlatform) -architecture:$(Platform) -flavor:$(_BuildType) -define:&quot;$(DefineConstants)&quot; -keepTempFiles+" StandardOutputImportance="Normal" />
 
     <!-- Update the location of the symbol file-->
     <PropertyGroup>
       <CurrentAssemblyPdb>$(BclRewriterSymbolOutput)</CurrentAssemblyPdb>
     </PropertyGroup>
   </Target>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/src/mscorlib/Tools/PostProcessingTools.targets b/src/mscorlib/Tools/PostProcessingTools.targets
index 7231540ddf..2574db570e 100644
--- a/src/mscorlib/Tools/PostProcessingTools.targets
+++ b/src/mscorlib/Tools/PostProcessingTools.targets
@@ -7,10 +7,13 @@
     <Clean Include="@(RewrittenAssembly->'$(FinalOutputPath)\%(Filename)%(Extension)')" />
     <Clean Include="$(FinalOutputPath)\$(TargetName).pdb" />
   </ItemGroup>
+  
+  <Import Project="$(ToolsDir)toolruntime.targets" />
 
   <PropertyGroup>
     <CurrentAssemblyPdb>$(IntermediateOutputPath)$(TargetName).pdb</CurrentAssemblyPdb>
     <PostProcessingTargets>RewriteWithBclRewriter</PostProcessingTargets>
+    <BclRewriterDependencyTargets>EnsureBuildToolsRuntime</BclRewriterDependencyTargets>
   </PropertyGroup>
 
   <Target Name="AfterBuild" DependsOnTargets="$(PostProcessingTargets)"
@@ -22,4 +25,4 @@
     <Copy Condition="Exists('$(CurrentAssemblyPdb)')" Retries="3" SourceFiles="$(CurrentAssemblyPdb)" DestinationFiles="$(FinalOutputPath)\$(TargetName).pdb"/>
   </Target>
 
-</Project>
+</Project>
\ No newline at end of file