Fix build script

Change-Id: I50a80f2ec2655264a34028cf4d938351a002aa52

diff --git a/build/build.dummy.csproj b/build/build.dummy.csproj
index 2100ad3..264b527 100644 (file)
--- a/build/build.dummy.csproj
+++ b/build/build.dummy.csproj
@@ -10,6 +10,7 @@
     <GenerateDependencyFile>false</GenerateDependencyFile>
     <DummyAssemblyVersion>$(VersionPrefix)</DummyAssemblyVersion>
     <BaseIntermediateOutputPath>$(OutputBaseDir)obj\</BaseIntermediateOutputPath>
+    <OutDir>$(OutputDummyDir)</OutDir>
   </PropertyGroup>
 
   <!-- Properties for directories -->

diff --git a/build/build.proj b/build/build.proj
index ccb85da..dc1f4bf 100644 (file)
--- a/build/build.proj
+++ b/build/build.proj
@@ -5,6 +5,7 @@
   <!-- Common Properties -->
   <PropertyGroup>
     <PublicModuleListFile>$(PackageSrcDir)PublicModuleList.txt</PublicModuleListFile>
+    <DummyBuildProject>$(MSBuildThisFileDirectory)build.dummy.csproj</DummyBuildProject>
   </PropertyGroup>
 
   <!-- Build Properties -->
@@ -52,10 +53,14 @@
   <Target Name="Build" DependsOnTargets="Clean">
 
     <MSBuild Projects="@(ProjectToBuild)"
-             Properties="Configuration=$(Configuration);OutDir=$(OutputPlatformDir);RestoreSources=$(RestoreSources)"
+             Properties="Configuration=$(Configuration);RestoreSources=$(RestoreSources)"
+             Targets="Restore" />
+
+    <MSBuild Projects="@(ProjectToBuild)"
+             Properties="Configuration=$(Configuration);OutDir=$(OutputPlatformDir)"
              BuildInParallel="true"
              UseResultsCache="true"
-             Targets="Restore;Rebuild" />
+             Targets="Build" />
 
     <ReadLinesFromFile File="$(PublicModuleListFile)">
       <Output TaskParameter="Lines" ItemName="PublicProject" />
@@ -83,10 +88,8 @@
   -->
   <Target Name="BuildDummy">
 
-    <MSBuild Projects="$(MSBuildThisFileDirectory)build.dummy.csproj"
-             Properties="Configuration=$(Configuration);OutDir=$(OutputBaseDir)\obj\bin;RestoreSources=$(RestoreSources)"
-             BuildInParallel="true"
-             UseResultsCache="true"
+    <MSBuild Projects="$(DummyBuildProject)"
+             Properties="Configuration=$(Configuration);RestoreSources=$(RestoreSources)"
              Targets="Restore;Rebuild" />
 
   </Target>