diff --git a/PowerShell.Common.props b/PowerShell.Common.props index d25ddac462b..79a33e915a1 100644 --- a/PowerShell.Common.props +++ b/PowerShell.Common.props @@ -93,8 +93,8 @@ Microsoft Corporation (c) Microsoft Corporation. All rights reserved. - netcoreapp2.1 - 2.1.5 + netcoreapp2.2 + 2.2.0-preview3-27014-02 Latest true diff --git a/appveyor.yml b/appveyor.yml index 45bda6488b4..74cc5bada1f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 Purpose: ElevatedPesterTests_xUnit_Packaging -# cache version - netcoreapp.2.1-sdk.2.1.403 +# cache version - netcoreapp2.2.100-preview3-009430 cache: - '%HOMEDRIVE%%HOMEPATH%\.nuget\packages -> appveyor.yml' diff --git a/assets/files.wxs b/assets/files.wxs index dc3496021a8..31807510065 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -2017,11 +2017,11 @@ - - + + - - + + @@ -2669,8 +2669,8 @@ - - + + diff --git a/build.psm1 b/build.psm1 index fa6a8f3e360..47fb7633e36 100644 --- a/build.psm1 +++ b/build.psm1 @@ -9,7 +9,7 @@ $script:TestModulePathSeparator = [System.IO.Path]::PathSeparator $script:TestModuleDirPath = Join-Path ([System.IO.Path]::GetTempPath()) 'PwshTestModules' $null = New-Item -Force -ItemType Directory -Path $script:TestModuleDirPath -$dotnetCLIChannel = "release" +$dotnetCLIChannel = 'preview' # TODO: Change this to 'release' once .Net Core 2.2 goes RTM $dotnetCLIRequiredVersion = $(Get-Content $PSScriptRoot/global.json | ConvertFrom-Json).Sdk.Version # Track if tags have been sync'ed @@ -386,7 +386,7 @@ Fix steps: Pop-Location } - # publish netcoreapp2.1 reference assemblies + # publish netcoreapp2.2 reference assemblies try { Push-Location "$PSScriptRoot/src/TypeCatalogGen" $refAssemblies = Get-Content -Path $incFileName | Where-Object { $_ -like "*microsoft.netcore.app*" } | ForEach-Object { $_.TrimEnd(';') } @@ -586,7 +586,7 @@ function New-PSOptions { [ValidateSet("Debug", "Release", "CodeCoverage", '')] [string]$Configuration, - [ValidateSet("netcoreapp2.1")] + [ValidateSet("netcoreapp2.2")] [string]$Framework, # These are duplicated from Start-PSBuild @@ -639,7 +639,7 @@ function New-PSOptions { Write-Verbose "Top project directory is $Top" if (-not $Framework) { - $Framework = "netcoreapp2.1" + $Framework = "netcoreapp2.2" Write-Verbose "Using framework '$Framework'" } diff --git a/docs/building/linux.md b/docs/building/linux.md index be37662a19f..32ff1c7e3ac 100644 --- a/docs/building/linux.md +++ b/docs/building/linux.md @@ -71,7 +71,7 @@ Start-PSBuild Congratulations! If everything went right, PowerShell is now built. The `Start-PSBuild` script will output the location of the executable: -`./src/powershell-unix/bin/Debug/netcoreapp2.1/linux-x64/publish/pwsh`. +`./src/powershell-unix/bin/Debug/netcoreapp2.2/linux-x64/publish/pwsh`. You should now be running the PowerShell Core that you just built, if your run the above executable. You can run our cross-platform Pester tests with `Start-PSPester`, and our xUnit tests with `Start-PSxUnit`. diff --git a/docs/building/macos.md b/docs/building/macos.md index 8f4e2594105..9df5ee95721 100644 --- a/docs/building/macos.md +++ b/docs/building/macos.md @@ -36,4 +36,4 @@ We cannot do this for you in the build module due to #[847][]. Start a PowerShell session by running `pwsh`, and then use `Start-PSBuild` from the module. -After building, PowerShell will be at `./src/powershell-unix/bin/Debug/netcoreapp2.1/osx-x64/publish/pwsh`. +After building, PowerShell will be at `./src/powershell-unix/bin/Debug/netcoreapp2.2/osx-x64/publish/pwsh`. diff --git a/docs/building/windows-core.md b/docs/building/windows-core.md index 92755f323db..81c049f5b46 100644 --- a/docs/building/windows-core.md +++ b/docs/building/windows-core.md @@ -58,11 +58,11 @@ Import-Module ./build.psm1 Start-PSBuild ``` -Congratulations! If everything went right, PowerShell is now built and executable as `./src/powershell-win-core/bin/Debug/netcoreapp2.1/win7-x64/publish/pwsh.exe`. +Congratulations! If everything went right, PowerShell is now built and executable as `./src/powershell-win-core/bin/Debug/netcoreapp2.2/win7-x64/publish/pwsh.exe`. This location is of the form `./[project]/bin/[configuration]/[framework]/[rid]/publish/[binary name]`, and our project is `powershell`, configuration is `Debug` by default, -framework is `netcoreapp2.1`, runtime identifier is `win7-x64` by default, +framework is `netcoreapp2.2`, runtime identifier is `win7-x64` by default, and binary name is `pwsh`. The function `Get-PSOutput` will return the path to the executable; thus you can execute the development copy via `& (Get-PSOutput)`. diff --git a/global.json b/global.json index 55e448dfe00..b082538e039 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "2.1.403" + "version": "2.2.100-preview3-009430" } } diff --git a/test/Test.Common.props b/test/Test.Common.props index 11b20a9fed7..d4a9fcad66a 100644 --- a/test/Test.Common.props +++ b/test/Test.Common.props @@ -4,8 +4,8 @@ Microsoft Corporation (c) Microsoft Corporation. All rights reserved. - netcoreapp2.1 - 2.1.5 + netcoreapp2.2 + 2.2.0-preview3-27014-02 true true diff --git a/test/tools/OpenCover/OpenCover.psm1 b/test/tools/OpenCover/OpenCover.psm1 index 78502650761..dbafa8b722a 100644 --- a/test/tools/OpenCover/OpenCover.psm1 +++ b/test/tools/OpenCover/OpenCover.psm1 @@ -624,7 +624,7 @@ function Invoke-OpenCover [parameter()]$OutputLog = "$home/Documents/OpenCover.xml", [parameter()]$TestPath = "${script:psRepoPath}/test/powershell", [parameter()]$OpenCoverPath = "$home/OpenCover", - [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/netcoreapp2.1/win7-x64/publish", + [parameter()]$PowerShellExeDirectory = "${script:psRepoPath}/src/powershell-win-core/bin/CodeCoverage/netcoreapp2.2/win7-x64/publish", [parameter()]$PesterLogElevated = "$HOME/Documents/TestResultsElevated.xml", [parameter()]$PesterLogUnelevated = "$HOME/Documents/TestResultsUnelevated.xml", [parameter()]$PesterLogFormat = "NUnitXml", diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj index a24e519ac4f..4fc854c36a0 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -7,7 +7,7 @@ - + diff --git a/tools/packaging/packaging.psm1 b/tools/packaging/packaging.psm1 index f3d62cd0e99..6c64f4eaa42 100644 --- a/tools/packaging/packaging.psm1 +++ b/tools/packaging/packaging.psm1 @@ -117,14 +117,14 @@ function Start-PSPackage { -not $Script:Options -or ## Start-PSBuild hasn't been executed yet -not $PSModuleRestoreCorrect -or ## Last build didn't specify '-PSModuleRestore' correctly $Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release' - $Script:Options.Framework -ne "netcoreapp2.1" ## Last build wasn't for CoreCLR + $Script:Options.Framework -ne "netcoreapp2.2" ## Last build wasn't for CoreCLR } else { -not $Script:Options -or ## Start-PSBuild hasn't been executed yet -not $crossGenCorrect -or ## Last build didn't specify '-CrossGen' correctly -not $PSModuleRestoreCorrect -or ## Last build didn't specify '-PSModuleRestore' correctly $Script:Options.Runtime -ne $Runtime -or ## Last build wasn't for the required RID $Script:Options.Configuration -ne $Configuration -or ## Last build was with configuration other than 'Release' - $Script:Options.Framework -ne "netcoreapp2.1" ## Last build wasn't for CoreCLR + $Script:Options.Framework -ne "netcoreapp2.2" ## Last build wasn't for CoreCLR } # Make sure the most recent build satisfies the package requirement @@ -2441,7 +2441,7 @@ function New-MSIPatch # This example shows how to produce a Debug-x64 installer for development purposes. cd $RootPathOfPowerShellRepo Import-Module .\build.psm1; Import-Module .\tools\packaging\packaging.psm1 - New-MSIPackage -Verbose -ProductCode (New-Guid) -ProductSourcePath '.\src\powershell-win-core\bin\Debug\netcoreapp2.1\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3' + New-MSIPackage -Verbose -ProductCode (New-Guid) -ProductSourcePath '.\src\powershell-win-core\bin\Debug\netcoreapp2.2\win7-x64\publish' -ProductTargetArchitecture x64 -ProductVersion '1.2.3' #> function New-MSIPackage { diff --git a/tools/packaging/packaging.strings.psd1 b/tools/packaging/packaging.strings.psd1 index 1e862b5885b..a562533cbdd 100644 --- a/tools/packaging/packaging.strings.psd1 +++ b/tools/packaging/packaging.strings.psd1 @@ -127,7 +127,7 @@ NuspecTemplate = @' - +