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

Merge pull request #1004 from piotrpMSFT/anurse/bootstrap-with-nuget-finally

Browse source 
Anurse/bootstrap with nuget finally
This commit is contained in:
Piotr Puszkiewicz 2016-01-27 11:03:19 -08:00
commit 788194e48e
84 changed files with 530 additions and 584 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,5 +1,8 @@
### Repo-specific things ###
# NuGet keeps dropping
Library/
# NuGet v3 restore drops these even though we don't use MSBuild :(
*.nuget.targets
*.nuget.props

3
build.cmd
View file

@ -3,4 +3,7 @@
REM Copyright (c) .NET Foundation and contributors. All rights reserved.
REM Licensed under the MIT license. See LICENSE file in the project root for full license information.
REM Crossgen Workaround
set ComPlus_ReadyToRun=0
powershell -NoProfile -NoLogo -Command "%~dp0scripts\build\build.ps1 %*; exit $LastExitCode;"

2
packaging/windows/Dotnet.Cli.Msi.Tests/project.json
View file

@ -1,4 +1,4 @@
{
{
"compilationOptions": {
"emitEntryPoint": true
},

3
scripts/build/build.ps1
View file

@ -39,6 +39,9 @@ if ($Offline){
else {
_ "$RepoRoot\scripts\obtain\install-tools.ps1"
# Put the stage0 on the path
$env:PATH = "$env:DOTNET_INSTALL_DIR\cli\bin;$env:PATH"
_ "$RepoRoot\scripts\build\restore-packages.ps1"
}

11
scripts/build/build.sh
View file

@ -32,10 +32,10 @@ $REPOROOT/scripts/test/check-prereqs.sh
header "Adjusting file descriptors limit, if necessary"
# Increases the file descriptors limit for this bash. It prevents an issue we were hitting during restore
FILE_DESCRIPTOR_LIMIT=$( ulimit -n )
if [ $FILE_DESCRIPTOR_LIMIT -lt 512 ]
if [ $FILE_DESCRIPTOR_LIMIT -lt 1024 ]
then
info "Increasing file description limit to 512"
ulimit -n 512
info "Increasing file description limit to 1024"
ulimit -n 1024
fi
header "Restoring Tools and Packages"
@ -44,8 +44,9 @@ if [ ! -z "$OFFLINE" ]; then
info "Skipping Tools and Package Download: Offline build"
else
$REPOROOT/scripts/obtain/install-tools.sh
$REPOROOT/scripts/build/restore-packages.sh
# Restore using the stage 0
PATH="$REPOROOT/.dotnet_stage0/$RID/bin:$PATH" $REPOROOT/scripts/build/restore-packages.sh
fi
header "Compiling"

9
scripts/build/restore-packages.ps1
View file

@ -6,13 +6,14 @@
. $PSScriptRoot\..\common\_common.ps1
# Restore packages
# NOTE(anurse): I had to remove --quiet, because NuGet3 is too quiet when that's provided :(
header "Restoring packages"
& "$DnxRoot\dnu" restore "$RepoRoot\src" --quiet --runtime "$Rid"
& "$DnxRoot\dnu" restore "$RepoRoot\test" --quiet --runtime "$Rid"
& "$DnxRoot\dnu" restore "$RepoRoot\tools" --quiet --runtime "$Rid"
dotnet restore "$RepoRoot\src" --runtime "$Rid"
dotnet restore "$RepoRoot\test" --runtime "$Rid"
dotnet restore "$RepoRoot\tools" --runtime "$Rid"
$oldErrorAction=$ErrorActionPreference
$ErrorActionPreference="SilentlyContinue"
& "$DnxRoot\dnu" restore "$RepoRoot\testapp" --quiet --runtime "$Rid" "$NoCacheArg" 2>&1 | Out-Null
dotnet restore "$RepoRoot\testapp" --runtime "$Rid" 2>&1 | Out-Null
$ErrorActionPreference=$oldErrorAction

8
scripts/build/restore-packages.sh
View file

@ -18,9 +18,9 @@ source "$DIR/../common/_common.sh"
header "Restoring packages"
$DNX_ROOT/dnu restore "$REPOROOT/src" --quiet
$DNX_ROOT/dnu restore "$REPOROOT/test" --quiet
$DNX_ROOT/dnu restore "$REPOROOT/tools" --quiet
dotnet restore "$REPOROOT/src" --runtime $RID
dotnet restore "$REPOROOT/test" --runtime $RID
dotnet restore "$REPOROOT/tools" --runtime $RID
set +e
$DNX_ROOT/dnu restore "$REPOROOT/testapp" --quiet >/dev/null 2>&1
dotnet restore "$REPOROOT/testapp" --runtime $RID >/dev/null 2>&1
set -e

4
scripts/common/_common.ps1
View file

@ -7,7 +7,7 @@
$Rid = "win7-x64"
$Tfm = "dnxcore50"
$RepoRoot = Convert-Path "$PSScriptRoot\..\.."
$RepoRoot = Resolve-Path "$PSScriptRoot\..\.."
$OutputDir = "$RepoRoot\artifacts\$Rid"
$DnxDir = "$OutputDir\dnx"
$DnxRoot = "$DnxDir\bin"
@ -19,6 +19,8 @@ $HostDir = "$OutputDir\corehost"
$PackageDir = "$RepoRoot\artifacts\packages\dnvm"
$env:ReleaseSuffix = "beta"
$env:Channel = "$env:ReleaseSuffix"
$env:TEST_ROOT = "$OutputDir\tests"
$env:TEST_ARTIFACTS = "$env:TEST_ROOT\artifacts"
# Set reasonable defaults for unset variables
setEnvIfDefault "DOTNET_INSTALL_DIR" "$(Convert-Path "$PSScriptRoot\..")\.dotnet_stage0\win7-x64"

2
scripts/common/_rid.sh
View file

@ -23,7 +23,7 @@ if [ -z "$RID" ]; then
export RID=ubuntu.14.04-x64
elif [ "$(cat /etc/*-release | grep -cim1 centos)" -eq 1 ]; then
export OSNAME=centos
export RID=centos.7.1-x64
export RID=centos.7-x64
else
error "unknown Linux Distro" 1>&2
fi

8
scripts/compile/compile-stage.ps1
View file

@ -130,10 +130,10 @@ $BinariesForCoreHost | ForEach-Object {
}
# Crossgen Roslyn
if (-not (Test-Path "$OutputDir\bin\csc.ni.exe")) {
header "Crossgening Roslyn compiler ..."
_cmd "$RepoRoot\scripts\crossgen\crossgen_roslyn.cmd ""$OutputDir"""
}
#if (-not (Test-Path "$OutputDir\bin\csc.ni.exe")) {
#header "Crossgening Roslyn compiler ..."
#_cmd "$RepoRoot\scripts\crossgen\crossgen_roslyn.cmd ""$OutputDir"""
#}
# Copy in AppDeps
if (-not (Test-Path "$OutputDir\bin\appdepsdk\")) {

8
scripts/compile/compile-stage.sh
View file

@ -115,10 +115,10 @@ cd $OUTPUT_DIR
find . -type f | xargs chmod 644
$REPOROOT/scripts/build/fix-mode-flags.sh
if [ ! -f "$OUTPUT_DIR/bin/csc.ni.exe" ]; then
info "Crossgenning Roslyn compiler ..."
$REPOROOT/scripts/crossgen/crossgen_roslyn.sh "$OUTPUT_DIR/bin"
fi
#if [ ! -f "$OUTPUT_DIR/bin/csc.ni.exe" ]; then
#info "Crossgenning Roslyn compiler ..."
#$REPOROOT/scripts/crossgen/crossgen_roslyn.sh "$OUTPUT_DIR/bin"
#fi
# Make OUTPUT_DIR Folder Accessible
chmod -R a+r $OUTPUT_DIR

2
scripts/crossgen/crossgen_roslyn.cmd
View file

@ -9,7 +9,7 @@ set BIN_DIR=%CD%\bin
popd
REM Replace with a robust method for finding the right crossgen.exe
set CROSSGEN_UTIL=%NUGET_PACKAGES%\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-rc2-23704\tools\crossgen.exe
set CROSSGEN_UTIL=%NUGET_PACKAGES%\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-rc2-23720\tools\crossgen.exe
REM Crossgen currently requires itself to be next to mscorlib
copy %CROSSGEN_UTIL% /Y %BIN_DIR% > nul

2
scripts/crossgen/crossgen_roslyn.sh
View file

@ -23,7 +23,7 @@ else
fi
# Replace with a robust method for finding the right crossgen.exe
CROSSGEN_UTIL=$NUGET_PACKAGES/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-rc2-23704/tools/crossgen
CROSSGEN_UTIL=$NUGET_PACKAGES/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-rc2-23720/tools/crossgen
cd $BIN_DIR

36
scripts/obtain/install-dnx.ps1
View file

@ -1,36 +0,0 @@
#
# Copyright (c) .NET Foundation and contributors. All rights reserved.
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
#
. $PSScriptRoot\..\common\_common.ps1
$DnxPackage = "dnx-coreclr-win-x64.1.0.0-rc1-update1.nupkg"
$DnxVersion = "1.0.0-rc1-16231"
$doInstall = $true
# check if the required dnx version is already downloaded
if ((Test-Path "$DnxRoot\dnx.exe")) {
$dnxOut = & "$DnxRoot\dnx.exe" --version
if ($dnxOut -Match $DnxVersion) {
Write-Host "Dnx version - $DnxVersion already downloaded."
$doInstall = $false
}
}
if ($doInstall)
{
# Download dnx to copy to stage2
Remove-Item -Recurse -Force -ErrorAction Ignore $DnxDir
mkdir -Force "$DnxDir" | Out-Null
Write-Host "Downloading Dnx version - $DnxVersion."
$DnxUrl="https://api.nuget.org/packages/$DnxPackage"
Invoke-WebRequest -UseBasicParsing "$DnxUrl" -OutFile "$DnxDir\dnx.zip"
Add-Type -Assembly System.IO.Compression.FileSystem | Out-Null
[System.IO.Compression.ZipFile]::ExtractToDirectory("$DnxDir\dnx.zip", "$DnxDir")
}

71
scripts/obtain/install-dnx.sh
View file

@ -1,71 +0,0 @@
#!/usr/bin/env bash
#
# Copyright (c) .NET Foundation and contributors. All rights reserved.
# Licensed under the MIT license. See LICENSE file in the project root for full license information.
#
set -e
SOURCE="${BASH_SOURCE[0]}"
while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
SOURCE="$(readlink "$SOURCE")"
[[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
source "$DIR/../common/_common.sh"
say() {
printf "%b\n" "dotnet_install_dnx: $1"
}
doInstall=true
DNX_FEED="https://api.nuget.org/packages"
DNX_PACKAGE_VERSION="1.0.0-rc1-update1"
DNX_VERSION="1.0.0-rc1-16231"
if [ "$OSNAME" == "osx" ]; then
DNX_FLAVOR="dnx-coreclr-darwin-x64"
elif [ "$OSNAME" == "ubuntu" ]; then
DNX_FLAVOR="dnx-coreclr-linux-x64"
elif [ "$OSNAME" == "centos" ]; then
# No support dnx on redhat yet.
# using patched dnx
DNX_FEED="https://dotnetcli.blob.core.windows.net/dotnet/redhat_dnx"
DNX_PACKAGE_VERSION="1.0.0-rc2-15000"
DNX_VERSION="1.0.0-rc2-15000"
DNX_FLAVOR="dnx-coreclr-redhat-x64"
else
error "unknown OS: $OSNAME" 1>&2
exit 1
fi
DNX_URL="$DNX_FEED/$DNX_FLAVOR.$DNX_PACKAGE_VERSION.nupkg"
say "Preparing to install DNX to $DNX_DIR"
say "Requested Version: $DNX_VERSION"
if [ -e "$DNX_ROOT/dnx" ] ; then
dnxOut=`$DNX_ROOT/dnx --version | grep '^ Version: ' | awk '{ print $2; }'`
say "Local Version: $dnxOut"
if [ $dnxOut = $DNX_VERSION ] ; then
say "You already have the requested version."
doInstall=false
fi
else
say "Local Version: Not Installed"
fi
if [ $doInstall = true ] ; then
rm -rf $DNX_DIR
mkdir -p $DNX_DIR
curl -o $DNX_DIR/dnx.zip $DNX_URL --silent
unzip -qq $DNX_DIR/dnx.zip -d $DNX_DIR
chmod a+x $DNX_ROOT/dnu $DNX_ROOT/dnx
fi

7
scripts/obtain/install-tools.ps1
View file

@ -14,10 +14,3 @@ if (!(Test-Path $env:DOTNET_INSTALL_DIR))
# Install a stage 0
header "Installing dotnet stage 0"
_ "$RepoRoot\scripts\obtain\install.ps1" @("$env:Channel")
# Put stage0 on the PATH
$env:PATH = "$env:DOTNET_INSTALL_DIR\cli\bin;$env:PATH"
# Download dnx to copy to stage2
header "Downloading DNX $DnxVersion"
_ "$RepoRoot\scripts\obtain\install-dnx.ps1"

7
scripts/obtain/install-tools.sh
View file

@ -22,10 +22,3 @@ source "$DIR/../common/_common.sh"
# Ensure the latest stage0 is installed
header "Installing dotnet stage 0"
$REPOROOT/scripts/obtain/install.sh
# Put the stage0 on the PATH
export PATH=$REPOROOT/artifacts/$RID/stage0/bin:$PATH
# Download DNX to copy into stage2
header "Downloading DNX $DNX_VERSION"
$REPOROOT/scripts/obtain/install-dnx.sh

1
src/Microsoft.DotNet.Cli.Utils/Command.cs
View file

@ -103,6 +103,7 @@ namespace Microsoft.DotNet.Cli.Utils
#endif
return new CommandResult(
this._process.StartInfo,
exitCode,
_stdOut.GetCapturedOutput(),
_stdErr.GetCapturedOutput());

6
src/Microsoft.DotNet.Cli.Utils/CommandResult.cs
View file

@ -1,18 +1,22 @@
// Copyright (c) .NET Foundation and contributors. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
using System.Diagnostics;
namespace Microsoft.DotNet.Cli.Utils
{
public struct CommandResult
{
public static readonly CommandResult Empty = new CommandResult();
public ProcessStartInfo StartInfo { get; }
public int ExitCode { get; }
public string StdOut { get; }
public string StdErr { get; }
public CommandResult(int exitCode, string stdOut, string stdErr)
public CommandResult(ProcessStartInfo startInfo, int exitCode, string stdOut, string stdErr)
{
StartInfo = startInfo;
ExitCode = exitCode;
StdOut = stdOut;
StdErr = stdErr;

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

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
@ -6,15 +6,17 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"System.Reflection.Metadata": "1.1.0",
"System.Reflection.Metadata": "1.2.0-rc3-23727",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530"
},
"frameworks": {
"dnxcore50": { }
},
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}
}

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

@ -5,8 +5,8 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
@ -14,7 +14,9 @@
}
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}

8
src/Microsoft.DotNet.Compiler.Common/project.json
View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
@ -6,15 +6,15 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"System.CommandLine": "0.1.0-*",
"Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-win8+net45"
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {

8
src/Microsoft.DotNet.ProjectModel.Loader/project.json
View file

@ -4,11 +4,13 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"System.Runtime.Loader": "4.0.0-rc2-23704"
"System.Runtime.Loader": "4.0.0-rc3-23727"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

48
src/Microsoft.DotNet.ProjectModel.Server/project.json
View file

@ -1,26 +1,28 @@
{
"name": "dotnet-projectmodel-server",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"System.Threading.ThreadPool": "4.0.10-rc2-23704",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23704",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
"name": "dotnet-projectmodel-server",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"Microsoft.Extensions.Logging": "1.0.0-rc2-16011",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16011",
"Newtonsoft.Json": "7.0.1"
},
"frameworks": {
"dnxcore50": { }
},
"scripts": {
}
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727",
"System.Threading.ThreadPool": "4.0.10-rc3-23727",
"System.Runtime.Serialization.Primitives": "4.1.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Extensions.Logging": "1.0.0-rc2-16011",
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-16011",
"Newtonsoft.Json": "7.0.1"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}
}

28
src/Microsoft.DotNet.ProjectModel.Workspaces/project.json
View file

@ -1,17 +1,17 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160108-01"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"version": "1.0.0-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160108-01"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}
}

22
src/Microsoft.DotNet.ProjectModel/project.json
View file

@ -1,17 +1,17 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"keyFile": "../../tools/Key.snk"
},
"description": "Types to model a .NET Project",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"System.Reflection.Metadata": "1.2.0-rc2-23608",
"System.Runtime.Loader": "4.0.0-rc2-23704",
"System.Dynamic.Runtime": "4.0.11-rc2-23704",
"System.Security.Cryptography.Algorithms": "4.0.0-rc2-23704",
"Microsoft.CSharp": "4.0.1-rc2-23704",
"System.Xml.XDocument": "4.0.11-rc2-23704",
"System.Runtime.Loader": "4.0.0-rc3-23727",
"System.Dynamic.Runtime": "4.0.11-rc3-23727",
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23727",
"Microsoft.CSharp": "4.0.1-rc3-23727",
"System.Xml.XDocument": "4.0.11-rc3-23727",
"NuGet.Packaging": "3.4.0-beta-536",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15975",
@ -24,13 +24,15 @@
"version": "1.0.0-*"
},
"Microsoft.Extensions.DependencyModel": {
"type": "build",
"version": "1.0.0-*"
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}

22
src/Microsoft.DotNet.Runtime/project.json
View file

@ -1,14 +1,16 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23704"
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc3-23727"
},
"frameworks": {
"dnxcore50": { }
}
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

