Skip to content

Commit b3e7fd3

Browse files
daxian-dbwadityapatwardhan
daxian-dbw
authored and
adityapatwardhan
committed
Move to the official .NET Core 2.0 (PowerShell#4603)
* Migrate to official .NET Core 2.0 * [Feature] Remove chmod code as the issue has been fixed in dotnet
1 parent 0d1e191 commit b3e7fd3

10 files changed

Lines changed: 26 additions & 44 deletions

File tree

‎PowerShell.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<VersionPrefix>6.0.0</VersionPrefix>
88
<TargetFramework>netcoreapp2.0</TargetFramework>
9-
<RuntimeFrameworkVersion>2.0.0-preview3-25426-01</RuntimeFrameworkVersion>
9+
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
1010

1111
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1212
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
image: Visual Studio 2017
44

5-
# cache version - netcoreapp.2.0.0-preview3-25426-01
5+
# cache version - netcoreapp.2.0.0
66
cache:
77
- '%LocalAppData%\Microsoft\dotnet -> appveyor.yml'
88
- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'

‎build.psm1‎

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# On Windows paths is separated by semicolon
33
$script:TestModulePathSeparator = [System.IO.Path]::PathSeparator
44

5-
$dotnetCLIChannel = "preview"
6-
$dotnetCLIRequiredVersion = "2.0.0-preview2-006502"
5+
$dotnetCLIChannel = "release"
6+
$dotnetCLIRequiredVersion = "2.0.0"
77

88
# Track if tags have been sync'ed
99
$tagsUpToDate = $false
@@ -490,12 +490,6 @@ Fix steps:
490490
Pop-Location
491491
}
492492

493-
# add 'x' permission when building the standalone application
494-
# this is temporary workaround to a bug in dotnet.exe, tracking by dotnet/cli issue #6286
495-
if ($Options.Configuration -eq "Linux") {
496-
chmod u+x $Options.Output
497-
}
498-
499493
# publish netcoreapp2.0 reference assemblies
500494
try {
501495
Push-Location "$PSScriptRoot/src/TypeCatalogGen"
@@ -798,12 +792,6 @@ function Publish-PSTestTools {
798792
dotnet publish --output bin --configuration $Options.Configuration --framework $Options.Framework --runtime $Options.Runtime
799793
$toolPath = Join-Path -Path $tool.Path -ChildPath "bin"
800794

801-
# add 'x' permission when building the standalone application
802-
# this is temporary workaround to a bug in dotnet.exe, tracking by dotnet/cli issue #6286
803-
if ($Options.Configuration -eq "Linux") {
804-
$executable = Join-Path -Path $toolPath -ChildPath "$($tool.Output)"
805-
chmod u+x $executable
806-
}
807795
if ( $env:PATH -notcontains $toolPath ) {
808796
$env:PATH = $toolPath+$TestModulePathSeparator+$($env:PATH)
809797
}
@@ -1844,12 +1832,6 @@ function Start-CrossGen {
18441832
}
18451833
Write-Verbose "Matched CrossGen.exe: $crossGenPath" -Verbose
18461834

1847-
# 'x' permission is not set for packages restored on Linux/OSX.
1848-
# this is temporary workaround to a bug in dotnet.exe, tracking by dotnet/cli issue #6286
1849-
if ($Environment.IsLinux -or $Environment.IsOSX) {
1850-
chmod u+x $crossGenPath
1851-
}
1852-
18531835
# Crossgen.exe requires the following assemblies:
18541836
# mscorlib.dll
18551837
# System.Private.CoreLib.dll

‎src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
</PropertyGroup>
7171

7272
<ItemGroup>
73-
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0-preview3-25423-02" />
73+
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
7474
</ItemGroup>
7575

7676
</Project>

‎src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
</PropertyGroup>
8080

8181
<ItemGroup>
82-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.2.0" />
82+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.1" />
8383
</ItemGroup>
8484

8585
</Project>

‎src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
<ItemGroup>
1212
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
13-
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.3.0" />
13+
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0" />
1414
</ItemGroup>
1515

1616
<PropertyGroup>

‎src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</PropertyGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0-preview3-25423-02" />
28+
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0" />
2929
</ItemGroup>
3030

3131
</Project>

‎src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="System.Data.SqlClient" Version="4.4.0-preview3-25423-02" />
21-
<PackageReference Include="System.IO.Packaging" Version="4.4.0-preview3-25423-02" />
22-
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.4.0-preview3-25423-02" />
23-
<PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0-preview3-25423-01" />
24-
<PackageReference Include="System.ServiceModel.Http" Version="4.4.0-preview3-25423-01" />
25-
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0-preview3-25423-01" />
26-
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0-preview3-25423-01" />
27-
<PackageReference Include="System.ServiceModel.Security" Version="4.4.0-preview3-25423-01" />
28-
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0-preview3-25423-02" />
29-
<PackageReference Include="System.Threading.AccessControl" Version="4.4.0-preview3-25423-02" />
30-
<PackageReference Include="System.Private.ServiceModel" Version="4.4.0-preview3-25423-01" />
20+
<PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
21+
<PackageReference Include="System.IO.Packaging" Version="4.4.0" />
22+
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.4.0" />
23+
<PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0" />
24+
<PackageReference Include="System.ServiceModel.Http" Version="4.4.0" />
25+
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0" />
26+
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0" />
27+
<PackageReference Include="System.ServiceModel.Security" Version="4.4.0" />
28+
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0" />
29+
<PackageReference Include="System.Threading.AccessControl" Version="4.4.0" />
30+
<PackageReference Include="System.Private.ServiceModel" Version="4.4.0" />
3131
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
3232
</ItemGroup>
3333

‎src/System.Management.Automation/System.Management.Automation.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<ItemGroup>
1212
<ProjectReference Include="..\Microsoft.PowerShell.CoreCLR.AssemblyLoadContext\Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj" />
1313
<ProjectReference Include="..\Microsoft.PowerShell.CoreCLR.Eventing\Microsoft.PowerShell.CoreCLR.Eventing.csproj" />
14-
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0-preview3-25423-02" />
14+
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0" />
1515
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
16-
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0-preview3-25423-02" />
17-
<PackageReference Include="System.Security.AccessControl" Version="4.4.0-preview3-25423-02" />
18-
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0-preview3-25423-02" />
19-
<PackageReference Include="System.Security.Permissions" Version="4.4.0-preview3-25423-02" />
20-
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0-preview3-25423-02" />
16+
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
17+
<PackageReference Include="System.Security.AccessControl" Version="4.4.0" />
18+
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0" />
19+
<PackageReference Include="System.Security.Permissions" Version="4.4.0" />
20+
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
2121
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0-alpha*" />
2222
</ItemGroup>
2323

‎test/Test.Common.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
66

77
<TargetFramework>netcoreapp2.0</TargetFramework>
8-
<RuntimeFrameworkVersion>2.0.0-preview3-25426-01</RuntimeFrameworkVersion>
8+
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
99

1010
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
1111
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

0 commit comments

Comments
 (0)