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

Address PR comments and fix build break

Browse source
This commit is contained in:
Justin Goshi 2017-02-07 16:52:08 -08:00
parent 83b46ebc17
commit b927922b65
5 changed files with 13 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
build.proj
View file

@ -73,8 +73,15 @@
WorkingDirectory="$(DotnetCliBuildDirectory)"/> WorkingDirectory="$(DotnetCliBuildDirectory)"/>
</Target> </Target>
<Target Name="WriteDynamicPropsToStaticPropsFiles"
DependsOnTargets="BuildDotnetCliBuildFramework;
WriteBuildInfoProps;
WriteHostInfoProps"/>
<Target DependsOnTargets="$(CLITargets)" Name="BuildTheWholeCli"></Target> <Target DependsOnTargets="$(CLITargets)" Name="BuildTheWholeCli"></Target>
<Import Project="build/Microsoft.DotNet.Cli.BuildInfo.targets" />
<Import Project="build/Microsoft.DotNet.Cli.HostInfo.targets" />
<Import Project="build/Microsoft.DotNet.Cli.Prepare.targets" /> <Import Project="build/Microsoft.DotNet.Cli.Prepare.targets" />
<Import Project="build/Microsoft.DotNet.Cli.Compile.targets" /> <Import Project="build/Microsoft.DotNet.Cli.Compile.targets" />
<Import Project="build/Microsoft.DotNet.Cli.Package.targets" /> <Import Project="build/Microsoft.DotNet.Cli.Package.targets" />

3
build/Microsoft.DotNet.Cli.BuildInfo.targets
View file

@ -3,7 +3,8 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" />
<Target Name="WriteBuildInfoProps" <Target Name="WriteBuildInfoProps"
Condition=" !Exists('$(BuildInfoProps)') "> Condition=" !Exists('$(BuildInfoProps)') "
DependsOnTargets="BuildDotnetCliBuildFramework">
<GetCommitHash RepoRoot="$(RepoRoot)"> <GetCommitHash RepoRoot="$(RepoRoot)">
<Output TaskParameter="CommitHash" PropertyName="CommitHash" /> <Output TaskParameter="CommitHash" PropertyName="CommitHash" />
</GetCommitHash> </GetCommitHash>

3
build/Microsoft.DotNet.Cli.HostInfo.targets
View file

@ -3,7 +3,8 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" />
<Target Name="WriteHostInfoProps" <Target Name="WriteHostInfoProps"
Condition=" !Exists('$(HostInfoProps)') "> Condition=" !Exists('$(HostInfoProps)') "
DependsOnTargets="BuildDotnetCliBuildFramework">
<GetCurrentRuntimeInformation> <GetCurrentRuntimeInformation>
<Output TaskParameter="Rid" PropertyName="Rid" /> <Output TaskParameter="Rid" PropertyName="Rid" />
<Output TaskParameter="Architecture" PropertyName="Architecture" /> <Output TaskParameter="Architecture" PropertyName="Architecture" />

3
run-build.ps1
View file

@ -114,8 +114,7 @@ if ($NoBuild)
} }
else else
{ {
dotnet msbuild build\Microsoft.DotNet.Cli.BuildInfo.targets /t:WriteBuildInfoProps dotnet msbuild build.proj /t:WriteDynamicPropsToStaticPropsFiles
dotnet msbuild build\Microsoft.DotNet.Cli.HostInfo.targets /t:WriteHostInfoProps
dotnet msbuild build.proj /m /v:diag /p:Architecture=$Architecture $ExtraParameters dotnet msbuild build.proj /m /v:diag /p:Architecture=$Architecture $ExtraParameters
if($LASTEXITCODE -ne 0) { throw "Failed to build" } if($LASTEXITCODE -ne 0) { throw "Failed to build" }
} }

3
run-build.sh
View file

@ -179,8 +179,7 @@ export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
echo "${args[@]}" echo "${args[@]}"
if [ $BUILD -eq 1 ]; then if [ $BUILD -eq 1 ]; then
dotnet msbuild build/Microsoft.DotNet.Cli.BuildInfo.targets /t:WriteBuildInfoProps dotnet msbuild build.proj /t:WriteDynamicPropsToStaticPropsFiles
dotnet msbuild build/Microsoft.DotNet.Cli.HostInfo.targets /t:WriteHostInfoProps
dotnet msbuild build.proj /m /v:diag /p:Architecture=$ARCHITECTURE "${args[@]}" dotnet msbuild build.proj /m /v:diag /p:Architecture=$ARCHITECTURE "${args[@]}"
else else
echo "Not building due to --nobuild" echo "Not building due to --nobuild"