46
src/Microsoft.DotNet.Tools.Builder/project.json
View file

@ -1,25 +1,25 @@
{
"name": "dotnet-build",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Tools.Compiler": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
{
"name": "dotnet-build",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Tools.Compiler": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-win8+net45"
}
},
"scripts": {
}
}

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

@ -5,9 +5,10 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160108-01",
"System.Net.Sockets": "4.1.0-rc3-23727",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
@ -17,7 +18,7 @@
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},

6
src/Microsoft.DotNet.Tools.Compiler.Fsc/project.json
View file

@ -5,8 +5,8 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-151218",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
@ -17,7 +17,7 @@
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},

2
src/Microsoft.DotNet.Tools.Compiler.Native/appdep/project.json
View file

@ -5,7 +5,7 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.AppDep":"1.0.4-*"
},
"frameworks": {

8
src/Microsoft.DotNet.Tools.Compiler.Native/project.json
View file

@ -5,8 +5,8 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
@ -17,7 +17,9 @@
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}

7
src/Microsoft.DotNet.Tools.Compiler/Program.cs
View file

@ -303,7 +303,7 @@ namespace Microsoft.DotNet.Tools.Compiler
};
RunScripts(context, ScriptNames.PreCompile, contextVariables);
var result = Command.Create($"dotnet-compile-{compilerName}", new string[] {"@" + $"{rsp}" })
var result = Command.Create($"dotnet-compile-{compilerName}", new [] {"@" + $"{rsp}" })
.OnErrorLine(line =>
{
var diagnostic = ParseDiagnostic(context.ProjectDirectory, line);
@ -335,6 +335,11 @@ namespace Microsoft.DotNet.Tools.Compiler
var success = result.ExitCode == 0;
if (!success)
{
Reporter.Error.WriteLine($"{result.StartInfo.FileName} {result.StartInfo.Arguments} returned Exit Code {result.ExitCode}");
}
if (success)
{
success &= GenerateCultureResourceAssemblies(context.ProjectFile, dependencies, outputPath);

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

@ -1,11 +1,11 @@
{
{
"name": "dotnet-compile",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
@ -21,7 +21,7 @@
}
},
"frameworks": {
"dnxcore50": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},

4
src/Microsoft.DotNet.Tools.New/CSharp_Console/project.json
View file

@ -1,11 +1,11 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23727"
},
"frameworks": {

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

@ -1,11 +1,11 @@
{
{
"name": "dotnet-new",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
@ -15,9 +15,11 @@
}
},
"compileExclude": [ "CSharp_Console/**", "FSharp_Console/**" ],
"resource": [ "CSharp_Console/**", "FSharp_Console/**" ],
"resource": [ "CSharp_Console/NuGet.Config", "CSharp_Console/Program.cs", "CSharp_Console/project.json", "FSharp_Console/NuGet.config", "FSharp_Console/Program.fs", "FSharp_Console/project.json"],
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}

46
src/Microsoft.DotNet.Tools.Pack/project.json
View file

@ -1,27 +1,27 @@
{
"name": "dotnet-pack",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23704",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
"name": "dotnet-pack",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727",
"System.IO.Compression.ZipFile": "4.0.1-rc3-23727",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}
}

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

@ -5,7 +5,7 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
@ -15,7 +15,9 @@
}
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}

