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

Merge pull request #2067 from eerhardt/UpdateDependencies23925

Browse source 
Updating CoreFX to rc2-23925
This commit is contained in:
Eric Erhardt 2016-03-25 17:21:14 -05:00
commit 77f4d9955c
101 changed files with 210 additions and 192 deletions
Download patch file Download diff file Expand all files Collapse all files

4
scripts/Microsoft.DotNet.Cli.Build.Framework/project.json
View file

@ -1,8 +1,8 @@
{
"version": "1.0.0-*",
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-23924",
"System.Diagnostics.Process": "4.1.0-rc2-23924",
"NETStandard.Library": "1.5.0-rc2-23925",
"System.Diagnostics.Process": "4.1.0-rc2-23925",
"Microsoft.Extensions.PlatformAbstractions": "1.0.0-rc2-16537"
},
"frameworks": {

4
scripts/dotnet-cli-build/CompileTargets.cs
View file

@ -14,7 +14,7 @@ namespace Microsoft.DotNet.Cli.Build
{
public class CompileTargets
{
public static readonly string CoreCLRVersion = "1.0.2-rc2-23924";
public static readonly string CoreCLRVersion = "1.0.2-rc2-23925";
public static readonly string AppDepSdkVersion = "1.0.6-prerelease-00003";
public static readonly bool IsWinx86 = CurrentPlatform.IsWindows && CurrentArchitecture.Isx86;
@ -308,7 +308,7 @@ namespace Microsoft.DotNet.Cli.Build
// corehost will be renamed to dotnet at some point and then we will not need to rename it here.
File.Copy(
Path.Combine(Dirs.Corehost, CoreHostBaseName),
Path.Combine(SharedFrameworkNameAndVersionRoot, $"dotnet{Constants.ExeSuffix}"));
Path.Combine(SharedFrameworkNameAndVersionRoot, $"dotnet{Constants.ExeSuffix}"), true);
File.Copy(
Path.Combine(Dirs.Corehost, HostPolicyBaseName),
Path.Combine(SharedFrameworkNameAndVersionRoot, HostPolicyBaseName), true);

8
scripts/dotnet-cli-build/project.json
View file

@ -5,12 +5,12 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-23924",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924",
"System.Xml.XmlSerializer": "4.0.11-rc2-23924",
"NETStandard.Library": "1.5.0-rc2-23925",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925",
"System.Xml.XmlSerializer": "4.0.11-rc2-23925",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"WindowsAzure.Storage": "6.2.2-preview",
"System.Reflection.Metadata": "1.3.0-rc2-23924"
"System.Reflection.Metadata": "1.3.0-rc2-23925"
},
"frameworks": {
"netstandardapp1.5": {

2
scripts/update-dependencies.ps1
View file

@ -28,7 +28,7 @@ Write-Host "Installing .NET Core CLI Stage 0"
& "$PSScriptRoot\obtain\install.ps1" -Architecture x64
# Put the stage0 on the path
$env:PATH = "$env:DOTNET_INSTALL_DIR\cli;$env:PATH"
$env:PATH = "$env:DOTNET_INSTALL_DIR;$env:PATH"
$appPath = "$PSScriptRoot\update-dependencies"

6
scripts/update-dependencies/project.json
View file

@ -5,9 +5,9 @@
"emitEntryPoint": true
},
"dependencies": {
"NETStandard.Library": "1.5.0-rc2-23924",
"Microsoft.CSharp": "4.0.1-rc2-23924",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23924",
"NETStandard.Library": "1.5.0-rc2-23925",
"Microsoft.CSharp": "4.0.1-rc2-23925",
"System.Runtime.Serialization.Primitives": "4.1.1-rc2-23925",
"Microsoft.DotNet.Cli.Build.Framework": "1.0.0-*",
"NuGet.Versioning": "3.5.0-beta-1068",
"Newtonsoft.Json": "7.0.1",