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

Merge pull request #3215 from eerhardt/netcore-rc3

Browse source 
Upgrade to CoreFX rc3
This commit is contained in:
Livar 2016-05-24 10:33:59 -07:00
commit fe7b519722
113 changed files with 702 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build_projects/dotnet-cli-build/CompileTargets.cs
View file

@ -15,7 +15,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class CompileTargets
{
public static readonly string CoreCLRVersion = "1.0.2-rc2-24027";
public static readonly string CoreCLRVersion = "1.0.2-rc3-24123-01";
public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;
public static readonly string[] BinariesForCoreHost = new[]

9
build_projects/dotnet-cli-build/TestTargets.cs
View file

@ -34,7 +34,8 @@ namespace Microsoft.DotNet.Cli.Build
"dotnet-run.UnitTests",
"dotnet-test.Tests",
"dotnet-test.UnitTests",
"Kestrel.Tests",
// TODO: https://github.com/dotnet/cli/issues/3216
//"Kestrel.Tests",
"Microsoft.DotNet.Cli.Utils.Tests",
"Microsoft.DotNet.Compiler.Common.Tests",
"Microsoft.DotNet.ProjectModel.Tests",
@ -82,8 +83,7 @@ namespace Microsoft.DotNet.Cli.Build
CleanNuGetTempCache();
var dotnet = DotNetCli.Stage2;
dotnet.Restore("--verbosity", "verbose",
"--infer-runtimes",
dotnet.Restore("--verbosity", "verbose",
"--fallbacksource", Dirs.CorehostLocalPackages,
"--fallbacksource", Dirs.CorehostDummyPackages)
.WorkingDirectory(Path.Combine(c.BuildContext.BuildDirectory, "TestAssets", "TestPackages"))
@ -103,8 +103,7 @@ namespace Microsoft.DotNet.Cli.Build
var dotnet = DotNetCli.Stage2;
dotnet.Restore(
"--verbosity", "verbose",
"--infer-runtimes",
"--verbosity", "verbose",
"--fallbacksource", Dirs.TestPackages,
"--fallbacksource", Dirs.CorehostLocalPackages,
"--fallbacksource", Dirs.CorehostDummyPackages)

3
build_projects/dotnet-cli-build/build.ps1
View file

@ -35,6 +35,9 @@ else
$env:DOTNET_BUILD_SKIP_PACKAGING=0
}
Write-Host "Disabling crossgen for the CLI build. See issue - https://github.com/dotnet/cli/issues/3059"
$env:DISABLE_CROSSGEN=1
# Load Branch Info
cat "$RepoRoot\branchinfo.txt" | ForEach-Object {
if(!$_.StartsWith("#") -and ![String]::IsNullOrWhiteSpace($_)) {

35
build_projects/dotnet-cli-build/project.json
View file

@ -5,16 +5,21 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-24027",
"Microsoft.CSharp": "4.0.1-rc2-24027",
"System.Dynamic.Runtime": "4.0.11-rc2-24027",
"System.Reflection.Metadata": "1.3.0-rc2-24027",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-24027",
"System.Xml.XmlSerializer": "4.0.11-rc2-24027",
"NETStandard.Library": "1.5.0-rc3-24123-01",
"Microsoft.NETCore.Runtime": "1.0.2-rc3-24123-01",
"Microsoft.CSharp": "4.0.1-rc3-24123-01",
"System.Dynamic.Runtime": "4.0.11-rc3-24123-01",
"System.Reflection.Metadata": "1.3.0-rc3-24123-01",
"System.Runtime.Serialization.Primitives": "4.1.1-rc3-24123-01",
"System.Xml.XmlSerializer": "4.0.11-rc3-24123-01",
"WindowsAzure.Storage": "6.2.2-preview",
"NuGet.CommandLine.XPlat": "3.5.0-rc-1285",
"Microsoft.DotNet.Cli.Build.Framework": { "target": "project" },
"shared-build-targets-utils": { "target": "project" }
"Microsoft.DotNet.Cli.Build.Framework": {
"target": "project"
},
"shared-build-targets-utils": {
"target": "project"
}
},
"frameworks": {
"netcoreapp1.0": {
@ -25,12 +30,12 @@
}
},
"runtimes": {
"win7-x64": { },
"win7-x86": { },
"osx.10.11-x64": { },
"ubuntu.14.04-x64": { },
"centos.7-x64": { },
"rhel.7.2-x64": { },
"debian.8-x64": { }
"win7-x64": {},
"win7-x86": {},
"osx.10.11-x64": {},
"ubuntu.14.04-x64": {},
"centos.7-x64": {},
"rhel.7.2-x64": {},
"debian.8-x64": {}
}
}