6
src/Microsoft.DotNet.Tools.Repl.Csi/project.json
View file

@ -1,12 +1,12 @@
{
{
"name": "dotnet-repl-csi",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta1-20160108-01",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",

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

@ -1,12 +1,12 @@
{
{
"name": "dotnet-repl",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
@ -15,7 +15,9 @@
}
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}

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

@ -5,9 +5,9 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"System.Xml.XDocument": "4.0.11-rc2-23704",
"System.Resources.ReaderWriter": "4.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"System.Xml.XDocument": "4.0.11-rc3-23727",
"System.Resources.ReaderWriter": "4.0.0-rc3-23727",
"Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
@ -18,7 +18,7 @@
}
},
"frameworks": {
"dnxcore50": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},

7
src/Microsoft.DotNet.Tools.Run/project.json
View file

@ -5,16 +5,17 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160108-01",
"System.Net.Sockets": "4.1.0-rc3-23727",
"System.CommandLine" : "0.1.0-d111815-3",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*"
},
"frameworks": {
"dnxcore50": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},

72
src/Microsoft.DotNet.Tools.Test/project.json
View file

@ -1,41 +1,43 @@
{
"name": "dotnet-test",
"description": "Test host for discovering and running unit tests at design time, such as in Visual Studio.",
"version": "1.0.0-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"
},
"compilationOptions": {
"warningsAsErrors": true,
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23704",
"System.Diagnostics.TraceSource": "4.0.0-rc2-23704",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23616",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23616",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.Testing.Abstractions": "1.0.0-*",
"Microsoft.Dnx.Runtime.CommandParsing.Sources": {
"version": "1.0.0-*",
"type": "build"
"name": "dotnet-test",
"description": "Test host for discovering and running unit tests at design time, such as in Visual Studio.",
"version": "1.0.0-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"
},
"Microsoft.Dnx.Runtime.Sources": {
"version": "1.0.0-*",
"type": "build"
"compilationOptions": {
"warningsAsErrors": true,
"emitEntryPoint": true
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"version": "1.0.0-*",
"type": "build"
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-23727",
"System.Diagnostics.TraceSource": "4.0.0-rc3-23727",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc3-23727",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-23727",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Dnx.Runtime.CommandParsing.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Dnx.Runtime.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.Testing.Abstractions": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.CommandLineUtils.Sources": {
"version": "1.0.0-*",
"type": "build"
},
"Microsoft.Extensions.Logging": "1.0.0-rc2-16011",
"Newtonsoft.Json": "7.0.1"
},
"Microsoft.Extensions.Logging": "1.0.0-rc2-16023"
},
"frameworks": {
"dnxcore50": {
"frameworks": {
"dnxcore50": {
}
}
}
}

21
src/Microsoft.Extensions.DependencyModel/project.json
View file

@ -17,20 +17,21 @@
"dotnet5.4": {
"imports": "portable-net451+win8",
"dependencies": {
"System.IO.FileSystem": "4.0.1-rc2-23616",
"System.Linq": "4.0.1-rc2-23616",
"System.Runtime": "4.0.21-rc2-23616",
"System.Reflection": "4.1.0-rc2-23616",
"System.Dynamic.Runtime": "4.0.11-rc2-23616"
"System.IO.FileSystem": "4.0.1-rc3-23727",
"System.Linq": "4.0.1-rc3-23727",
"System.Runtime": "4.0.21-rc3-23727",
"System.Reflection": "4.1.0-rc3-23727",
"System.Dynamic.Runtime": "4.0.11-rc3-23727"
}
},
"dnxcore50": {
"dependencies": {
"System.IO.FileSystem": "4.0.1-rc2-23616",
"System.Linq": "4.0.1-rc2-23616",
"System.Runtime": "4.0.21-rc2-23616",
"System.Reflection": "4.1.0-rc2-23616",
"System.Dynamic.Runtime": "4.0.11-rc2-23616"
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23727",
"System.IO.FileSystem": "4.0.1-rc3-23727",
"System.Linq": "4.0.1-rc3-23727",
"System.Runtime": "4.0.21-rc3-23727",
"System.Reflection": "4.1.0-rc3-23727",
"System.Dynamic.Runtime": "4.0.11-rc3-23727"
}
}
},

