From 86dd49772ee5ff6c6905d730a5414df8e66dfb66 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Wed, 10 Feb 2021 02:10:40 +0000 Subject: [PATCH 1/3] Merged PR 14462: Bump .NET SDK to 3.1.12 --- .devcontainer/Dockerfile | 2 +- .vsts-ci/templates/ci-build.yml | 3 +- .vsts-ci/templates/windows-packaging.yml | 5 +- .vsts-ci/templates/windows-test.yml | 10 ++++ assets/files.wxs | 58 +------------------ global.json | 2 +- ...crosoft.PowerShell.Commands.Utility.csproj | 2 +- .../Modules/PSReadLine/PSReadLine.Tests.ps1 | 4 +- test/tools/WebListener/WebListener.csproj | 2 +- test/xUnit/xUnit.tests.csproj | 4 +- 10 files changed, 24 insertions(+), 68 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index c4cae722cb0..d902a5d3273 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -3,7 +3,7 @@ # Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information. #------------------------------------------------------------------------------------------------------------- -FROM mcr.microsoft.com/dotnet/core/sdk:3.1.105 +FROM mcr.microsoft.com/dotnet/core/sdk:3.1.112 # Avoid warnings by switching to noninteractive ENV DEBIAN_FRONTEND=noninteractive diff --git a/.vsts-ci/templates/ci-build.yml b/.vsts-ci/templates/ci-build.yml index 026448908f6..1838d99b060 100644 --- a/.vsts-ci/templates/ci-build.yml +++ b/.vsts-ci/templates/ci-build.yml @@ -22,8 +22,7 @@ jobs: - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml - - powershell: | - [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12 + - pwsh: | Import-Module .\tools\ci.psm1 Invoke-CIInstall -SkipUser displayName: Bootstrap diff --git a/.vsts-ci/templates/windows-packaging.yml b/.vsts-ci/templates/windows-packaging.yml index 455efbb9fec..0bfa92446e3 100644 --- a/.vsts-ci/templates/windows-packaging.yml +++ b/.vsts-ci/templates/windows-packaging.yml @@ -20,10 +20,9 @@ jobs: - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml - - powershell: | - [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12 + - pwsh: | Import-Module .\tools\ci.psm1 - Invoke-CIInstall + Invoke-CIInstall -SkipUser displayName: Bootstrap condition: succeededOrFailed() diff --git a/.vsts-ci/templates/windows-test.yml b/.vsts-ci/templates/windows-test.yml index a153b563e3f..7b93a87f4c2 100644 --- a/.vsts-ci/templates/windows-test.yml +++ b/.vsts-ci/templates/windows-test.yml @@ -34,6 +34,16 @@ jobs: # must be run frow Windows PowerShell - powershell: | + # Remove "Program Files\dotnet" from the env variable PATH, so old SDKs won't affect us. + Write-Host "Old Path:" + Write-Host $env:Path + $dotnetPath = Join-Path $env:SystemDrive 'Program Files\dotnet' + $paths = $env:Path -split ";" | Where-Object { -not $_.StartsWith($dotnetPath) } + $env:Path = $paths -join ";" + Write-Host "New Path:" + Write-Host $env:Path + + # Bootstrap Import-Module .\tools\ci.psm1 Invoke-CIInstall displayName: Bootstrap diff --git a/assets/files.wxs b/assets/files.wxs index 37b5f8b7532..4d53839649c 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -2001,9 +2001,6 @@ - - - @@ -2063,9 +2060,6 @@ - - - @@ -2092,9 +2086,6 @@ - - - @@ -2148,9 +2139,6 @@ - - - @@ -2243,9 +2231,6 @@ - - - @@ -2284,9 +2269,6 @@ - - - @@ -2364,9 +2346,6 @@ - - - @@ -2387,9 +2366,6 @@ - - - @@ -2476,9 +2452,6 @@ - - - @@ -2541,9 +2514,6 @@ - - - @@ -2603,9 +2573,6 @@ - - - @@ -2632,9 +2599,6 @@ - - - @@ -2721,9 +2685,6 @@ - - - @@ -3056,8 +3017,8 @@ - - + + @@ -3701,7 +3662,6 @@ - @@ -3721,7 +3681,6 @@ - @@ -3730,7 +3689,6 @@ - @@ -3748,7 +3706,6 @@ - @@ -3779,7 +3736,6 @@ - @@ -3792,7 +3748,6 @@ - @@ -3818,14 +3773,12 @@ - - @@ -3854,7 +3807,6 @@ - @@ -3875,7 +3827,6 @@ - @@ -3895,7 +3846,6 @@ - @@ -3904,7 +3854,6 @@ - @@ -3933,7 +3882,6 @@ - @@ -4043,7 +3991,7 @@ - + diff --git a/global.json b/global.json index d82f13f4dbe..f5fbfb4df0c 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "3.1.405" + "version": "3.1.406" } } diff --git a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj index 258681b7161..da9e579de09 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj +++ b/src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj @@ -33,7 +33,7 @@ - + diff --git a/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 index de50ffe050d..afc7aa75388 100644 --- a/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 +++ b/test/powershell/Modules/PSReadLine/PSReadLine.Tests.ps1 @@ -12,13 +12,13 @@ Describe "PSReadLine" -tags "CI" { Import-Module PSReadLine $module = Get-Module PSReadLine $module.Name | Should -BeExactly 'PSReadLine' - $module.Version | Should -BeExactly '2.0.2' + $module.Version | Should -BeExactly '2.0.4' } It "Should be installed to `$PSHOME" { $module = Get-Module (Join-Path -Path $PSHOME -ChildPath "Modules" -AdditionalChildPath "PSReadLine") -ListAvailable $module.Name | Should -BeExactly 'PSReadLine' - $module.Version | Should -BeExactly '2.0.2' + $module.Version | Should -BeExactly '2.0.4' $module.Path | Should -Be (Join-Path -Path $PSHOME -ChildPath "Modules/PSReadLine/PSReadLine.psd1") } diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj index 107c48a0a1e..c8429d2fe23 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/xUnit/xUnit.tests.csproj b/test/xUnit/xUnit.tests.csproj index 78ffc9b2f45..b95b569c240 100644 --- a/test/xUnit/xUnit.tests.csproj +++ b/test/xUnit/xUnit.tests.csproj @@ -25,8 +25,8 @@ - - + + From ce0f86a646922bfb5c2ea468a374127a5b6f4dab Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 9 Feb 2021 22:39:15 -0800 Subject: [PATCH 2/3] Fix third party signing for files in sub-folders (#14751) --- .../azureDevOps/templates/windows-packaging.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml index a2428f80cb1..f646b904010 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -179,7 +179,14 @@ jobs: $null = New-Item -ItemType Directory -Path $signedFilesDirectory -Force $missingSignatures | ForEach-Object { - Copy-Item -Path $_ -Destination $filesToSignDirectory + $pathWithoutLeaf = Split-Path $_ + $relativePath = $pathWithoutLeaf.replace($BuildPath,'') + $targetDirectory = Join-Path -Path $filesToSignDirectory -ChildPath $relativePath + if(!(Test-Path $targetDirectory)) + { + $null = New-Item -ItemType Directory -Path $targetDirectory -Force + } + Copy-Item -Path $_ -Destination $targetDirectory } displayName: Create ThirdParty Signing Folder From 6034d7d525ae6191d3c9711db8606982a8b09b8e Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 11 Feb 2021 21:55:04 +0000 Subject: [PATCH 3/3] Merged PR 14479: Update ChangeLog for v7.0.5 release Update ChangeLog for v7.0.5 release --- CHANGELOG/7.0.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md index b51667e8264..329b7672797 100644 --- a/CHANGELOG/7.0.md +++ b/CHANGELOG/7.0.md @@ -1,5 +1,24 @@ # 7.0 Changelog +## [7.0.5] - 2021-02-11 + +### Build and Packaging Improvements + +
+ + +Bump .NET SDK to version 3.1.406 + + +
    +
  • Fix third party signing for files in sub-folders (#14751)
    • +
  • Bump .NET SDK to 3.1.12 (Internal 14462)
    • +
+ +
+ +[7.0.5]: https://github.com/PowerShell/PowerShell/compare/v7.0.4...v7.0.5 + ## [7.0.4] - 2021-01-19 ### Build and Packaging Improvements