Skip to content

Move to the official .NET Core 2.0 #4603

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 2 commits into from
Aug 17, 2017
Merged

Move to the official .NET Core 2.0 #4603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f466c1a
Migrate to official .NET Core 2.0
daxian-dbw Aug 16, 2017
48c93e5
[Feature] Remove chmod code as the issue has been fixed in dotnet
daxian-dbw Aug 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PowerShell.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Copy link
Member

@TravisEz13 TravisEz13 Aug 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't we update the caches to depend on PowerShell.Common.props. Then we only have one place to update the version.

Copy link
Member Author

@daxian-dbw daxian-dbw Aug 16, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some changes pending for PowerShell.Common.props (see Ilya's MSBuild refactoring PRs). I think for the time being, PowerShell.Common.props has more churns than appveyor.yml.

Copy link
Member

@TravisEz13 TravisEz13 Aug 17, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sounds good

- '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml'
Expand Down
22 changes: 2 additions & 20 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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)
}
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.ConsoleHost/Microsoft.PowerShell.ConsoleHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
22 changes: 11 additions & 11 deletions src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
12 changes: 6 additions & 6 deletions src/System.Management.Automation/System.Management.Automation.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
2 changes: 1 addition & 1 deletion test/Test.Common.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down