Build Shims before src

And place shims in both ref and runtime path for active build configuration.
dotnet · Jan 30, 2017 · c034a19 · c034a19
1 parent 3733239
commit c034a19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/dirs.proj b/src/dirs.proj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <Project Include="ref.builds" />
-    <Project Include="src.builds" />
     <Project Include="shims\shims.proj" />
+    <Project Include="src.builds" />
   </ItemGroup>
 
   <Import Project="..\dir.targets" />

diff --git a/src/shims/shims.proj b/src/shims/shims.proj
@@ -54,9 +54,12 @@
     <Exec Command="$(GenFacadesCmd) -contracts:$(NetStandardRefPath)netstandard.dll @&quot;$(GenFacadesResponseFile)&quot;" WorkingDirectory="$(ToolRuntimePath)" />
 
     <!-- Copy the facades to the package ref and lib folders to be included in the packages -->
+    <!-- TODO: replace with BinPlacing targets -->
     <ItemGroup>
       <PackageOutputPaths Include="$(BinDir)$(TargetGroup)/pkg/ref" />
       <PackageOutputPaths Include="$(BinDir)$(TargetGroup)/pkg/lib" />
+      <PackageOutputPaths Include="$(BuildConfigurationRefPath)" />
+      <PackageOutputPaths Include="$(RuntimePath)" />
       <ProducedFacades Include="$(GenFacadesOutputPath)*.dll" />
       <FileWrites Include="@(ProducedFacades)" />
     </ItemGroup>