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

Pinning stage0 to latest and reverting build scripts to use stage0 for now.

Browse source
This commit is contained in:
Livar Cunha 2017-01-05 12:40:23 -08:00
parent 205244fb8a
commit 72cd3d7c43
7 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -42,7 +42,7 @@
TestProject=%(TestProjects.ProjectPath);
TestProjectName=%(TestProjects.OutputName);
TestResultXmlDir=$(TestResultXmlDir);
ToolPath=$(Stage2Directory);
ToolPath=$(Stage0Directory);
WorkingDirectory=%(TestProjects.ProjectDir)
</Properties>
</ProjectsToTest>
@ -79,7 +79,7 @@
Outputs="%(TestProjects.BuildOutput)">
<DotNetBuild Configuration="$(Configuration)"
Framework="%(TestProjects.Framework)"
ToolPath="$(Stage2Directory)"
ToolPath="$(Stage0Directory)"
ProjectPath="%(TestProjects.ProjectPath)" />
</Target>
@ -91,7 +91,7 @@
Outputs="@(RestoreTestsInputs->'%(RelativeDir)/obj/project.assets.json');@(RestoreTestsInputs->'%(RelativeDir)/obj/%(Filename).csproj.nuget.g.props');@(RestoreTestsInputs->'%(RelativeDir)/obj/%(Filename).csproj.nuget.g.targets')">
<CallTarget Targets="CleanTestProjectsLockFiles"/>
<DotNetRestore ToolPath="$(Stage2Directory)"
<DotNetRestore ToolPath="$(Stage0Directory)"
ProjectPath="&quot;%(RestoreTestsInputs.FullPath)&quot;" />
</Target>
@ -217,7 +217,7 @@
<DotNetPack NoBuild="True"
Output="$(TestPackagesDir)"
ProjectPath="%(TestPackageProject.ProjectPath)"
ToolPath="$(Stage2Directory)"
ToolPath="$(Stage0Directory)"
VersionSuffix="%(TestPackageProject.VersionSuffix)"
MsbuildArgs="$(DotNetPackMsbuildArgs) /p:SdkNuGetVersion=$(SdkNugetVersion)" />
</Target>
@ -231,7 +231,7 @@
<DotNetBuild Framework="%(TestPackageProject.Framework)"
Runtime="%(TestPackageProject.Runtime)"
ProjectPath="%(TestPackageProject.ProjectPath)"
ToolPath="$(Stage2Directory)" />
ToolPath="$(Stage0Directory)" />
</Target>
<Target Name="RestoreTestAssetPackageProjects"

4
build/compile/Microsoft.DotNet.Cli.LzmaArchive.targets
View file

@ -80,12 +80,12 @@
<Message Text="Publishing Archiver" />
<DotNetPublish ToolPath="$(Stage2Directory)"
<DotNetPublish ToolPath="$(Stage0Directory)"
WorkingDirectory="$(RepoRoot)/tools/Archiver"
Output="$(ToolsOutputDirectory)"
Configuration="$(Configuration)" />
<Exec Command="$(DotnetStage2) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
<Exec Command="$(DotnetStage0) $(ArchiverDll) -a $(IntermediateArchive) $(NuGetPackagesArchiveFolder)" />
</Target>
<Target Name="SetupNuGetPackagesArchiveInputsOutputs"

2
build/package/Microsoft.DotNet.Cli.Installer.DEB.proj
View file

@ -94,7 +94,7 @@
<!-- Run E2E -->
<DotNetTest ProjectPath="$(EndToEndTestProject)"
EnvironmentVariables="@(TestSdkDebTaskEnvironmentVariables)"
ToolPath="$(Stage2Directory)" />
ToolPath="$(Stage0Directory)" />
<!-- Clean up Packages -->
<Exec Command="sudo dpkg -r $(SdkDebianPackageName)" />

2
build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
View file

@ -144,7 +144,7 @@
<Exec Command ="powershell -NoProfile -NoLogo $(SdkTestMsiPowershellScript)
-InputMsi '$(SdkInstallerFile)'
-DotnetDir '$(Stage2Directory)'" />
-DotnetDir '$(Stage0Directory)'" />
<WriteLinesToFile
File="$(SdkMsiTestedSentinel)"

4
build/package/Microsoft.DotNet.Cli.Nupkg.targets
View file

@ -25,7 +25,7 @@
<DotNetPack NoBuild="True"
Output="$(NupkgOutputDirectory)"
ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj"
ToolPath="$(Stage2Directory)"
ToolPath="$(Stage0Directory)"
VersionSuffix="preview5-$(NupkgVersionSuffix)"
Configuration="$(Configuration)" />
</Target>
@ -36,7 +36,7 @@
<MakeDir Directories="$(PackagingBuildBasePath)" />
<DotNetBuild ToolPath="$(Stage2Directory)"
<DotNetBuild ToolPath="$(Stage0Directory)"
Configuration="$(Configuration)"
ProjectPath="%(ProjectsToPack.Identity)/%(ProjectsToPack.ProjectName).csproj" />
</Target>

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-004384"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -Version ""1.0.0-preview5-004384"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Write-Host "$dotnetInstallPath -Version ""1.0.0-preview5-004392"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -Version ""1.0.0-preview5-004392"" -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-004384\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
$dotnetInstallPath --version "1.0.0-preview5-004384" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
echo "installing CLI: $dotnetInstallPath --version \"1.0.0-preview5-004392\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
$dotnetInstallPath --version "1.0.0-preview5-004392" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
if [ $? != 0 ]; then
echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
exit $?