45
src/Microsoft.Extensions.Testing.Abstractions/project.json
View file

@ -1,24 +1,27 @@
{
"description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.",
"version": "1.0.0-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"
},
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Newtonsoft.Json": "7.0.1",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16011",
"NETStandard.Library": "1.0.0-rc2-23704",
"System.Resources.ResourceManager": "4.0.1-rc2-23704",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23704"
},
"frameworks": {
"dnxcore50": {
"description": "Abstractions for test runners to communicate to a tool, such as Visual Studio.",
"version": "1.0.0-*",
"repository": {
"type": "git",
"url": "git://github.com/dotnet/cli"
},
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"Newtonsoft.Json": "7.0.1",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-15935",
"NETStandard.Library": "1.0.0-rc3-23727",
"System.Resources.ResourceManager": "4.0.1-rc3-23727",
"System.Runtime.Serialization.Primitives": "4.1.0-rc3-23727"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}
}
}

10
src/dotnet-restore/project.json
View file

@ -12,10 +12,10 @@
},
"dependencies": {
"NuGet.CommandLine.XPlat": "3.4.0-beta-536",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23704",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc2-23704",
"System.Linq.Expressions": "4.0.11-rc2-23704",
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23727",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-23727",
"NETStandard.Library": "1.0.0-rc3-23727",
"System.Linq.Expressions": "4.0.11-rc3-23727",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Dnx.Runtime.CommandParsing.Sources": {
@ -31,7 +31,7 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net45+win8"
"imports": "portable-net451+win8"
}
},
"scripts": {

8
test/ArgumentForwardingTests/ArgumentForwardingTests/project.json
View file

@ -5,8 +5,8 @@
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23714",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23714",
"NETStandard.Library" : "1.0.0-rc3-23722",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-23722",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
@ -19,6 +19,8 @@
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

8
test/ArgumentForwardingTests/Reflector/project.json
View file

@ -5,8 +5,8 @@
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23706",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23706",
"NETStandard.Library" : "1.0.0-rc3-23722",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-23722",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
@ -19,6 +19,8 @@
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

12
test/E2E/project.json
View file

@ -1,12 +1,11 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23704",
"Microsoft.NETCore.TestHost" : "1.0.0-rc2-23704",
"NETStandard.Library" : "1.0.0-rc3-23727",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
@ -19,7 +18,8 @@
},
"frameworks": {
"dnxcore50": { }
},
"testRunner":"xunit"
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

