mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into dev/jgoshi/renamePropsFiles

Browse source
This commit is contained in:
Justin Goshi 2017-02-15 10:28:47 -08:00
commit 72db23ed4d
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
build/Signing.proj
View file

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project InitialTargets="SetSigningProperties" DefaultTargets="SignFiles" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))/dir.props" /> <PropertyGroup>
<RepoRoot>$(MSBuildThisFileDirectory)/..</RepoRoot>
</PropertyGroup>
<Import Project="$(RepoRoot)/build_tools/MicroBuild.Core.props" /> <Import Project="$(RepoRoot)/build_tools/MicroBuild.Core.props" />
<!-- This will be overridden if we're building with MicroBuild. --> <!-- This will be overridden if we're building with MicroBuild. -->

2
run-build.ps1
View file

@ -85,7 +85,7 @@ if ((Test-Path $bootStrapperPath) -eq 0)
} }
# now execute it # now execute it
& $bootStrapperPath -RepositoryRoot (Get-Location) -ToolsLocalPath $toolsLocalPath -CliLocalPath $env:DOTNET_INSTALL_DIR_PJ -Architecture $Architecture | Out-File (Join-Path (Get-Location) "bootstrap.log") & $bootStrapperPath -DotNetInstallBranch master -RepositoryRoot (Get-Location) -ToolsLocalPath $toolsLocalPath -CliLocalPath $env:DOTNET_INSTALL_DIR_PJ -Architecture $Architecture | Out-File (Join-Path (Get-Location) "bootstrap.log")
if ($LastExitCode -ne 0) if ($LastExitCode -ne 0)
{ {
Write-Output "Boot-strapping failed with exit code $LastExitCode, see bootstrap.log for more information." Write-Output "Boot-strapping failed with exit code $LastExitCode, see bootstrap.log for more information."

2
run-build.sh
View file

@ -147,7 +147,7 @@ if [ ! -f $bootStrapperPath ]; then
chmod u+x $bootStrapperPath chmod u+x $bootStrapperPath
fi fi
$bootStrapperPath --repositoryRoot "$REPOROOT" --toolsLocalPath "$toolsLocalPath" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE > bootstrap.log $bootStrapperPath --dotNetInstallBranch master --repositoryRoot "$REPOROOT" --toolsLocalPath "$toolsLocalPath" --cliInstallPath $DOTNET_INSTALL_DIR_PJ --architecture $ARCHITECTURE > bootstrap.log
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "run-build: Error: Boot-strapping failed with exit code $?, see bootstrap.log for more information." >&2 echo "run-build: Error: Boot-strapping failed with exit code $?, see bootstrap.log for more information." >&2