bootstrap using nuget instead of dnx

This commit is contained in:
Andrew Stanton-Nurse 2016-01-22 10:40:01 -08:00 committed by piotrp
parent 90fad34d5a
commit 066bebcc6c
72 changed files with 459 additions and 544 deletions

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

View file

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

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"
}

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"
@ -45,7 +45,8 @@ if [ ! -z "$OFFLINE" ]; then
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"

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

View file

@ -18,9 +18,10 @@ 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
# NOTE(anurse): I had to remove --quiet, because NuGet3 is too quiet when that's provided :(
dotnet restore "$REPOROOT/src"
dotnet restore "$REPOROOT/test"
dotnet restore "$REPOROOT/tools"
set +e
$DNX_ROOT/dnu restore "$REPOROOT/testapp" --quiet >/dev/null 2>&1
dotnet restore "$REPOROOT/testapp" >/dev/null 2>&1
set -e

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\")) {

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

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

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

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")
}

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

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"

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

View file

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

View file

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

View file

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

View file

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

View file

@ -5,9 +5,9 @@
"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",
"NETStandard.Library": "1.0.0-rc3-23722",
"System.Threading.ThreadPool": "4.0.10-rc3-23722",
"System.Runtime.Serialization.Primitives": "4.1.0-rc3-23722",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {
@ -19,7 +19,9 @@
"Newtonsoft.Json": "7.0.1"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}

View file

@ -4,14 +4,14 @@
"keyFile": "../../tools/Key.snk"
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"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"
"imports": "portable-net451+win8"
}
}
}

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-23722",
"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-23722",
"System.Dynamic.Runtime": "4.0.11-rc3-23722",
"System.Security.Cryptography.Algorithms": "4.0.0-rc3-23722",
"Microsoft.CSharp": "4.0.1-rc3-23722",
"System.Xml.XDocument": "4.0.11-rc3-23722",
"NuGet.Packaging": "3.4.0-beta-536",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15975",
@ -30,7 +30,9 @@
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}

View file

@ -5,10 +5,12 @@
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23704"
"NETStandard.Library" : "1.0.0-rc3-23722"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

View file

@ -1,11 +1,11 @@
{
{
"name": "dotnet-build",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Tools.Compiler": "1.0.0-*",
@ -17,7 +17,7 @@
},
"frameworks": {
"dnxcore50": {
"imports": "portable-win8+net45"
"imports": "portable-net451+win8"
}
},
"scripts": {

View file

@ -5,9 +5,10 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160108-01",
"System.Net.Sockets": "4.1.0-rc3-23722",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.CommandLineUtils.Sources": {

View file

@ -5,7 +5,7 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"Microsoft.FSharp.Compiler.netcore": "1.0.0-alpha-151218",

View file

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

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-23722",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",

View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true

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-23722",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
@ -17,7 +17,9 @@
"compileExclude": [ "CSharp_Console/**", "FSharp_Console/**" ],
"resource": [ "CSharp_Console/**", "FSharp_Console/**" ],
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"scripts": {
}

View file

@ -5,8 +5,8 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"System.IO.Compression.ZipFile": "4.0.1-rc3-23722",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",

View file

@ -5,7 +5,7 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"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": {
}

View file

@ -1,11 +1,11 @@
{
{
"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-23722",
"Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta1-20160108-01",

View file

@ -1,11 +1,11 @@
{
{
"name": "dotnet-repl",
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"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": {
}

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-23722",
"System.Xml.XDocument": "4.0.11-rc3-23722",
"System.Resources.ReaderWriter": "4.0.0-rc3-23722",
"Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",

View file

@ -5,9 +5,10 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta1-20160108-01",
"System.Net.Sockets": "4.1.0-rc3-23722",
"System.CommandLine" : "0.1.0-d111815-3",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",

View file

@ -11,15 +11,12 @@
"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",
"NETStandard.Library": "1.0.0-rc3-23722",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc3-23722",
"System.Diagnostics.TraceSource": "4.0.0-rc3-23722",
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc3-23722",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-23722",
"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"
@ -28,11 +25,16 @@
"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-16023"
"Microsoft.Extensions.Logging": "1.0.0-rc2-16011",
"Newtonsoft.Json": "7.0.1"
},
"frameworks": {
"dnxcore50": {

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-23722",
"System.Linq": "4.0.1-rc3-23722",
"System.Runtime": "4.0.21-rc3-23722",
"System.Reflection": "4.1.0-rc3-23722",
"System.Dynamic.Runtime": "4.0.11-rc3-23722"
}
},
"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-23722",
"System.IO.FileSystem": "4.0.1-rc3-23722",
"System.Linq": "4.0.1-rc3-23722",
"System.Runtime": "4.0.21-rc3-23722",
"System.Reflection": "4.1.0-rc3-23722",
"System.Dynamic.Runtime": "4.0.11-rc3-23722"
}
}
},

View file

@ -12,13 +12,16 @@
"dependencies": {
"Newtonsoft.Json": "7.0.1",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16011",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-15935",
"NETStandard.Library": "1.0.0-rc2-23704",
"System.Resources.ResourceManager": "4.0.1-rc2-23704",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23704"
"System.Resources.ResourceManager": "4.0.1-rc3-23722",
"System.Runtime.Serialization.Primitives": "4.1.0-rc3-23722"
},
"frameworks": {
"dnxcore50": {
}
"imports": "portable-net451+win8"
}
},
"scripts": {
}
}

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-23722",
"Microsoft.NETCore.TestHost": "1.0.0-rc3-23722",
"NETStandard.Library": "1.0.0-rc3-23722",
"System.Linq.Expressions": "4.0.11-rc3-23722",
"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": {

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-23722",
"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"
}
}
}

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"
}
}
}

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"
}
}
}

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"
}
}
}

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"
}
}
}

