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

Bump CoreFx to rc2-23808

Browse source 
Workaround for issue 1294

Improve crossgen notifications
This commit is contained in:
Piotr Puszkiewicz 2016-02-09 15:07:36 -08:00
parent 199093b09c
commit 48797ea80a
67 changed files with 239 additions and 156 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/CompileFail/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestApp/project.json
View file

@ -7,7 +7,7 @@
"dependencies": { "dependencies": {
"TestLibrary": { "target":"project"}, "TestLibrary": { "target":"project"},
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestAppCompilationContext/project.json
View file

@ -8,7 +8,7 @@
"dependencies": { "dependencies": {
"TestLibrary": "1.0.0-*", "TestLibrary": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestAppWithArgs/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestAppWithContents/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"content": "testcontentfile.txt", "content": "testcontentfile.txt",

2
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json
View file

@ -10,7 +10,7 @@
"dnxcore50": { "dnxcore50": {
"imports" : "portable-net45+wp80+win8", "imports" : "portable-net45+wp80+win8",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
} }
} }
} }

2
TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json
View file

@ -11,7 +11,7 @@
"dnxcore50": { "dnxcore50": {
"imports" : "portable-net45+wp80+win8", "imports" : "portable-net45+wp80+win8",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
} }
} }
} }

2
TestAssets/TestProjects/TestLibrary/project.json
View file

@ -6,7 +6,7 @@
"additionalArguments": [ "-highentropyva+" ] "additionalArguments": [ "-highentropyva+" ]
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" } "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" }
}, },

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json
View file

@ -8,7 +8,7 @@
"L11": "1.0.0-*", "L11": "1.0.0-*",
"L12": "1.0.0-*", "L12": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json
View file

@ -5,7 +5,7 @@
"L12": "1.0.0-*", "L12": "1.0.0-*",
"L21": "1.0.0-*", "L21": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json
View file

