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

Tweak restoration and dependencies

Browse source
This commit is contained in:
Bryan Thornbury 2015-12-03 00:01:19 +00:00
parent 64523881e7
commit a93e9111d7
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scripts/test/e2e-test.sh
View file

@ -17,7 +17,7 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
source "$DIR/../_common.sh" source "$DIR/../_common.sh"
rm "$REPOROOT/test/E2E/project.lock.json" rm "$REPOROOT/test/E2E/project.lock.json"
dotnet restore "$REPOROOT/test/E2E" --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64" dotnet restore --quiet "$REPOROOT/test/E2E" --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64"
dotnet publish --framework dnxcore50 --runtime "$RID" --output "$REPOROOT/artifacts/$RID/e2etest" "$REPOROOT/test/E2E" dotnet publish --framework dnxcore50 --runtime "$RID" --output "$REPOROOT/artifacts/$RID/e2etest" "$REPOROOT/test/E2E"
# set -e will abort if the exit code of this is non-zero # set -e will abort if the exit code of this is non-zero

2
test/E2E/E2ETest.cs
View file

@ -117,7 +117,7 @@ namespace ConsoleApplication
Directory.SetCurrentDirectory(TestDirectory); Directory.SetCurrentDirectory(TestDirectory);
TestRunCommand("dotnet", "init"); TestRunCommand("dotnet", "init");
TestRunCommand("dotnet", "restore"); TestRunCommand("dotnet", "restore --quiet");
} }
private bool SkipForOS(OSPlatform os, string reason) private bool SkipForOS(OSPlatform os, string reason)

10
test/E2E/project.json
View file

@ -5,11 +5,11 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms":"1.0.1-beta-*", "Microsoft.NETCore.Platforms":"1.0.1-*",
"Microsoft.NETCore.Runtime": "1.0.1-beta-*", "Microsoft.NETCore.Runtime": "1.0.1-*",
"System.Console": "4.0.0-beta-*", "System.Console": "4.0.0-*",
"System.Runtime": "4.0.21-beta-*", "System.Runtime": "4.0.21-*",
"System.AppContext": "4.0.1-beta-*", "System.AppContext": "4.0.1-*",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101", "xunit.console.netcore": "1.0.2-prerelease-00101",