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

Merge pull request #445 from brthor/stdlib

Browse source 
Move references to StdLib, Update other versions to "-rc2-23608"
This commit is contained in:
Bryan Thornbury 2015-12-10 11:14:32 -08:00
commit 8b12fa9ffe
24 changed files with 93 additions and 144 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scripts/_common.ps1
View file

@ -6,9 +6,11 @@
$Rid = "win7-x64"
$Tfm = "dnxcore50"
$RepoRoot = Convert-Path "$PSScriptRoot\.."
$DnxVersion = "1.0.0-rc1-update1"
$RepoRoot = Convert-Path "$PSScriptRoot\.."
$OutputDir = "$RepoRoot\artifacts\$Rid"
$DnxDir = "$OutputDir\dnx"
$Stage1Dir = "$OutputDir\stage1"
$Stage2Dir = "$OutputDir\stage2"
$HostDir = "$OutputDir\corehost"

4
scripts/_common.sh
View file

@ -77,16 +77,20 @@ if [ -z "$RID" ]; then
if [ "$UNAME" == "Darwin" ]; then
export OSNAME=osx
export RID=osx.10.10-x64
export DNX_FLAVOR="dnx-coreclr-darwin-x64"
elif [ "$UNAME" == "Linux" ]; then
# Detect Distro?
export OSNAME=linux
export RID=ubuntu.14.04-x64
export DNX_FLAVOR="dnx-coreclr-linux-x64"
else
error "unknown OS: $UNAME" 1>&2
exit 1
fi
fi
export DNX_VERSION="1.0.0-rc1-update1"
export REPOROOT=$(cd $COMMONDIR/.. && pwd)
export OUTPUT_ROOT=$REPOROOT/artifacts/$RID
export DNX_DIR=$OUTPUT_ROOT/dnx

23
scripts/compile.ps1
View file

