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

Merge pull request #497 from brthor/upgrade_stdlib

Browse source 
Upgrade StdLib References to rc2-23614, Upgrade Runtime Version
This commit is contained in:
Bryan Thornbury 2015-12-16 15:38:51 -08:00
commit 0f6562df77
25 changed files with 51 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/crossgen/crossgen_roslyn.cmd
View file

@ -9,7 +9,7 @@ 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=%UserProfile%\.dnx\packages\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-beta-23504\tools\crossgen.exe set CROSSGEN_UTIL=%UserProfile%\.dnx\packages\runtime.win7-x64.Microsoft.NETCore.Runtime.CoreCLR\1.0.1-rc2-23616\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

2
scripts/crossgen/crossgen_roslyn.sh
View file

@ -22,7 +22,7 @@ if [ -z "$RID" ]; then
fi fi
# Replace with a robust method for finding the right crossgen.exe # Replace with a robust method for finding the right crossgen.exe
CROSSGEN_UTIL=~/.dnx/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-beta-23504/tools/crossgen CROSSGEN_UTIL=$HOME/.dnx/packages/runtime.$RID.Microsoft.NETCore.Runtime.CoreCLR/1.0.1-rc2-23616/tools/crossgen
cd $BIN_DIR cd $BIN_DIR

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

@ -4,7 +4,7 @@
"shared": "**/*.cs", "shared": "**/*.cs",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"Microsoft.DotNet.ProjectModel": "1.0.0" "Microsoft.DotNet.ProjectModel": "1.0.0"
}, },

3
src/Microsoft.DotNet.Cli/project.json
View file

@ -5,8 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",

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

@ -2,9 +2,8 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "System.Reflection": "4.0.10-rc2-23616",
"System.Linq": "4.0.1-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Reflection": "4.0.10-rc2-23608",
"System.CommandLine": "0.1.0-*", "System.CommandLine": "0.1.0-*",
"Microsoft.CodeAnalysis.CSharp": "1.1.1", "Microsoft.CodeAnalysis.CSharp": "1.1.1",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",

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

@ -1,9 +1,9 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23616",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"NETStandard.Library": "1.0.0-rc2-23608", "System.Runtime.Loader": "4.0.0-rc2-23616"
"System.Runtime.Loader": "4.0.0-rc2-23608"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { } "dnxcore50": { }

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

@ -1,6 +1,7 @@
{ {
"version": "1.0.0-*", "version": "1.0.0-*",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23616",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.0-*" "Microsoft.CodeAnalysis.CSharp.Workspaces": "1.1.0-*"
}, },

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

@ -2,17 +2,16 @@
"version": "1.0.0-*", "version": "1.0.0-*",
"description": "Types to model a .NET Project", "description": "Types to model a .NET Project",
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-rc2-23608", "System.Threading.Thread": "4.0.0-rc2-23616",
"System.Threading.Thread": "4.0.0-rc2-23608", "System.Runtime.Loader": "4.0.0-rc2-23616",
"System.Runtime.Loader": "4.0.0-rc2-23608", "System.Dynamic.Runtime": "4.0.11-rc2-23616",
"System.Dynamic.Runtime": "4.0.11-rc2-23608", "System.Security.Cryptography.Algorithms": "4.0.0-rc2-23616",
"System.Security.Cryptography.Algorithms": "4.0.0-rc2-23608", "Microsoft.CSharp": "4.0.1-rc2-23616",
"Microsoft.CSharp": "4.0.1-rc2-23608", "System.Xml.XDocument": "4.0.11-rc2-23616",
"System.Xml.XDocument": "4.0.11-rc2-23608",
"NuGet.Packaging": "3.3.0-*", "NuGet.Packaging": "3.3.0-*",
"Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15791", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0-rc2-15882",
"Microsoft.Extensions.JsonParser.Sources": { "Microsoft.Extensions.JsonParser.Sources": {
"type": "build", "type": "build",
"version": "1.0.0-*" "version": "1.0.0-*"

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

@ -5,8 +5,7 @@
}, },
"dependencies": { "dependencies": {
"NETStandard.Library" : "1.0.0-rc2-23608", "NETStandard.Library" : "1.0.0-rc2-23616"
"Microsoft.NETCore.Runtime": "1.0.1-beta-23504"
}, },
"frameworks": { "frameworks": {

3
src/Microsoft.DotNet.Tools.Compiler.Csc/project.json
View file

@ -5,8 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151215-01", "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151215-01",

3
src/Microsoft.DotNet.Tools.Compiler.Native/project.json
View file

@ -5,8 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",

3
src/Microsoft.DotNet.Tools.Compiler/project.json
View file

@ -5,8 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-rc2-23608",
"System.Reflection.Metadata": "1.1.0", "System.Reflection.Metadata": "1.1.0",
"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-*",

5
src/Microsoft.DotNet.Tools.New/Template/project.json
View file

@ -5,10 +5,7 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Runtime": "1.0.1-beta-*", "NETStandard.Library": "1.0.0-rc2-23616"
"System.IO": "4.0.11-beta-*",
"System.Console": "4.0.0-beta-*",
"System.Runtime": "4.0.21-beta-*"
}, },
"frameworks": { "frameworks": {

4
src/Microsoft.DotNet.Tools.New/project.json
View file

@ -5,9 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-beta-23504",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {

6
src/Microsoft.DotNet.Tools.Pack/project.json
View file

@ -5,9 +5,9 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.IO.Compression.ZipFile": "4.0.1-rc2-23608", "System.IO.Compression.ZipFile": "4.0.1-rc2-23616",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {

3
src/Microsoft.DotNet.Tools.Publish/project.json
View file

@ -5,8 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {

3
src/Microsoft.DotNet.Tools.Repl.Csi/project.json
View file

@ -5,8 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta-20151106-02", "Microsoft.Net.CSharp.Interactive.netcore": "1.2.0-beta-20151106-02",

5
src/Microsoft.DotNet.Tools.Repl/project.json
View file

@ -5,9 +5,8 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-rc2-23608",
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",

7
src/Microsoft.DotNet.Tools.Resgen/project.json
View file

@ -5,10 +5,9 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-rc2-23608", "System.Xml.XDocument": "4.0.11-rc2-23616",
"System.Xml.XDocument": "4.0.11-rc2-23608", "System.Resources.ReaderWriter": "4.0.0-rc2-23616",
"System.Resources.ReaderWriter": "4.0.0-rc2-23608",
"Microsoft.CodeAnalysis.CSharp": "1.1.1", "Microsoft.CodeAnalysis.CSharp": "1.1.1",
"Microsoft.DotNet.Compiler.Common": "1.0.0-*", "Microsoft.DotNet.Compiler.Common": "1.0.0-*",

3
src/Microsoft.DotNet.Tools.Run/project.json
View file

@ -5,8 +5,7 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Linq": "4.0.1-beta-23504",
"Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151215-01", "Microsoft.Net.Compilers.netcore": "1.2.0-beta-20151215-01",
"System.CommandLine" : "0.1.0-d111815-3", "System.CommandLine" : "0.1.0-d111815-3",

14
src/Microsoft.DotNet.Tools.Test/project.json
View file

@ -11,8 +11,8 @@
"emitEntryPoint": true "emitEntryPoint": true
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.ConsoleHost": "1.0.0-beta-23409", "Microsoft.NETCore.ConsoleHost": "1.0.0-rc2-23616",
"Microsoft.NETCore.TestHost": "1.0.0-beta-23409", "Microsoft.NETCore.TestHost": "1.0.0-rc2-23616",
"Microsoft.Extensions.Compilation.Abstractions": "1.0.0-*", "Microsoft.Extensions.Compilation.Abstractions": "1.0.0-*",
"Microsoft.DotNet.Cli.Utils": { "Microsoft.DotNet.Cli.Utils": {
"type": "build", "type": "build",
@ -40,11 +40,11 @@
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23608", "System.Diagnostics.TextWriterTraceListener": "4.0.0-rc2-23616",
"System.Diagnostics.TraceSource": "4.0.0-rc2-23608", "System.Diagnostics.TraceSource": "4.0.0-rc2-23616",
"System.Dynamic.Runtime": "4.0.11-rc2-23608", "System.Dynamic.Runtime": "4.0.11-rc2-23616",
"System.Threading.Thread": "4.0.0-rc2-23608" "System.Threading.Thread": "4.0.0-rc2-23616"
} }
} }
}, },

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

