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

Cleanup

Browse source
This commit is contained in:
Piotr Puszkiewicz 2017-01-27 00:45:59 -08:00
parent d70aeb950b
commit c4e928a18d
5 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
build/Microsoft.DotNet.Cli.Test.targets
View file

@ -11,7 +11,8 @@
<Target Name="Test"
Condition=" '$(CLIBUILD_SKIP_TESTS)' != 'true' "
DependsOnTargets="BuildTests;">
DependsOnTargets="EnsureStageSeparation;
BuildTests;">
<PropertyGroup>
<PathListSeparator>:</PathListSeparator>
@ -101,4 +102,9 @@
MsbuildArgs="%(TestPackageProject.MsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" />
</Target>
<Target Name="EnsureStageSeparation">
<DotNetMSBuild Arguments=" /v:diag $(RepoRoot)/build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj /p:Stage2Directory=&quot;$(Stage2Directory)&quot;"
ToolPath="$(Stage2Dir)" />
</Target>
</Project>

6
build_projects/Microsoft.DotNet.Cli.Build.SelfTest/InvokeWithStage0.proj
View file

@ -3,9 +3,7 @@
<Import Project="$(RepoRoot)/build/Microsoft.DotNet.Cli.tasks" />
<Target Name="RunValidation">
<Message Text="================================"/>
<DotNetMSBuild Arguments=" /v:diag $(MSBuildThisFileDirectory)/InvokeWithStage2.proj /p:ToolPath=&quot;$(Stage2Dir)&quot;"
ToolPath="$(Stage2Dir)" />
<Message Text="================================"/>
<DotNetMSBuild Arguments=" /v:diag $(MSBuildThisFileDirectory)/InvokeWithStage2.proj /p:ToolPath=&quot;$(Stage2Directory)&quot;"
ToolPath="$(Stage2Directory)" />
</Target>
</Project>

3
build_projects/dotnet-cli-build/DotNetTool.cs
View file

@ -1,9 +1,6 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using Microsoft.Build.Framework;
using Microsoft.Build.Utilities;

4
run-build.ps1
View file

@ -103,8 +103,8 @@ if ($LastExitCode -ne 0)
# install the post-PJnistic stage0
$dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"
Write-Host "$dotnetInstallPath -Version ""1.0.0-preview5-004422"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -Version ""1.0.0-preview5-004422"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Write-Host "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
if ($LastExitCode -ne 0)
{
Write-Output "The .NET CLI installation failed with exit code $LastExitCode"

4
run-build.sh
View file

@ -163,8 +163,8 @@ if [ $? != 0 ]; then
fi
# now execute the script
echo "installing CLI: $dotnetInstallPath --version \"1.0.0-preview5-004422\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
$dotnetInstallPath --version "1.0.0-preview5-004422" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
echo "installing CLI: $dotnetInstallPath --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
$dotnetInstallPath --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
if [ $? != 0 ]; then
echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
exit $?