Migrate to netstandard2.0 and PSStandard #741
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,16 +18,17 @@ param( | |
|
|
||
| $script:IsCIBuild = $env:APPVEYOR -ne $null | ||
| $script:IsUnix = $PSVersionTable.PSEdition -and $PSVersionTable.PSEdition -eq "Core" -and !$IsWindows | ||
| $script:TargetPlatform = "netstandard2.0" | ||
| $script:TargetFrameworksParam = "/p:TargetFrameworks=`"$script:TargetPlatform`"" | ||
| $script:SaveModuleSupportsAllowPrerelease = (Get-Command Save-Module).Parameters.ContainsKey("AllowPrerelease") | ||
|
|
||
| if ($PSVersionTable.PSEdition -ne "Core") { | ||
| Add-Type -Assembly System.IO.Compression.FileSystem | ||
| } | ||
|
|
||
| task SetupDotNet -Before Clean, Build, TestHost, TestServer, TestProtocol, PackageNuGet { | ||
|
|
||
| $requiredSdkVersion = "2.1.300" | ||
|
There was a problem hiding this comment. did you really need a newer version of this? There was a problem hiding this comment. Changed this to 2.1.301 (I think that's a stable one?) -- I needed to change it to get things to work There was a problem hiding this comment. Now changed to 2.1.401 since that's the latest release. I had to update, and there doesn't seem to be a reason to not update to the latest. |
||
|
|
||
| $dotnetPath = "$PSScriptRoot/.dotnet" | ||
| $dotnetExePath = if ($script:IsUnix) { "$dotnetPath/dotnet" } else { "$dotnetPath/dotnet.exe" } | ||
|
|
@@ -128,30 +129,14 @@ task GetProductVersion -Before PackageNuGet, PackageModule, UploadArtifacts { | |
| Write-Host "`n### Product Version: $script:FullVersion`n" -ForegroundColor Green | ||
| } | ||
|
|
||
|
|
||
| task Build { | ||
| exec { & $script:dotnetExe restore } | ||
| exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices.Host\PowerShellEditorServices.Host.csproj -f $script:TargetPlatform } | ||
| exec { & $script:dotnetExe build -c $Configuration .\src\PowerShellEditorServices.VSCode\PowerShellEditorServices.VSCode.csproj $script:TargetFrameworksParam } | ||
| exec { & $script:dotnetExe publish -c $Configuration .\src\PowerShellEditorServices\PowerShellEditorServices.csproj -f $script:TargetPlatform } | ||
|
There was a problem hiding this comment. nit: can you put the PSES.VSCode one on the bottom since that is separate to the actual PSES module? |
||
| Copy-Item $PSScriptRoot\src\PowerShellEditorServices\bin\$Configuration\$script:TargetPlatform\publish\UnixConsoleEcho.dll -Destination $PSScriptRoot\src\PowerShellEditorServices.Host\bin\$Configuration\$script:TargetPlatform | ||
| Copy-Item $PSScriptRoot\src\PowerShellEditorServices\bin\$Configuration\$script:TargetPlatform\publish\runtimes\osx-64\native\libdisablekeyecho.dylib -Destination $PSScriptRoot\src\PowerShellEditorServices.Host\bin\$Configuration\$script:TargetPlatform | ||
| Copy-Item $PSScriptRoot\src\PowerShellEditorServices\bin\$Configuration\$script:TargetPlatform\publish\runtimes\linux-64\native\libdisablekeyecho.so -Destination $PSScriptRoot\src\PowerShellEditorServices.Host\bin\$Configuration\$script:TargetPlatform | ||
| } | ||
|
|
||
| function UploadTestLogs { | ||
|
|
@@ -174,22 +159,40 @@ function UploadTestLogs { | |
|
|
||
| task Test TestServer,TestProtocol,TestHost | ||
|
|
||
| task TestServer { | ||
| Set-Location .\test\PowerShellEditorServices.Test\ | ||
|
|
||
| if (-not $script:IsUnix) { | ||
| exec { & $script:dotnetExe build -c $Configuration -f net461 } | ||
| exec { & $script:dotnetExe xunit -configuration $Configuration -framework net461 -verbose -nobuild } | ||
| } | ||
|
|
||
| exec { & $script:dotnetExe build -c $Configuration -f netcoreapp2.1 } | ||
| exec { & $script:dotnetExe test -f netcoreapp2.1 } | ||
| } | ||
|
|
||
| task TestProtocol { | ||
| Set-Location .\test\PowerShellEditorServices.Test.Protocol\ | ||
|
|
||
| if (-not $script:IsUnix) { | ||
| exec { & $script:dotnetExe build -c $Configuration -f net461 } | ||
| exec { & $script:dotnetExe xunit -configuration $Configuration -framework net461 -verbose -nobuild } | ||
| } | ||
|
|
||
| exec { & $script:dotnetExe build -c $Configuration -f netcoreapp2.1 } | ||
| exec { & $script:dotnetExe test -f netcoreapp2.1 } | ||
| } | ||
|
|
||
| task TestHost -If { | ||
|
There was a problem hiding this comment. there still is a There was a problem hiding this comment. p.s. I thought these were the evil tests. There was a problem hiding this comment. Ah yes! I thought I fixed this already but evidently not |
||
| Set-Location .\test\PowerShellEditorServices.Test.Host\ | ||
|
|
||
| if (-not $script:IsUnix) { | ||
| exec { & $script:dotnetExe build -c $Configuration -f net461 } | ||
| exec { & $script:dotnetExe xunit -configuration $Configuration -framework net461 -verbose -nobuild } | ||
| } | ||
|
|
||
| exec { & $script:dotnetExe build -c $Configuration -f netcoreapp2.1 } | ||
| exec { & $script:dotnetExe test -f netcoreapp2.1 } | ||
| } | ||
|
|
||
| task CITest ?Test, { | ||
|
|
@@ -207,21 +210,12 @@ task LayoutModule -After Build { | |
| New-Item -Force $PSScriptRoot\module\PowerShellEditorServices\bin\Desktop -Type Directory | Out-Null | ||
| New-Item -Force $PSScriptRoot\module\PowerShellEditorServices\bin\Core -Type Directory | Out-Null | ||
|
|
||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices\bin\$Configuration\$script:TargetPlatform\publish\Serilog*.dll -Destination $PSScriptRoot\module\PowerShellEditorServices\bin\Core\ | ||
|
There was a problem hiding this comment. As @SeeminglyScience said, we don't need to put this in |
||
|
|
||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices.Host\bin\$Configuration\$script:TargetPlatform\* -Filter Microsoft.PowerShell.EditorServices*.dll -Destination $PSScriptRoot\module\PowerShellEditorServices\bin\Core\ | ||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices.Host\bin\$Configuration\$script:TargetPlatform\UnixConsoleEcho.dll -Destination $PSScriptRoot\module\PowerShellEditorServices\bin\Core\ | ||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices.Host\bin\$Configuration\$script:TargetPlatform\libdisablekeyecho.* -Destination $PSScriptRoot\module\PowerShellEditorServices\bin\Core\ | ||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices.Host\bin\$Configuration\$script:TargetPlatform\publish\runtimes\win\lib\netstandard1.3\* -Filter System.IO.Pipes*.dll -Destination $PSScriptRoot\module\PowerShellEditorServices\bin\Core\ | ||
|
|
||
| # Copy Third Party Notices.txt to module folder | ||
| Copy-Item -Force -Path "$PSScriptRoot\Third Party Notices.txt" -Destination $PSScriptRoot\module\PowerShellEditorServices | ||
|
|
@@ -231,23 +225,13 @@ task LayoutModule -After Build { | |
| New-Item -Force $PSScriptRoot\module\PowerShellEditorServices.VSCode\bin\Desktop -Type Directory | Out-Null | ||
| New-Item -Force $PSScriptRoot\module\PowerShellEditorServices.VSCode\bin\Core -Type Directory | Out-Null | ||
|
|
||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices.VSCode\bin\$Configuration\$script:TargetPlatform\* -Filter Microsoft.PowerShell.EditorServices.VSCode*.dll -Destination $PSScriptRoot\module\PowerShellEditorServices.VSCode\bin\Core\ | ||
|
|
||
| if ($Configuration -eq "Debug") { | ||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices.VSCode\bin\$Configuration\$script:TargetPlatform\Microsoft.PowerShell.EditorServices.VSCode.pdb -Destination $PSScriptRoot\module\PowerShellEditorServices.VSCode\bin\Core\ | ||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices\bin\$Configuration\$script:TargetPlatform\Microsoft.PowerShell.EditorServices.pdb -Destination $PSScriptRoot\module\PowerShellEditorServices\bin\Core\ | ||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices.Host\bin\$Configuration\$script:TargetPlatform\Microsoft.PowerShell.EditorServices.Host.pdb -Destination $PSScriptRoot\module\PowerShellEditorServices\bin\Core\ | ||
| Copy-Item -Force -Path $PSScriptRoot\src\PowerShellEditorServices.Protocol\bin\$Configuration\$script:TargetPlatform\Microsoft.PowerShell.EditorServices.Protocol.pdb -Destination $PSScriptRoot\module\PowerShellEditorServices\bin\Core\ | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -359,4 +343,4 @@ task UploadArtifacts -If ($script:IsCIBuild) { | |
| } | ||
|
|
||
| # The default task is to run the entire CI build | ||
| task . GetProductVersion, Clean, Build, CITest, BuildCmdletHelp, PackageNuGet, PackageModule, UploadArtifacts | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.