@ -4,7 +4,7 @@
"dependencies": { "dependencies": {
"L22": "1.0.0-*", "L22": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestProjectWithResource/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
TestAssets/TestProjects/TestSimpleIncrementalApp/project.json
View file

@ -6,7 +6,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

12
scripts/build/build.ps1
View file

@ -14,6 +14,8 @@ $ErrorActionPreference="Stop"
. "$RepoRoot\scripts\build\generate-version.ps1" . "$RepoRoot\scripts\build\generate-version.ps1"
_ "$RepoRoot\scripts\clean\clear-nuget-cache.ps1"
header "Building dotnet tools version $($env:DOTNET_CLI_VERSION) - $Configuration" header "Building dotnet tools version $($env:DOTNET_CLI_VERSION) - $Configuration"
header "Checking Pre-Reqs" header "Checking Pre-Reqs"
@ -26,13 +28,13 @@ if ($Offline){
} }
else { else {
_ "$RepoRoot\scripts\obtain\install-tools.ps1" _ "$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"
} }
header "Cleaning out .ni's from Stage0"
rm "$RepoRoot\.dotnet_stage0\**\*.ni.*"
_ "$RepoRoot\scripts\build\restore-packages.ps1"
header "Compiling" header "Compiling"
_ "$RepoRoot\scripts\compile\compile.ps1" @("$Configuration") _ "$RepoRoot\scripts\compile\compile.ps1" @("$Configuration")

11
scripts/build/build.sh
View file

@ -17,8 +17,11 @@ done
DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
source "$DIR/../common/_common.sh" source "$DIR/../common/_common.sh"
source "$REPOROOT/scripts/build/generate-version.sh" source "$REPOROOT/scripts/build/generate-version.sh"
"$REPOROOT/scripts/clean/clear-nuget-cache.sh"
header "Building dotnet tools version $DOTNET_CLI_VERSION - $CONFIGURATION" header "Building dotnet tools version $DOTNET_CLI_VERSION - $CONFIGURATION"
header "Checking Pre-Reqs" header "Checking Pre-Reqs"
@ -39,11 +42,13 @@ if [ ! -z "$OFFLINE" ]; then
info "Skipping Tools and Package Download: Offline build" info "Skipping Tools and Package Download: Offline build"
else else
$REPOROOT/scripts/obtain/install-tools.sh $REPOROOT/scripts/obtain/install-tools.sh
# Restore using the stage 0
PATH="$REPOROOT/.dotnet_stage0/$RID/bin:$PATH" $REPOROOT/scripts/build/restore-packages.sh
fi fi
header "Cleaning out .ni's from Stage0"
find ".dotnet_stage0" -name '*.ni.*' -delete
$REPOROOT/scripts/build/restore-packages.sh
header "Compiling" header "Compiling"
$REPOROOT/scripts/compile/compile.sh $REPOROOT/scripts/compile/compile.sh

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

@ -5,30 +5,14 @@
. $PSScriptRoot\..\common\_common.ps1 . $PSScriptRoot\..\common\_common.ps1
if ($env:CI_BUILD -eq "1") {
# periodically clear out the package cache on the CI server
$PackageCacheFile = "$env:NUGET_PACKAGES\packageCacheTime.txt"
if(!(Test-Path $PackageCacheFile)) {
Get-Date | Out-File -FilePath $PackageCacheFile
}
else {
$PackageCacheTimeProperty = Get-ItemProperty -Path $PackageCacheFile -Name CreationTimeUtc
$PackageCacheTime = [datetime]($PackageCacheTimeProperty).CreationTimeUtc
if ($PackageCacheTime -lt ([datetime]::UtcNow).AddHours(-$env:NUGET_PACKAGES_CACHE_TIME_LIMIT)) {
header "Clearing package cache"
Remove-Item -Recurse -Force "$env:NUGET_PACKAGES"
mkdir $env:NUGET_PACKAGES | Out-Null
Get-Date | Out-File -FilePath $PackageCacheFile
}
}
}
# Restore packages # Restore packages
# NOTE(anurse): I had to remove --quiet, because NuGet3 is too quiet when that's provided :( # NOTE(anurse): I had to remove --quiet, because NuGet3 is too quiet when that's provided :(
header "Restoring packages" header "Restoring packages"
$StartPath = $env:PATH
$env:PATH = "$env:DOTNET_INSTALL_DIR\cli\bin;$StartPath"
& dotnet restore "$RepoRoot\src" --runtime "$Rid" & dotnet restore "$RepoRoot\src" --runtime "$Rid"
& dotnet restore "$RepoRoot\tools" --runtime "$Rid" & dotnet restore "$RepoRoot\tools" --runtime "$Rid"
$env:PATH=$StartPath

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

@ -16,27 +16,12 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
source "$DIR/../common/_common.sh" source "$DIR/../common/_common.sh"
if [ ! -z "$CI_BUILD" ]; then export StartPath=$PATH
# periodically clear out the package cache on the CI server export PATH=$DOTNET_INSTALL_DIR/bin:$PATH
PackageCacheFile="$NUGET_PACKAGES/packageCacheTime.txt"
if [ ! -f $PackageCacheFile ]; then
date > $PackageCacheFile
else
#$NUGET_PACKAGES_CACHE_TIME_LIMIT is in hours
CacheTimeLimitInSeconds=$(($NUGET_PACKAGES_CACHE_TIME_LIMIT * 3600))
CacheExpireTime=$(($(date +%s) - $CacheTimeLimitInSeconds))
if [ $(date +%s -r $PackageCacheFile) -lt $CacheExpireTime ]; then
header "Clearing package cache"
rm -Rf $NUGET_PACKAGES
mkdir -p $NUGET_PACKAGES
date > $PackageCacheFile
fi
fi
fi
header "Restoring packages" header "Restoring packages"
dotnet restore "$REPOROOT/src" --runtime "$RID" $DISABLE_PARALLEL dotnet restore "$REPOROOT/src" --runtime "$RID" $DISABLE_PARALLEL
dotnet restore "$REPOROOT/tools" --runtime "$RID" $DISABLE_PARALLEL dotnet restore "$REPOROOT/tools" --runtime "$RID" $DISABLE_PARALLEL
export PATH=$StartPath

27
scripts/clean/clear-nuget-cache.ps1 Normal file
View file

@ -0,0 +1,27 @@
#
# 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
if ($env:CI_BUILD -eq "1") {
# periodically clear out the package cache on the CI server
$PackageCacheFile = "$env:NUGET_PACKAGES\packageCacheTime.txt"
if(!(Test-Path $PackageCacheFile)) {
Get-Date | Out-File -FilePath $PackageCacheFile
}
else {
$PackageCacheTimeProperty = Get-ItemProperty -Path $PackageCacheFile -Name CreationTimeUtc
$PackageCacheTime = [datetime]($PackageCacheTimeProperty).CreationTimeUtc
if ($PackageCacheTime -lt ([datetime]::UtcNow).AddHours(-$env:NUGET_PACKAGES_CACHE_TIME_LIMIT)) {
header "Clearing package cache"
Remove-Item -Recurse -Force "$env:NUGET_PACKAGES"
mkdir $env:NUGET_PACKAGES | Out-Null
Get-Date | Out-File -FilePath $PackageCacheFile
}
}
}

37
scripts/clean/clear-nuget-cache.sh Executable file
View file

@ -0,0 +1,37 @@
#!/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"
if [ ! -z "$CI_BUILD" ]; then
# periodically clear out the package cache on the CI server
PackageCacheFile="$NUGET_PACKAGES/packageCacheTime.txt"
if [ ! -f $PackageCacheFile ]; then
date > $PackageCacheFile
else
#$NUGET_PACKAGES_CACHE_TIME_LIMIT is in hours
CacheTimeLimitInSeconds=$(($NUGET_PACKAGES_CACHE_TIME_LIMIT * 3600))
CacheExpireTime=$(($(date +%s) - $CacheTimeLimitInSeconds))
if [ $(date +%s -r $PackageCacheFile) -lt $CacheExpireTime ]; then
header "Clearing package cache"
rm -Rf $NUGET_PACKAGES
mkdir -p $NUGET_PACKAGES
date > $PackageCacheFile
fi
fi
fi

4
scripts/common/_common.ps1
View file

@ -5,6 +5,7 @@
. $PSScriptRoot\_utility.ps1 . $PSScriptRoot\_utility.ps1
$Skip_Crossgen = $false
$Rid = "win7-x64" $Rid = "win7-x64"
$Tfm = "dnxcore50" $Tfm = "dnxcore50"
$RepoRoot = Resolve-Path "$PSScriptRoot\..\.." $RepoRoot = Resolve-Path "$PSScriptRoot\..\.."
@ -25,8 +26,9 @@ $env:ReleaseSuffix = "beta"
$env:Channel = "$env:ReleaseSuffix" $env:Channel = "$env:ReleaseSuffix"
# Set reasonable defaults for unset variables # Set reasonable defaults for unset variables
setEnvIfDefault "DOTNET_INSTALL_DIR" "$(Convert-Path "$PSScriptRoot\..")\.dotnet_stage0\win7-x64" setEnvIfDefault "DOTNET_INSTALL_DIR" "$RepoRoot\.dotnet_stage0\win7-x64"
setEnvIfDefault "DOTNET_CLI_VERSION" "0.1.0.0" setEnvIfDefault "DOTNET_CLI_VERSION" "0.1.0.0"
setEnvIfDefault "SKIP_CROSSGEN" "$Skip_Crossgen"
setPathAndHomeIfDefault "$Stage2Dir" setPathAndHomeIfDefault "$Stage2Dir"
setVarIfDefault "Configuration" "Debug" setVarIfDefault "Configuration" "Debug"

1
scripts/common/_common.sh
View file

@ -15,6 +15,7 @@ source "$COMMONDIR/_prettyprint.sh"
source "$COMMONDIR/_rid.sh" source "$COMMONDIR/_rid.sh"
# TODO: Replace this with a dotnet generation # TODO: Replace this with a dotnet generation
export SKIP_CROSSGEN=false
export TFM=dnxcore50 export TFM=dnxcore50
export REPOROOT=$(cd $COMMONDIR/../.. && pwd) export REPOROOT=$(cd $COMMONDIR/../.. && pwd)
export OUTPUT_ROOT=$REPOROOT/artifacts/$RID export OUTPUT_ROOT=$REPOROOT/artifacts/$RID

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

@ -75,7 +75,6 @@ $BinariesForCoreHost | ForEach-Object {
# Crossgen Roslyn # Crossgen Roslyn
if (-not (Test-Path "$StageOutputDir\bin\csc.ni.exe")) { if (-not (Test-Path "$StageOutputDir\bin\csc.ni.exe")) {
header "Crossgening Roslyn compiler ..."
_cmd "$RepoRoot\scripts\crossgen\crossgen_roslyn.cmd ""$StageOutputDir""" _cmd "$RepoRoot\scripts\crossgen\crossgen_roslyn.cmd ""$StageOutputDir"""
} }

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

@ -81,7 +81,6 @@ find . -type f | xargs chmod 644
$REPOROOT/scripts/build/fix-mode-flags.sh $REPOROOT/scripts/build/fix-mode-flags.sh
if [ ! -f "$OUTPUT_DIR/bin/csc.ni.exe" ]; then if [ ! -f "$OUTPUT_DIR/bin/csc.ni.exe" ]; then
info "Crossgenning Roslyn compiler ..."
$REPOROOT/scripts/crossgen/crossgen_roslyn.sh "$OUTPUT_DIR/bin" $REPOROOT/scripts/crossgen/crossgen_roslyn.sh "$OUTPUT_DIR/bin"
fi fi

3
scripts/compile/compile.ps1
View file

@ -18,6 +18,9 @@ try {
_ "$RepoRoot\scripts\compile\compile-stage-1.ps1" _ "$RepoRoot\scripts\compile\compile-stage-1.ps1"
# Issue https://github.com/dotnet/cli/issues/1294
_ "$RepoRoot\scripts\build\restore-packages.ps1"
_ "$RepoRoot\scripts\compile\compile-stage-2.ps1" _ "$RepoRoot\scripts\compile\compile-stage-2.ps1"
} finally { } finally {
$env:PATH = $StartPath $env:PATH = $StartPath

3
scripts/compile/compile.sh
View file

@ -20,4 +20,7 @@ $REPOROOT/scripts/compile/compile-corehost.sh
$REPOROOT/scripts/compile/compile-stage-1.sh $REPOROOT/scripts/compile/compile-stage-1.sh
# Issue https://github.com/dotnet/cli/issues/1294
$REPOROOT/scripts/build/restore-packages.sh
$REPOROOT/scripts/compile/compile-stage-2.sh $REPOROOT/scripts/compile/compile-stage-2.sh

29
scripts/crossgen/crossgen_roslyn.cmd
View file

@ -3,13 +3,17 @@
REM Copyright (c) .NET Foundation and contributors. All rights reserved. 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 Licensed under the MIT license. See LICENSE file in the project root for full license information.
if %SKIP_CROSSGEN% EQU 0 goto skip
echo Crossgenning Roslyn compiler ...
REM Get absolute path REM Get absolute path
pushd %1 pushd %1
set BIN_DIR=%CD%\bin set BIN_DIR=%CD%\bin
popd popd
REM Replace with a robust method for finding the right crossgen.exe 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-23805\tools\crossgen.exe set CROSSGEN_UTIL=%NUGET_PACKAGES%\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-rc2-23808\tools\crossgen.exe
REM Crossgen currently requires itself to be next to mscorlib REM Crossgen currently requires itself to be next to mscorlib
copy %CROSSGEN_UTIL% /Y %BIN_DIR% > nul copy %CROSSGEN_UTIL% /Y %BIN_DIR% > nul
@ -21,28 +25,33 @@ if exist mscorlib.ni.dll (
copy /Y mscorlib.ni.dll mscorlib.dll > nul copy /Y mscorlib.ni.dll mscorlib.dll > nul
) )
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% System.Collections.Immutable.dll >nul 2>nul set READYTORUN=
crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% System.Collections.Immutable.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% System.Reflection.Metadata.dll >nul 2>nul crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% System.Reflection.Metadata.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.dll >nul 2>nul crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.CSharp.dll >nul 2>nul crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.CSharp.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.VisualBasic.dll >nul 2>nul crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% Microsoft.CodeAnalysis.VisualBasic.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% csc.dll >nul 2>nul crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% csc.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
crossgen /nologo /ReadyToRun /Platform_Assemblies_Paths %BIN_DIR% vbc.dll >nul 2>nul crossgen /nologo %READYTORUN% /Platform_Assemblies_Paths %BIN_DIR% vbc.dll >nul 2>nul
if not %errorlevel% EQU 0 goto fail if not %errorlevel% EQU 0 goto fail
popd popd
echo CrossGen Roslyn Finished
goto end goto end
:fail :fail
@ -50,4 +59,8 @@ popd
echo Crossgen failed... echo Crossgen failed...
exit /B 1 exit /B 1
:skip
echo Skipping Crossgen
goto end
:end :end

41
scripts/crossgen/crossgen_roslyn.sh
View file

@ -4,6 +4,25 @@
# Licensed under the MIT license. See LICENSE file in the project root for full license information. # Licensed under the MIT license. See LICENSE file in the project root for full license information.
# #
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"
if $SKIP_CROSSGEN ; then
echo "Skipping Crossgen"
exit 0
fi
info "Crossgenning Roslyn compiler ..."
set -e set -e
BIN_DIR="$( cd $1 && pwd )" BIN_DIR="$( cd $1 && pwd )"
@ -22,8 +41,10 @@ else
exit 1 exit 1
fi fi
READYTORUN=""
# Replace with a robust method for finding the right crossgen.exe # 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-23805/tools/crossgen CROSSGEN_UTIL=$NUGET_PACKAGES/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-rc2-23808/tools/crossgen
cd $BIN_DIR cd $BIN_DIR
@ -31,20 +52,22 @@ cd $BIN_DIR
cp $CROSSGEN_UTIL $BIN_DIR cp $CROSSGEN_UTIL $BIN_DIR
chmod +x crossgen chmod +x crossgen
./crossgen -nologo -platform_assemblies_paths $BIN_DIR mscorlib.dll ./crossgen -nologo $READYTORUN -platform_assemblies_paths $BIN_DIR mscorlib.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR System.Collections.Immutable.dll ./crossgen -nologo $READYTORUN -platform_assemblies_paths $BIN_DIR System.Collections.Immutable.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR System.Reflection.Metadata.dll ./crossgen -nologo $READYTORUN -platform_assemblies_paths $BIN_DIR System.Reflection.Metadata.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.dll ./crossgen -nologo $READYTORUN -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.CSharp.dll ./crossgen -nologo $READYTORUN -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.CSharp.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.VisualBasic.dll ./crossgen -nologo $READYTORUN -platform_assemblies_paths $BIN_DIR Microsoft.CodeAnalysis.VisualBasic.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR csc.dll ./crossgen -nologo $READYTORUN -platform_assemblies_paths $BIN_DIR csc.dll
[ -e csc.ni.exe ] && [ ! -e csc.ni.dll ] && mv csc.ni.exe csc.ni.dll [ -e csc.ni.exe ] && [ ! -e csc.ni.dll ] && mv csc.ni.exe csc.ni.dll
./crossgen -nologo -platform_assemblies_paths $BIN_DIR vbc.dll ./crossgen -nologo $READYTORUN -platform_assemblies_paths $BIN_DIR vbc.dll
[ -e vbc.ni.exe ] && [ ! -e vbc.ni.dll ] && mv vbc.ni.exe vbc.ni.dll [ -e vbc.ni.exe ] && [ ! -e vbc.ni.dll ] && mv vbc.ni.exe vbc.ni.dll
info "CrossGen Roslyn Finished"

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

@ -6,9 +6,9 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"System.Reflection.Metadata": "1.2.0-rc2-23805", "System.Reflection.Metadata": "1.2.0-rc2-23808",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537" "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537"
}, },

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

