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

Pinning the CLI version because once this goes in, the next stage0 won't allow for having compile in the csprojs. We will have to update the CLI ones.

Browse source
This commit is contained in:
Livar Cunha 2017-01-04 22:13:19 -08:00 • committed by Livar Cunha
parent 3a4e23e373
commit 92ee4aac26
3 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
run-build.ps1
View file

@ -103,8 +103,8 @@ if ($LastExitCode -ne 0)
# install the post-PJnistic stage0 # install the post-PJnistic stage0
$dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1" $dotnetInstallPath = Join-Path $toolsLocalPath "dotnet-install.ps1"
Write-Host "$dotnetInstallPath -Version ""latest"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" Write-Host "$dotnetInstallPath -Version ""1.0.0-preview5-004384"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
Invoke-Expression "$dotnetInstallPath -Version ""latest"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture""" Invoke-Expression "$dotnetInstallPath -Version ""1.0.0-preview5-004384"" -InstallDir $env:DOTNET_INSTALL_DIR -Architecture ""$Architecture"""
if ($LastExitCode -ne 0) if ($LastExitCode -ne 0)
{ {
Write-Output "The .NET CLI installation failed with exit code $LastExitCode" 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 fi
# now execute the script # now execute the script
echo "installing CLI: $dotnetInstallPath --version \"latest\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\"" echo "installing CLI: $dotnetInstallPath --version \"1.0.0-preview5-004384\" --install-dir $DOTNET_INSTALL_DIR --architecture \"$ARCHITECTURE\""
$dotnetInstallPath --version "latest" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE" $dotnetInstallPath --version "1.0.0-preview5-004384" --install-dir $DOTNET_INSTALL_DIR --architecture "$ARCHITECTURE"
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2 echo "run-build: Error: Boot-strapping post-PJ stage0 with exit code $?." >&2
exit $? exit $?

7
test/dotnet-vstest.Tests/VSTestTests.cs
View file

@ -19,12 +19,17 @@ namespace Microsoft.DotNet.Cli.VSTest.Tests
var testAppName = "VSTestDotNetCore"; var testAppName = "VSTestDotNetCore";
var testRoot = TestAssets.Get(testAppName) var testRoot = TestAssets.Get(testAppName)
.CreateInstance() .CreateInstance()
.WithSourceFiles()
.WithRestoreFiles() .WithRestoreFiles()
.WithBuildFiles()
.Root; .Root;
var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; var configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
new BuildCommand()
.WithWorkingDirectory(testRoot)
.Execute()
.Should().Pass();
var outputDll = testRoot var outputDll = testRoot
.GetDirectory("bin", configuration, "netcoreapp1.0") .GetDirectory("bin", configuration, "netcoreapp1.0")
.GetFile($"{testAppName}.dll"); .GetFile($"{testAppName}.dll");