Fixed bootstrapping on osx/linux
- This won’t fully work since we need to download a precanned build from somewhere.
This commit is contained in:
parent
3495781233
commit
d5d3fd086c
7 changed files with 24 additions and 29 deletions
|
@ -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)"
|
echo "Building basic dotnet tools using Stage 0 (DNX hosted)"
|
||||||
$STAGE0_PUBLISH --framework dnxcore50 --runtime $RID --output "$STAGE1_DIR" "$REPOROOT/src/Microsoft.DotNet.Cli"
|
$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"
|
$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"
|
$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"
|
$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
|
# 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 ..."
|
echo "Building stage2 dotnet using stage1 ..."
|
||||||
dotnet publish --framework dnxcore50 --runtime $RID --output "$STAGE2_DIR" "$REPOROOT/src/Microsoft.DotNet.Cli"
|
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"
|
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"
|
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"
|
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
17
scripts/stage0/dotnet-compile-csc
Executable 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 "$@"
|
|
@ -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
|
|
|
@ -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
|
|
|
@ -156,7 +156,6 @@ namespace Microsoft.DotNet.Tools.Compiler
|
||||||
// Default suppressions
|
// Default suppressions
|
||||||
"-nowarn:CS1701",
|
"-nowarn:CS1701",
|
||||||
"-nowarn:CS1702",
|
"-nowarn:CS1702",
|
||||||
"-nowarn:CS1705",
|
|
||||||
"-nostdlib",
|
"-nostdlib",
|
||||||
"-nologo",
|
"-nologo",
|
||||||
$"-out:\"{outputName}\""
|
$"-out:\"{outputName}\""
|
||||||
|
|
|
@ -13,7 +13,6 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
|
||||||
private readonly IList<LibraryDescription> _libraries;
|
private readonly IList<LibraryDescription> _libraries;
|
||||||
private readonly IList<DiagnosticMessage> _diagnostics;
|
private readonly IList<DiagnosticMessage> _diagnostics;
|
||||||
private readonly string _projectPath;
|
private readonly string _projectPath;
|
||||||
private readonly NuGetFramework _targetFramework;
|
|
||||||
|
|
||||||
public LibraryManager(string projectPath,
|
public LibraryManager(string projectPath,
|
||||||
NuGetFramework targetFramework,
|
NuGetFramework targetFramework,
|
||||||
|
@ -21,7 +20,6 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
|
||||||
IList<DiagnosticMessage> diagnostics)
|
IList<DiagnosticMessage> diagnostics)
|
||||||
{
|
{
|
||||||
_projectPath = projectPath;
|
_projectPath = projectPath;
|
||||||
_targetFramework = targetFramework;
|
|
||||||
_libraries = libraries;
|
_libraries = libraries;
|
||||||
_diagnostics = diagnostics;
|
_diagnostics = diagnostics;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,13 +10,10 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
|
||||||
{
|
{
|
||||||
public class PackageDependencyProvider
|
public class PackageDependencyProvider
|
||||||
{
|
{
|
||||||
private readonly string _packagesPath;
|
|
||||||
|
|
||||||
private readonly VersionFolderPathResolver _packagePathResolver;
|
private readonly VersionFolderPathResolver _packagePathResolver;
|
||||||
|
|
||||||
public PackageDependencyProvider(string packagesPath)
|
public PackageDependencyProvider(string packagesPath)
|
||||||
{
|
{
|
||||||
_packagesPath = packagesPath;
|
|
||||||
_packagePathResolver = new VersionFolderPathResolver(packagesPath);
|
_packagePathResolver = new VersionFolderPathResolver(packagesPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,7 +30,6 @@ namespace Microsoft.Extensions.ProjectModel.Resolution
|
||||||
targetLibrary.RuntimeAssemblies.Any() ||
|
targetLibrary.RuntimeAssemblies.Any() ||
|
||||||
!containsAssembly;
|
!containsAssembly;
|
||||||
|
|
||||||
var resolved = compatible;
|
|
||||||
var dependencies = new List<LibraryRange>(targetLibrary.Dependencies.Count + targetLibrary.FrameworkAssemblies.Count);
|
var dependencies = new List<LibraryRange>(targetLibrary.Dependencies.Count + targetLibrary.FrameworkAssemblies.Count);
|
||||||
PopulateDependencies(dependencies, targetLibrary);
|
PopulateDependencies(dependencies, targetLibrary);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue