From 1b16f77e21b5ae91a17ea1086c464bb35e3a0792 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 4 May 2017 17:09:03 -0700 Subject: [PATCH] Update powershell to use .NET Core 2.0.0-preview1-002106-00 (#3699) Use 2.0 CLI/SDK of version `2.0.0-preview1-005952` to keep in sync with the .NET Core 2.0 //Build dogfood instructions. The version of `Microsoft.NetCore.App` in use is `2.0.0-preview1-002106-00`. --- appveyor.yml | 2 +- build.psm1 | 10 ++++----- ...soft.PowerShell.Commands.Management.csproj | 2 +- ...crosoft.PowerShell.Commands.Utility.csproj | 1 - ...crosoft.PowerShell.CoreCLR.Eventing.csproj | 2 +- .../Microsoft.PowerShell.SDK.csproj | 22 +++++++++---------- src/Microsoft.WSMan.Management/Interop.cs | 4 ---- .../CoreCLR/CorePsStub.cs | 12 ---------- .../System.Management.Automation.csproj | 15 +++++-------- 9 files changed, 25 insertions(+), 45 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e7b4d03b7a..df29d1da8b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: 6.0.0-alpha.18-{build} image: Visual Studio 2015 -# cache version - netcoreapp.2.0.0-preview1-001913-00 +# cache version - netcoreapp.2.0.0-preview1-002106-00 cache: - '%LocalAppData%\Microsoft\dotnet -> appveyor.yml' - '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml' diff --git a/build.psm1 b/build.psm1 index bec7a06e46..496f46ae74 100644 --- a/build.psm1 +++ b/build.psm1 @@ -967,7 +967,7 @@ function Install-Dotnet { [CmdletBinding()] param( [string]$Channel = "preview", - [string]$Version = "2.0.0-preview1-005724", + [string]$Version = "2.0.0-preview1-005952", [switch]$NoSudo ) @@ -1029,7 +1029,7 @@ function Start-PSBootstrap { [string]$Channel = "preview", # we currently pin dotnet-cli version, and will # update it when more stable version comes out. - [string]$Version = "2.0.0-preview1-005724", + [string]$Version = "2.0.0-preview1-005952", [switch]$Package, [switch]$NoSudo, [switch]$Force @@ -2760,14 +2760,14 @@ function Start-CrossGen { # The crossgen tool is only published for these particular runtimes $crossGenRuntime = if ($IsWindows) { if ($Runtime -match "-x86") { - "win7-x86" + "win-x86" } else { - "win7-x64" + "win-x64" } } elseif ($IsLinux) { "linux-x64" } elseif ($IsOSX) { - "osx.10.12-x64" + "osx-x64" } if (-not $crossGenRuntime) { diff --git a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj index d1195d345a..c38477248e 100644 --- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj +++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj @@ -78,7 +78,7 @@ - + diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index ce3d5d925f..2ac72e3b5d 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -91,7 +91,6 @@ - diff --git a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj index a5968b902a..d1377e41d8 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj @@ -32,7 +32,7 @@ - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index 680ef13b1d..2c9cc44241 100644 --- a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj +++ b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj @@ -17,17 +17,17 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/src/Microsoft.WSMan.Management/Interop.cs b/src/Microsoft.WSMan.Management/Interop.cs index e24412c68c..17ee74fcd8 100644 --- a/src/Microsoft.WSMan.Management/Interop.cs +++ b/src/Microsoft.WSMan.Management/Interop.cs @@ -14,10 +14,6 @@ using System.Collections; using System.Collections.Generic; using System.Diagnostics.CodeAnalysis; using System.Text; -#if CORECLR -// Use stub for TypeLibTypeAttribute -using Microsoft.PowerShell.CoreClr.Stubs; -#endif #pragma warning disable 1591 diff --git a/src/System.Management.Automation/CoreCLR/CorePsStub.cs b/src/System.Management.Automation/CoreCLR/CorePsStub.cs index f070a11f9b..b761da5ca4 100644 --- a/src/System.Management.Automation/CoreCLR/CorePsStub.cs +++ b/src/System.Management.Automation/CoreCLR/CorePsStub.cs @@ -32,18 +32,6 @@ namespace Microsoft.PowerShell.CoreClr.Stubs NoZone = -1, } - /// - /// Stub for TypeLibTypeAttribute - /// - public sealed class TypeLibTypeAttribute : Attribute - { - /// - /// - /// - /// - public TypeLibTypeAttribute(short flags) { } - } - #endregion Misc_Types #region SystemManagementStubs diff --git a/src/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj index 54ea060932..bd1c08c037 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -19,12 +19,13 @@ - + - - - - + + + + + @@ -145,8 +146,4 @@ full - - - -