Move compiler shared to its own folder
This commit is contained in:
parent
912aaaa9d2
commit
69ed946970
|
|
@ -1,4 +1,4 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<configuration>
|
<configuration>
|
||||||
<packageSources>
|
<packageSources>
|
||||||
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
|
<add key="AspNetVNext" value="https://www.myget.org/F/aspnetcidev/api/v3/index.json" />
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
"version": "1.0.0-*",
|
"version": "1.0.0-*",
|
||||||
"compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] },
|
"compilationOptions": { "warningsAsErrors": true, "define": [ "DEMO", "TESTING" ] },
|
||||||
"compile": [
|
"compile": [
|
||||||
"../../test/E2ETests/compiler/shared/**/*.cs"
|
"../../shared/**/*.cs"
|
||||||
],
|
],
|
||||||
"publishExclude": "*.cmd",
|
"publishExclude": "*.cmd",
|
||||||
"webroot": "wwwroot",
|
"webroot": "wwwroot",
|
||||||
|
|
|
||||||
|
|
@ -1,26 +1,29 @@
|
||||||
{
|
{
|
||||||
"compilationOptions": {
|
"compilationOptions": {
|
||||||
"warningsAsErrors": true
|
"warningsAsErrors": true
|
||||||
},
|
},
|
||||||
"commands": {
|
"compile": [
|
||||||
"test": "xunit.runner.aspnet"
|
"../../shared/**/*.cs"
|
||||||
},
|
],
|
||||||
"dependencies": {
|
"commands": {
|
||||||
"Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
|
"test": "xunit.runner.aspnet"
|
||||||
"Microsoft.AspNet.Server.IIS": "1.0.0-*",
|
},
|
||||||
"Microsoft.AspNet.Server.Testing": "1.0.0-*",
|
"dependencies": {
|
||||||
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
|
"Microsoft.AspNet.Authentication.OpenIdConnect": "1.0.0-*",
|
||||||
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
|
"Microsoft.AspNet.Server.IIS": "1.0.0-*",
|
||||||
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
|
"Microsoft.AspNet.Server.Testing": "1.0.0-*",
|
||||||
"xunit.runner.aspnet": "2.0.0-aspnet-*"
|
"Microsoft.AspNet.WebUtilities": "1.0.0-*",
|
||||||
},
|
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-*",
|
||||||
"frameworks": {
|
"Microsoft.Extensions.Logging.Console": "1.0.0-*",
|
||||||
"dnx451": {
|
"xunit.runner.aspnet": "2.0.0-aspnet-*"
|
||||||
"frameworkAssemblies": {
|
},
|
||||||
"System.Data": "",
|
"frameworks": {
|
||||||
"System.Net.Http": "",
|
"dnx451": {
|
||||||
"System.Xml": ""
|
"frameworkAssemblies": {
|
||||||
}
|
"System.Data": "",
|
||||||
}
|
"System.Net.Http": "",
|
||||||
|
"System.Xml": ""
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -14,7 +14,7 @@ Write-Host "Test folder: $serverFolder"
|
||||||
$projectName = (get-item $projectFile).Directory.Name
|
$projectName = (get-item $projectFile).Directory.Name
|
||||||
Write-Host "Test project: $projectName"
|
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
|
$pass = ConvertTo-SecureString $password -AsPlainText -Force
|
||||||
$cred = New-Object System.Management.Automation.PSCredential ($userName, $pass);
|
$cred = New-Object System.Management.Automation.PSCredential ($userName, $pass);
|
||||||
|
|
@ -28,7 +28,7 @@ $remoteScript = {
|
||||||
dir
|
dir
|
||||||
$env:DNX_TRACE=1
|
$env:DNX_TRACE=1
|
||||||
|
|
||||||
$output = & .\test.cmd 2>&1
|
$output = & .\approot\test.cmd 2>&1
|
||||||
$output
|
$output
|
||||||
$lastexitcode
|
$lastexitcode
|
||||||
}
|
}
|
||||||
|
|
@ -38,8 +38,10 @@ $remoteJob = Invoke-Command -ComputerName $server -Credential $cred -ScriptBlock
|
||||||
Wait-Job $remoteJob
|
Wait-Job $remoteJob
|
||||||
Write-Host "<<<< Remote execution code completed >>>>"
|
Write-Host "<<<< Remote execution code completed >>>>"
|
||||||
|
|
||||||
|
Write-Host ">>>> Remote execution output <<<<"
|
||||||
$remoteResult = Receive-Job $remoteJob
|
$remoteResult = Receive-Job $remoteJob
|
||||||
$remoteResult
|
$remoteResult
|
||||||
|
Write-Host "<<<< End of remote execution output >>>>"
|
||||||
|
|
||||||
$finalExitCode = $remoteResult[$remoteResult.Length-1]
|
$finalExitCode = $remoteResult[$remoteResult.Length-1]
|
||||||
exit $finalExitCode
|
exit $finalExitCode
|
||||||
|
|
|
||||||
|
|
@ -55,7 +55,7 @@ try
|
||||||
Write-Host "Bundling the application..."
|
Write-Host "Bundling the application..."
|
||||||
cd "$workDir"
|
cd "$workDir"
|
||||||
dnvm use default -r CoreCLR -arch x64
|
dnvm use default -r CoreCLR -arch x64
|
||||||
dnu publish --runtime active
|
dnu publish --runtime active --no-source
|
||||||
if ($lastexitcode -ne 0) {
|
if ($lastexitcode -ne 0) {
|
||||||
Write-Error "Failed to bundle the application"
|
Write-Error "Failed to bundle the application"
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue