From 0ca6adb4a0ec0dc5d9bffe99ed163c72b69a3215 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Fri, 15 Jan 2021 06:05:19 +0000 Subject: [PATCH 1/5] Merged PR 14158: Fix release pipeline by skipping the global tool package Fix release pipeline by skipping the global tool package --- .../azureDevOps/templates/release-ReleaseToNuGet.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml index e134e4ccc7b..cd4f8c2ae96 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml @@ -30,7 +30,7 @@ steps: $releaseVersion = Get-Content "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" | ConvertFrom-Json | Select-Object -ExpandProperty 'ReleaseVersion' $globalToolPath = "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell.$releaseVersion.nupkg" ### -WhatIf to make sure we do not release global tool. Remove -WhatIf when the PowerShell name reservation is done. - Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release" -WhatIf + ### Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release" -WhatIf Get-ChildItem "$(Pipeline.Workspace)/release" -recurse displayName: Download and capture nupkgs From c8b58cf14ea34153fabcb35972f34bd7c76d3380 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Fri, 15 Jan 2021 17:26:26 -0800 Subject: [PATCH 2/5] Publish the global tool package for stable release --- .../azureDevOps/templates/release-ReleaseToNuGet.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml index cd4f8c2ae96..5d6b8ea4616 100644 --- a/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml +++ b/tools/releaseBuild/azureDevOps/templates/release-ReleaseToNuGet.yml @@ -23,14 +23,15 @@ steps: path: '$(Pipeline.Workspace)/releasePipeline/metadata' - pwsh: | - #Exclude all global tool packages. Their names start with 'PowerShell.' + # Exclude all global tool packages. Their names start with 'PowerShell.' $null = New-Item -ItemType Directory -Path "$(Pipeline.Workspace)/release" Copy-Item "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/*.nupkg" -Destination "$(Pipeline.Workspace)/release" -Exclude "PowerShell.*.nupkg" -Force -Verbose $releaseVersion = Get-Content "$ENV:PIPELINE_WORKSPACE/releasePipeline/metadata/release.json" | ConvertFrom-Json | Select-Object -ExpandProperty 'ReleaseVersion' $globalToolPath = "$ENV:PIPELINE_WORKSPACE/releasePipeline/finalResults/PowerShell.$releaseVersion.nupkg" - ### -WhatIf to make sure we do not release global tool. Remove -WhatIf when the PowerShell name reservation is done. - ### Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release" -WhatIf + + # Publish the global tool package for stable release. + Copy-Item $globalToolPath -Destination "$(Pipeline.Workspace)/release" Get-ChildItem "$(Pipeline.Workspace)/release" -recurse displayName: Download and capture nupkgs From 70f68e9ee920e6aacfb5ff607e4513d65cb4cd03 Mon Sep 17 00:00:00 2001 From: Aditya Patwardhan Date: Wed, 10 Feb 2021 22:28:59 +0000 Subject: [PATCH 3/5] Merged PR 14459: Bump .NET SDK to version 5.0.103 Bump .NET SDK to version 5.0.103 --- .devcontainer/Dockerfile | 2 +- .vsts-ci/templates/ci-build.yml | 10 ++++++++-- .vsts-ci/templates/nix-test.yml | 7 +++++++ .vsts-ci/templates/windows-packaging.yml | 5 ++--- .vsts-ci/templates/windows-test.yml | 10 ++++++++++ DotnetRuntimeMetadata.json | 6 +++--- assets/files.wxs | 10 +++++++--- global.json | 2 +- test/tools/WebListener/WebListener.csproj | 2 +- 9 files changed, 40 insertions(+), 14 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 7c940b0211b..0fd11e28edc 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/nightly/sdk:5.0.100 +FROM mcr.microsoft.com/dotnet/nightly/sdk:5.0.103 # 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..bb1cd5074d4 100644 --- a/.vsts-ci/templates/ci-build.yml +++ b/.vsts-ci/templates/ci-build.yml @@ -22,8 +22,14 @@ jobs: - template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml - - powershell: | - [Net.ServicePointManager]::SecurityProtocol = [Net.ServicePointManager]::SecurityProtocol -bor [Net.SecurityProtocolType]::Tls12 + - pwsh: | + if (Test-Path -Path $HOME/.dotnet) { + Remove-Item $HOME/.dotnet -Recurse -Force + } + displayName: Remove Old .NET SDKs + condition: succeededOrFailed() + + - pwsh: | Import-Module .\tools\ci.psm1 Invoke-CIInstall -SkipUser displayName: Bootstrap diff --git a/.vsts-ci/templates/nix-test.yml b/.vsts-ci/templates/nix-test.yml index 0938a93bcf9..eb28e508a35 100644 --- a/.vsts-ci/templates/nix-test.yml +++ b/.vsts-ci/templates/nix-test.yml @@ -33,6 +33,13 @@ jobs: displayName: 'Capture Artifacts Directory' continueOnError: true + - pwsh: | + if (Test-Path -Path $HOME/.dotnet) { + Remove-Item $HOME/.dotnet -Recurse -Force + } + displayName: Remove Old .NET SDKs + condition: succeededOrFailed() + - pwsh: | Import-Module .\tools\ci.psm1 Invoke-CIInstall -SkipUser 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/DotnetRuntimeMetadata.json b/DotnetRuntimeMetadata.json index 84cdf2ce88f..9c036f70a96 100644 --- a/DotnetRuntimeMetadata.json +++ b/DotnetRuntimeMetadata.json @@ -1,8 +1,8 @@ { "sdk": { - "channel": "release/5.0.1xx", - "packageVersionPattern": "5.0.0", - "sdkImageVersion": "5.0.100", + "channel": "latest", + "packageVersionPattern": "5.0.3", + "sdkImageVersion": "5.0.103", "nextChannel": "net5/rc2" } } diff --git a/assets/files.wxs b/assets/files.wxs index 4aa9ab2dfd3..04f23c88c83 100644 --- a/assets/files.wxs +++ b/assets/files.wxs @@ -3057,8 +3057,11 @@ - - + + + + + @@ -4045,7 +4048,8 @@ - + + diff --git a/global.json b/global.json index 10c378d31f5..43d4eeeb544 100644 --- a/global.json +++ b/global.json @@ -1,5 +1,5 @@ { "sdk": { - "version": "5.0.102" + "version": "5.0.103" } } diff --git a/test/tools/WebListener/WebListener.csproj b/test/tools/WebListener/WebListener.csproj index 6adedf53878..6962c1519ba 100644 --- a/test/tools/WebListener/WebListener.csproj +++ b/test/tools/WebListener/WebListener.csproj @@ -7,7 +7,7 @@ - + From 9b0071e14814ec8d65ac11316c91036f19a2ba55 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 9 Feb 2021 22:39:15 -0800 Subject: [PATCH 4/5] 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 4987514291f..7a16c2bc678 100644 --- a/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml +++ b/tools/releaseBuild/azureDevOps/templates/windows-packaging.yml @@ -178,7 +178,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 2f7d7fd5959065827d140e19e8a5af8f66c428c9 Mon Sep 17 00:00:00 2001 From: Dongbo Wang Date: Thu, 11 Feb 2021 21:55:28 +0000 Subject: [PATCH 5/5] Merged PR 14480: Update ChangeLog for v7.1.2 release Update ChangeLog for v7.1.2 release --- CHANGELOG/7.1.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CHANGELOG/7.1.md b/CHANGELOG/7.1.md index 6f92dd03b54..3868d52fddc 100644 --- a/CHANGELOG/7.1.md +++ b/CHANGELOG/7.1.md @@ -1,5 +1,25 @@ # 7.1 Changelog +## [7.1.2] - 2021-02-11 + +### Build and Packaging Improvements + +
+ + +Bump .NET SDK to version 5.0.103 + + +
    +
  • Fix third party signing for files in sub-folders (#14751)
    • +
  • Bump .NET SDK to version 5.0.103 (Internal 14459)
    • +
  • Publish the global tool package for stable release
    • +
+ +
+ +[7.1.2]: https://github.com/PowerShell/PowerShell/compare/v7.1.1...v7.1.2 + ## [7.1.1] - 2021-01-14 ### General Cmdlet Updates and Fixes