@ -13,13 +13,13 @@
"Microsoft.DotNet.ProjectModel": "1.0.0-*", "Microsoft.DotNet.ProjectModel": "1.0.0-*",
"Microsoft.Extensions.Compilation.Abstractions": "1.0.0-*", "Microsoft.Extensions.Compilation.Abstractions": "1.0.0-*",
"Microsoft.Extensions.Logging.Abstractions": "1.0.0-*", "Microsoft.Extensions.Logging.Abstractions": "1.0.0-*",
"System.Runtime.Serialization.Primitives": "4.0.11-rc2-23608" "System.Runtime.Serialization.Primitives": "4.0.11-rc2-23616"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "dnxcore50": {
"dependencies": { "dependencies": {
"NETStandard.Library": "1.0.0-rc2-23608", "NETStandard.Library": "1.0.0-rc2-23616",
"System.Resources.ResourceManager": "4.0.1-rc2-23608" "System.Resources.ResourceManager": "4.0.1-rc2-23616"
} }
} }
}, },

2
src/corehost/inc/pal.h
View file

@ -82,7 +82,7 @@ namespace pal
typedef std::string string_t; typedef std::string string_t;
typedef std::stringstream stringstream_t; typedef std::stringstream stringstream_t;
typedef std::ifstream ifstream_t; typedef std::ifstream ifstream_t;
typedef long hresult_t; typedef int hresult_t;
typedef void* dll_t; typedef void* dll_t;
typedef void* proc_t; typedef void* proc_t;

5
test/E2E/E2ETest.cs
View file

@ -59,6 +59,11 @@ namespace ConsoleApplication
return; return;
} }
if(SkipForOS(OSPlatform.Linux, "https://github.com/dotnet/cli/issues/527"))
{
return;
}
TestSetup(); TestSetup();
TestRunCommand("dotnet", $"compile --native -o {OutputDirectory}"); TestRunCommand("dotnet", $"compile --native -o {OutputDirectory}");

6
test/E2E/project.json
View file

@ -5,11 +5,7 @@
}, },
"dependencies": { "dependencies": {
"Microsoft.NETCore.Platforms":"1.0.1-*", "NETStandard.Library" : "1.0.0-rc2-23616",
"Microsoft.NETCore.Runtime": "1.0.1-*",
"System.Console": "4.0.0-*",
"System.Runtime": "4.0.21-*",
"System.AppContext": "4.0.1-*",
"xunit": "2.1.0", "xunit": "2.1.0",
"xunit.console.netcore": "1.0.2-prerelease-00101", "xunit.console.netcore": "1.0.2-prerelease-00101",