From e243638a899df65798788a5df29ba1e400245640 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 21 Jan 2018 19:20:24 +0000 Subject: [PATCH 1/3] Upgrade to netcore 2.0.5 runtime --- README.md | 3 +-- appveyor.yml | 4 ++-- global.json | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index bd38a220d..d8b30ad56 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,7 @@ Exit ### From Source -#### Requirements -* [.NET Core 1.1.5 SDK](https://github.com/dotnet/core/blob/master/release-notes/download-archives/1.1.5.md) +* [.NET Core 2.1.4 SDK](https://github.com/dotnet/core/blob/master/release-notes/download-archives/2.0.5-download.md) * [PlatyPS 0.5.0 or greater](https://github.com/PowerShell/platyPS) * Optionally but recommended for development: [Visual Studio 2017](https://www.visualstudio.com/downloads/) diff --git a/appveyor.yml b/appveyor.yml index 4db1569fe..6243fdc67 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -28,10 +28,10 @@ install: } - ps: | # the legacy WMF4 image only has the old preview SDKs of dotnet - if (-not ((dotnet --version).StartsWith('1.1'))) + if (-not ((dotnet --version).StartsWith('2.1.4'))) { Invoke-WebRequest 'https://dot.net/v1/dotnet-install.ps1' -OutFile dotnet-install.ps1 - .\dotnet-install.ps1 -Channel 1.1 + .\dotnet-install.ps1 -Version 2.1.4 } build_script: diff --git a/global.json b/global.json index a7d00c0aa..0b0ba35ab 100644 --- a/global.json +++ b/global.json @@ -4,6 +4,6 @@ "Rules" ], "sdk": { - "version": "1.1.5" + "version": "2.1.4" } } From 60e18c7d52a943ed8fc3cb1e23a3cd3193408af3 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 21 Jan 2018 22:06:35 +0000 Subject: [PATCH 2/3] add test build using netstandard 1.6 to test in CI that only supported APIs are being called. --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index 6243fdc67..a3f6051fe 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -39,6 +39,9 @@ build_script: $PSVersionTable Push-Location C:\projects\psscriptanalyzer dotnet --version + # Test build using netstandard to test whether APIs are being called that are not available in .Net Core. Remove output afterwards. + .\buildCoreClr.ps1 -Framework netstandard1.6 -Configuration $env:BuildConfiguration -Build + git clean -dfx C:\projects\psscriptanalyzer\buildCoreClr.ps1 -Framework net451 -Configuration $env:BuildConfiguration -Build C:\projects\psscriptanalyzer\build.ps1 -BuildDocs Pop-Location From 04bdcbfe40ec9dd720f81c85ec910725685b2255 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 21 Jan 2018 22:14:13 +0000 Subject: [PATCH 3/3] PSv3Release configuration is not applicable to netstandard1.6 framework -> hardcode 'Release' for netstandard 1.6 test build --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a3f6051fe..e5582850a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -40,7 +40,7 @@ build_script: Push-Location C:\projects\psscriptanalyzer dotnet --version # Test build using netstandard to test whether APIs are being called that are not available in .Net Core. Remove output afterwards. - .\buildCoreClr.ps1 -Framework netstandard1.6 -Configuration $env:BuildConfiguration -Build + .\buildCoreClr.ps1 -Framework netstandard1.6 -Configuration Release -Build git clean -dfx C:\projects\psscriptanalyzer\buildCoreClr.ps1 -Framework net451 -Configuration $env:BuildConfiguration -Build C:\projects\psscriptanalyzer\build.ps1 -BuildDocs