tweaking @ferventcoder's build updates

.gitignore

@@ -8,4 +8,5 @@ App_Data
 _AzurePackage
 *.bak
 NuGetGallery.sln.docstates
-_ReSharper.NuGetGallery
+_ReSharper.NuGetGallery
+_PackagedWebsite

Scripts/NuGetGallery.msbuild

@@ -5,38 +5,29 @@
 
   <PropertyGroup>
     <Platform>Any CPU</Platform>
-    <BuildDirectory>bin\</BuildDirectory>
-    <BuildPath>$(SolutionDir)..\$(BuildDirectory)</BuildPath>
-    <MigrationsFile>$(BuildPath)\_PublishedWebsites\WebSite\bin\NuGetGallery.Website.dll</MigrationsFile>
+    <OutDir>$(SolutionDir)..\Website\bin\</OutDir>
+    <PackagedWebsiteDir>$(SolutionDir)..\_PackagedWebsite</PackagedWebsiteDir>
   </PropertyGroup>
 
   <UsingTask AssemblyFile="../3rdParty\xunit\xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
 
   <Target Name="Clean">
-    <MSBuild Projects="..\NuGetGallery.sln" Targets="Clean" Properties="Configuration=$(Configuration);Platform=$(Platform);OutDir=$(BuildPath)"/>
-    <RemoveDir Directories="$(BuildPath)" ContinueOnError="true" />
+    <MSBuild Projects="..\NuGetGallery.sln" Targets="Clean" Properties="Configuration=$(Configuration);Platform=$(Platform);OutDir=$(OutDir)"/>
+    <Exec Command="rd $(PackagedWebsiteDir) /s /q" />
   </Target>
 
   <Target Name="Build" DependsOnTargets="Clean">
-    <MSBuild Projects="..\NuGetGallery.sln" Targets="Build" Properties="Configuration=$(Configuration);CodeAnalysis=true;Platform=$(Platform);OutDir=$(BuildPath)" />
+    <MSBuild Projects="..\NuGetGallery.sln" Targets="Build" Properties="Configuration=$(Configuration);CodeAnalysis=true;Platform=$(Platform);OutDir=$(OutDir)" />
+    <Exec Command="xcopy.exe $(OutDir)_PublishedWebsites\Website $(PackagedWebsiteDir)\ /ey" />
+    <Exec Command="rd $(OutDir)_PublishedWebsites /s /q" />
   </Target>
 
   <Target Name="RunFacts" DependsOnTargets="Build"> 
-    <xunit Assembly="$(BuildPath)\NuGetGallery.Facts.dll" Xml="NuGetGallery.Facts.results.xml" />
+    <xunit Assembly="$(OutDir)\NuGetGallery.Facts.dll" Xml="NuGetGallery.Facts.results.xml" />
   </Target>
 
-  <Target Name="CleanBuildOutput">   
-    <ItemGroup>
-      <FilesToRemove 
-        Exclude="$(BuildPath)\_PublishedWebSites\**\*" 
-        Include="$(BuildPath)\**\*"
-      />
-    </ItemGroup>
-    <Delete Files="@(FilesToRemove)" />
-  </Target>
-
-  <Target Name="CIBuild" DependsOnTargets="RunFacts;CleanBuildOutput" />
+  <Target Name="CIBuild" DependsOnTargets="RunFacts" />
 
-  <Target Name="FullBuild" DependsOnTargets="RunFacts;CleanBuildOutput" />
+  <Target Name="FullBuild" DependsOnTargets="RunFacts" />
 
 </Project>