Skip to content
This repository has been archived by the owner on May 29, 2019. It is now read-only.

Commit

Permalink
Move compiler shared to its own folder
Browse files Browse the repository at this point in the history
  • Loading branch information
Victor Hurdugaci committed Oct 16, 2015
1 parent 912aaaa commit 69ed946
Show file tree
Hide file tree
Showing 24 changed files with 33 additions and 28 deletions.
2 changes: 1 addition & 1 deletion NuGet.config
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/MusicStore/project.json
Expand Up @@ -6,7 +6,7 @@
"version": "1.0.0-*",
"compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] },
"compile": [
"../../test/E2ETests/compiler/shared/**/*.cs"
"../../shared/**/*.cs"
],
"publishExclude": "*.cmd",
"webroot": "wwwroot",
Expand Down
49 changes: 26 additions & 23 deletions test/E2ETests/project.json
@@ -1,26 +1,29 @@
{
"compilationOptions": {
"warningsAsErrors": true
},
"commands": {
"test": "xunit.runner.aspnet"
},
"dependencies": {
"Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
"Microsoft.AspNet.Server.IIS": "1.0.0-*",
"Microsoft.AspNet.Server.Testing": "1.0.0-*",
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
"frameworks": {
"dnx451": {
"frameworkAssemblies": {
"System.Data": "",
"System.Net.Http": "",
"System.Xml": ""
}
}
"compilationOptions": {
"warningsAsErrors": true
},
"compile": [
"../../shared/**/*.cs"
],
"commands": {
"test": "xunit.runner.aspnet"
},
"dependencies": {
"Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
"Microsoft.AspNet.Server.IIS": "1.0.0-*",
"Microsoft.AspNet.Server.Testing": "1.0.0-*",
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
"xunit.runner.aspnet": "2.0.0-aspnet-*"
},
"frameworks": {
"dnx451": {
"frameworkAssemblies": {
"System.Data": "",
"System.Net.Http": "",
"System.Xml": ""
}
}
}
}
6 changes: 4 additions & 2 deletions test/RemoteTest.ps1
Expand Up @@ -14,7 +14,7 @@ Write-Host "Test folder: $serverFolder"
$projectName = (get-item $projectFile).Directory.Name
Write-Host "Test project: $projectName"

Invoke-Expression "..\tools\BundleAndDeploy.ps1 -projectFile $projectFile -server $server -serverFolder $serverFolder -userName $userName -password $password"
Invoke-Expression "..\tools\BundleAndDeploy.ps1 -projectFile $projectFile -server $server -serverFolder $serverFolder -userName $userName -password `"$password`""

$pass = ConvertTo-SecureString $password -AsPlainText -Force
$cred = New-Object System.Management.Automation.PSCredential ($userName, $pass);
Expand All @@ -28,7 +28,7 @@ $remoteScript = {
dir
$env:DNX_TRACE=1

$output = & .\test.cmd 2>&1
$output = & .\approot\test.cmd 2>&1
$output
$lastexitcode
}
Expand All @@ -38,8 +38,10 @@ $remoteJob = Invoke-Command -ComputerName $server -Credential $cred -ScriptBlock
Wait-Job $remoteJob
Write-Host "<<<< Remote execution code completed >>>>"

Write-Host ">>>> Remote execution output <<<<"
$remoteResult = Receive-Job $remoteJob
$remoteResult
Write-Host "<<<< End of remote execution output >>>>"

$finalExitCode = $remoteResult[$remoteResult.Length-1]
exit $finalExitCode
2 changes: 1 addition & 1 deletion tools/BundleAndDeploy.ps1
Expand Up @@ -55,7 +55,7 @@ try
Write-Host "Bundling the application..."
cd "$workDir"
dnvm use default -r CoreCLR -arch x64
dnu publish --runtime active
dnu publish --runtime active --no-source
if ($lastexitcode -ne 0) {
Write-Error "Failed to bundle the application"
exit 1
Expand Down

0 comments on commit 69ed946

Please sign in to comment.