10
test/FSharpTestProjects/CompileFail/project.json
View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
@ -9,12 +9,12 @@
],
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23704",
"Microsoft.NETCore.Runtime": "1.0.1-rc2-23704",
"System.Console": "4.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23722"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

14
test/FSharpTestProjects/TestApp/project.json
View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
@ -8,16 +8,14 @@
"Program.fs"
],
"dependencies": {
"TestLibrary": { "target": "project" },
"TestLibrary": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc3-23722",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"System.IO": "4.0.11-beta-23428",
"System.Console": "4.0.0-beta-23428",
"System.Runtime": "4.0.21-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23428"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

12
test/FSharpTestProjects/TestAppWithArgs/project.json
View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
@ -9,14 +9,12 @@
],
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"System.IO": "4.0.11-beta-23428",
"System.Console": "4.0.0-beta-23428",
"System.Runtime": "4.0.21-beta-23428",
"System.Diagnostics.Process": "4.1.0-beta-23428",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23428"
"NETStandard.Library": "1.0.0-rc3-23722"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

9
test/FSharpTestProjects/TestLibrary/project.json
View file

@ -1,9 +1,8 @@
{
{
"version": "1.0.0-*",
"dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"System.Runtime": "4.0.21-beta-23428",
"System.Console": "4.0.0-beta-23428"
"NETStandard.Library": "1.0.0-rc3-23722"
},
"compilerName": "fsc",
"compileFiles": [
@ -11,6 +10,8 @@
"Helper.fs"
],
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

3
test/FSharpTestProjects/global.json Normal file
View file

@ -0,0 +1,3 @@
{
"projects": [ ".", "../../src" ]
}

16
test/LoadContextTest/project.json
View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"description": "LoadContextTest Console Application",
@ -7,18 +7,14 @@
},
"dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23516",
"System.Collections": "4.0.11-beta-23516",
"System.Console": "4.0.0-beta-23516",
"System.Linq": "4.0.1-beta-23516",
"System.Threading": "4.0.11-beta-23516",
"NETStandard.Library" : "1.0.0-rc3-23727",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530",
"Microsoft.DotNet.ProjectModel.Loader": {"target":"project"}
"Microsoft.DotNet.ProjectModel.Loader": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

