From b3e7fd374f2898f7e84b28229aada18a3fcbe23e Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Wed, 16 Aug 2017 17:32:46 -0700 Subject: [PATCH] Move to the official .NET Core 2.0 (#4603) * Migrate to official .NET Core 2.0 * [Feature] Remove chmod code as the issue has been fixed in dotnet --- PowerShell.Common.props | 2 +- appveyor.yml | 2 +- build.psm1 | 22 ++----------------- ...soft.PowerShell.Commands.Management.csproj | 2 +- ...crosoft.PowerShell.Commands.Utility.csproj | 2 +- .../Microsoft.PowerShell.ConsoleHost.csproj | 2 +- ...crosoft.PowerShell.CoreCLR.Eventing.csproj | 2 +- .../Microsoft.PowerShell.SDK.csproj | 22 +++++++++---------- .../System.Management.Automation.csproj | 12 +++++----- test/Test.Common.props | 2 +- 10 files changed, 26 insertions(+), 44 deletions(-) diff --git a/PowerShell.Common.props b/PowerShell.Common.props index bb55bac74c..947f320217 100644 --- a/PowerShell.Common.props +++ b/PowerShell.Common.props @@ -6,7 +6,7 @@ 6.0.0 netcoreapp2.0 - 2.0.0-preview3-25426-01 + 2.0.0 true true diff --git a/appveyor.yml b/appveyor.yml index 90497e78fc..5c2ab1fc7f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ image: Visual Studio 2017 -# cache version - netcoreapp.2.0.0-preview3-25426-01 +# cache version - netcoreapp.2.0.0 cache: - '%LocalAppData%\Microsoft\dotnet -> appveyor.yml' - '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml' diff --git a/build.psm1 b/build.psm1 index 5f653fd4c3..0ad818f2ce 100644 --- a/build.psm1 +++ b/build.psm1 @@ -2,8 +2,8 @@ # On Windows paths is separated by semicolon $script:TestModulePathSeparator = [System.IO.Path]::PathSeparator -$dotnetCLIChannel = "preview" -$dotnetCLIRequiredVersion = "2.0.0-preview2-006502" +$dotnetCLIChannel = "release" +$dotnetCLIRequiredVersion = "2.0.0" # Track if tags have been sync'ed $tagsUpToDate = $false @@ -490,12 +490,6 @@ Fix steps: Pop-Location } - # add 'x' permission when building the standalone application - # this is temporary workaround to a bug in dotnet.exe, tracking by dotnet/cli issue #6286 - if ($Options.Configuration -eq "Linux") { - chmod u+x $Options.Output - } - # publish netcoreapp2.0 reference assemblies try { Push-Location "$PSScriptRoot/src/TypeCatalogGen" @@ -798,12 +792,6 @@ function Publish-PSTestTools { dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $Options.Runtime $toolPath = Join-Path -Path $tool.Path -ChildPath "bin" - # add 'x' permission when building the standalone application - # this is temporary workaround to a bug in dotnet.exe, tracking by dotnet/cli issue #6286 - if ($Options.Configuration -eq "Linux") { - $executable = Join-Path -Path $toolPath -ChildPath "$($tool.Output)" - chmod u+x $executable - } if ( $env:PATH -notcontains $toolPath ) { $env:PATH = $toolPath+$TestModulePathSeparator+$($env:PATH) } @@ -1844,12 +1832,6 @@ function Start-CrossGen { } Write-Verbose "Matched CrossGen.exe: $crossGenPath" -Verbose - # 'x' permission is not set for packages restored on Linux/OSX. - # this is temporary workaround to a bug in dotnet.exe, tracking by dotnet/cli issue #6286 - if ($Environment.IsLinux -or $Environment.IsOSX) { - chmod u+x $crossGenPath - } - # Crossgen.exe requires the following assemblies: # mscorlib.dll # System.Private.CoreLib.dll 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 feb8b95fb4..d2b01f66e6 100644 --- a/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj +++ b/src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj @@ -70,7 +70,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 d7c8a15932..27f06219da 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -79,7 +79,7 @@ - + diff --git a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj index 918968b80f..a2bf5fb2fe 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj +++ b/src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj @@ -10,7 +10,7 @@ - + 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 a7913ecc4b..656bf5df6e 100644 --- a/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj +++ b/src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj b/src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj index e01b135aef..91ff7e6e15 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/System.Management.Automation/System.Management.Automation.csproj b/src/System.Management.Automation/System.Management.Automation.csproj index a90b0aa748..a4adcdb44b 100644 --- a/src/System.Management.Automation/System.Management.Automation.csproj +++ b/src/System.Management.Automation/System.Management.Automation.csproj @@ -11,13 +11,13 @@ - + - - - - - + + + + + diff --git a/test/Test.Common.props b/test/Test.Common.props index 0534a8ee24..79f0b8fbcf 100644 --- a/test/Test.Common.props +++ b/test/Test.Common.props @@ -5,7 +5,7 @@ (c) Microsoft Corporation. All rights reserved. netcoreapp2.0 - 2.0.0-preview3-25426-01 + 2.0.0 true true