@ -6,7 +6,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"System.CommandLine": "0.1.0-e160119-1", "System.CommandLine": "0.1.0-e160119-1",
"Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01", "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",

4
src/Microsoft.DotNet.Files/project.json
View file

@ -5,8 +5,8 @@
}, },
"description": "Abstraction to interact with the file system and file paths.", "description": "Abstraction to interact with the file system and file paths.",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"System.Linq.Expressions": "4.0.11-rc2-23805", "System.Linq.Expressions": "4.0.11-rc2-23808",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",

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

@ -4,9 +4,9 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"System.Runtime.Loader": "4.0.0-rc2-23805" "System.Runtime.Loader": "4.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {

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

@ -4,7 +4,7 @@
"keyFile": "../../tools/Key.snk" "keyFile": "../../tools/Key.snk"
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160108-01" "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160108-01"

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

@ -5,13 +5,13 @@
}, },
"description": "Types to model a .NET Project", "description": "Types to model a .NET Project",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"System.Reflection.Metadata": "1.2.0-rc2-23805", "System.Reflection.Metadata": "1.2.0-rc2-23808",
"System.Runtime.Loader": "4.0.0-rc2-23805", "System.Runtime.Loader": "4.0.0-rc2-23808",
"System.Dynamic.Runtime": "4.0.11-rc2-23805", "System.Dynamic.Runtime": "4.0.11-rc2-23808",
"System.Security.Cryptography.Algorithms": "4.0.0-rc2-23805", "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23808",
"Microsoft.CSharp": "4.0.1-rc2-23805", "Microsoft.CSharp": "4.0.1-rc2-23808",
"System.Xml.XDocument": "4.0.11-rc2-23805", "System.Xml.XDocument": "4.0.11-rc2-23808",
"NuGet.Packaging": "3.4.0-beta-583", "NuGet.Packaging": "3.4.0-beta-583",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996",

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

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23805" "NETStandard.Library" : "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

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