28
test/Microsoft.DotNet.ProjectModel.Server.Tests/project.json
View file

@ -1,15 +1,17 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23706",
"Microsoft.DotNet.ProjectModel": {"target":"project"},
"Microsoft.DotNet.ProjectModel.Server": {"target":"project"},
"Newtonsoft.Json": "7.0.1",
"xunit.runner.aspnet": "2.0.0-aspnet-rc2-16068"
},
"frameworks": {
"dnxcore50": { }
},
"commands": {
"test": "xunit.runner.aspnet"
}
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.ProjectModel.Server": "1.0.0-*",
"Newtonsoft.Json": "7.0.1",
"xunit.runner.aspnet": "2.0.0-aspnet-rc2-16068"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"commands": {
"test": "xunit.runner.aspnet"
}
}

36
test/Microsoft.DotNet.Tools.Builder.Tests/project.json
View file

@ -1,23 +1,25 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"Microsoft.NETCore.TestHost" : "1.0.0-rc2-23704",
{
"version": "1.0.0-*",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
"xunit.netcore.extensions": "1.0.0-prerelease-00153",
"xunit.runner.utility": "2.1.0",
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.NETCore.TestHost" : "1.0.0-*",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": {
"target": "project",
"type": "build"
}
},
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
"xunit.netcore.extensions": "1.0.0-prerelease-*",
"xunit.runner.utility": "2.1.0",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": {
"target": "project",
"type": "build"
}
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

36
test/Microsoft.DotNet.Tools.Compiler.Tests/project.json
View file

@ -1,23 +1,25 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"Microsoft.NETCore.TestHost" : "1.0.0-rc2-23704",
{
"version": "1.0.0-*",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
"xunit.netcore.extensions": "1.0.0-prerelease-00153",
"xunit.runner.utility": "2.1.0",
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.NETCore.TestHost" : "1.0.0-*",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": {
"target": "project",
"type": "build"
}
},
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
"xunit.netcore.extensions": "1.0.0-prerelease-*",
"xunit.runner.utility": "2.1.0",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": {
"target": "project",
"type": "build"
}
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

35
test/Microsoft.DotNet.Tools.Publish.Tests/project.json
View file

@ -1,24 +1,25 @@
{
"version": "1.0.0-*",
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23706",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23706",
"System.Text.RegularExpressions": "4.0.11-rc2-23706",
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-*",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
"xunit.netcore.extensions": "1.0.0-prerelease-00153",
"xunit.runner.utility": "2.1.0",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
"xunit.netcore.extensions": "1.0.0-prerelease-*",
"xunit.runner.utility": "2.1.0",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": {
"target": "project",
"type": "build"
}
},
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": {
"target": "project",
"type": "build"
}
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

28
test/Microsoft.DotNet.Tools.Tests.Utilities/Assertions/CommandResultAssertions.cs
View file

