From 2ba6dbd6306bd38a1f61d00af71fc2d6d0611329 Mon Sep 17 00:00:00 2001 From: Bryan Date: Wed, 9 Dec 2015 19:15:37 -0800 Subject: [PATCH] Downgrade runtime version to get unblocked on CoreCLR bug. Fix some other dependency versions --- scripts/crossgen/crossgen_roslyn.cmd | 2 +- scripts/crossgen/crossgen_roslyn.sh | 2 +- src/Microsoft.DotNet.ProjectModel.Loader/project.json | 4 ++-- src/Microsoft.DotNet.Runtime/project.json | 2 +- src/Microsoft.DotNet.Tools.Repl.Csi/project.json | 2 +- src/Microsoft.DotNet.Tools.Resgen/project.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/crossgen/crossgen_roslyn.cmd b/scripts/crossgen/crossgen_roslyn.cmd index 5f319fe9a..b7242247d 100644 --- a/scripts/crossgen/crossgen_roslyn.cmd +++ b/scripts/crossgen/crossgen_roslyn.cmd @@ -9,7 +9,7 @@ set BIN_DIR=%CD%\bin popd REM Replace with a robust method for finding the right crossgen.exe -set CROSSGEN_UTIL=%UserProfile%\.dnx\packages\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-rc2-23608\tools\crossgen.exe +set CROSSGEN_UTIL=%UserProfile%\.dnx\packages\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-beta-23504\tools\crossgen.exe REM Crossgen currently requires itself to be next to mscorlib copy %CROSSGEN_UTIL% /Y %BIN_DIR% > nul diff --git a/scripts/crossgen/crossgen_roslyn.sh b/scripts/crossgen/crossgen_roslyn.sh index bb0125026..01b144e62 100755 --- a/scripts/crossgen/crossgen_roslyn.sh +++ b/scripts/crossgen/crossgen_roslyn.sh @@ -22,7 +22,7 @@ if [ -z "$RID" ]; then fi # Replace with a robust method for finding the right crossgen.exe -CROSSGEN_UTIL=~/.dnx/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-rc2-23608/tools/crossgen +CROSSGEN_UTIL=~/.dnx/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-beta-23504/tools/crossgen cd $BIN_DIR diff --git a/src/Microsoft.DotNet.ProjectModel.Loader/project.json b/src/Microsoft.DotNet.ProjectModel.Loader/project.json index e451aed94..2fb94efcd 100644 --- a/src/Microsoft.DotNet.ProjectModel.Loader/project.json +++ b/src/Microsoft.DotNet.ProjectModel.Loader/project.json @@ -1,8 +1,8 @@ { "dependencies": { "Microsoft.DotNet.ProjectModel": "1.0.0-*", - "System.AppContext": "4.0.1-beta-23504", - "System.Runtime.Loader": "4.0.0-beta-23504" + "NETStandard.Library": "1.0.0-rc2-23608", + "System.Runtime.Loader": "4.0.0-rc2-23608" }, "frameworks": { "dnxcore50": { } diff --git a/src/Microsoft.DotNet.Runtime/project.json b/src/Microsoft.DotNet.Runtime/project.json index 6a4e9c5bf..58300b5fb 100644 --- a/src/Microsoft.DotNet.Runtime/project.json +++ b/src/Microsoft.DotNet.Runtime/project.json @@ -6,7 +6,7 @@ "dependencies": { "NETStandard.Library" : "1.0.0-rc2-23608", - "Microsoft.NETCore.Runtime": "1.0.1-rc2-23608" + "Microsoft.NETCore.Runtime": "1.0.1-beta-23504" }, "frameworks": { diff --git a/src/Microsoft.DotNet.Tools.Repl.Csi/project.json b/src/Microsoft.DotNet.Tools.Repl.Csi/project.json index a1414ab9e..1f4bec6f3 100644 --- a/src/Microsoft.DotNet.Tools.Repl.Csi/project.json +++ b/src/Microsoft.DotNet.Tools.Repl.Csi/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "NETStandard.Library": "1.0.0-rc2-23608", - "System.Linq": "4.0.1-beta-23504", + "System.Linq": "4.0.1-rc2-23608", "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta-20151106-02", diff --git a/src/Microsoft.DotNet.Tools.Resgen/project.json b/src/Microsoft.DotNet.Tools.Resgen/project.json index a6e9d52f7..819738824 100644 --- a/src/Microsoft.DotNet.Tools.Resgen/project.json +++ b/src/Microsoft.DotNet.Tools.Resgen/project.json @@ -7,7 +7,7 @@ "dependencies": { "NETStandard.Library": "1.0.0-rc2-23608", "System.Linq": "4.0.1-rc2-23608", - "System.Xml.XDocument": "4.0.11-beta-23504", + "System.Xml.XDocument": "4.0.11-rc2-23608", "System.Resources.ReaderWriter": "4.0.0-rc2-23608", "Microsoft.DotNet.Cli.Utils": {