@ -18,22 +18,22 @@
"dotnet5.4": { "dotnet5.4": {
"imports": "portable-net451+win8", "imports": "portable-net451+win8",
"dependencies": { "dependencies": {
"System.IO.FileSystem": "4.0.1-rc2-23805", "System.IO.FileSystem": "4.0.1-rc2-23808",
"System.Linq": "4.0.1-rc2-23805", "System.Linq": "4.0.1-rc2-23808",
"System.Runtime": "4.0.21-rc2-23805", "System.Runtime": "4.0.21-rc2-23808",
"System.Reflection": "4.1.0-rc2-23805", "System.Reflection": "4.1.0-rc2-23808",
"System.Dynamic.Runtime": "4.0.11-rc2-23805" "System.Dynamic.Runtime": "4.0.11-rc2-23808"
} }
}, },
"dnxcore50": { "dnxcore50": {
"imports": "portable-net45+win8", "imports": "portable-net45+win8",
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms": "1.0.1-rc2-23805", "Microsoft.NETCore.Platforms": "1.0.1-rc2-23808",
"System.IO.FileSystem": "4.0.1-rc2-23805", "System.IO.FileSystem": "4.0.1-rc2-23808",
"System.Linq": "4.0.1-rc2-23805", "System.Linq": "4.0.1-rc2-23808",
"System.Runtime": "4.0.21-rc2-23805", "System.Runtime": "4.0.21-rc2-23808",
"System.Reflection": "4.1.0-rc2-23805", "System.Reflection": "4.1.0-rc2-23808",
"System.Dynamic.Runtime": "4.0.11-rc2-23805" "System.Dynamic.Runtime": "4.0.11-rc2-23808"
} }
} }
}, },

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