View file

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

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-23722",
"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"
}
}
}

View file

@ -1,13 +1,15 @@
{
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23706",
"Microsoft.DotNet.ProjectModel": {"target":"project"},
"Microsoft.DotNet.ProjectModel.Server": {"target":"project"},
"Microsoft.NETCore.Platforms": "1.0.1-rc3-23722",
"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": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
},
"commands": {
"test": "xunit.runner.aspnet"

View file

@ -1,13 +1,13 @@
{
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"Microsoft.NETCore.TestHost" : "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"Microsoft.NETCore.TestHost" : "1.0.0-*",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
"xunit.netcore.extensions": "1.0.0-prerelease-00153",
"xunit.netcore.extensions": "1.0.0-prerelease-*",
"xunit.runner.utility": "2.1.0",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
@ -18,6 +18,8 @@
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

View file

@ -1,13 +1,13 @@
{
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23704",
"Microsoft.NETCore.TestHost" : "1.0.0-rc2-23704",
"NETStandard.Library": "1.0.0-rc3-23722",
"Microsoft.NETCore.TestHost" : "1.0.0-*",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
"xunit.netcore.extensions": "1.0.0-prerelease-00153",
"xunit.netcore.extensions": "1.0.0-prerelease-*",
"xunit.runner.utility": "2.1.0",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
@ -18,6 +18,8 @@
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

View file

@ -1,14 +1,14 @@
{
{
"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",
"NETStandard.Library": "1.0.0-rc3-23722",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-*",
"System.Text.RegularExpressions": "4.0.11-*",
"xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101",
"xunit.netcore.extensions": "1.0.0-prerelease-00153",
"xunit.netcore.extensions": "1.0.0-prerelease-*",
"xunit.runner.utility": "2.1.0",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
@ -19,6 +19,8 @@
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

View file

@ -1,26 +1,28 @@
{
{
"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",
"System.Collections": "4.0.11-rc3-23722",
"System.Collections.Immutable": "1.2.0-rc3-23722",
"System.Linq": "4.0.1-rc3-23722",
"System.Threading": "4.0.11-rc3-23722",
"System.IO.FileSystem": "4.0.1-rc3-23722",
"System.IO": "4.0.11-rc3-23722",
"System.Runtime.InteropServices": "4.0.21-rc3-23722",
"System.Text.RegularExpressions": "4.0.11-rc3-23722",
"FluentAssertions": "4.0.0",
"xunit": "2.1.0",
"Microsoft.DotNet.Cli.Utils": {"target":"project"},
"Microsoft.DotNet.Cli.Utils": "1.0.0-*",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

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": {

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": {

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" }
},

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"}
},

View file

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

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"
}
}
}

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": {

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-23722"
},
"frameworks": {

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-23722"
},
"frameworks": {

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-23722"
},

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-23722"
},
"frameworks": {

View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"testRunner": "xunit",
"dependencies": {

View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"compilationOptions": {
"emitEntryPoint": true

View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"dependencies": {

View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"dependencies": {

View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"dependencies": {

View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"dependencies": {

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": {

View file

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

View file

@ -3,6 +3,8 @@
"Newtonsoft.Json": "4.5.11"
},
"frameworks": {
"dnxcore50": { }
"dnxcore50": {
"imports": "portable-net451+win8"
}
}
}

View file

@ -1,4 +1,4 @@
{
{
"version": "1.0.0-*",
"name": "pjvalidate",
"compilationOptions": {