@ -21,64 +21,74 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public AndConstraint<CommandResultAssertions> ExitWith(int expectedExitCode)
{
Execute.Assertion.ForCondition(_commandResult.ExitCode == expectedExitCode)
.FailWith("Expected command to exit with {0} but it exited with {1}.", expectedExitCode, _commandResult.ExitCode);
.FailWith(AppendDiagnosticsTo($"Expected command to exit with {expectedExitCode} but it did not."));
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> Pass()
{
Execute.Assertion.ForCondition(_commandResult.ExitCode == 0)
.FailWith("Expected command to pass but it exited with {0}.", _commandResult.ExitCode);
.FailWith(AppendDiagnosticsTo($"Expected command to pass but it did not."));
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> Fail()
{
Execute.Assertion.ForCondition(_commandResult.ExitCode != 0)
.FailWith("Expected command to fail but it exited with {0}.", _commandResult.ExitCode);
.FailWith(AppendDiagnosticsTo($"Expected command to fail but it did not."));
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> HaveStdOut()
{
Execute.Assertion.ForCondition(!string.IsNullOrEmpty(_commandResult.StdOut))
.FailWith("Command did not output anything to stdout");
.FailWith(AppendDiagnosticsTo("Command did not output anything to stdout"));
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> HaveStdOut(string expectedOutput)
{
Execute.Assertion.ForCondition(_commandResult.StdOut.Equals(expectedOutput, StringComparison.Ordinal))
.FailWith($"Command did not output with Expected Output. Expected: {expectedOutput} Actual: {_commandResult.StdOut}");
.FailWith(AppendDiagnosticsTo($"Command did not output with Expected Output. Expected: {expectedOutput}"));
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> StdOutMatchPattern(string pattern, RegexOptions options = RegexOptions.None)
{
Execute.Assertion.ForCondition(Regex.Match(_commandResult.StdOut, pattern, options).Success)
.FailWith($"Matching the command output failed. Pattern: {pattern}{Environment.NewLine} input: {_commandResult.StdOut}");
.FailWith(AppendDiagnosticsTo($"Matching the command output failed. Pattern: {pattern}{Environment.NewLine}"));
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> HaveStdErr()
{
Execute.Assertion.ForCondition(!string.IsNullOrEmpty(_commandResult.StdErr))
.FailWith("Command did not output anything to stderr");
.FailWith(AppendDiagnosticsTo("Command did not output anything to stderr."));
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> NotHaveStdOut()
{
Execute.Assertion.ForCondition(string.IsNullOrEmpty(_commandResult.StdOut))
.FailWith("Expected command to not output to stdout but found - {0}{1}", Environment.NewLine, _commandResult.StdOut);
.FailWith(AppendDiagnosticsTo($"Expected command to not output to stdout but it was not:"));
return new AndConstraint<CommandResultAssertions>(this);
}
public AndConstraint<CommandResultAssertions> NotHaveStdErr()
{
Execute.Assertion.ForCondition(string.IsNullOrEmpty(_commandResult.StdErr))
.FailWith("Expected command to not output to stderr but found - {0}{1}", Environment.NewLine, _commandResult.StdErr);
.FailWith(AppendDiagnosticsTo("Expected command to not output to stderr but it was not:"));
return new AndConstraint<CommandResultAssertions>(this);
}
private string AppendDiagnosticsTo(string s)
{
return s + $"{Environment.NewLine}" +
$"File Name: {_commandResult.StartInfo.FileName}{Environment.NewLine}" +
$"Arguments: {_commandResult.StartInfo.Arguments}{Environment.NewLine}" +
$"Exit Code: {_commandResult.ExitCode}{Environment.NewLine}" +
$"StdOut:{Environment.NewLine}{_commandResult.StdOut}{Environment.NewLine}" +
$"StdErr:{Environment.NewLine}{_commandResult.StdErr}{Environment.NewLine}"; ;
}
}
}

1
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/TestCommand.cs
View file

@ -80,6 +80,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
threadErr.Join();
var result = new CommandResult(
process.StartInfo,
process.ExitCode,
stdOut.GetCapturedOutput(),
stdErr.GetCapturedOutput());

29
test/Microsoft.DotNet.Tools.Tests.Utilities/TempFileSystem/TempRoot.cs
View file

@ -10,22 +10,34 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
public sealed class TempRoot : IDisposable
{
private static readonly bool DoDispose;
private readonly List<IDisposable> _temps = new List<IDisposable>();
public static readonly string Root;
static TempRoot()
{
Root = Path.Combine(Path.GetTempPath(), "DotnetCLITests");
var persistedRoot = Environment.GetEnvironmentVariable("TEST_ARTIFACTS");
if (string.IsNullOrWhiteSpace(persistedRoot))
{
Root = Path.Combine(Path.GetTempPath(), "DotnetCLITests");
DoDispose = true;
}
else
{
Root = persistedRoot;
DoDispose = false;
}
Directory.CreateDirectory(Root);
}
public void Dispose()
{
if (_temps != null)
{
DisposeAll(_temps);
_temps.Clear();
}
if (!DoDispose || _temps == null) return;
DisposeAll(_temps);
_temps.Clear();
}
private static void DisposeAll(IEnumerable<IDisposable> temps)
@ -34,10 +46,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
{
try
{
if (temp != null)
{
temp.Dispose();
}
temp?.Dispose();
}
catch
{

36
test/Microsoft.DotNet.Tools.Tests.Utilities/project.json
View file

@ -1,26 +1,22 @@
{
"version": "1.0.0-*",
"description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library",
{
"version": "1.0.0-*",
"description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library",
"dependencies": {
"System.Collections": "4.0.11-rc2-23714",
"System.Collections.Immutable": "1.1.38-rc2-23714",
"System.Linq": "4.0.1-rc2-23714",
"System.Threading": "4.0.11-rc2-23714",
"System.IO.FileSystem": "4.0.1-rc2-23714",
"System.IO": "4.0.11-rc2-23714",
"System.Runtime.InteropServices": "4.0.21-rc2-23714",
"System.Text.RegularExpressions": "4.0.11-rc2-23714",
"FluentAssertions": "4.0.0",
"xunit": "2.1.0",
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727",
"System.Collections.Immutable": "1.2.0-rc3-23727",
"FluentAssertions": "4.0.0",
"xunit": "2.1.0",
"Microsoft.DotNet.Cli.Utils": {"target":"project"},
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530"
},
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530"
},
"frameworks": {
"dnxcore50": { }
}
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

4
test/PackagedCommands/Commands/dotnet-hello/v1/dotnet-hello/project.json
View file

@ -1,11 +1,11 @@
{
{
"version": "1.0.0",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23616"
"NETStandard.Library": "1.0.0-rc3-23722"
},
"frameworks": {

4
test/PackagedCommands/Commands/dotnet-hello/v2/dotnet-hello/project.json
View file

@ -1,11 +1,11 @@
{
{
"version": "2.0.0",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23616"
"NETStandard.Library": "1.0.0-rc3-23722"
},
"frameworks": {

2
test/PackagedCommands/Consumers/AppWithDirectAndToolDependency/project.json.template
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"dotnet-hello": { "version": "1.0.0", "target": "package" }
},

2
test/PackagedCommands/Consumers/AppWithDirectDependency/project.json.template
View file

@ -7,7 +7,7 @@
"testRunner": "must-be-specified-to-generate-deps",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"dotnet-hello": {"version": "1.0.0", "target": "package"}
},

2
test/PackagedCommands/Consumers/AppWithToolDependency/project.json.template
View file

@ -5,7 +5,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23722"
},
"frameworks": {

8
test/StreamForwarderTests/project.json
View file

@ -1,11 +1,11 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23706",
"NETStandard.Library" : "1.0.0-rc3-23722",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
@ -19,6 +19,8 @@
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

5
test/TestProjects/CompileFail/project.json
View file

@ -1,12 +1,11 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23722"
},
"frameworks": {

5
test/TestProjects/TestApp/project.json
View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
@ -7,8 +7,7 @@
"dependencies": {
"TestLibrary": { "target":"project"},
"NETStandard.Library": "1.0.0-rc2-23704",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23727"
},
"frameworks": {

7
test/TestProjects/TestAppWithArgs/project.json
View file

@ -1,14 +1,11 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-rc2-23714",
"System.IO": "4.0.10-rc2-23714",
"System.Console": "4.0.0-rc2-23714",
"System.Runtime": "4.0.21-rc2-23714"
"NETStandard.Library": "1.0.0-rc3-23727"
},
"frameworks": {

21
test/TestProjects/TestAppWithContents/project.json
View file

@ -1,16 +1,13 @@
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc3-23727"
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-rc2-23714",
"System.IO": "4.0.10-rc2-23714",
"System.Console": "4.0.0-rc2-23714",
"System.Runtime": "4.0.21-rc2-23714"
},
"frameworks": {
"dnxcore50": { }

6
test/TestProjects/TestLibrary/project.json
View file

@ -1,13 +1,11 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"nowarn": [ "CS1591" ],
"xmlDoc": true
},
"dependencies": {
"System.Runtime": "4.0.21-rc2-23704",
"System.Console": "4.0.0-rc2-23704",
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23727"
},
"frameworks": {

6
test/TestProjects/TestLibraryWithRunner/project.json
View file

@ -1,9 +1,9 @@
{
{
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {
"Microsoft.Extensions.DependencyModel": "1.0.0-*",
"Newtonsoft.Json": "6.0.0",
"Newtonsoft.Json": "6.0.0"
},
"frameworks": {
@ -11,7 +11,7 @@
"dnxcore50": {
"imports" : "portable-net45+wp80+win8",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23722"
}
}
}

4
test/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
@ -8,7 +8,7 @@
"L11": "1.0.0-*",
"L12": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23727"
},
"frameworks": {

4
test/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
View file

@ -1,11 +1,11 @@
{
{
"version": "1.0.0-*",
"dependencies": {
"L12": "1.0.0-*",
"L21": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23727"
},
"frameworks": {

4
test/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
View file

@ -1,10 +1,10 @@
{
{
"version": "1.0.0-*",
"dependencies": {
"L22": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23727"
},
"frameworks": {

4
test/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
View file

@ -1,8 +1,8 @@
{
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23727"
},
"frameworks": {

4
test/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
View file

@ -1,8 +1,8 @@
{
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23727"
},
"frameworks": {

4
test/TestProjects/TestSimpleIncrementalApp/project.json
View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true,
@ -6,7 +6,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704"
"NETStandard.Library": "1.0.0-rc3-23722"
},
"frameworks": {

3
testapp/DthTestProjects/src/EmptyConsoleApp/project.json
View file

@ -3,8 +3,7 @@
"frameworks": {
"dnxcore50": {
"dependencies": {
"System.Runtime": "4.0.21-*",
"System.Console": "4.0.0-*"
"NETStandard.Library": "1.0.0-rc3-23722",
}
},
"dnx451": { }

14
testapp/DthTestProjects/src/IncompatiblePackageSample/project.json
View file

@ -1,8 +1,10 @@
{
"dependencies": {
"Newtonsoft.Json": "4.5.11"
},
"frameworks": {
"dnxcore50": { }
}
"dependencies": {
"Newtonsoft.Json": "4.5.11"
},
"frameworks": {
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

4
tools/MultiProjectValidator/project.json
View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"name": "pjvalidate",
"compilationOptions": {
@ -6,7 +6,7 @@
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23727",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*"
},