@ -13,9 +13,9 @@
"Newtonsoft.Json": "7.0.1", "Newtonsoft.Json": "7.0.1",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16040", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16040",
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"System.Resources.ResourceManager": "4.0.1-rc2-23805", "System.Resources.ResourceManager": "4.0.1-rc2-23808",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23805" "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23808"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {

2
src/dotnet/commands/dotnet-compile-native/appdep/project.json
View file

@ -4,7 +4,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.AppDep":"1.0.5-prerelease-00001" "Microsoft.DotNet.AppDep":"1.0.5-prerelease-00001"
}, },
"frameworks": { "frameworks": {

2
src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template
View file

@ -11,7 +11,7 @@
"dependencies": { "dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

24
src/dotnet/project.json
View file

@ -49,18 +49,18 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"type": "build" "type": "build"
}, },
"Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23805", "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23808",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23805", "Microsoft.NETCore.TestHost": "1.0.0-rc2-23808",
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23805", "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23808",
"System.Diagnostics.TraceSource": "4.0.0-rc2-23805", "System.Diagnostics.TraceSource": "4.0.0-rc2-23808",
"System.Linq.Expressions": "4.0.11-rc2-23805", "System.Linq.Expressions": "4.0.11-rc2-23808",
"System.Xml.XDocument": "4.0.11-rc2-23805", "System.Xml.XDocument": "4.0.11-rc2-23808",
"System.Resources.ReaderWriter": "4.0.0-rc2-23805", "System.Resources.ReaderWriter": "4.0.0-rc2-23808",
"System.Net.Sockets": "4.1.0-rc2-23805", "System.Net.Sockets": "4.1.0-rc2-23808",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23805", "System.IO.Compression.ZipFile": "4.0.1-rc2-23808",
"System.Threading.ThreadPool": "4.0.10-rc2-23805", "System.Threading.ThreadPool": "4.0.10-rc2-23808",
"System.Runtime.Serialization.Primitives": "4.1.0-rc2-23805" "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23808"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {

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

@ -5,8 +5,8 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23805", "NETStandard.Library" : "1.0.0-rc2-23808",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23805", "Microsoft.NETCore.TestHost": "1.0.0-rc2-23808",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101", "xunit.console.netcore": "1.0.2-prerelease-00101",

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

@ -5,8 +5,8 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23805", "NETStandard.Library" : "1.0.0-rc2-23808",
"Microsoft.NETCore.TestHost": "1.0.0-rc2-23805", "Microsoft.NETCore.TestHost": "1.0.0-rc2-23808",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101", "xunit.console.netcore": "1.0.2-prerelease-00101",

2
test/Compiler.Common.Tests/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.ProjectModel": { "target": "project" },

2
test/EndToEnd/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" },

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

@ -9,7 +9,7 @@
], ],
"dependencies": { "dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

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

@ -9,7 +9,7 @@
], ],
"dependencies": { "dependencies": {
"TestLibrary": "1.0.0-*", "TestLibrary": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
}, },

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

