diff --git a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json index 1951a8841..c1ff9b863 100644 --- a/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v1/dotnet-hello/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json index aea13bbb9..a42fc8eab 100644 --- a/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json +++ b/TestAssets/TestPackages/dotnet-hello/v2/dotnet-hello/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/CompileFail/project.json b/TestAssets/TestProjects/CompileFail/project.json index c33f13b32..f993ed899 100644 --- a/TestAssets/TestProjects/CompileFail/project.json +++ b/TestAssets/TestProjects/CompileFail/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestApp/project.json b/TestAssets/TestProjects/TestApp/project.json index 6f5eb6f88..76a72ded1 100644 --- a/TestAssets/TestProjects/TestApp/project.json +++ b/TestAssets/TestProjects/TestApp/project.json @@ -7,7 +7,7 @@ "dependencies": { "TestLibrary": { "target":"project"}, - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppCompilationContext/project.json b/TestAssets/TestProjects/TestAppCompilationContext/project.json index 5d5dd0639..890d6f9bc 100644 --- a/TestAssets/TestProjects/TestAppCompilationContext/project.json +++ b/TestAssets/TestProjects/TestAppCompilationContext/project.json @@ -8,7 +8,7 @@ "dependencies": { "TestLibrary": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithArgs/project.json b/TestAssets/TestProjects/TestAppWithArgs/project.json index c33f13b32..f993ed899 100644 --- a/TestAssets/TestProjects/TestAppWithArgs/project.json +++ b/TestAssets/TestProjects/TestAppWithArgs/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestAppWithContents/project.json b/TestAssets/TestProjects/TestAppWithContents/project.json index d39a572b2..e14971196 100644 --- a/TestAssets/TestProjects/TestAppWithContents/project.json +++ b/TestAssets/TestProjects/TestAppWithContents/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "content": "testcontentfile.txt", diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json index 056e2aa8d..1707aad9e 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryGreater/project.json @@ -10,7 +10,7 @@ "dnxcore50": { "imports" : "portable-net45+wp80+win8", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" } } } diff --git a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json index 50e1727fa..d418fc4a0 100644 --- a/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json +++ b/TestAssets/TestProjects/TestBindingRedirectGeneration/TestLibraryLesser/project.json @@ -11,7 +11,7 @@ "dnxcore50": { "imports" : "portable-net45+wp80+win8", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" } } } diff --git a/TestAssets/TestProjects/TestLibrary/project.json b/TestAssets/TestProjects/TestLibrary/project.json index e0f1d57ad..6aaf77a3d 100644 --- a/TestAssets/TestProjects/TestLibrary/project.json +++ b/TestAssets/TestProjects/TestLibrary/project.json @@ -6,7 +6,7 @@ "additionalArguments": [ "-highentropyva+" ] }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json index 88ab122a5..285afb682 100644 --- a/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json +++ b/TestAssets/TestProjects/TestLibraryWithAnalyzer/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "System.Runtime.Analyzers": { "version": "1.1.0", "type": "build" } }, diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json index 14d0f7002..a40259097 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L0/project.json @@ -8,7 +8,7 @@ "L11": "1.0.0-*", "L12": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json index 93679c638..1532e7039 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L11/project.json @@ -5,7 +5,7 @@ "L12": "1.0.0-*", "L21": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json index 88bb294ed..95df01e40 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L12/project.json @@ -4,7 +4,7 @@ "dependencies": { "L22": "1.0.0-*", - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json index dc3249379..443b65101 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L21/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json index dc3249379..443b65101 100644 --- a/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json +++ b/TestAssets/TestProjects/TestProjectToProjectDependencies/src/L22/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json index c33f13b32..f993ed899 100644 --- a/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithCultureSpecificResource/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestProjectWithResource/project.json b/TestAssets/TestProjects/TestProjectWithResource/project.json index c33f13b32..f993ed899 100644 --- a/TestAssets/TestProjects/TestProjectWithResource/project.json +++ b/TestAssets/TestProjects/TestProjectWithResource/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json index 0a12fb663..1cb66987f 100644 --- a/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json +++ b/TestAssets/TestProjects/TestSimpleIncrementalApp/project.json @@ -6,7 +6,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/scripts/build/build.ps1 b/scripts/build/build.ps1 index f2b7e633a..c302e0378 100644 --- a/scripts/build/build.ps1 +++ b/scripts/build/build.ps1 @@ -14,6 +14,8 @@ $ErrorActionPreference="Stop" . "$RepoRoot\scripts\build\generate-version.ps1" +_ "$RepoRoot\scripts\clean\clear-nuget-cache.ps1" + header "Building dotnet tools version $($env:DOTNET_CLI_VERSION) - $Configuration" header "Checking Pre-Reqs" @@ -26,13 +28,13 @@ 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" } +header "Cleaning out .ni's from Stage0" +rm "$RepoRoot\.dotnet_stage0\**\*.ni.*" + +_ "$RepoRoot\scripts\build\restore-packages.ps1" + header "Compiling" _ "$RepoRoot\scripts\compile\compile.ps1" @("$Configuration") diff --git a/scripts/build/build.sh b/scripts/build/build.sh index 834111bca..362f7c531 100755 --- a/scripts/build/build.sh +++ b/scripts/build/build.sh @@ -17,8 +17,11 @@ done DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )" source "$DIR/../common/_common.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 "Checking Pre-Reqs" @@ -39,11 +42,13 @@ if [ ! -z "$OFFLINE" ]; then info "Skipping Tools and Package Download: Offline build" else $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 +header "Cleaning out .ni's from Stage0" +find ".dotnet_stage0" -name '*.ni.*' -delete + +$REPOROOT/scripts/build/restore-packages.sh + header "Compiling" $REPOROOT/scripts/compile/compile.sh diff --git a/scripts/build/restore-packages.ps1 b/scripts/build/restore-packages.ps1 index 9bce280c5..9ba972481 100644 --- a/scripts/build/restore-packages.ps1 +++ b/scripts/build/restore-packages.ps1 @@ -5,30 +5,14 @@ . $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 # NOTE(anurse): I had to remove --quiet, because NuGet3 is too quiet when that's provided :( header "Restoring packages" +$StartPath = $env:PATH +$env:PATH = "$env:DOTNET_INSTALL_DIR\cli\bin;$StartPath" + & dotnet restore "$RepoRoot\src" --runtime "$Rid" & dotnet restore "$RepoRoot\tools" --runtime "$Rid" + +$env:PATH=$StartPath diff --git a/scripts/build/restore-packages.sh b/scripts/build/restore-packages.sh index 44975fbf6..935bca61a 100755 --- a/scripts/build/restore-packages.sh +++ b/scripts/build/restore-packages.sh @@ -16,27 +16,12 @@ 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 +export StartPath=$PATH +export PATH=$DOTNET_INSTALL_DIR/bin:$PATH header "Restoring packages" dotnet restore "$REPOROOT/src" --runtime "$RID" $DISABLE_PARALLEL dotnet restore "$REPOROOT/tools" --runtime "$RID" $DISABLE_PARALLEL + +export PATH=$StartPath diff --git a/scripts/clean/clear-nuget-cache.ps1 b/scripts/clean/clear-nuget-cache.ps1 new file mode 100644 index 000000000..028a156db --- /dev/null +++ b/scripts/clean/clear-nuget-cache.ps1 @@ -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 + } + } +} diff --git a/scripts/clean/clear-nuget-cache.sh b/scripts/clean/clear-nuget-cache.sh new file mode 100755 index 000000000..ec915a443 --- /dev/null +++ b/scripts/clean/clear-nuget-cache.sh @@ -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 diff --git a/scripts/common/_common.ps1 b/scripts/common/_common.ps1 index 29ad33709..85621ab53 100644 --- a/scripts/common/_common.ps1 +++ b/scripts/common/_common.ps1 @@ -5,6 +5,7 @@ . $PSScriptRoot\_utility.ps1 +$Skip_Crossgen = $false $Rid = "win7-x64" $Tfm = "dnxcore50" $RepoRoot = Resolve-Path "$PSScriptRoot\..\.." @@ -25,8 +26,9 @@ $env:ReleaseSuffix = "beta" $env:Channel = "$env:ReleaseSuffix" # 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 "SKIP_CROSSGEN" "$Skip_Crossgen" setPathAndHomeIfDefault "$Stage2Dir" setVarIfDefault "Configuration" "Debug" diff --git a/scripts/common/_common.sh b/scripts/common/_common.sh index bea33b5f0..163bbf797 100644 --- a/scripts/common/_common.sh +++ b/scripts/common/_common.sh @@ -15,6 +15,7 @@ source "$COMMONDIR/_prettyprint.sh" source "$COMMONDIR/_rid.sh" # TODO: Replace this with a dotnet generation +export SKIP_CROSSGEN=false export TFM=dnxcore50 export REPOROOT=$(cd $COMMONDIR/../.. && pwd) export OUTPUT_ROOT=$REPOROOT/artifacts/$RID diff --git a/scripts/compile/compile-stage.ps1 b/scripts/compile/compile-stage.ps1 index 8ee99c3a7..a2de5c30d 100644 --- a/scripts/compile/compile-stage.ps1 +++ b/scripts/compile/compile-stage.ps1 @@ -75,7 +75,6 @@ $BinariesForCoreHost | ForEach-Object { # Crossgen Roslyn if (-not (Test-Path "$StageOutputDir\bin\csc.ni.exe")) { - header "Crossgening Roslyn compiler ..." _cmd "$RepoRoot\scripts\crossgen\crossgen_roslyn.cmd ""$StageOutputDir""" } diff --git a/scripts/compile/compile-stage.sh b/scripts/compile/compile-stage.sh index f9f1838e6..2f4b8ef9d 100755 --- a/scripts/compile/compile-stage.sh +++ b/scripts/compile/compile-stage.sh @@ -81,7 +81,6 @@ 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 diff --git a/scripts/compile/compile.ps1 b/scripts/compile/compile.ps1 index 3adb21563..b562c4fab 100644 --- a/scripts/compile/compile.ps1 +++ b/scripts/compile/compile.ps1 @@ -18,6 +18,9 @@ try { _ "$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" } finally { $env:PATH = $StartPath diff --git a/scripts/compile/compile.sh b/scripts/compile/compile.sh index ab3d93f04..3a1416a30 100755 --- a/scripts/compile/compile.sh +++ b/scripts/compile/compile.sh @@ -20,4 +20,7 @@ $REPOROOT/scripts/compile/compile-corehost.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 diff --git a/scripts/crossgen/crossgen_roslyn.cmd b/scripts/crossgen/crossgen_roslyn.cmd index 1632a18a1..4d145b81e 100644 --- a/scripts/crossgen/crossgen_roslyn.cmd +++ b/scripts/crossgen/crossgen_roslyn.cmd @@ -3,13 +3,17 @@ 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. +if %SKIP_CROSSGEN% EQU 0 goto skip + +echo Crossgenning Roslyn compiler ... + REM Get absolute path pushd %1 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-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 copy %CROSSGEN_UTIL% /Y %BIN_DIR% > nul @@ -21,28 +25,33 @@ if exist mscorlib.ni.dll ( 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 -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 -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 -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 -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 -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 -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 popd + +echo CrossGen Roslyn Finished + goto end :fail @@ -50,4 +59,8 @@ popd echo Crossgen failed... exit /B 1 +:skip +echo Skipping Crossgen +goto end + :end diff --git a/scripts/crossgen/crossgen_roslyn.sh b/scripts/crossgen/crossgen_roslyn.sh index 41b47a191..db93038b9 100755 --- a/scripts/crossgen/crossgen_roslyn.sh +++ b/scripts/crossgen/crossgen_roslyn.sh @@ -4,6 +4,25 @@ # 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 BIN_DIR="$( cd $1 && pwd )" @@ -22,8 +41,10 @@ else exit 1 fi +READYTORUN="" + # 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 @@ -31,20 +52,22 @@ cd $BIN_DIR cp $CROSSGEN_UTIL $BIN_DIR 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 -./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 + +info "CrossGen Roslyn Finished" \ No newline at end of file diff --git a/src/Microsoft.DotNet.Cli.Utils/project.json b/src/Microsoft.DotNet.Cli.Utils/project.json index e026dadad..71cef2cf7 100644 --- a/src/Microsoft.DotNet.Cli.Utils/project.json +++ b/src/Microsoft.DotNet.Cli.Utils/project.json @@ -6,9 +6,9 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "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" }, diff --git a/src/Microsoft.DotNet.Compiler.Common/project.json b/src/Microsoft.DotNet.Compiler.Common/project.json index 07099171e..425558fa0 100644 --- a/src/Microsoft.DotNet.Compiler.Common/project.json +++ b/src/Microsoft.DotNet.Compiler.Common/project.json @@ -6,7 +6,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "System.CommandLine": "0.1.0-e160119-1", "Microsoft.CodeAnalysis.CSharp": "1.2.0-beta1-20160108-01", "Microsoft.DotNet.ProjectModel": "1.0.0-*", diff --git a/src/Microsoft.DotNet.Files/project.json b/src/Microsoft.DotNet.Files/project.json index e89980cc9..7d197d75c 100644 --- a/src/Microsoft.DotNet.Files/project.json +++ b/src/Microsoft.DotNet.Files/project.json @@ -5,8 +5,8 @@ }, "description": "Abstraction to interact with the file system and file paths.", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", - "System.Linq.Expressions": "4.0.11-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", + "System.Linq.Expressions": "4.0.11-rc2-23808", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index 83612b365..1fd61f5bf 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -4,9 +4,9 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.Runtime.Loader": "4.0.0-rc2-23805" + "System.Runtime.Loader": "4.0.0-rc2-23808" }, "frameworks": { "dnxcore50": { diff --git a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json index 2eb3925eb..9af7eef1f 100644 --- a/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Workspaces/project.json @@ -4,7 +4,7 @@ "keyFile": "../../tools/Key.snk" }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.2.0-beta1-20160108-01" diff --git a/src/Microsoft.DotNet.ProjectModel/project.json b/src/Microsoft.DotNet.ProjectModel/project.json index 58f128bc2..23fd6864e 100644 --- a/src/Microsoft.DotNet.ProjectModel/project.json +++ b/src/Microsoft.DotNet.ProjectModel/project.json @@ -5,13 +5,13 @@ }, "description": "Types to model a .NET Project", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", - "System.Reflection.Metadata": "1.2.0-rc2-23805", - "System.Runtime.Loader": "4.0.0-rc2-23805", - "System.Dynamic.Runtime": "4.0.11-rc2-23805", - "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23805", - "Microsoft.CSharp": "4.0.1-rc2-23805", - "System.Xml.XDocument": "4.0.11-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", + "System.Reflection.Metadata": "1.2.0-rc2-23808", + "System.Runtime.Loader": "4.0.0-rc2-23808", + "System.Dynamic.Runtime": "4.0.11-rc2-23808", + "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23808", + "Microsoft.CSharp": "4.0.1-rc2-23808", + "System.Xml.XDocument": "4.0.11-rc2-23808", "NuGet.Packaging": "3.4.0-beta-583", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15996", diff --git a/src/Microsoft.DotNet.Runtime/project.json b/src/Microsoft.DotNet.Runtime/project.json index 576f92d54..59ff24da0 100644 --- a/src/Microsoft.DotNet.Runtime/project.json +++ b/src/Microsoft.DotNet.Runtime/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23805" + "NETStandard.Library" : "1.0.0-rc2-23808" }, "frameworks": { diff --git a/src/Microsoft.Extensions.DependencyModel/project.json b/src/Microsoft.Extensions.DependencyModel/project.json index d3f8b494a..70f3009bf 100644 --- a/src/Microsoft.Extensions.DependencyModel/project.json +++ b/src/Microsoft.Extensions.DependencyModel/project.json @@ -18,22 +18,22 @@ "dotnet5.4": { "imports": "portable-net451+win8", "dependencies": { - "System.IO.FileSystem": "4.0.1-rc2-23805", - "System.Linq": "4.0.1-rc2-23805", - "System.Runtime": "4.0.21-rc2-23805", - "System.Reflection": "4.1.0-rc2-23805", - "System.Dynamic.Runtime": "4.0.11-rc2-23805" + "System.IO.FileSystem": "4.0.1-rc2-23808", + "System.Linq": "4.0.1-rc2-23808", + "System.Runtime": "4.0.21-rc2-23808", + "System.Reflection": "4.1.0-rc2-23808", + "System.Dynamic.Runtime": "4.0.11-rc2-23808" } }, "dnxcore50": { "imports": "portable-net45+win8", "dependencies": { - "Microsoft.NETCore.Platforms": "1.0.1-rc2-23805", - "System.IO.FileSystem": "4.0.1-rc2-23805", - "System.Linq": "4.0.1-rc2-23805", - "System.Runtime": "4.0.21-rc2-23805", - "System.Reflection": "4.1.0-rc2-23805", - "System.Dynamic.Runtime": "4.0.11-rc2-23805" + "Microsoft.NETCore.Platforms": "1.0.1-rc2-23808", + "System.IO.FileSystem": "4.0.1-rc2-23808", + "System.Linq": "4.0.1-rc2-23808", + "System.Runtime": "4.0.21-rc2-23808", + "System.Reflection": "4.1.0-rc2-23808", + "System.Dynamic.Runtime": "4.0.11-rc2-23808" } } }, diff --git a/src/Microsoft.Extensions.Testing.Abstractions/project.json b/src/Microsoft.Extensions.Testing.Abstractions/project.json index 413e8f9f8..455c4d4bf 100644 --- a/src/Microsoft.Extensions.Testing.Abstractions/project.json +++ b/src/Microsoft.Extensions.Testing.Abstractions/project.json @@ -13,9 +13,9 @@ "Newtonsoft.Json": "7.0.1", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-rc2-16040", - "NETStandard.Library": "1.0.0-rc2-23805", - "System.Resources.ResourceManager": "4.0.1-rc2-23805", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808", + "System.Resources.ResourceManager": "4.0.1-rc2-23808", + "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23808" }, "frameworks": { "dnxcore50": { diff --git a/src/dotnet/commands/dotnet-compile-native/appdep/project.json b/src/dotnet/commands/dotnet-compile-native/appdep/project.json index 73b162490..433597726 100644 --- a/src/dotnet/commands/dotnet-compile-native/appdep/project.json +++ b/src/dotnet/commands/dotnet-compile-native/appdep/project.json @@ -4,7 +4,7 @@ "emitEntryPoint": true }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.DotNet.AppDep":"1.0.5-prerelease-00001" }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template index c33f13b32..f993ed899 100644 --- a/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/CSharp_Console/project.json.template @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template index 6ff51d4d3..5e81b85f5 100644 --- a/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template +++ b/src/dotnet/commands/dotnet-new/FSharp_Console/project.json.template @@ -11,7 +11,7 @@ "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/src/dotnet/project.json b/src/dotnet/project.json index bae58825c..b4aa62fa3 100644 --- a/src/dotnet/project.json +++ b/src/dotnet/project.json @@ -49,18 +49,18 @@ "version": "1.0.0-*", "type": "build" }, - "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23805", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23805", - "NETStandard.Library": "1.0.0-rc2-23805", - "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23805", - "System.Diagnostics.TraceSource": "4.0.0-rc2-23805", - "System.Linq.Expressions": "4.0.11-rc2-23805", - "System.Xml.XDocument": "4.0.11-rc2-23805", - "System.Resources.ReaderWriter": "4.0.0-rc2-23805", - "System.Net.Sockets": "4.1.0-rc2-23805", - "System.IO.Compression.ZipFile": "4.0.1-rc2-23805", - "System.Threading.ThreadPool": "4.0.10-rc2-23805", - "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23805" + "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23808", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23808", + "NETStandard.Library": "1.0.0-rc2-23808", + "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23808", + "System.Diagnostics.TraceSource": "4.0.0-rc2-23808", + "System.Linq.Expressions": "4.0.11-rc2-23808", + "System.Xml.XDocument": "4.0.11-rc2-23808", + "System.Resources.ReaderWriter": "4.0.0-rc2-23808", + "System.Net.Sockets": "4.1.0-rc2-23808", + "System.IO.Compression.ZipFile": "4.0.1-rc2-23808", + "System.Threading.ThreadPool": "4.0.10-rc2-23808", + "System.Runtime.Serialization.Primitives": "4.1.0-rc2-23808" }, "frameworks": { "dnxcore50": { diff --git a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json index 73c4bef6e..7bcfca0ca 100644 --- a/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json +++ b/test/ArgumentForwardingTests/ArgumentForwardingTests/project.json @@ -5,8 +5,8 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23805", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23805", + "NETStandard.Library" : "1.0.0-rc2-23808", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23808", "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", diff --git a/test/ArgumentForwardingTests/Reflector/project.json b/test/ArgumentForwardingTests/Reflector/project.json index 73c4bef6e..7bcfca0ca 100644 --- a/test/ArgumentForwardingTests/Reflector/project.json +++ b/test/ArgumentForwardingTests/Reflector/project.json @@ -5,8 +5,8 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23805", - "Microsoft.NETCore.TestHost": "1.0.0-rc2-23805", + "NETStandard.Library" : "1.0.0-rc2-23808", + "Microsoft.NETCore.TestHost": "1.0.0-rc2-23808", "xunit": "2.1.0", "xunit.console.netcore": "1.0.2-prerelease-00101", diff --git a/test/Compiler.Common.Tests/project.json b/test/Compiler.Common.Tests/project.json index 969bee4fb..7a21ba6c8 100644 --- a/test/Compiler.Common.Tests/project.json +++ b/test/Compiler.Common.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.ProjectModel": { "target": "project" }, diff --git a/test/EndToEnd/project.json b/test/EndToEnd/project.json index acf2a9dcb..c1b8b37bd 100644 --- a/test/EndToEnd/project.json +++ b/test/EndToEnd/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, diff --git a/test/FSharpTestProjects/CompileFail/project.json b/test/FSharpTestProjects/CompileFail/project.json index 60b8a9290..b683cbd86 100644 --- a/test/FSharpTestProjects/CompileFail/project.json +++ b/test/FSharpTestProjects/CompileFail/project.json @@ -9,7 +9,7 @@ ], "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/test/FSharpTestProjects/TestApp/project.json b/test/FSharpTestProjects/TestApp/project.json index 92b7fdd2b..ede07a7f4 100644 --- a/test/FSharpTestProjects/TestApp/project.json +++ b/test/FSharpTestProjects/TestApp/project.json @@ -9,7 +9,7 @@ ], "dependencies": { "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", }, diff --git a/test/FSharpTestProjects/TestAppWithArgs/project.json b/test/FSharpTestProjects/TestAppWithArgs/project.json index 60b8a9290..b683cbd86 100644 --- a/test/FSharpTestProjects/TestAppWithArgs/project.json +++ b/test/FSharpTestProjects/TestAppWithArgs/project.json @@ -9,7 +9,7 @@ ], "dependencies": { "Microsoft.FSharp.Core.netcore": "1.0.0-alpha-151221", - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/test/FSharpTestProjects/TestLibrary/project.json b/test/FSharpTestProjects/TestLibrary/project.json index 4121e6552..d3828b5c5 100644 --- a/test/FSharpTestProjects/TestLibrary/project.json +++ b/test/FSharpTestProjects/TestLibrary/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { "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", "compileFiles": [ diff --git a/test/LoadContextTest/project.json b/test/LoadContextTest/project.json index e1293b762..e5fb932d2 100644 --- a/test/LoadContextTest/project.json +++ b/test/LoadContextTest/project.json @@ -7,7 +7,7 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23805", + "NETStandard.Library" : "1.0.0-rc2-23808", "Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16530", "Microsoft.DotNet.ProjectModel.Loader": "1.0.0-*" }, diff --git a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json index 2a2f21f1e..4e33aa73c 100644 --- a/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json +++ b/test/Microsoft.DotNet.Tools.Tests.Utilities/project.json @@ -3,8 +3,8 @@ "description": "Microsoft.DotNet.Tools.Tests.Utilities Class Library", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", - "System.Collections.Immutable": "1.2.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", + "System.Collections.Immutable": "1.2.0-rc2-23808", "FluentAssertions": "4.0.0", "xunit": "2.1.0", diff --git a/test/PackagedCommands/Consumers/AppWithDirectAndToolDependency/project.json b/test/PackagedCommands/Consumers/AppWithDirectAndToolDependency/project.json index 17d76e74c..cb3d3e206 100644 --- a/test/PackagedCommands/Consumers/AppWithDirectAndToolDependency/project.json +++ b/test/PackagedCommands/Consumers/AppWithDirectAndToolDependency/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "dotnet-hello": { "version": "1.0.0", "target": "package" } }, diff --git a/test/PackagedCommands/Consumers/AppWithDirectDependency/project.json b/test/PackagedCommands/Consumers/AppWithDirectDependency/project.json index a86b13693..1d8f61956 100644 --- a/test/PackagedCommands/Consumers/AppWithDirectDependency/project.json +++ b/test/PackagedCommands/Consumers/AppWithDirectDependency/project.json @@ -7,7 +7,7 @@ "testRunner": "must-be-specified-to-generate-deps", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "dotnet-hello": {"version": "1.0.0", "target": "package"} }, diff --git a/test/PackagedCommands/Consumers/AppWithToolDependency/project.json b/test/PackagedCommands/Consumers/AppWithToolDependency/project.json index 0e1304193..2186cff2d 100644 --- a/test/PackagedCommands/Consumers/AppWithToolDependency/project.json +++ b/test/PackagedCommands/Consumers/AppWithToolDependency/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" }, "frameworks": { diff --git a/test/StreamForwarderTests/project.json b/test/StreamForwarderTests/project.json index ff95b1d88..75dcf2c23 100644 --- a/test/StreamForwarderTests/project.json +++ b/test/StreamForwarderTests/project.json @@ -5,7 +5,7 @@ }, "dependencies": { - "NETStandard.Library" : "1.0.0-rc2-23805", + "NETStandard.Library" : "1.0.0-rc2-23808", "Microsoft.DotNet.ProjectModel": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { "target": "project" }, diff --git a/test/dotnet-build.Tests/project.json b/test/dotnet-build.Tests/project.json index e36da2b8a..3a2c33240 100644 --- a/test/dotnet-build.Tests/project.json +++ b/test/dotnet-build.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { diff --git a/test/dotnet-compile.Tests/project.json b/test/dotnet-compile.Tests/project.json index 6f8c2fca4..ed80c94ee 100644 --- a/test/dotnet-compile.Tests/project.json +++ b/test/dotnet-compile.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { diff --git a/test/dotnet-publish.Tests/project.json b/test/dotnet-publish.Tests/project.json index 98ee231b1..1f1fcddc5 100644 --- a/test/dotnet-publish.Tests/project.json +++ b/test/dotnet-publish.Tests/project.json @@ -2,7 +2,7 @@ "version": "1.0.0-*", "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.DotNet.Tools.Tests.Utilities": { "target": "project" }, "Microsoft.DotNet.Cli.Utils": { diff --git a/testapp/DthTestProjects/src/BrokenProjectPathSample/project.json b/testapp/DthTestProjects/src/BrokenProjectPathSample/project.json index 92abcd99c..61047b28c 100644 --- a/testapp/DthTestProjects/src/BrokenProjectPathSample/project.json +++ b/testapp/DthTestProjects/src/BrokenProjectPathSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "EmptyLibrary": "" }, "frameworks": { diff --git a/testapp/DthTestProjects/src/EmptyConsoleApp/project.json b/testapp/DthTestProjects/src/EmptyConsoleApp/project.json index 183f83467..185607372 100644 --- a/testapp/DthTestProjects/src/EmptyConsoleApp/project.json +++ b/testapp/DthTestProjects/src/EmptyConsoleApp/project.json @@ -3,7 +3,7 @@ "frameworks": { "dnxcore50": { "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805" + "NETStandard.Library": "1.0.0-rc2-23808" } }, "dnx451": { } diff --git a/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json b/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json index 9a184314c..0af4a7cb5 100644 --- a/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json +++ b/testapp/DthTestProjects/src/IncompatiblePackageSample/project.json @@ -1,6 +1,6 @@ { "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.Web.Administration": "7.0.0" }, "frameworks": { diff --git a/tools/MultiProjectValidator/project.json b/tools/MultiProjectValidator/project.json index 48547b052..b200ff06e 100644 --- a/tools/MultiProjectValidator/project.json +++ b/tools/MultiProjectValidator/project.json @@ -6,7 +6,7 @@ }, "dependencies": { - "NETStandard.Library": "1.0.0-rc2-23805", + "NETStandard.Library": "1.0.0-rc2-23808", "Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.Cli.Utils": "1.0.0-*" },