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

merge with masters changes

Browse source
This commit is contained in:
Bryan Thornbury 2015-10-21 23:46:41 -07:00
commit 94f04350f2
11 changed files with 137 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
README.md
View file

@ -1,5 +1,15 @@
# .NET Command Line Interface # .NET Command Line Interface
Build Status
------------
| |Ubuntu 14.04 |Windows |Mac OS X |
|---------|:------:|:------:|:------:|:------:|:-------:|:-------:|
|**Debug**|[![Build Status](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_debug_ubuntu/badge/icon)](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_debug_ubuntu/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_debug_windows_nt/badge/icon)](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_debug_windows_nt/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_debug_osx/badge/icon)](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_debug_osx/) |
|**Release**|[![Build Status](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_release_ubuntu/badge/icon)](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_release_ubuntu/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_release_windows_nt/badge/icon)](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_release_windows_nt/)|[![Build Status](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_release_osx/badge/icon)](http://dotnet-ci.cloudapp.net/job/Private/job/dotnet_cli_release_osx/) |
## Building/Running ## Building/Running
1. Run `build.cmd` or `build.sh` from the root 1. Run `build.cmd` or `build.sh` from the root

92
netci.groovy
View file

@ -4,34 +4,78 @@ import jobs.generation.Utilities;
import jobs.generation.InternalUtilities; import jobs.generation.InternalUtilities;
def project = 'dotnet/cli' def project = 'dotnet/cli'
// Define build strings
def debugBuildString = '''./build.sh'''
// Generate the builds for debug def osList = ['Ubuntu', 'OSX', 'Windows_NT']
def linuxDebugJob = job(InternalUtilities.getFullJobName(project, 'linux_debug', false)) { def machineLabelMap = ['Ubuntu':'ubuntu',
label('ubuntu') 'OSX':'mac',
steps { 'Windows_NT':'windows']
shell(debugBuildString)
} def static getBuildJobName(def configuration, def os) {
return configuration.toLowerCase() + '_' + os.toLowerCase()
} }
InternalUtilities.addPrivatePermissions(linuxDebugJob)
InternalUtilities.addPrivateScm(linuxDebugJob, project) ['Debug', 'Release'].each { configuration ->
Utilities.addStandardOptions(linuxDebugJob) osList.each { os ->
Utilities.addStandardNonPRParameters(linuxDebugJob) // Calculate names
Utilities.addGithubPushTrigger(linuxDebugJob) def lowerConfiguration = configuration.toLowerCase()
// Calculate job name
def jobName = getBuildJobName(configuration, os)
def buildCommand = '';
// Calculate the build command
if (os == 'Windows_NT') {
buildCommand = ".\\scripts\\ci_build.cmd ${lowerConfiguration}"
}
else {
buildCommand = "./scripts/ci_build.sh ${lowerConfiguration}"
}
// Create the new job
def newCommitJob = job(InternalUtilities.getFullJobName(project, jobName, false)) {
// Set the label.
label(machineLabelMap[os])
steps {
if (os == 'Windows_NT') {
// Batch
batchFile(buildCommand)
}
else {
// Shell
shell(buildCommand)
}
}
}
InternalUtilities.addPrivatePermissions(newCommitJob)
InternalUtilities.addPrivateScm(newCommitJob, project)
Utilities.addStandardOptions(newCommitJob)
Utilities.addStandardNonPRParameters(newCommitJob)
Utilities.addGithubPushTrigger(newCommitJob)
def linuxDebugPRJob = job(InternalUtilities.getFullJobName(project, 'linux_debug', true)) { def newPRJob = job(InternalUtilities.getFullJobName(project, jobName, true)) {
label('ubuntu') // Set the label.
steps { label(machineLabelMap[os])
shell(debugBuildString) steps {
} if (os == 'Windows_NT') {
// Batch
batchFile(buildCommand)
}
else {
// Shell
shell(buildCommand)
}
}
}
InternalUtilities.addPrivatePermissions(newPRJob)
InternalUtilities.addPrivatePRTestSCM(newPRJob, project)
Utilities.addStandardOptions(newPRJob)
Utilities.addStandardPRParameters(newPRJob, project)
Utilities.addGithubPRTrigger(newPRJob, "${os} ${configuration} Build")
}
} }
InternalUtilities.addPrivatePermissions(linuxDebugPRJob)
InternalUtilities.addPrivatePRTestSCM(linuxDebugPRJob, project)
Utilities.addStandardOptions(linuxDebugPRJob)
Utilities.addStandardPRParameters(linuxDebugPRJob, project)
Utilities.addGithubPRTrigger(linuxDebugPRJob, 'Linux Debug Build')

5
scripts/ci_build.cmd Normal file
View file

@ -0,0 +1,5 @@
@echo off
CALL %~dp0..\build.cmd %*
exit /b %errorlevel%

9
scripts/ci_build.sh Executable file
View file

@ -0,0 +1,9 @@
#!/usr/bin/env bash
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
$SCRIPT_DIR/../build.sh $@
ret_code=$?
exit $ret_code

8
src/Microsoft.DotNet.Cli.Utils/project.json
View file

@ -4,10 +4,10 @@
"shared": "**/*.cs", "shared": "**/*.cs",
"dependencies": { "dependencies": {
"System.Console": "4.0.0-*", "System.Console": "4.0.0-beta-23419",
"System.IO.FileSystem": "4.0.1-*", "System.IO.FileSystem": "4.0.1-beta-23419",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-beta-23419",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-*" "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23419"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { } "dnxcore50": { }

10
src/Microsoft.DotNet.Cli/project.json
View file

@ -8,12 +8,12 @@
"dotnet": "Microsoft.DotNet.Cli" "dotnet": "Microsoft.DotNet.Cli"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23413", "Microsoft.NETCore.Runtime": "1.0.1-beta-23419",
"System.Console": "4.0.0-*", "System.Console": "4.0.0-beta-23419",
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-beta-23419",
"System.Linq": "4.0.1-*", "System.Linq": "4.0.1-beta-23419",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-beta-23419",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"

14
src/Microsoft.DotNet.Tools.Compiler.Csc/project.json
View file

@ -8,14 +8,14 @@
"dotnet-compile-csc": "Microsoft.DotNet.Tools.Compiler.Csc" "dotnet-compile-csc": "Microsoft.DotNet.Tools.Compiler.Csc"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.TestHost": "1.0.0-*", "Microsoft.NETCore.TestHost": "1.0.0-beta-23419",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23413", "Microsoft.NETCore.Runtime": "1.0.1-beta-23419",
"System.Console": "4.0.0-*", "System.Console": "4.0.0-beta-23419",
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-beta-23419",
"System.Linq": "4.0.1-*", "System.Linq": "4.0.1-beta-23419",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-beta-23419",
"System.IO.FileSystem": "4.0.1-*", "System.IO.FileSystem": "4.0.1-beta-23419",
"Microsoft.Extensions.ProjectModel": "1.0.0-*", "Microsoft.Extensions.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",

10
src/Microsoft.DotNet.Tools.Compiler/project.json
View file

@ -11,11 +11,11 @@
"Microsoft.NETCore.TestHost": "1.0.0-*", "Microsoft.NETCore.TestHost": "1.0.0-*",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23413", "Microsoft.NETCore.Runtime": "1.0.1-beta-23413",
"System.Console": "4.0.0-*", "System.Console": "4.0.0-beta-23419",
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-beta-23419",
"System.Linq": "4.0.1-*", "System.Linq": "4.0.1-beta-23419",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-beta-23419",
"System.IO.FileSystem": "4.0.1-*", "System.IO.FileSystem": "4.0.1-beta-23419",
"Microsoft.Extensions.ProjectModel": "1.0.0-*", "Microsoft.Extensions.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",

14
src/Microsoft.DotNet.Tools.Publish/project.json
View file

@ -8,12 +8,12 @@
"dotnet-publish": "Microsoft.DotNet.Tools.Publish" "dotnet-publish": "Microsoft.DotNet.Tools.Publish"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23413", "Microsoft.NETCore.Runtime": "1.0.1-beta-23419",
"System.Console": "4.0.0-*", "System.Console": "4.0.0-beta-23419",
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-beta-23419",
"System.Linq": "4.0.1-*", "System.Linq": "4.0.1-beta-23419",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-beta-23419",
"System.IO.FileSystem": "4.0.1-*", "System.IO.FileSystem": "4.0.1-beta-23419",
"Microsoft.Extensions.ProjectModel": "1.0.0-*", "Microsoft.Extensions.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",
@ -23,7 +23,7 @@
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"
}, },
"System.AppContext": "4.0.1-*" "System.AppContext": "4.0.1-beta-23419"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { } "dnxcore50": { }

18
src/Microsoft.DotNet.Tools.Resgen/project.json
View file

@ -8,13 +8,13 @@
"resgen": "Microsoft.DotNet.Tools.Resgen" "resgen": "Microsoft.DotNet.Tools.Resgen"
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.TestHost": "1.0.0-*", "Microsoft.NETCore.TestHost": "1.0.0-beta-23419",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23413", "Microsoft.NETCore.Runtime": "1.0.1-beta-23419",
"System.Console": "4.0.0-*", "System.Console": "4.0.0-beta-23419",
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-beta-23419",
"System.Linq": "4.0.1-*", "System.Linq": "4.0.1-beta-23419",
"System.Diagnostics.Process": "4.1.0-*", "System.Diagnostics.Process": "4.1.0-beta-23419",
"System.IO.FileSystem": "4.0.1-*", "System.IO.FileSystem": "4.0.1-beta-23419",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"
@ -23,8 +23,8 @@
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"
}, },
"System.Xml.XDocument": "4.0.11-*", "System.Xml.XDocument": "4.0.11-beta-23419",
"System.Resources.ReaderWriter": "4.0.0-*" "System.Resources.ReaderWriter": "4.0.0-beta-23419"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { } "dnxcore50": { }

16
src/Microsoft.Extensions.ProjectModel/project.json
View file

@ -3,18 +3,18 @@
"description": "Types to model a .NET Project", "description": "Types to model a .NET Project",
"dependencies": { "dependencies": {
"Microsoft.CSharp": "4.0.1-*", "Microsoft.CSharp": "4.0.1-beta-23419",
"System.Collections": "4.0.11-*", "System.Collections": "4.0.11-beta-23419",
"System.Linq": "4.0.1-*", "System.Linq": "4.0.1-beta-23419",
"System.Threading.Thread": "4.0.0-*", "System.Threading.Thread": "4.0.0-beta-23419",
"System.Runtime.Loader": "4.0.0-*", "System.Runtime.Loader": "4.0.0-beta-23419",
"System.Dynamic.Runtime": "4.0.11-*", "System.Dynamic.Runtime": "4.0.11-beta-23419",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-*", "System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23419",
"NuGet.Packaging": "3.2.0", "NuGet.Packaging": "3.2.0",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-23401", "System.Security.Cryptography.Algorithms": "4.0.0-beta-23401",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-*", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-beta-23419",
"Microsoft.Extensions.JsonParser.Sources": { "Microsoft.Extensions.JsonParser.Sources": {
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"