admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move to the official .NET Core 2.0 (#4603)

Browse Source 
* Migrate to official .NET Core 2.0

* [Feature] Remove chmod code as the issue has been fixed in dotnet
This commit is contained in:
Dongbo Wang
2017-08-16 17:32:46 -07:00
committed by Aditya Patwardhan
parent 0d1e1919f2
commit b3e7fd374f
10 changed files with 26 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
PowerShell.Common.props
+1 -1
View File
@@ -6,7 +6,7 @@
<VersionPrefix>6.0.0</VersionPrefix>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>2.0.0-preview3-25426-01</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
appveyor.yml
+1 -1
View File
@@ -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'
build.psm1
+2 -20
View File
@@ -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
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
+1 -1
View File
@@ -70,7 +70,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.ServiceProcess.ServiceController" Version="4.4.0" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
+1 -1
View File
@@ -79,7 +79,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="2.3.1" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
+1 -1
View File
@@ -10,7 +10,7 @@
<ItemGroup>
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.3.0" />
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.4.0" />
</ItemGroup>
<PropertyGroup>
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
+1 -1
View File
@@ -25,7 +25,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.Security.Principal.Windows" Version="4.4.0" />
</ItemGroup>
</Project>
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
+11 -11
View File
@@ -17,17 +17,17 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="System.Data.SqlClient" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.IO.Packaging" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0-preview3-25423-01" />
<PackageReference Include="System.ServiceModel.Http" Version="4.4.0-preview3-25423-01" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0-preview3-25423-01" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0-preview3-25423-01" />
<PackageReference Include="System.ServiceModel.Security" Version="4.4.0-preview3-25423-01" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.Threading.AccessControl" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.Private.ServiceModel" Version="4.4.0-preview3-25423-01" />
<PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
<PackageReference Include="System.IO.Packaging" Version="4.4.0" />
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.4.0" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.4.0" />
<PackageReference Include="System.ServiceModel.Http" Version="4.4.0" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.4.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.4.0" />
<PackageReference Include="System.ServiceModel.Security" Version="4.4.0" />
<PackageReference Include="System.Text.Encodings.Web" Version="4.4.0" />
<PackageReference Include="System.Threading.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Private.ServiceModel" Version="4.4.0" />
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
</ItemGroup>
src/System.Management.Automation/System.Management.Automation.csproj
+6 -6
View File
@@ -11,13 +11,13 @@
<ItemGroup>
<ProjectReference Include="..\Microsoft.PowerShell.CoreCLR.AssemblyLoadContext\Microsoft.PowerShell.CoreCLR.AssemblyLoadContext.csproj" />
<ProjectReference Include="..\Microsoft.PowerShell.CoreCLR.Eventing\Microsoft.PowerShell.CoreCLR.Eventing.csproj" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="4.4.0" />
<PackageReference Include="Newtonsoft.Json" Version="10.0.1" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.Security.AccessControl" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.Security.Permissions" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0-preview3-25423-02" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Security.AccessControl" Version="4.4.0" />
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="4.4.0" />
<PackageReference Include="System.Security.Permissions" Version="4.4.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.4.0" />
<PackageReference Include="Microsoft.Management.Infrastructure" Version="1.0.0-alpha*" />
</ItemGroup>
test/Test.Common.props
+1 -1
View File
@@ -5,7 +5,7 @@
<Copyright>(c) Microsoft Corporation. All rights reserved.</Copyright>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RuntimeFrameworkVersion>2.0.0-preview3-25426-01</RuntimeFrameworkVersion>
<RuntimeFrameworkVersion>2.0.0</RuntimeFrameworkVersion>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>