@ -9,7 +9,7 @@
], ],
"dependencies": { "dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

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

@ -2,7 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221",
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"compilerName": "fsc", "compilerName": "fsc",
"compileFiles": [ "compileFiles": [

2
test/LoadContextTest/project.json
View file

@ -7,7 +7,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23805", "NETStandard.Library" : "1.0.0-rc2-23808",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530",
"Microsoft.DotNet.ProjectModel.Loader": "1.0.0-*" "Microsoft.DotNet.ProjectModel.Loader": "1.0.0-*"
}, },

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

@ -3,8 +3,8 @@
"description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library", "description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"System.Collections.Immutable": "1.2.0-rc2-23805", "System.Collections.Immutable": "1.2.0-rc2-23808",
"FluentAssertions": "4.0.0", "FluentAssertions": "4.0.0",
"xunit": "2.1.0", "xunit": "2.1.0",

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

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

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

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

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

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
}, },
"frameworks": { "frameworks": {

2
test/StreamForwarderTests/project.json
View file

@ -5,7 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23805", "NETStandard.Library" : "1.0.0-rc2-23808",
"Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.ProjectModel": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" },

2
test/dotnet-build.Tests/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {

2
test/dotnet-compile.Tests/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {

2
test/dotnet-publish.Tests/project.json
View file

@ -2,7 +2,7 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" },
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {

2
testapp/DthTestProjects/src/BrokenProjectPathSample/project.json
View file

@ -1,6 +1,6 @@
{ {
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"EmptyLibrary": "" "EmptyLibrary": ""
}, },
"frameworks": { "frameworks": {

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

@ -3,7 +3,7 @@
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805" "NETStandard.Library": "1.0.0-rc2-23808"
} }
}, },
"dnx451": { } "dnx451": { }

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

@ -1,6 +1,6 @@
{ {
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.Web.Administration": "7.0.0" "Microsoft.Web.Administration": "7.0.0"
}, },
"frameworks": { "frameworks": {

2
tools/MultiProjectValidator/project.json
View file

@ -6,7 +6,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23805", "NETStandard.Library": "1.0.0-rc2-23808",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": "1.0.0-*" "Microsoft.DotNet.Cli.Utils": "1.0.0-*"
}, },