@ -31,27 +31,26 @@ Download it from https://www.cmake.org
Exit 1
}
# Put stage 0 on the path
$DotNetTools = $env:DOTNET_INSTALL_DIR
if (!$DotNetTools) {
$DotNetTools = "$($env:LOCALAPPDATA)\Microsoft\dotnet"
}
if (Test-Path "$DotNetTools\cli\dotnet.exe") {
Write-Warning "Your stage0 is using the old layout"
$DnxDir = "$DotNetTools\cli\dnx"
$env:PATH = "$DotNetTools\cli;$StartPath"
} elseif (Test-Path "$DotNetTools\cli\bin\dotnet.exe") {
$DnxDir = "$DotNetTools\cli\bin\dnx"
$env:PATH = "$DotNetTools\cli\bin;$StartPath"
} else {
throw "Couldn't find stage0 dotnet tools!"
# Download dnx to copy to stage2
if ((Test-Path "$DnxDir")) {
Remove-Item -Recurse -Force $DnxDir
}
mkdir "$DnxDir" | Out-Null
$DnxUrl="https://api.nuget.org/packages/dnx-coreclr-win-x64.$DnxVersion.nupkg"
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")
$DnxRoot = "$DnxDir/bin"
# Restore packages
header "Restoring packages"
dotnet restore "$RepoRoot" --quiet --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64" --no-cache
& "$DnxRoot\dnu" restore "$RepoRoot" --quiet --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64" --no-cache
if (!$?) {
Write-Host "Command failed: " dotnet restore "$RepoRoot" --quiet --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64" --no-cache
Exit 1
@ -118,7 +117,7 @@ Download it from https://www.cmake.org
# Copy dnx into stage 2
cp -rec "$DnxDir\" "$Stage2Dir\bin\dnx\"
cp -rec "$DnxRoot\" "$Stage2Dir\bin\dnx\"
# Copy in the dotnet-restore script
cp "$PSScriptRoot\dotnet-restore.cmd" "$Stage2Dir\bin\dotnet-restore.cmd"

23
scripts/compile.sh
View file

@ -13,7 +13,6 @@ while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symli
[[ $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 )"
REPOROOT="$( cd -P "$DIR/.." && pwd )"
source "$DIR/_common.sh"
@ -26,7 +25,15 @@ fi
[ -z "$CONFIGURATION" ] && export CONFIGURATION=Debug
REPOROOT="$( cd -P "$DIR/.." && pwd )"
# Download DNX to copy into stage2
header "Downloading DNX $DNX_VERSION"
DNX_URL="https://api.nuget.org/packages/$DNX_FLAVOR.$DNX_VERSION.nupkg"
DNX_ROOT="$DNX_DIR/bin"
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
# Ensure the latest stage0 is installed
$DIR/install.sh
@ -39,19 +46,9 @@ unset DOTNET_TOOLS
DOTNET_PATH=$(which dotnet)
PREFIX="$(cd -P "$(dirname "$DOTNET_PATH")/.." && pwd)"
DNX_ROOT="$PREFIX/share/dotnet/cli/bin/dnx"
if [ ! -d "$DNX_ROOT" ]; then
echo "warning: your stage0 is using the old layout" 1>&2
DNX_ROOT="$PREFIX/share/dotnet/cli/dnx"
fi
if [ ! -d "$DNX_ROOT" ] || [ ! -e "$DNX_ROOT/dnx" ]; then
echo "error: could not find DNX in $DNX_ROOT" 1>&2
exit 1
fi
header "Restoring packages"
dotnet restore "$REPOROOT" --quiet --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64" --no-cache
$DNX_ROOT/dnu restore "$REPOROOT" --quiet --runtime "osx.10.10-x64" --runtime "ubuntu.14.04-x64" --runtime "win7-x64" --no-cache
header "Building corehost"

2
scripts/dotnet-restore.cmd
View file

@ -6,7 +6,7 @@ REM Licensed under the MIT license. See LICENSE file in the project root for ful
SETLOCAL
SET ERRORLEVEL=
"%~dp0dnx\dnx" "%~dp0dnx\Microsoft.Dnx.Tooling\Microsoft.Dnx.Tooling.dll" restore %*
"%~dp0dnx\dnx" "%~dp0dnx\lib\Microsoft.Dnx.Tooling\Microsoft.Dnx.Tooling.dll" restore %*
exit /b %ERRORLEVEL%
ENDLOCAL

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

@ -4,14 +4,10 @@
"shared": "**/*.cs",
"dependencies": {
"System.AppContext": "4.0.0",
"System.Console": "4.0.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"System.Threading": "4.0.11-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"Microsoft.DotNet.ProjectModel": "1.0.0"
},
"frameworks": {
"dnxcore50": { }
}

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

@ -5,10 +5,9 @@
"emitEntryPoint": true
},
"dependencies": {
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"

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

@ -2,12 +2,12 @@
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"System.CommandLine": "0.1.0-*",
"System.Linq": "4.0.1-beta-23504",
"System.Runtime": "4.0.21-beta-23504",
"Microsoft.DotNet.ProjectModel": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }
},

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

@ -1,8 +1,8 @@
{
"dependencies": {
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"System.AppContext": "4.0.1-beta-23504",
"System.Runtime.Loader": "4.0.0-beta-23504"
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Runtime.Loader": "4.0.0-rc2-23608"
},
"frameworks": {
"dnxcore50": { }

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

@ -2,15 +2,14 @@
"version": "1.0.0-*",
"description": "Types to model a .NET Project",
"dependencies": {
"Microsoft.CSharp": "4.0.1-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Threading.Thread": "4.0.0-beta-23504",
"System.Runtime.Loader": "4.0.0-beta-23504",
"System.Dynamic.Runtime": "4.0.11-beta-23504",
"System.Runtime.InteropServices.RuntimeInformation": "4.0.0-beta-23504",
"System.Security.Cryptography.Algorithms": "4.0.0-beta-23504",
"System.Xml.XDocument": "4.0.11-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"System.Threading.Thread": "4.0.0-rc2-23608",
"System.Runtime.Loader": "4.0.0-rc2-23608",
"System.Dynamic.Runtime": "4.0.11-rc2-23608",
"System.Security.Cryptography.Algorithms": "4.0.0-rc2-23608",
"Microsoft.CSharp": "4.0.1-rc2-23608",
"System.Xml.XDocument": "4.0.11-rc2-23608",
"NuGet.Packaging": "3.3.0-*",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15791",

2
src/Microsoft.DotNet.Runtime/Program.cs
View file

@ -1,6 +1,6 @@
// 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;
namespace Microsoft.DotNet.Runtime
{
public class Program

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

@ -5,6 +5,7 @@
},
"dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23608",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23504"
},

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

@ -5,11 +5,10 @@
"emitEntryPoint": true
},
"dependencies": {
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
@ -19,8 +18,7 @@
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04"
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }

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

@ -5,16 +5,9 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-beta-23504",
"Microsoft.NETCore.Runtime": "1.0.1-beta-23504",
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"Microsoft.NETCore.TestHost": "1.0.0-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO": "4.0.11-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"System.AppContext": "4.0.1-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
@ -23,9 +16,9 @@
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.DotNet.ILCompiler": "1.0.3-*",
"Microsoft.DotNet.ILCompiler.SDK": "1.0.3-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
"Microsoft.DotNet.ILCompiler": "1.0.3-*",
"Microsoft.DotNet.ILCompiler.SDK": "1.0.3-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*"
},
"frameworks": {
"dnxcore50": { }

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

@ -5,14 +5,10 @@
"emitEntryPoint": true
},
"dependencies": {
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"System.AppContext": "4.0.1-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"System.Reflection.Metadata": "1.1.0",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {

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

@ -5,14 +5,9 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"System.AppContext": "4.0.1-beta-23504",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {

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

@ -5,15 +5,11 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23504",
"System.IO.Compression.ZipFile": "4.0.1-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23608",
"Microsoft.NETCore.Targets.DNXCore": "5.0.0-beta-23511",
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {

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

@ -5,14 +5,8 @@
"emitEntryPoint": true
},
"dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-23504",
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"System.AppContext": "4.0.1-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {

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

@ -5,12 +5,10 @@
"emitEntryPoint": true
},
"dependencies": {
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"System.AppContext": "4.0.1-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta-20151106-02",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
@ -19,8 +17,7 @@
"Microsoft.Extensions.CommandLineUtils.Sources": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta-20151106-02"
}
},
"frameworks": {
"dnxcore50": { }

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

@ -5,11 +5,8 @@
"emitEntryPoint": true
},
"dependencies": {
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {

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

@ -5,13 +5,10 @@
"emitEntryPoint": true
},
"dependencies": {
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"System.Xml.XDocument": "4.0.11-beta-23504",
"System.Resources.ReaderWriter": "4.0.0-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-rc2-23608",
"System.Xml.XDocument": "4.0.11-rc2-23608",
"System.Resources.ReaderWriter": "4.0.0-rc2-23608",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",

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

@ -5,19 +5,17 @@
"emitEntryPoint": true
},
"dependencies": {
"System.Console": "4.0.0-beta-23504",
"System.Collections": "4.0.11-beta-23504",
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Linq": "4.0.1-beta-23504",
"System.Diagnostics.Process": "4.1.0-beta-23504",
"System.IO.FileSystem": "4.0.1-beta-23504",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04",
"System.CommandLine" : "0.1.0-d111815-3",
"Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": {
"type": "build",
"version": "1.0.0-*"
},
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151117-04",
"System.CommandLine" : "0.1.0-d111815-3"
}
},
"frameworks": {
"dnxcore50": { }

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

@ -40,17 +40,11 @@
"frameworks": {
"dnxcore50": {
"dependencies": {
"System.Console": "4.0.0-beta-*",
"System.Diagnostics.Process": "4.1.0-beta-*",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-beta-*",
"System.Diagnostics.TraceSource": "4.0.0-beta-*",
"System.Dynamic.Runtime": "4.0.11-beta-*",
"System.Net.Primitives": "4.0.11-beta-*",
"System.Net.Sockets": "4.1.0-beta-*",
"System.Runtime": "4.0.21-rc2-*",
"System.Reflection.Extensions": "4.0.1-beta-*",
"System.Reflection.TypeExtensions": "4.0.1-beta-*",
"System.Threading.Thread": "4.0.0-beta-*"
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23608",
"System.Diagnostics.TraceSource": "4.0.0-rc2-23608",
"System.Dynamic.Runtime": "4.0.11-rc2-23608",
"System.Threading.Thread": "4.0.0-rc2-23608"
}
}
},

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

@ -16,16 +16,13 @@
},
"Microsoft.Extensions.Compilation.Abstractions": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
"System.Runtime.Serialization.Primitives": "4.0.11-beta-*"
"System.Runtime.Serialization.Primitives": "4.0.11-rc2-23608"
},
"frameworks": {
"dnxcore50": {
"dependencies": {
"System.Collections": "4.0.11-rc2-*",
"System.Reflection": "4.1.0-beta-*",
"System.Resources.ResourceManager": "4.0.1-beta-*",
"System.Runtime": "4.0.21-rc2-*",
"System.Runtime.Extensions": "4.0.11-rc2-*"
"NETStandard.Library": "1.0.0-rc2-23608",
"System.Resources.ResourceManager": "4.0.1-rc2-23608"
}
}
},