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

Fixed bootstrapping on osx/linux

Browse source 
- This won’t fully work since we need to download a precanned build
from somewhere.
This commit is contained in:
David Fowler 2015-10-18 02:38:46 -07:00
parent 3495781233
commit d5d3fd086c
7 changed files with 24 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
scripts/bootstrap
View file

@ -48,8 +48,11 @@ dnu restore "$REPOROOT" --runtime osx.10.10-x64 --runtime ubuntu.14.04-x64 --run
echo "Building basic dotnet tools using Stage 0 (DNX hosted)"
$STAGE0_PUBLISH --framework dnxcore50 --runtime $RID --output "$STAGE1_DIR" "$REPOROOT/src/Microsoft.DotNet.Cli"
rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
$STAGE0_PUBLISH --framework dnxcore50 --runtime $RID --output "$STAGE1_DIR" "$REPOROOT/src/Microsoft.DotNet.Tools.Compiler"
rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
$STAGE0_PUBLISH --framework dnxcore50 --runtime $RID --output "$STAGE1_DIR" "$REPOROOT/src/Microsoft.DotNet.Tools.Compiler.Csc"
rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
$STAGE0_PUBLISH --framework dnxcore50 --runtime $RID --output "$STAGE1_DIR" "$REPOROOT/src/Microsoft.DotNet.Tools.Publish"
# Add stage1 to the path and use it to build stage2
@ -57,6 +60,10 @@ export PATH=$STAGE1_DIR:$PATH
echo "Building stage2 dotnet using stage1 ..."
dotnet publish --framework dnxcore50 --runtime $RID --output "$STAGE2_DIR" "$REPOROOT/src/Microsoft.DotNet.Cli"
rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
dotnet publish --framework dnxcore50 --runtime $RID --output "$STAGE2_DIR" "$REPOROOT/src/Microsoft.DotNet.Tools.Compiler"
rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
dotnet publish --framework dnxcore50 --runtime $RID --output "$STAGE2_DIR" "$REPOROOT/src/Microsoft.DotNet.Tools.Compiler.Csc"
rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi
dotnet publish --framework dnxcore50 --runtime $RID --output "$STAGE2_DIR" "$REPOROOT/src/Microsoft.DotNet.Tools.Publish"
rc=$?; if [[ $rc != 0 ]]; then exit $rc; fi

17
scripts/stage0/dotnet-compile-csc Executable file
View file

@ -0,0 +1,17 @@
#!/usr/bin/env bash
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 )"
# work around restore timeouts on Mono
[ -z "$MONO_THREADS_PER_CPU" ] && export MONO_THREADS_PER_CPU=50
# Makes development easier
export PATH=$PATH:$DIR
exec "dnx" -p "$DIR/../../src/Microsoft.DotNet.Tools.Compiler.Csc" run "$@"

11
scripts/stage0/dotnet-compile.cmd
View file

@ -1,11 +0,0 @@
@Echo OFF
SETLOCAL
SET ERRORLEVEL=
REM makes testing easier for now
set PATH=%ProgramFiles(x86)%\MSBuild\14.0\Bin;%PATH%;%~dp0
dnx %DOTNET_OPTIONS% -p %~dp0..\..\src\Microsoft.DotNet.Tools.Compiler run %*
exit /b %ERRORLEVEL%
ENDLOCAL

11
scripts/stage0/dotnet-publish.cmd
View file

@ -1,11 +0,0 @@
@Echo OFF
SETLOCAL
SET ERRORLEVEL=
REM makes testing easier for now
set PATH=%PATH%;%~dp0
dnx %DOTNET_OPTIONS% -p %~dp0..\..\src\Microsoft.DotNet.Tools.Publish run %*
exit /b %ERRORLEVEL%
ENDLOCAL

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

@ -156,7 +156,6 @@ namespace Microsoft.DotNet.Tools.Compiler
// Default suppressions
"-nowarn:CS1701",
"-nowarn:CS1702",
"-nowarn:CS1705",
"-nostdlib",
"-nologo",
$"-out:\"{outputName}\""

2
src/Microsoft.Extensions.ProjectModel/Resolution/LibraryManager.cs
View file

@ -13,7 +13,6 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
private readonly IList<LibraryDescription> _libraries;
private readonly IList<DiagnosticMessage> _diagnostics;
private readonly string _projectPath;
private readonly NuGetFramework _targetFramework;
public LibraryManager(string projectPath,
NuGetFramework targetFramework,
@ -21,7 +20,6 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
IList<DiagnosticMessage> diagnostics)
{
_projectPath = projectPath;
_targetFramework = targetFramework;
_libraries = libraries;
_diagnostics = diagnostics;
}

4
src/Microsoft.Extensions.ProjectModel/Resolution/PackageDependencyProvider.cs
View file

@ -10,13 +10,10 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
{
public class PackageDependencyProvider
{
private readonly string _packagesPath;
private readonly VersionFolderPathResolver _packagePathResolver;
public PackageDependencyProvider(string packagesPath)
{
_packagesPath = packagesPath;
_packagePathResolver = new VersionFolderPathResolver(packagesPath);
}
@ -33,7 +30,6 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
targetLibrary.RuntimeAssemblies.Any() ||
!containsAssembly;
var resolved = compatible;
var dependencies = new List<LibraryRange>(targetLibrary.Dependencies.Count + targetLibrary.FrameworkAssemblies.Count);
PopulateDependencies(dependencies, targetLibrary);