diff options
| author | James Newton-King <james@newtonking.com> | 2012-03-19 13:10:57 +0400 |
|---|---|---|
| committer | James Newton-King <james@newtonking.com> | 2012-03-19 13:10:57 +0400 |
| commit | 1bd218523052921327f3019ff350aca6e2ef49b6 (patch) | |
| tree | b7d08a6e2959c42f2895274f639d38b11ba0cdd7 | |
| parent | 167f186610c3694029df909a14c6e0a3ab446e85 (diff) | |
-More build fixes
| -rw-r--r-- | Build/build.ps1 | 4 | ||||
| -rw-r--r-- | Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/Build/build.ps1 b/Build/build.ps1 index 963492a..fc673f0 100644 --- a/Build/build.ps1 +++ b/Build/build.ps1 @@ -75,7 +75,7 @@ task Package -depends Build { $name = $build.TestsName
$finalDir = $build.FinalDir
- robocopy "$sourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\Package\Bin\$finalDir /NP /XO
+ robocopy "$sourceDir\Newtonsoft.Json\bin\Release\$finalDir" $workingDir\Package\Bin\$finalDir /NP /XO /XF *.pri
}
if ($buildNuGet)
@@ -119,7 +119,7 @@ task Package -depends Build { Copy-Item -Path $docDir\readme.txt -Destination $workingDir\Package\
Copy-Item -Path $docDir\versions.txt -Destination $workingDir\Package\Bin\
- robocopy $sourceDir $workingDir\Package\Source\Src /MIR /NP /XD .svn bin obj TestResults AppPackage /XF *.suo *.user
+ robocopy $sourceDir $workingDir\Package\Source\Src /MIR /NP /XD .svn bin obj TestResults AppPackages /XF *.suo *.user
robocopy $buildDir $workingDir\Package\Source\Build /MIR /NP /XD .svn
robocopy $docDir $workingDir\Package\Source\Doc /MIR /NP /XD .svn
robocopy $toolsDir $workingDir\Package\Source\Tools /MIR /NP /XD .svn
diff --git a/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj b/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj index 6c5973b..ef00576 100644 --- a/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj +++ b/Src/Newtonsoft.Json/Newtonsoft.Json.Metro.csproj @@ -274,11 +274,11 @@ <VisualStudioVersion>11.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
- <!-- To modify your build process, add your task inside one of the targets below and uncomment it. - Other similar extension points exist, see Microsoft.Common.targets. - <Target Name="BeforeBuild"> - </Target> - <Target Name="AfterBuild"> - </Target> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+ Other similar extension points exist, see Microsoft.Common.targets.
+ <Target Name="BeforeBuild">
+ </Target>
+ <Target Name="AfterBuild">
+ </Target>
-->
</Project>
\ No newline at end of file |