Compare commits
4 commits
master
...
FixDotnetU
Author | SHA1 | Date | |
---|---|---|---|
41d90e60af | |||
7df0c1b0cc | |||
c87f2c2804 | |||
dd6ef97685 |
2
.github/ISSUE_TEMPLATE/config.yml
vendored
2
.github/ISSUE_TEMPLATE/config.yml
vendored
|
@ -1,7 +1,7 @@
|
|||
blank_issues_enabled: false
|
||||
contact_links:
|
||||
- name: Windows PowerShell
|
||||
url: https://support.microsoft.com/windows/send-feedback-to-microsoft-with-the-feedback-hub-app-f59187f8-8739-22d6-ba93-f66612949332
|
||||
url: https://windowsserver.uservoice.com/forums/301869-powershell
|
||||
about: Windows PowerShell issues or suggestions.
|
||||
- name: Support
|
||||
url: https://github.com/PowerShell/PowerShell/blob/master/.github/SUPPORT.md
|
||||
|
|
11
.github/prquantifier.yaml
vendored
11
.github/prquantifier.yaml
vendored
|
@ -1,11 +0,0 @@
|
|||
# https://github.com/microsoft/PullRequestQuantifier/blob/main/docs/prquantifier-yaml.md
|
||||
Excluded:
|
||||
# defaults
|
||||
- '*.csproj'
|
||||
- prquantifier.yaml
|
||||
- package-lock.json
|
||||
- '*.md'
|
||||
- '*.sln'
|
||||
# autogenerated files
|
||||
- cgmanifest.json
|
||||
- assets/wix/files.wxs
|
|
@ -1,27 +0,0 @@
|
|||
# Copyright (c) Microsoft Corporation.
|
||||
# Licensed under the MIT License.
|
||||
|
||||
function Set-GWVariable {
|
||||
param(
|
||||
[Parameter(Mandatory = $true)]
|
||||
[string]$Name,
|
||||
[Parameter(Mandatory = $true)]
|
||||
[string]$Value
|
||||
)
|
||||
|
||||
Write-Verbose "Setting CI variable $Name to $Value" -Verbose
|
||||
|
||||
if ($env:GITHUB_ENV) {
|
||||
"$Name=$Value" | Out-File $env:GITHUB_ENV -Append
|
||||
}
|
||||
}
|
||||
|
||||
function Get-GWTempPath {
|
||||
$temp = [System.IO.Path]::GetTempPath()
|
||||
if ($env:RUNNER_TEMP) {
|
||||
$temp = $env:RUNNER_TEMP
|
||||
}
|
||||
|
||||
Write-Verbose "Get CI Temp path: $temp" -Verbose
|
||||
return $temp
|
||||
}
|
52
.github/workflows/daily.yml
vendored
52
.github/workflows/daily.yml
vendored
|
@ -30,16 +30,18 @@ jobs:
|
|||
git fetch --prune --unshallow --tags
|
||||
- name: Execute Update .NET script
|
||||
run: |
|
||||
Import-Module ./.github/workflows/GHWorkflowHelper
|
||||
$currentVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
|
||||
Set-GWVariable -Name OLD_VERSION -Value $currentVersion
|
||||
Write-Verbose "OLD_VERSION=$currentVersion" -Verbose
|
||||
"OLD_VERSION=$currentVersion" | Out-File $env:GITHUB_ENV -Append
|
||||
|
||||
./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging -UseInternalFeed
|
||||
$newVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
|
||||
Set-GWVariable -Name NEW_VERSION -Value $newVersion
|
||||
Write-Verbose "NEW_VERSION=$newVersion" -Verbose
|
||||
"NEW_VERSION=$newVersion" | Out-File $env:GITHUB_ENV -Append
|
||||
|
||||
if ($currentVersion -ne $newVersion) {
|
||||
Set-GWVariable -Name CREATE_PR -Value 'true'
|
||||
Write-Verbose "CREATE_PR=true" -Verbose
|
||||
"CREATE_PR=true" | Out-File $env:GITHUB_ENV -Append
|
||||
}
|
||||
- name: Microsoft Teams Notifier
|
||||
uses: skitionek/notify-microsoft-teams@master
|
||||
|
@ -56,43 +58,5 @@ jobs:
|
|||
title: "Update .NET SDK version from `${{ env.OLD_VERSION }}` to `${{ env.NEW_VERSION }}`"
|
||||
base: master
|
||||
branch: dotnet_update
|
||||
update-tpn:
|
||||
name: Update Notices File
|
||||
timeout-minutes: 15
|
||||
runs-on: windows-latest
|
||||
if: github.repository == 'PowerShell/PowerShell'
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Update Notices file
|
||||
run: |
|
||||
Invoke-WebRequest -Uri https://aka.ms/pwsh-daily-tpn -OutFile ./ThirdPartyNotices.txt
|
||||
- name: Capture Git Status
|
||||
run: |
|
||||
git status --short
|
||||
- name: Check if we need to create a PR
|
||||
run: |
|
||||
$ErrorActionPreference = 'continue'
|
||||
git diff --quiet ThirdPartyNotices.txt
|
||||
$exitCode = $LASTEXITCODE
|
||||
Write-Verbose -Message "Exit code: $exitCode" -Verbose
|
||||
if ($LASTEXITCODE -ne 0) {
|
||||
Import-Module ./.github/workflows/GHWorkflowHelper
|
||||
Set-GWVariable -Name CREATE_PR -Value 'true'
|
||||
} else {
|
||||
Write-Verbose "No difference found. Not creating a PR." -Verbose
|
||||
}
|
||||
exit 0
|
||||
- name: Create Pull Request
|
||||
uses: peter-evans/create-pull-request@v3
|
||||
id: cprtpn
|
||||
if: env.CREATE_PR == 'true'
|
||||
with:
|
||||
commit-message: "Update to the latest notice file"
|
||||
committer: GitHub <noreply@github.com>
|
||||
author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
|
||||
title: "Update to the latest notice file"
|
||||
reviewers: travisez13
|
||||
base: master
|
||||
draft: false
|
||||
branch: update-cgmanifest
|
||||
|
||||
|
||||
|
|
57
.github/workflows/update-cgmanifest.yml
vendored
57
.github/workflows/update-cgmanifest.yml
vendored
|
@ -1,57 +0,0 @@
|
|||
# Copyright (c) Microsoft Corporation.
|
||||
# Licensed under the MIT license.
|
||||
|
||||
name: Update cgmanifest
|
||||
on:
|
||||
workflow_dispatch:
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: pwsh
|
||||
|
||||
env:
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||
POWERSHELL_TELEMETRY_OPTOUT: 1
|
||||
CGMANIFEST_PATH: ''
|
||||
NUGET_PACKAGES: ${{ github.workspace }}\.nuget\packages
|
||||
|
||||
jobs:
|
||||
update-cgmanifest:
|
||||
name: Update cgmanifest
|
||||
timeout-minutes: 15
|
||||
runs-on: windows-latest
|
||||
if: github.repository == 'PowerShell/PowerShell'
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v2
|
||||
- name: Cache DotNet
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
~\AppData\Local\Microsoft\dotnet
|
||||
${{ github.workspace }}\.nuget\packages
|
||||
key: ${{ runner.os }}-${{ hashFiles('**\DotnetRuntimeMetadata.json') }}-${{ hashFiles('**\nuget.config') }}
|
||||
- name: Sync tags
|
||||
run: |
|
||||
git fetch --prune --unshallow --tags
|
||||
- name: Install Ships provider to deal with project.assets.json
|
||||
run: |
|
||||
Install-Module -Name dotnet.project.assets -force
|
||||
- name: Bootstrap
|
||||
run: |
|
||||
Import-Module ./build.psm1
|
||||
Start-PSBootStrap
|
||||
- name: Verify cgmanifest is up to date
|
||||
run: |
|
||||
Import-Module ./build.psm1
|
||||
Find-Dotnet
|
||||
./tools/findMissingNotices.ps1
|
||||
- name: Upload cgmanifest
|
||||
uses: actions/upload-artifact@v2
|
||||
if: always() && env.CGMANIFEST_PATH != ''
|
||||
with:
|
||||
name: cgmanifest
|
||||
path: ${{ env.CGMANIFEST_PATH }}
|
32
.spelling
32
.spelling
|
@ -15,7 +15,6 @@
|
|||
about_
|
||||
about_debuggers
|
||||
about_jobs
|
||||
about_Telemetry
|
||||
acl
|
||||
adamdriscoll
|
||||
add-localgroupmember
|
||||
|
@ -133,7 +132,6 @@ CodeFormatter
|
|||
codeowner
|
||||
codepage
|
||||
commanddiscovery
|
||||
CommandInvocationIntrinsics
|
||||
commandsearch
|
||||
CommandSearcher
|
||||
comobject
|
||||
|
@ -178,7 +176,6 @@ ctrl
|
|||
CurrentCulture
|
||||
CustomShellCommands.cs
|
||||
DamirAinullin
|
||||
DarylGraves
|
||||
darquewarrior
|
||||
darwinjs
|
||||
DateTime
|
||||
|
@ -287,7 +284,6 @@ folderName
|
|||
foreach
|
||||
formatfileloading
|
||||
formatviewbinding
|
||||
FormatWideCommand
|
||||
Francisco-Gamino
|
||||
frontload
|
||||
fullclr
|
||||
|
@ -489,7 +485,6 @@ miaromero
|
|||
microsoft
|
||||
Microsoft.ApplicationInsights
|
||||
Microsoft.CodeAnalysis.CSharp
|
||||
Microsoft.CodeAnalysis.NetAnalyzers
|
||||
microsoft.com
|
||||
microsoft.management.infrastructure.cimcmdlets
|
||||
microsoft.management.infrastructure.native
|
||||
|
@ -655,7 +650,6 @@ preview.5.20268.9
|
|||
preview.5.20272.6
|
||||
preview.6
|
||||
preview.6.20318.15
|
||||
preview.6.21355.2
|
||||
preview.7
|
||||
preview.7.20356.2
|
||||
preview.7.20358.6
|
||||
|
@ -706,8 +700,6 @@ RandomNoun7
|
|||
raspbian
|
||||
rc
|
||||
rc.1
|
||||
rc.1.21455.2
|
||||
rc.1.21458.32
|
||||
rc.2
|
||||
rc.3
|
||||
rc2-24027
|
||||
|
@ -925,7 +917,6 @@ unregister-pssessionconfiguration
|
|||
unregistering
|
||||
untracked
|
||||
unvalidated
|
||||
UpdateDotnetRuntime.ps1
|
||||
update-formatdata
|
||||
update-modulemanifest
|
||||
update-scriptfileinfo
|
||||
|
@ -1270,7 +1261,7 @@ package.json
|
|||
jcotton42
|
||||
RPMs
|
||||
PSDesiredStateConfiguration
|
||||
- CHANGELOG/7.2.md
|
||||
- CHANGELOG/preview.md
|
||||
Gimly
|
||||
jborean93
|
||||
mkswd
|
||||
|
@ -1377,39 +1368,18 @@ msixbundle
|
|||
PowerShell-Native#70
|
||||
AppxManifest.xml
|
||||
preview.9
|
||||
preview.10
|
||||
ArmaanMcleod
|
||||
entrypoint
|
||||
lselden
|
||||
SethFalco
|
||||
CodeQL
|
||||
slowy07
|
||||
rc.2.21505.57
|
||||
ThirdPartyNotices.txt
|
||||
cgmanifest.json
|
||||
buildinfo
|
||||
tar.gz
|
||||
psoptions.json
|
||||
manifest.spdx.json
|
||||
vPack
|
||||
kondratyev-nv
|
||||
v7.2.0
|
||||
cgmanifest.json
|
||||
pwsh.exe
|
||||
6.0.100-rtm.21527.11
|
||||
6.0.100-rc.2.21505.57
|
||||
ThirdPartyNotices.txt
|
||||
rtm.21527.11
|
||||
- CHANGELOG/7.0.md
|
||||
codesign
|
||||
release-BuildJson
|
||||
yml
|
||||
centos-7
|
||||
PSDesiredStateConfiguration
|
||||
NoLanguage
|
||||
createdump
|
||||
vPack
|
||||
PkgES
|
||||
- test/perf/benchmarks/README.md
|
||||
benchmarked
|
||||
BenchmarkDotNet
|
||||
|
|
|
@ -11,9 +11,9 @@ trigger:
|
|||
include:
|
||||
- '*'
|
||||
exclude:
|
||||
- .vsts-ci/misc-analysis.yml
|
||||
- .github/ISSUE_TEMPLATE/*
|
||||
- .dependabot/config.yml
|
||||
- /.vsts-ci/misc-analysis.yml
|
||||
- /.github/ISSUE_TEMPLATE/*
|
||||
- /.dependabot/config.yml
|
||||
- test/perf/*
|
||||
pr:
|
||||
branches:
|
||||
|
@ -30,14 +30,10 @@ pr:
|
|||
- .vsts-ci/misc-analysis.yml
|
||||
- .vsts-ci/windows.yml
|
||||
- .vsts-ci/windows/*
|
||||
- cgmanifest.json
|
||||
- LICENSE.txt
|
||||
- test/common/markdown/*
|
||||
- test/perf/*
|
||||
- tools/releaseBuild/*
|
||||
- tools/releaseBuild/azureDevOps/templates/*
|
||||
- README.md
|
||||
- .spelling
|
||||
|
||||
variables:
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||
|
|
|
@ -11,10 +11,10 @@ trigger:
|
|||
include:
|
||||
- '*'
|
||||
exclude:
|
||||
- tools/releaseBuild/**/*
|
||||
- .vsts-ci/misc-analysis.yml
|
||||
- .github/ISSUE_TEMPLATE/*
|
||||
- .dependabot/config.yml
|
||||
- /tools/releaseBuild/**/*
|
||||
- /.vsts-ci/misc-analysis.yml
|
||||
- /.github/ISSUE_TEMPLATE/*
|
||||
- /.dependabot/config.yml
|
||||
- test/perf/*
|
||||
pr:
|
||||
branches:
|
||||
|
@ -29,17 +29,13 @@ pr:
|
|||
- .dependabot/config.yml
|
||||
- .github/ISSUE_TEMPLATE/*
|
||||
- .vsts-ci/misc-analysis.yml
|
||||
- .vsts-ci/windows.yml
|
||||
- .vsts-ci/windows/*
|
||||
- cgmanifest.json
|
||||
- LICENSE.txt
|
||||
- /.vsts-ci/windows.yml
|
||||
- /.vsts-ci/windows/*
|
||||
- test/common/markdown/*
|
||||
- test/perf/*
|
||||
- tools/packaging/*
|
||||
- tools/releaseBuild/*
|
||||
- tools/releaseBuild/azureDevOps/templates/*
|
||||
- README.md
|
||||
- .spelling
|
||||
|
||||
variables:
|
||||
DOTNET_CLI_TELEMETRY_OPTOUT: 1
|
||||
|
@ -101,6 +97,10 @@ stages:
|
|||
vmImage: macOS-latest
|
||||
steps:
|
||||
- pwsh: |
|
||||
# Remove old .NET SDKs
|
||||
if (Test-Path -Path $HOME/.dotnet) {
|
||||
Remove-Item $HOME/.dotnet -Recurse -Force
|
||||
}
|
||||
Import-Module .\tools\ci.psm1
|
||||
New-CodeCoverageAndTestPackage
|
||||
displayName: CodeCoverage and Test Package
|
||||
|
|
|
@ -27,41 +27,83 @@ variables:
|
|||
- name: repoFolder
|
||||
value: PowerShell
|
||||
|
||||
stages:
|
||||
- stage: Compliance
|
||||
jobs:
|
||||
- job: CI_Compliance
|
||||
displayName: CI Compliance
|
||||
jobs:
|
||||
- job: CI_Compliance
|
||||
displayName: CI Compliance
|
||||
|
||||
pool:
|
||||
vmImage: windows-latest
|
||||
pool:
|
||||
vmImage: windows-latest
|
||||
|
||||
variables:
|
||||
- name: repoPath
|
||||
value: $(Agent.BuildDirectory)\$(repoFolder)
|
||||
variables:
|
||||
- name: repoPath
|
||||
value: $(Agent.BuildDirectory)\$(repoFolder)
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
clean: true
|
||||
path: $(repoFolder)
|
||||
steps:
|
||||
- checkout: self
|
||||
clean: true
|
||||
path: $(repoFolder)
|
||||
|
||||
- checkout: ComplianceRepo
|
||||
- checkout: ComplianceRepo
|
||||
|
||||
- template: ci-compliance.yml@ComplianceRepo
|
||||
- stage: markdown_spelling_lint
|
||||
displayName: Markdown Spelling and Lint
|
||||
dependsOn: []
|
||||
jobs:
|
||||
- template: ./misc-analysis/mdSpell.yml
|
||||
- stage: markdown_link
|
||||
displayName: Markdown Link
|
||||
dependsOn: []
|
||||
jobs:
|
||||
- template: ./misc-analysis/generateMarkdownMatrix.yml
|
||||
- template: ci-compliance.yml@ComplianceRepo
|
||||
|
||||
- job: Linux_CI
|
||||
displayName: Markdown and Common Tests
|
||||
|
||||
pool:
|
||||
vmImage: ubuntu-20.04
|
||||
|
||||
variables:
|
||||
- name: repoPath
|
||||
value: $(Agent.BuildDirectory)/$(repoFolder)
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
clean: true
|
||||
path: $(repoFolder)
|
||||
|
||||
- checkout: ComplianceRepo
|
||||
|
||||
- powershell: |
|
||||
Get-ChildItem -Path env:
|
||||
displayName: Capture Environment
|
||||
condition: succeededOrFailed()
|
||||
|
||||
- powershell: |
|
||||
Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
|
||||
displayName: Install Pester
|
||||
condition: succeededOrFailed()
|
||||
|
||||
- bash: |
|
||||
curl -o- --progress-bar -L https://yarnpkg.com/install.sh | bash
|
||||
displayName: Bootstrap Yarn
|
||||
condition: succeededOrFailed()
|
||||
|
||||
- bash: |
|
||||
sudo yarn global add markdown-spellcheck@0.11.0
|
||||
displayName: Install mdspell
|
||||
condition: succeededOrFailed()
|
||||
|
||||
- bash: |
|
||||
mdspell '**/*.md' '!**/Pester/**/*.md' '!**/dotnet-tools/**/*.md' --ignore-numbers --ignore-acronyms --report --en-us;
|
||||
displayName: Test Spelling in Markdown
|
||||
condition: succeededOrFailed()
|
||||
workingDirectory: '$(repoPath)'
|
||||
|
||||
- ${{ if not(contains(variables['SYSTEM.COLLECTIONURI'],'mscodehub')) }}:
|
||||
- pwsh: |
|
||||
Import-module ./build.psm1
|
||||
$path = Join-Path -Path $pwd -ChildPath './commonTestResults.xml'
|
||||
$results = invoke-pester -Script ./test/common -OutputFile $path -OutputFormat NUnitXml -PassThru
|
||||
Write-Host "##vso[results.publish type=NUnit;mergeResults=true;runTitle=Common Tests;publishRunAttachments=true;resultFiles=$path;]"
|
||||
if($results.TotalCount -eq 0 -or $results.FailedCount -gt 0)
|
||||
{
|
||||
throw "Markdown tests failed"
|
||||
}
|
||||
displayName: Run Common Tests
|
||||
condition: succeededOrFailed()
|
||||
workingDirectory: '$(repoPath)'
|
||||
|
||||
- template: dailyBuildCompliance.yml@ComplianceRepo
|
||||
parameters:
|
||||
jobName: generateMatrix
|
||||
taskName: matrixTask
|
||||
- template: ./misc-analysis/markdown.yml
|
||||
parameters:
|
||||
matrix: $[ dependencies.generateMatrix.outputs['matrixTask.matrix'] ]
|
||||
dependsOn: generateMatrix
|
||||
sourceScanPath: '$(repoPath)'
|
||||
|
|
|
@ -1,46 +0,0 @@
|
|||
parameters:
|
||||
- name: jobName
|
||||
- name: taskName
|
||||
|
||||
jobs:
|
||||
- job: ${{ parameters.jobName }}
|
||||
displayName: Generate Markdown Matrix
|
||||
|
||||
pool:
|
||||
vmImage: ubuntu-20.04
|
||||
|
||||
variables:
|
||||
- name: repoPath
|
||||
value: $(Agent.BuildDirectory)/$(repoFolder)
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
clean: true
|
||||
path: $(repoFolder)
|
||||
|
||||
- powershell: |
|
||||
$matrix = @{}
|
||||
$matrix += @{
|
||||
'root' = @{
|
||||
markdown_folder = "$(repoPath)"
|
||||
markdown_recurse = $false
|
||||
}
|
||||
}
|
||||
Get-ChildItem -path '$(repoPath)' -Directory | Foreach-Object {
|
||||
$folder = $_
|
||||
$matrix += @{
|
||||
$_.Name = @{
|
||||
markdown_folder = $_.fullName
|
||||
markdown_recurse = $true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$matrixJson = $matrix | ConvertTo-Json -Compress
|
||||
$variableName = "matrix"
|
||||
$command = "vso[task.setvariable variable=$variableName;isoutput=true]$($matrixJson)"
|
||||
Write-Verbose "sending command: '$command'"
|
||||
Write-Host "##$command"
|
||||
displayName: Create Matrix
|
||||
condition: succeededOrFailed()
|
||||
name: ${{ parameters.taskName }}
|
|
@ -1,63 +0,0 @@
|
|||
parameters:
|
||||
- name: matrix
|
||||
- name: dependsOn
|
||||
|
||||
jobs:
|
||||
- job: markdown
|
||||
strategy:
|
||||
matrix: ${{ parameters.matrix }}
|
||||
maxParallel: 5
|
||||
|
||||
displayName: Markdown Link Verification
|
||||
|
||||
dependsOn: ${{ parameters.dependsOn }}
|
||||
|
||||
pool:
|
||||
vmImage: ubuntu-20.04
|
||||
|
||||
variables:
|
||||
- name: repoPath
|
||||
value: $(Agent.BuildDirectory)/$(repoFolder)
|
||||
- name: YARN_CACHE_FOLDER
|
||||
value: $(Pipeline.Workspace)/.yarn
|
||||
- name: YARN_GLOBAL_CACHE_FOLDER
|
||||
value: $(Pipeline.Workspace)/.yarn-global
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
clean: true
|
||||
path: $(repoFolder)
|
||||
|
||||
- checkout: ComplianceRepo
|
||||
|
||||
- task: Cache@2
|
||||
inputs:
|
||||
key: '"markdown-link-check" | "$(Agent.OS)" | $(repoPath)/test/common/markdown-link/markdown-link.tests.ps1'
|
||||
path: $(YARN_GLOBAL_CACHE_FOLDER)
|
||||
displayName: Cache Yarn packages
|
||||
|
||||
- powershell: |
|
||||
Install-module Pester -Scope CurrentUser -Force -MaximumVersion 4.99
|
||||
displayName: Install Pester
|
||||
|
||||
- bash: |
|
||||
curl -o- --progress-bar -L https://yarnpkg.com/install.sh | bash
|
||||
displayName: Bootstrap Yarn
|
||||
|
||||
- bash: |
|
||||
yarn config set global-folder "$(YARN_GLOBAL_CACHE_FOLDER)"
|
||||
displayName: Set Yarn global cache folder
|
||||
|
||||
- ${{ if not(contains(variables['SYSTEM.COLLECTIONURI'],'mscodehub')) }}:
|
||||
- pwsh: |
|
||||
Import-module ./build.psm1
|
||||
$path = Join-Path -Path $pwd -ChildPath './commonTestResults.xml'
|
||||
$results = invoke-pester -Script ./test/common/markdown-link -OutputFile $path -OutputFormat NUnitXml -PassThru
|
||||
Write-Host "##vso[results.publish type=NUnit;mergeResults=true;runTitle=Markdown Link;publishRunAttachments=true;resultFiles=$path;]"
|
||||
if($results.TotalCount -eq 0 -or $results.FailedCount -gt 0)
|
||||
{
|
||||
throw "Markdown tests failed"
|
||||
}
|
||||
displayName: Run Markdown Link Tests
|
||||
condition: succeededOrFailed()
|
||||
workingDirectory: '$(repoPath)'
|
|
@ -1,56 +0,0 @@
|
|||
jobs:
|
||||
- job: markdown
|
||||
displayName: Markdown Spelling
|
||||
|
||||
pool:
|
||||
vmImage: ubuntu-20.04
|
||||
|
||||
variables:
|
||||
- name: repoPath
|
||||
value: $(Agent.BuildDirectory)/$(repoFolder)
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
clean: true
|
||||
path: $(repoFolder)
|
||||
|
||||
- checkout: ComplianceRepo
|
||||
|
||||
- powershell: |
|
||||
Get-ChildItem -Path env:
|
||||
displayName: Capture Environment
|
||||
condition: succeededOrFailed()
|
||||
|
||||
- bash: |
|
||||
curl -o- --progress-bar -L https://yarnpkg.com/install.sh | bash
|
||||
displayName: Bootstrap Yarn
|
||||
condition: succeededOrFailed()
|
||||
|
||||
- bash: |
|
||||
sudo yarn global add markdown-spellcheck@0.11.0
|
||||
displayName: Install mdspell
|
||||
condition: succeededOrFailed()
|
||||
|
||||
- bash: |
|
||||
mdspell '**/*.md' '!**/Pester/**/*.md' '!**/dotnet-tools/**/*.md' --ignore-numbers --ignore-acronyms --report --en-us;
|
||||
displayName: Test Spelling in Markdown
|
||||
condition: succeededOrFailed()
|
||||
workingDirectory: '$(repoPath)'
|
||||
|
||||
- ${{ if not(contains(variables['SYSTEM.COLLECTIONURI'],'mscodehub')) }}:
|
||||
- pwsh: |
|
||||
Import-module ./build.psm1
|
||||
$path = Join-Path -Path $pwd -ChildPath './commonTestResults.xml'
|
||||
$results = invoke-pester -Script ./test/common/markdown-lint -OutputFile $path -OutputFormat NUnitXml -PassThru
|
||||
Write-Host "##vso[results.publish type=NUnit;mergeResults=true;runTitle=Markdown Lint;publishRunAttachments=true;resultFiles=$path;]"
|
||||
if($results.TotalCount -eq 0 -or $results.FailedCount -gt 0)
|
||||
{
|
||||
throw "Markdown tests failed"
|
||||
}
|
||||
displayName: Run Markdown Lint Tests
|
||||
condition: succeededOrFailed()
|
||||
workingDirectory: '$(repoPath)'
|
||||
|
||||
- template: dailyBuildCompliance.yml@ComplianceRepo
|
||||
parameters:
|
||||
sourceScanPath: '$(repoPath)'
|
|
@ -34,8 +34,6 @@ resources:
|
|||
clean: true
|
||||
jobs:
|
||||
- job: SSHRemotingTests
|
||||
pool:
|
||||
vmImage: ubuntu-20.04
|
||||
container: mcr.microsoft.com/powershell/test-deps:ubuntu-18.04
|
||||
displayName: SSH Remoting Tests
|
||||
|
||||
|
|
|
@ -11,31 +11,38 @@ jobs:
|
|||
displayName: ${{ parameters.displayName }}
|
||||
|
||||
steps:
|
||||
- pwsh: |
|
||||
- powershell: |
|
||||
Get-ChildItem -Path env:
|
||||
displayName: Capture Environment
|
||||
condition: succeededOrFailed()
|
||||
|
||||
- pwsh: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
|
||||
- powershell: Write-Host "##vso[build.updatebuildnumber]$env:BUILD_SOURCEBRANCHNAME-$env:BUILD_SOURCEVERSION-$((get-date).ToString("yyyyMMddhhmmss"))"
|
||||
displayName: Set Build Name for Non-PR
|
||||
condition: ne(variables['Build.Reason'], 'PullRequest')
|
||||
|
||||
- ${{ if ne(variables['AzDevOpsFeed'], '') }}:
|
||||
- template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
|
||||
|
||||
- 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
|
||||
condition: succeeded()
|
||||
|
||||
- pwsh: |
|
||||
- powershell: |
|
||||
Import-Module .\tools\ci.psm1
|
||||
Invoke-CIBuild
|
||||
displayName: Build
|
||||
condition: succeeded()
|
||||
|
||||
- pwsh: |
|
||||
- powershell: |
|
||||
Import-Module .\tools\ci.psm1
|
||||
Restore-PSOptions
|
||||
Invoke-CIxUnit -SkipFailing
|
||||
|
|
|
@ -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
|
||||
|
@ -56,6 +63,18 @@ jobs:
|
|||
continueOnError: true
|
||||
|
||||
- pwsh: |
|
||||
Import-Module .\build.psm1 -Force
|
||||
$environment = Get-EnvironmentInformation
|
||||
$isUbuntu20 = $environment.IsUbuntu -and $environment.IsUbuntu20
|
||||
if ($isUbuntu20) {
|
||||
$env:LC_ALL='en_US.UTF-8'
|
||||
$env:LANG='en_US.UTF-8'
|
||||
sudo locale-gen $LANG
|
||||
sudo update-locale
|
||||
}
|
||||
|
||||
locale
|
||||
|
||||
Import-Module .\tools\ci.psm1
|
||||
Restore-PSOptions -PSOptionsPath '$(System.ArtifactsDirectory)\build\psoptions.json'
|
||||
$options = (Get-PSOptions)
|
||||
|
|
|
@ -11,9 +11,9 @@ trigger:
|
|||
include:
|
||||
- '*'
|
||||
exclude:
|
||||
- .vsts-ci/misc-analysis.yml
|
||||
- .github/ISSUE_TEMPLATE/*
|
||||
- .dependabot/config.yml
|
||||
- /.vsts-ci/misc-analysis.yml
|
||||
- /.github/ISSUE_TEMPLATE/*
|
||||
- /.dependabot/config.yml
|
||||
- test/perf/*
|
||||
pr:
|
||||
branches:
|
||||
|
@ -28,15 +28,11 @@ pr:
|
|||
- .dependabot/config.yml
|
||||
- .github/ISSUE_TEMPLATE/*
|
||||
- .vsts-ci/misc-analysis.yml
|
||||
- cgmanifest.json
|
||||
- LICENSE.txt
|
||||
- test/common/markdown/*
|
||||
- test/perf/*
|
||||
- tools/packaging/*
|
||||
- tools/releaseBuild/*
|
||||
- tools/releaseBuild/azureDevOps/templates/*
|
||||
- README.md
|
||||
- .spelling
|
||||
|
||||
variables:
|
||||
GIT_CONFIG_PARAMETERS: "'core.autocrlf=false'"
|
||||
|
|
|
@ -1,53 +1,25 @@
|
|||
parameters:
|
||||
- name: pool
|
||||
default: 'Hosted VS2017'
|
||||
- name: jobName
|
||||
default: 'win_packaging'
|
||||
- name: runtimePrefix
|
||||
default: 'win7'
|
||||
- name: architecture
|
||||
default: 'x64'
|
||||
- name: channel
|
||||
default: 'preview'
|
||||
pool: 'Hosted VS2017'
|
||||
jobName: 'win_packaging'
|
||||
architecture: 'x64'
|
||||
channel: 'preview'
|
||||
parentJobs: []
|
||||
|
||||
jobs:
|
||||
- job: ${{ parameters.jobName }}_${{ parameters.channel }}_${{ parameters.architecture }}
|
||||
|
||||
variables:
|
||||
- name: repoFolder
|
||||
value: PowerShell
|
||||
- name: repoPath
|
||||
value: $(Agent.BuildDirectory)\$(repoFolder)
|
||||
- name: complianceRepoFolder
|
||||
value: compliance
|
||||
- name: complianceRepoPath
|
||||
value: $(Agent.BuildDirectory)\$(complianceRepoFolder)
|
||||
|
||||
dependsOn:
|
||||
${{ parameters.parentJobs }}
|
||||
pool:
|
||||
name: ${{ parameters.pool }}
|
||||
|
||||
displayName: Windows Packaging - ${{ parameters.architecture }} - ${{ parameters.channel }}
|
||||
|
||||
steps:
|
||||
- checkout: self
|
||||
clean: true
|
||||
path: $(repoFolder)
|
||||
|
||||
- checkout: ComplianceRepo
|
||||
clean: true
|
||||
path: $(complianceRepoFolder)
|
||||
|
||||
- powershell: |
|
||||
Get-ChildItem -Path env:
|
||||
displayName: Capture environment
|
||||
condition: succeededOrFailed()
|
||||
|
||||
- pwsh: |
|
||||
$PSVersionTable
|
||||
displayName: Capture PowerShell Version Table
|
||||
condition: succeededOrFailed()
|
||||
|
||||
|
||||
- template: /tools/releaseBuild/azureDevOps/templates/insert-nuget-config-azfeed.yml
|
||||
|
||||
- pwsh: |
|
||||
|
@ -55,24 +27,9 @@ jobs:
|
|||
Invoke-CIInstall -SkipUser
|
||||
displayName: Bootstrap
|
||||
condition: succeeded()
|
||||
workingDirectory: $(repoPath)
|
||||
|
||||
- pwsh: |
|
||||
Import-Module .\tools\ci.psm1
|
||||
New-CodeCoverageAndTestPackage
|
||||
Invoke-CIFinish -Runtime ${{ parameters.runtimePrefix }}-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Build
|
||||
displayName: Build
|
||||
workingDirectory: $(repoPath)
|
||||
|
||||
- template: Sbom.yml@ComplianceRepo
|
||||
parameters:
|
||||
BuildDropPath: '$(System.ArtifactsDirectory)/mainBuild'
|
||||
Build_Repository_Uri: $(build.repository.uri)
|
||||
displayName: SBOM
|
||||
|
||||
- pwsh: |
|
||||
Import-Module .\tools\ci.psm1
|
||||
New-CodeCoverageAndTestPackage
|
||||
Invoke-CIFinish -Runtime ${{ parameters.runtimePrefix }}-${{ parameters.architecture }} -channel ${{ parameters.channel }} -Stage Package
|
||||
displayName: Package and Test
|
||||
workingDirectory: $(repoPath)
|
||||
Invoke-CIFinish -Runtime win7-${{ parameters.architecture }} -channel ${{ parameters.channel }}
|
||||
displayName: Build and Test Package
|
||||
|
|
|
@ -67,17 +67,10 @@ variables:
|
|||
- name: __SuppressAnsiEscapeSequences
|
||||
value: 1
|
||||
- group: fakeNugetKey
|
||||
- name: SBOMGenerator_Formats
|
||||
value: spdx:2.2
|
||||
|
||||
resources:
|
||||
repositories:
|
||||
- repository: ComplianceRepo
|
||||
type: github
|
||||
endpoint: PowerShell
|
||||
name: PowerShell/compliance
|
||||
ref: master
|
||||
|
||||
- repo: self
|
||||
clean: true
|
||||
stages:
|
||||
- stage: PackagingWin
|
||||
displayName: Packaging for Windows
|
||||
|
@ -93,13 +86,3 @@ stages:
|
|||
parameters:
|
||||
channel: preview
|
||||
architecture: x86
|
||||
- template: templates/windows-packaging.yml
|
||||
parameters:
|
||||
channel: preview
|
||||
architecture: arm
|
||||
runtimePrefix: win
|
||||
- template: templates/windows-packaging.yml
|
||||
parameters:
|
||||
channel: preview
|
||||
architecture: arm64
|
||||
runtimePrefix: win
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
<Project>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" PrivateAssets="all" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0" PrivateAssets="all" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0-rc2.21430.2" PrivateAssets="all" />
|
||||
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.354" PrivateAssets="all" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
@ -1,45 +1,5 @@
|
|||
# 7.0 Changelog
|
||||
|
||||
## [7.0.8] - 2021-10-14
|
||||
|
||||
### Engine Updates and Fixes
|
||||
|
||||
- Handle error from unauthorized access when removing `AppLocker` test files (#15881)
|
||||
- Handle error when the telemetry mutex cannot be created (#15574) (Thanks @gukoff!)
|
||||
- Configure `ApplicationInsights` to not send cloud role name (Internal 17099)
|
||||
- Disallow `Add-Type` in NoLanguage mode on a locked down machine (Internal 17521)
|
||||
|
||||
### Tools
|
||||
|
||||
- Add `.stylecop` to `filetypexml` and format it (#16025)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
<p>Bump .NET SDK to 3.1.414</p>
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Update the nuget.config file used for building NuGet packages (Internal 17547)</li>
|
||||
<li>Sign the .NET <code>createdump</code> executable (#16229)</li>
|
||||
<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
|
||||
<li>Move vPack build to 1ES Pool (#16169)</li>
|
||||
<li>Update to .NET SDK 3.1.414 (Internal 17532)</li>
|
||||
<li>Fix the macOS build by updating the pool image name (#16010)</li>
|
||||
<li>Move from PkgES hosted agents to 1ES hosted agents (#16023)</li>
|
||||
<li>Use Alpine 3.12 for building PowerShell for Alpine Linux (#16008)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Fix example nuget.config (#14349)
|
||||
|
||||
[7.0.8]: https://github.com/PowerShell/PowerShell/compare/v7.0.7...v7.0.8
|
||||
|
||||
## [7.0.7] - 2021-08-12
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
|
|
@ -1,45 +1,5 @@
|
|||
# 7.1 Changelog
|
||||
|
||||
## [7.1.5] - 2021-10-14
|
||||
|
||||
### Engine Updates and Fixes
|
||||
|
||||
- Handle error from unauthorized access when removing `AppLocker` test files (#15881)
|
||||
- Test more thoroughly whether a command is `Out-Default` for transcription scenarios (#15653)
|
||||
- Handle error when the telemetry mutex cannot be created (#15574) (Thanks @gukoff!)
|
||||
- Configure `ApplicationInsights` to not send cloud role name (Internal 17100)
|
||||
- Disallow `Add-Type` in NoLanguage mode on a locked down machine (Internal 17522)
|
||||
|
||||
### Tools
|
||||
|
||||
- Add `.stylecop` to `filetypexml` and format it (#16025)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
<p>Bump .NET SDK to 5.0.402</p>
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Upgrade <code>set-value</code> package for markdown test (#16196)</li>
|
||||
<li>Sign the .NET <code>createdump</code> executable (#16229)</li>
|
||||
<li>Move vPack build to 1ES Pool (#16169)</li>
|
||||
<li>Update to .NET SDK 5.0.402 (Internal 17537)</li>
|
||||
<li>Move from PkgES hosted agents to 1ES hosted agents (#16023)</li>
|
||||
<li>Fix the macOS build by updating the pool image name (#16010)</li>
|
||||
<li>Use Alpine 3.12 for building PowerShell for Alpine Linux (#16008)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Fix example nuget.config (#14349)
|
||||
|
||||
[7.1.5]: https://github.com/PowerShell/PowerShell/compare/v7.1.4...v7.1.5
|
||||
|
||||
## [7.1.4] - 2021-08-12
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
|
1122
CHANGELOG/7.2.md
1122
CHANGELOG/7.2.md
File diff suppressed because it is too large
Load diff
|
@ -1 +1,957 @@
|
|||
# Current preview release
|
||||
|
||||
## [7.2.0-preview.9] - 2021-08-23
|
||||
|
||||
### Breaking Changes
|
||||
|
||||
- Change the default value of `$PSStyle.OutputRendering` to `OutputRendering.Host` and remove `OutputRendering.Automatic` (#15882)
|
||||
- Fix `CA1052` for public API to make classes static when they only have static methods (#15775) (Thanks @xtqqczze!)
|
||||
- Update `pwsh.exe -File` to only accept `.ps1` script files on Windows (#15859)
|
||||
|
||||
### Engine Updates and Fixes
|
||||
|
||||
- Update .NET adapter to handle interface static members properly (#15908)
|
||||
- Catch and handle unauthorized access exception when removing AppLocker test files (#15881)
|
||||
|
||||
### General Cmdlet Updates and Fixes
|
||||
|
||||
- Add `-PassThru` parameter to `Set-Clipboard` (#13713) (Thanks @ThomasNieto!)
|
||||
- Add `-Encoding` parameter for `Tee-Object` (#12135) (Thanks @Peter-Schneider!)
|
||||
- Update `ConvertTo-Csv` and `Export-Csv` to handle `IDictionary` objects (#11029) (Thanks @vexx32!)
|
||||
- Update the parameters `-Exception` and `-ErrorRecord` for `Write-Error` to be position 0 (#13813) (Thanks @ThomasNieto!)
|
||||
- Don't use `ArgumentList` when creating COM object with `New-Object` as it's not applicable to the COM parameter set (#15915)
|
||||
- Fix `$PSStyle` list output to correctly show `TableHeader` (#15928)
|
||||
- Remove the `PSImplicitRemotingBatching` experimental feature (#15863)
|
||||
- Fix issue with `Get-Process -Module` failing to stop when it's piped to `Select-Object` (#15682) (Thanks @ArmaanMcleod!)
|
||||
- Make the experimental features `PSUnixFileStat`, `PSCultureInvariantReplaceOperator`, `PSNotApplyErrorActionToStderr`, `PSAnsiRendering`, `PSAnsiProgressFeatureName` stable (#15864)
|
||||
- Enhance `Remove-Item` to work with OneDrive (#15571) (Thanks @iSazonov!)
|
||||
- Make global tool entrypoint class static (#15880)
|
||||
- Update `ServerRemoteHost` version to be same as `PSVersion` (#15809)
|
||||
- Make the initialization of `HttpKnownHeaderNames` thread safe (#15519) (Thanks @iSazonov!)
|
||||
- `ConvertTo-Csv`: Quote fields with quotes and newlines when using `-UseQuotes AsNeeded` (#15765) (Thanks @lselden!)
|
||||
- Forwarding progress stream changes from `Foreach-Object -Parallel` runspaces (#14271) (Thanks @powercode!)
|
||||
- Add validation to `$PSStyle` to reject printable text when setting a property that only expects ANSI escape sequence (#15825)
|
||||
|
||||
### Code Cleanup
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@xtqqczze</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Avoid unneeded array allocation in module code (#14329) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable and fix analysis rules <code>CA1052</code>, <code>CA1067</code>, and <code>IDE0049</code> (#15840) (Thanks @xtqqczze!)</li>
|
||||
<li>Avoid unnecessary allocation in formatting code (#15832) (Thanks @xtqqczze!)</li>
|
||||
<li>Specify the analyzed API surface for all code quality rules (#15778) (Thanks @xtqqczze!)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Tools
|
||||
|
||||
- Enable `/rebase` to automatically rebase a PR (#15808)
|
||||
- Update `.editorconfig` to not replace tabs with spaces in `.tsv` files (#15815) (Thanks @SethFalco!)
|
||||
- Update PowerShell team members in the change log generation script (#15817)
|
||||
|
||||
### Tests
|
||||
|
||||
- Add more tests to validate the current command error handling behaviors (#15919)
|
||||
- Make `Measure-Object` property test independent of the file system (#15879)
|
||||
- Add more information when a `syslog` parsing error occurs (#15857)
|
||||
- Harden logic when looking for `syslog` entries to be sure that we select based on the process id (#15841)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@xtqqczze</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Disable implicit namespace imports for test projects (#15895)</li>
|
||||
<li>Update language version to 10 and fix related issues (#15886)</li>
|
||||
<li>Update <code>CodeQL</code> workflow to use Ubuntu 18.04 (#15868)</li>
|
||||
<li>Bump the version of various packages (#15944, #15934, #15935, #15891, #15812, #15822) (Thanks @xtqqczze!)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Update `README` and `metadata files` for release `v7.2.0-preview.8` (#15819)
|
||||
- Update change logs for 7.0.7 and 7.1.4 (#15921)
|
||||
- Fix spelling in XML docs (#15939) (Thanks @slowy07!)
|
||||
- Update PowerShell Committee members (#15837)
|
||||
|
||||
[7.2.0-preview.9]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.8...v7.2.0-preview.9
|
||||
|
||||
## [7.2.0-preview.8] - 2021-07-22
|
||||
|
||||
### Engine Updates and Fixes
|
||||
|
||||
- Add a Windows mode to `$PSNativeCommandArgumentPassing` that allows some commands to use legacy argument passing (#15408)
|
||||
- Use `nameof` to get parameter names when creating `ArgumentNullException` (#15604) (Thanks @gukoff!)
|
||||
- Test if a command is 'Out-Default' more thoroughly for transcribing scenarios (#15653)
|
||||
- Add `Microsoft.PowerShell.Crescendo` to telemetry allow list (#15372)
|
||||
|
||||
### General Cmdlet Updates and Fixes
|
||||
|
||||
- Use `$PSStyle.Formatting.FormatAccent` for `Format-List` and `$PSStyle.Formatting.TableHeader` for `Format-Table` output (#14406)
|
||||
- Highlight using error color the exception `Message` and underline in `PositionMessage` for `Get-Error` (#15786)
|
||||
- Implement a completion for View parameter of format cmdlets (#14513) (Thanks @iSazonov!)
|
||||
- Add support to colorize `FileInfo` file names (#14403)
|
||||
- Don't serialize to JSON ETS properties for `DateTime` and `string` types (#15665)
|
||||
- Fix `HyperVSocketEndPoint.ServiceId` setter (#15704) (Thanks @xtqqczze!)
|
||||
- Add `DetailedView` to `$ErrorView` (#15609)
|
||||
|
||||
### Code Cleanup
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@iSazonov, @xtqqczze</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Remove <code>consolehost.proto</code> file (#15741) (Thanks @iSazonov!)</li>
|
||||
<li>Implement <code>IDisposable</code> for <code>ConvertToJsonCommand</code> (#15787) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDisposable</code> implementation for <code>CommandPathSearch</code> (#15793) (Thanks @xtqqczze!)</li>
|
||||
<li>Delete IDE dispose analyzer rules (#15798) (Thanks @xtqqczze!)</li>
|
||||
<li>Seal private classes (#15725) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE0029: <code>UseCoalesceExpression</code> (#15770) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE0070: <code>UseSystemHashCode</code> (#15715) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE0030: <code>UseCoalesceExpressionForNullable</code> (#14289) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix CA1846 and CA1845 for using <code>AsSpan</code> instead of <code>Substring</code> (#15738)</li>
|
||||
<li>Use <code>List<T>.RemoveAll</code> to avoid creating temporary list (#15686) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE0044: <code>MakeFieldReadonly</code> (#13880) (Thanks @xtqqczze!)</li>
|
||||
<li>Disable IDE0130 (#15728) (Thanks @xtqqczze!)</li>
|
||||
<li>Make classes sealed (#15675) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1043: Use integral or string argument for indexers (#14467) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1812 (#15674) (Thanks @xtqqczze!)</li>
|
||||
<li>Replace <code>Single</code> with <code>First</code> when we know the element count is 1 (#15676) (Thanks @xtqqczze!)</li>
|
||||
<li>Skip analyzers for <code>Microsoft.Management.UI.Internal</code> (#15677) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix CA2243: Attribute string literals should parse correctly (#15622) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1401 (#15621) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix CA1309: Use ordinal <code>StringComparison</code> in Certificate Provider (#14352) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix CA1839: Use <code>Environment.ProcessPath</code> (#15650) (Thanks @xtqqczze!)</li>
|
||||
<li>Add new analyzer rules (#15620) (Thanks @xtqqczze!)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Tools
|
||||
|
||||
- Add `SkipRoslynAnalyzers` parameter to `Start-PSBuild` (#15640) (Thanks @xtqqczze!)
|
||||
- Create issue template for issues updating PowerShell through Windows update. (#15700)
|
||||
- Add `DocumentationAnalyzers` to build (#14336) (Thanks @xtqqczze!)
|
||||
- Convert GitHub issue templates to modern forms (#15645)
|
||||
|
||||
### Tests
|
||||
|
||||
- Add more tests for `ConvertFrom-Json` (#15706) (Thanks @strawgate!)
|
||||
- Update `glob-parent` and `hosted-git-info` test dependencies (#15643)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
Update .NET to version <code>v6.0.0-preview.6</code>
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Add new package name for <code>osx-arm64</code> (#15813)</li>
|
||||
<li>Prefer version when available for dotnet-install (#15810)</li>
|
||||
<li>Make warning about MU being required dynamic (#15776)</li>
|
||||
<li>Add <code>Start-PSBootstrap</code> before running tests (#15804)</li>
|
||||
<li>Update to .NET 6 Preview 6 and use <code>crossgen2</code> (#15763)</li>
|
||||
<li>Enable ARM64 packaging for macOS (#15768)</li>
|
||||
<li>Make Microsoft Update opt-out/in check boxes work (#15784)</li>
|
||||
<li>Add Microsoft Update opt out to MSI install (#15727)</li>
|
||||
<li>Bump <code>NJsonSchema</code> from <code>10.4.4</code> to <code>10.4.5</code> (#15769)</li>
|
||||
<li>Fix computation of SHA512 checksum (#15736)</li>
|
||||
<li>Update the script to use quality parameter for <code>dotnet-install</code> (#15731)</li>
|
||||
<li>Generate SHA512 checksum file for all packages (#15678)</li>
|
||||
<li>Enable signing daily release build with lifetime certificate (#15642)</li>
|
||||
<li>Update metadata and README for 7.2.0-preview.7 (#15593)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Fix broken RFC links (#15807)
|
||||
- Add to bug report template getting details from `Get-Error` (#15737)
|
||||
- Update issue templates to link to new docs (#15711)
|
||||
- Add @jborean93 to Remoting Working Group (#15683)
|
||||
|
||||
[7.2.0-preview.8]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.7...v7.2.0-preview.8
|
||||
|
||||
## [7.2.0-preview.7] - 2021-06-17
|
||||
|
||||
### Breaking Changes
|
||||
|
||||
- Remove PSDesiredStateConfiguration v2.0.5 module and published it to the PowerShell Gallery (#15536)
|
||||
|
||||
### Engine Updates and Fixes
|
||||
|
||||
- Fix splatting being treated as positional parameter in completions (#14623) (Thanks @MartinGC94!)
|
||||
- Prevent PowerShell from crashing when a telemetry mutex can't be created (#15574) (Thanks @gukoff!)
|
||||
- Ignore all exceptions when disposing an instance of a subsystem implementation (#15511)
|
||||
- Wait for SSH exit when closing remote connection (#14635) (Thanks @dinhngtu!)
|
||||
|
||||
### Performance
|
||||
|
||||
- Retrieve `ProductVersion` using informational version attribute in `AmsiUtils.Init()` (#15527) (Thanks @Fs00!)
|
||||
|
||||
### General Cmdlet Updates and Fixes
|
||||
|
||||
- Fix retrieving dynamic parameters from provider even if globbed path returns no results (#15525)
|
||||
- Revert "Enhance Remove-Item to work with OneDrive (#15260)" due to long path issue (#15546)
|
||||
|
||||
### Code Cleanup
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@octos4murai, @iSazonov, @Fs00</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Correct parameter name passed to exception in <code>PSCommand</code> constructor (#15580) (Thanks @octos4murai!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.ICommandRuntime</code> (#15566) (Thanks @iSazonov!)</li>
|
||||
<li>Clean up code regarding <code>AppDomain.CreateDomain</code> and <code>AppDomain.Unload</code> (#15554)</li>
|
||||
<li>Replace <code>ProcessModule.FileName</code> with <code>Environment.ProcessPath</code> and remove <code>PSUtils.GetMainModule</code> (#15012) (Thanks @Fs00!)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Tests
|
||||
|
||||
- Fix `Start-Benchmarking` to put `TargetPSVersion` and `TargetFramework` in separate parameter sets (#15508)
|
||||
- Add `win-x86` test package to the build (#15517)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@schuelermine</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Update README.md and metadata.json for version 7.2.0-preview.6 (#15464)</li>
|
||||
<li>Make sure GA revision increases from RC and Preview releases (#15558)</li>
|
||||
<li>Remove <code>SupportsShouldProcess</code> from <code>Start-PSBootstrap</code> in build.psm1 (#15491) (Thanks @schuelermine!)</li>
|
||||
<li>Update <code>DotnetMetadataRuntime.json</code> next channel to take daily build from .NET preview 5 (#15518)</li>
|
||||
<li>Fix <code>deps.json</code> update in the release pipeline (#15486)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Add new members to Engine and Cmdlet Working Groups document (#15560)
|
||||
- Update the `mdspell` command to exclude the folder that should be ignored (#15576)
|
||||
- Replace 'User Voice' with 'Feedback Hub' in `README.md` (#15557)
|
||||
- Update Virtual User Group chat links (#15505) (Thanks @Jaykul!)
|
||||
- Fix typo in `FileSystemProvider.cs` (#15445) (Thanks @eltociear!)
|
||||
- Add `PipelineStoppedException` notes to PowerShell API (#15324)
|
||||
- Updated governance on Working Groups (WGs) (#14603)
|
||||
- Correct and improve XML documentation comments on `PSCommand` (#15568) (Thanks @octos4murai!)
|
||||
|
||||
[7.2.0-preview.7]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.6...v7.2.0-preview.7
|
||||
|
||||
## [7.2.0-preview.6] - 2021-05-27
|
||||
|
||||
### Experimental Features
|
||||
|
||||
- [Breaking Change] Update prediction interface to provide additional feedback to a predictor plugin (#15421)
|
||||
|
||||
### Performance
|
||||
|
||||
- Avoid collecting logs in buffer if a pipeline execution event is not going to be logged (#15350)
|
||||
- Avoid allocation in `LanguagePrimitives.UpdateTypeConvertFromTypeTable` (#15168) (Thanks @xtqqczze!)
|
||||
- Replace `Directory.GetDirectories` with `Directory.EnumerateDirectories` to avoid array allocations (#15167) (Thanks @xtqqczze!)
|
||||
- Use `List.ConvertAll` instead of `LINQ` (#15140) (Thanks @xtqqczze!)
|
||||
|
||||
### General Cmdlet Updates and Fixes
|
||||
|
||||
- Use `AllocConsole` before initializing CLR to ensure codepage is correct for WinRM remoting (PowerShell/PowerShell-Native#70) (Thanks @jborean93!)
|
||||
- Add completions for `#requires` statements (#14596) (Thanks @MartinGC94!)
|
||||
- Add completions for comment-based help keywords (#15337) (Thanks @MartinGC94!)
|
||||
- Move cross platform DSC code to a PowerShell engine subsystem (#15127)
|
||||
- Fix `Minimal` progress view to handle activity that is longer than console width (#15264)
|
||||
- Handle exception if ConsoleHost tries to set cursor out of bounds because screen buffer changed (#15380)
|
||||
- Fix `NullReferenceException` in DSC `ClearCache()` (#15373)
|
||||
- Update `ControlSequenceLength` to handle colon as a virtual terminal parameter separator (#14942)
|
||||
- Update the summary comment for `StopTranscriptCmdlet.cs` (#15349) (Thanks @dbaileyut!)
|
||||
- Remove the unusable alias `d` for the `-Directory` parameter from `Get-ChildItem` (#15171) (Thanks @kvprasoon!)
|
||||
- Fix tab completion for un-localized `about` topics (#15265) (Thanks @MartinGC94!)
|
||||
- Remove the unneeded SSH stdio handle workaround (#15308)
|
||||
- Add `LoadAssemblyFromNativeMemory` API to load assemblies from memory in a native PowerShell host (#14652) (Thanks @awakecoding!)
|
||||
- Re-implement `Remove-Item` OneDrive support (#15260) (Thanks @iSazonov!)
|
||||
- Kill native processes in pipeline when pipeline is disposed on Unix (#15287)
|
||||
- Default to MTA on Windows platforms where STA is not supported (#15106)
|
||||
|
||||
### Code Cleanup
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@xtqqczze, @powercode, @bcwood</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Enable <code>nullable</code> in some classes (#14185, #14177, #14159, #14191, #14162, #14150, #14156, #14161, #14155, #14163, #14181, #14157, #14151) (Thanks @powercode!)</li>
|
||||
<li>Annotate <code>ThrowTerminatingError</code> with <code>DoesNotReturn</code> attribute (#15352) (Thanks @powercode!)</li>
|
||||
<li>Use <code>GetValueOrDefault()</code> for nullable <code>PSLanguageMode</code> (#13849) (Thanks @bcwood!)</li>
|
||||
<li>Enable <code>SA1008</code>: Opening parenthesis should be spaced correctly (#14242) (Thanks @xtqqczze!)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Tools
|
||||
|
||||
- Add `winget` release script (#15050)
|
||||
|
||||
### Tests
|
||||
|
||||
- Enable cross-runtime benchmarking to compare different .NET runtimes (#15387) (Thanks @adamsitnik!)
|
||||
- Add the performance benchmark project for PowerShell performance testing (#15242)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
Update .NET to version <code>v6.0.0-preview.4</code>
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Suppress prompting when uploading the <code>msixbundle</code> package to blob (#15227)</li>
|
||||
<li>Update to .NET preview 4 SDK (#15452)</li>
|
||||
<li>Update <code>AppxManifest.xml</code> with newer OS version to allow PowerShell installed from Windows Store to make system-level changes (#15375)</li>
|
||||
<li>Ensure the build works when <code>PSDesiredStateConfiguration</code> module is pulled in from PSGallery (#15355)</li>
|
||||
<li>Make sure daily release tag does not change when retrying failures (#15286)</li>
|
||||
<li>Improve messages and behavior when there's a problem in finding zip files (#15284)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Add documentation comments section to coding guidelines (#14316) (Thanks @xtqqczze!)
|
||||
|
||||
[7.2.0-preview.6]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.5...v7.2.0-preview.6
|
||||
|
||||
## [7.2.0-preview.5] - 2021-04-14
|
||||
|
||||
### Breaking Changes
|
||||
|
||||
- Make PowerShell Linux deb and RPM packages universal (#15109)
|
||||
- Enforce AppLocker Deny configuration before Execution Policy Bypass configuration (#15035)
|
||||
- Disallow mixed dash and slash in command line parameter prefix (#15142) (Thanks @davidBar-On!)
|
||||
|
||||
### Experimental Features
|
||||
|
||||
- `PSNativeCommandArgumentPassing`: Use `ArgumentList` for native executable invocation (breaking change) (#14692)
|
||||
|
||||
### Engine Updates and Fixes
|
||||
|
||||
- Add `IArgumentCompleterFactory` for parameterized `ArgumentCompleters` (#12605) (Thanks @powercode!)
|
||||
|
||||
### General Cmdlet Updates and Fixes
|
||||
|
||||
- Fix SSH remoting connection never finishing with misconfigured endpoint (#15175)
|
||||
- Respect `TERM` and `NO_COLOR` environment variables for `$PSStyle` rendering (#14969)
|
||||
- Use `ProgressView.Classic` when Virtual Terminal is not supported (#15048)
|
||||
- Fix `Get-Counter` issue with `-Computer` parameter (#15166) (Thanks @krishnayalavarthi!)
|
||||
- Fix redundant iteration while splitting lines (#14851) (Thanks @hez2010!)
|
||||
- Enhance `Remove-Item -Recurse` to work with OneDrive (#14902) (Thanks @iSazonov!)
|
||||
- Change minimum depth to 0 for `ConvertTo-Json` (#14830) (Thanks @kvprasoon!)
|
||||
- Allow `Set-Clipboard` to accept empty string (#14579)
|
||||
- Turn on and off `DECCKM` to modify keyboard mode for Unix native commands to work correctly (#14943)
|
||||
- Fall back to `CopyAndDelete()` when `MoveTo()` fails due to an `IOException` (#15077)
|
||||
|
||||
### Code Cleanup
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@xtqqczze, @iSazonov, @ZhiZe-ZG</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Update .NET to <code>6.0.0-preview.3</code> (#15221)</li>
|
||||
<li>Add space before comma to hosting test to fix error reported by <code>SA1001</code> (#15224)</li>
|
||||
<li>Add <code>SecureStringHelper.FromPlainTextString</code> helper method for efficient secure string creation (#14124) (Thanks @xtqqczze!)</li>
|
||||
<li>Use static lambda keyword (#15154) (Thanks @iSazonov!)</li>
|
||||
<li>Remove unnecessary <code>Array</code> -> <code>List</code> -> <code>Array</code> conversion in <code>ProcessBaseCommand.AllProcesses</code> (#15052) (Thanks @xtqqczze!)</li>
|
||||
<li>Standardize grammar comments in Parser.cs (#15114) (Thanks @ZhiZe-ZG!)</li>
|
||||
<li>Enable <code>SA1001</code>: Commas should be spaced correctly (#14171) (Thanks @xtqqczze!)</li>
|
||||
<li>Refactor <code>MultipleServiceCommandBase.AllServices</code> (#15053) (Thanks @xtqqczze!)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Tools
|
||||
|
||||
- Use Unix line endings for shell scripts (#15180) (Thanks @xtqqczze!)
|
||||
|
||||
### Tests
|
||||
|
||||
- Add the missing tag in Host Utilities tests (#14983)
|
||||
- Update `copy-props` version in `package.json` (#15124)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@JustinGrote</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Fix <code>yarn-lock</code> for <code>copy-props</code> (#15225)</li>
|
||||
<li>Make package validation regex accept universal Linux packages (#15226)</li>
|
||||
<li>Bump NJsonSchema from 10.4.0 to 10.4.1 (#15190)</li>
|
||||
<li>Make MSI and EXE signing always copy to fix daily build (#15191)</li>
|
||||
<li>Sign internals of EXE package so that it works correctly when signed (#15132)</li>
|
||||
<li>Bump Microsoft.NET.Test.Sdk from 16.9.1 to 16.9.4 (#15141)</li>
|
||||
<li>Update daily release tag format to work with new Microsoft Update work (#15164)</li>
|
||||
<li>Feature: Add Ubuntu 20.04 Support to install-powershell.sh (#15095) (Thanks @JustinGrote!)</li>
|
||||
<li>Treat rebuild branches like release branches (#15099)</li>
|
||||
<li>Update WiX to 3.11.2 (#15097)</li>
|
||||
<li>Bump NJsonSchema from 10.3.11 to 10.4.0 (#15092)</li>
|
||||
<li>Allow patching of preview releases (#15074)</li>
|
||||
<li>Bump Newtonsoft.Json from 12.0.3 to 13.0.1 (#15084, #15085)</li>
|
||||
<li>Update the <code>minSize</code> build package filter to be explicit (#15055)</li>
|
||||
<li>Bump NJsonSchema from 10.3.10 to 10.3.11 (#14965)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Merge `7.2.0-preview.4` changes to master (#15056)
|
||||
- Update `README` and `metadata.json` (#15046)
|
||||
- Fix broken links for `dotnet` CLI (#14937)
|
||||
|
||||
[7.2.0-preview.5]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.4...v7.2.0-preview.5
|
||||
|
||||
## [7.2.0-preview.4] - 2021-03-16
|
||||
|
||||
### Breaking Changes
|
||||
|
||||
- Fix `Get-Date -UFormat` `%G` and `%g` behavior (#14555) (Thanks @brianary!)
|
||||
|
||||
### Engine Updates and Fixes
|
||||
|
||||
- Update engine script signature validation to match `Get-AuthenticodeSignature` logic (#14849)
|
||||
- Avoid array allocations from `GetDirectories` and `GetFiles` (#14327) (Thanks @xtqqczze!)
|
||||
|
||||
### General Cmdlet Updates and Fixes
|
||||
|
||||
- Add `UseOSCIndicator` setting to enable progress indicator in terminal (#14927)
|
||||
- Re-enable VT mode on Windows after running command in `ConsoleHost` (#14413)
|
||||
- Fix `Move-Item` for `FileSystemProvider` to use copy-delete instead of move for DFS paths (#14913)
|
||||
- Fix `PromptForCredential()` to add `targetName` as domain (#14504)
|
||||
- Update `Concise` `ErrorView` to not show line information for errors from script module functions (#14912)
|
||||
- Remove the 32,767 character limit on the environment block for `Start-Process` (#14111) (Thanks @hbuckle!)
|
||||
- Don't write possible secrets to verbose stream for web cmdlets (#14788)
|
||||
|
||||
### Tools
|
||||
|
||||
- Update `dependabot` configuration to V2 format (#14882)
|
||||
- Add tooling issue slots in PR template (#14697)
|
||||
|
||||
### Tests
|
||||
|
||||
- Move misplaced test file to tests directory (#14908) (Thanks @MarianoAlipi!)
|
||||
- Refactor MSI CI (#14753)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
Update .NET to version <code>6.0.100-preview.2.21155.3</code>
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Update .NET to version <code>6.0.100-preview.2.21155.3</code> (#15007)</li>
|
||||
<li>Bump <code>Microsoft.PowerShell.Native</code> to <code>7.2.0-preview.1</code> (#15030)</li>
|
||||
<li>Create MSIX Bundle package in release pipeline (#14982)</li>
|
||||
<li>Build self-contained minimal size package for Guest Config team (#14976)</li>
|
||||
<li>Bump XunitXml.TestLogger from 3.0.62 to 3.0.66 (#14993) (Thanks @dependabot[bot]!)</li>
|
||||
<li>Enable building PowerShell for Apple M1 runtime (#14923)</li>
|
||||
<li>Fix the variable name in the condition for miscellaneous analysis CI (#14975)</li>
|
||||
<li>Fix the variable usage in CI yaml (#14974)</li>
|
||||
<li>Disable running markdown link verification in release build CI (#14971)</li>
|
||||
<li>Bump Microsoft.CodeAnalysis.CSharp from 3.9.0-3.final to 3.9.0 (#14934) (Thanks @dependabot[bot]!)</li>
|
||||
<li>Declare which variable group is used for checking the blob in the release build (#14970)</li>
|
||||
<li>Update metadata and script to enable consuming .NET daily builds (#14940)</li>
|
||||
<li>Bump NJsonSchema from 10.3.9 to 10.3.10 (#14933) (Thanks @dependabot[bot]!)</li>
|
||||
<li>Use template that disables component governance for CI (#14938)</li>
|
||||
<li>Add suppress for nuget multi-feed warning (#14893)</li>
|
||||
<li>Bump NJsonSchema from 10.3.8 to 10.3.9 (#14926) (Thanks @dependabot[bot]!)</li>
|
||||
<li>Add exe wrapper to release (#14881)</li>
|
||||
<li>Bump Microsoft.ApplicationInsights from 2.16.0 to 2.17.0 (#14847)</li>
|
||||
<li>Bump Microsoft.NET.Test.Sdk from 16.8.3 to 16.9.1 (#14895) (Thanks @dependabot[bot]!)</li>
|
||||
<li>Bump NJsonSchema from 10.3.7 to 10.3.8 (#14896) (Thanks @dependabot[bot]!)</li>
|
||||
<li>Disable codesign validation where the file type is not supported (#14885)</li>
|
||||
<li>Fixing broken Experimental Feature list in <code>powershell.config.json</code> (#14858)</li>
|
||||
<li>Bump NJsonSchema from 10.3.6 to 10.3.7 (#14855)</li>
|
||||
<li>Add exe wrapper for Microsoft Update scenarios (#14737)</li>
|
||||
<li>Install wget on <code>CentOS</code> 7 docker image (#14857)</li>
|
||||
<li>Fix install-dotnet download (#14856)</li>
|
||||
<li>Fix Bootstrap step in Windows daily test runs (#14820)</li>
|
||||
<li>Bump NJsonSchema from 10.3.5 to 10.3.6 (#14818)</li>
|
||||
<li>Bump <code>NJsonSchema</code> from <code>10.3.4</code> to <code>10.3.5</code> (#14807)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Update `README.md` and `metadata.json` for upcoming releases (#14755)
|
||||
- Merge 7.1.3 and 7.0.6 Change log to master (#15009)
|
||||
- Update `README` and `metadata.json` for releases (#14997)
|
||||
- Update ChangeLog for `v7.1.2` release (#14783)
|
||||
- Update ChangeLog for `v7.0.5` release (#14782) (Internal 14479)
|
||||
|
||||
[7.2.0-preview.4]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.3...v7.2.0-preview.4
|
||||
|
||||
## [7.2.0-preview.3] - 2021-02-11
|
||||
|
||||
### Breaking Changes
|
||||
|
||||
- Fix `Get-Date -UFormat %u` behavior to comply with ISO 8601 (#14549) (Thanks @brianary!)
|
||||
|
||||
### Engine Updates and Fixes
|
||||
|
||||
- Together with `PSDesiredStateConfiguration` `v3` module allows `Get-DscResource`, `Invoke-DscResource` and DSC configuration compilation on all platforms, supported by PowerShell (using class-based DSC resources).
|
||||
|
||||
### Performance
|
||||
|
||||
- Avoid array allocations from `Directory.GetDirectories` and `Directory.GetFiles`. (#14326) (Thanks @xtqqczze!)
|
||||
- Avoid `string.ToLowerInvariant()` from `GetEnvironmentVariableAsBool()` to avoid loading libicu at startup (#14323) (Thanks @iSazonov!)
|
||||
- Get PowerShell version in `PSVersionInfo` using assembly attribute instead of `FileVersionInfo` (#14332) (Thanks @Fs00!)
|
||||
|
||||
### General Cmdlet Updates and Fixes
|
||||
|
||||
- Suppress `Write-Progress` in `ConsoleHost` if output is redirected and fix tests (#14716)
|
||||
- Experimental feature `PSAnsiProgress`: Add minimal progress bar using ANSI rendering (#14414)
|
||||
- Fix web cmdlets to properly construct URI from body when using `-NoProxy` (#14673)
|
||||
- Update the `ICommandPredictor` to provide more feedback and also make feedback easier to be correlated (#14649)
|
||||
- Reset color after writing `Verbose`, `Debug`, and `Warning` messages (#14698)
|
||||
- Fix using variable for nested `ForEach-Object -Parallel` calls (#14548)
|
||||
- When formatting, if collection is modified, don't fail the entire pipeline (#14438)
|
||||
- Improve completion of parameters for attributes (#14525) (Thanks @MartinGC94!)
|
||||
- Write proper error messages for `Get-Command ' '` (#13564) (Thanks @jakekerr!)
|
||||
- Fix typo in the resource string `ProxyURINotSupplied` (#14526) (Thanks @romero126!)
|
||||
- Add support to `$PSStyle` for strikethrough and hyperlinks (#14461)
|
||||
- Fix `$PSStyle` blink codes (#14447) (Thanks @iSazonov!)
|
||||
|
||||
### Code Cleanup
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@xtqqczze, @powercode</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Fix coding style issues: RCS1215, IDE0090, SA1504, SA1119, RCS1139, IDE0032 (#14356, #14341, #14241, #14204, #14442, #14443) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable coding style checks: CA2249, CA1052, IDE0076, IDE0077, SA1205, SA1003, SA1314, SA1216, SA1217, SA1213 (#14395, #14483, #14494, #14495, #14441, #14476, #14470, #14471, #14472) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable nullable in PowerShell codebase (#14160, #14172, #14088, #14154, #14166, #14184, #14178) (Thanks @powercode!)</li>
|
||||
<li>Use <code>string.Split(char)</code> instead of <code>string.Split(string)</code> (#14465) (Thanks @xtqqczze!)</li>
|
||||
<li>Use <code>string.Contains(char)</code> overload (#14368) (Thanks @xtqqczze!)</li>
|
||||
<li>Refactor complex <code>if</code> statements (#14398) (Thanks @xtqqczze!)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Tools
|
||||
|
||||
- Update script to use .NET 6 build resources (#14705)
|
||||
- Fix the daily GitHub action (#14711) (Thanks @imba-tjd!)
|
||||
- GitHub Actions: fix deprecated `::set-env` (#14629) (Thanks @imba-tjd!)
|
||||
- Update markdown test tools (#14325) (Thanks @RDIL!)
|
||||
- Upgrade `StyleCopAnalyzers` to `v1.2.0-beta.312` (#14354) (Thanks @xtqqczze!)
|
||||
|
||||
### Tests
|
||||
|
||||
- Remove packaging from daily Windows build (#14749)
|
||||
- Update link to the Manning book (#14750)
|
||||
- A separate Windows packaging CI (#14670)
|
||||
- Update `ini` component version in test `package.json` (#14454)
|
||||
- Disable `libmi` dependent tests for macOS. (#14446)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<ul>
|
||||
<li>Fix the NuGet feed name and URL for .NET 6</li>
|
||||
<li>Fix third party signing for files in sub-folders (#14751)</li>
|
||||
<li>Make build script variable an <code>ArrayList</code> to enable <code>Add()</code> method (#14748)</li>
|
||||
<li>Remove old .NET SDKs to make <code>dotnet restore</code> work with the latest SDK in CI pipeline (#14746)</li>
|
||||
<li>Remove outdated Linux dependencies (#14688)</li>
|
||||
<li>Bump .NET SDK version to 6.0.0-preview.1 (#14719)</li>
|
||||
<li>Bump <code>NJsonSchema</code> to 10.3.4 (#14714)</li>
|
||||
<li>Update daily GitHub action to allow manual trigger (#14718)</li>
|
||||
<li>Bump <code>XunitXml.TestLogger</code> to 3.0.62 (#14702)</li>
|
||||
<li>Make universal deb package based on the deb package specification (#14681)</li>
|
||||
<li>Add manual release automation steps and improve changelog script (#14445)</li>
|
||||
<li>Fix release build to upload global tool packages to artifacts (#14620)</li>
|
||||
<li>Port changes from the PowerShell v7.0.4 release (#14637)</li>
|
||||
<li>Port changes from the PowerShell v7.1.1 release (#14621)</li>
|
||||
<li>Updated README and <code>metadata.json</code> (#14401, #14606, #14612)</li>
|
||||
<li>Do not push nupkg artifacts to MyGet (#14613)</li>
|
||||
<li>Use one feed in each <code>nuget.config</code> in official builds (#14363)</li>
|
||||
<li>Fix path signed RPMs are uploaded from in release build (#14424)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Update distribution support request template to point to .NET 5.0 support document (#14578)
|
||||
- Remove security GitHub issue template (#14453)
|
||||
- Add intent for using the Discussions feature in repo (#14399)
|
||||
- Fix Universal Dashboard to refer to PowerShell Universal (#14437)
|
||||
- Update document link because of HTTP 301 redirect (#14431) (Thanks @xtqqczze!)
|
||||
|
||||
[7.2.0-preview.3]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.2...v7.2.0-preview.3
|
||||
|
||||
## [7.2.0-preview.2] - 2020-12-15
|
||||
|
||||
### Breaking Changes
|
||||
|
||||
- Improve detection of mutable value types (#12495) (Thanks @vexx32!)
|
||||
- Ensure `-PipelineVariable` is set for all output from script cmdlets (#12766) (Thanks @vexx32!)
|
||||
|
||||
### Experimental Features
|
||||
|
||||
- `PSAnsiRendering`: Enable ANSI formatting via `$PSStyle` and support suppressing ANSI output (#13758)
|
||||
|
||||
### Performance
|
||||
|
||||
- Optimize `IEnumerable` variant of replace operator (#14221) (Thanks @iSazonov!)
|
||||
- Refactor multiply operation for better performance in two `Microsoft.PowerShell.Commands.Utility` methods (#14148) (Thanks @xtqqczze!)
|
||||
- Use `Environment.TickCount64` instead of `Datetime.Now` as the random seed for AppLocker test file content (#14283) (Thanks @iSazonov!)
|
||||
- Avoid unnecessary array allocations when searching in GAC (#14291) (Thanks @xtqqczze!)
|
||||
- Use `OrdinalIgnoreCase` in `CommandLineParser` (#14303) (Thanks @iSazonov!)
|
||||
- Use `StringComparison.Ordinal` instead of `StringComparison.CurrentCulture` (#14298) (Thanks @iSazonov!)
|
||||
- Avoid creating instances of the generated delegate helper class in `-replace` implementation (#14128)
|
||||
|
||||
### General Cmdlet Updates and Fixes
|
||||
|
||||
- Write better error message if config file is broken (#13496) (Thanks @iSazonov!)
|
||||
- Make AppLocker Enforce mode take precedence over UMCI Audit mode (#14353)
|
||||
- Add `-SkipLimitCheck` switch to `Import-PowerShellDataFile` (#13672)
|
||||
- Restrict `New-Object` in NoLanguage mode under lock down (#14140) (Thanks @krishnayalavarthi!)
|
||||
- The `-Stream` parameter now works with directories (#13941) (Thanks @kyanha!)
|
||||
- Avoid an exception if file system does not support reparse points (#13634) (Thanks @iSazonov!)
|
||||
- Enable `CA1012`: Abstract types should not have public constructors (#13940) (Thanks @xtqqczze!)
|
||||
- Enable `SA1212`: Property accessors should follow order (#14051) (Thanks @xtqqczze!)
|
||||
|
||||
### Code Cleanup
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@xtqqczze, @matthewjdegarmo, @powercode, @Gimly</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Enable <code>SA1007</code>: Operator keyword should be followed by space (#14130) (Thanks @xtqqczze!)</li>
|
||||
<li>Expand <code>where</code> alias to <code>Where-Object</code> in <code>Reset-PWSHSystemPath.ps1</code> (#14113) (Thanks @matthewjdegarmo!)</li>
|
||||
<li>Fix whitespace issues (#14092) (Thanks @xtqqczze!)</li>
|
||||
<li>Add <code>StyleCop.Analyzers</code> package (#13963) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>IDE0041</code>: <code>UseIsNullCheck</code> (#14041) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>IDE0082</code>: <code>ConvertTypeOfToNameOf</code> (#14042) (Thanks @xtqqczze!)</li>
|
||||
<li>Remove unnecessary usings part 4 (#14023) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>PriorityAttribute</code> name (#14094) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Interpreter.IBoxableInstruction</code> (#14165) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Provider.IDynamicPropertyProvider</code> (#14167) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Language.IScriptExtent</code> (#14179) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Language.ICustomAstVisitor2</code> (#14192) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.LanguagePrimitives.IConversionData</code> (#14187) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Automation.Remoting.Client.IWSManNativeApiFacade</code> (#14186) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Language.ISupportsAssignment</code> (#14180) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.ICommandRuntime2</code> (#14183) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.IOutputProcessingState</code> (#14175) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.IJobDebugger</code> (#14174) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Interpreter.IInstructionProvider</code> (#14173) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.IHasSessionStateEntryVisibility</code> (#14169) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Tracing.IEtwEventCorrelator</code> (#14168) (Thanks @powercode!)</li>
|
||||
<li>Fix syntax error in Windows packaging script (#14377)</li>
|
||||
<li>Remove redundant local assignment in <code>AclCommands</code> (#14358) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Language.IAstPostVisitHandler</code> (#14164) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.IModuleAssemblyInitializer</code> (#14158) (Thanks @powercode!)</li>
|
||||
<li>Use <code>Microsoft.PowerShell.MarkdownRender</code> package from <code>nuget.org</code> (#14090)</li>
|
||||
<li>Replace <code>GetFiles</code> in <code>TestModuleManifestCommand</code> (#14317) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Provider.IContentWriter</code> (#14152) (Thanks @powercode!)</li>
|
||||
<li>Simplify getting Encoding in <code>TranscriptionOption.FlushContentToDisk</code> (#13910) (Thanks @Gimly!)</li>
|
||||
<li>Mark applicable structs as <code>readonly</code> and use <code>in</code>-modifier (#13919) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.IArgumentCompleter</code> (#14182) (Thanks @powercode!)</li>
|
||||
<li>Enable <code>CA1822</code>: Mark <code>private</code> members as <code>static</code> (#13897) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 6 (#14338) (Thanks @xtqqczze!)</li>
|
||||
<li>Avoid array allocations from <code>GetDirectories</code>/<code>GetFiles</code>. (#14328) (Thanks @xtqqczze!)</li>
|
||||
<li>Avoid array allocations from <code>GetDirectories</code>/<code>GetFiles</code>. (#14330) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>RCS1188</code>: Remove redundant auto-property initialization part 2 (#14262) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Host.IHostSupportsInteractiveSession</code> (#14170) (Thanks @powercode!)</li>
|
||||
<li>Enable nullable: <code>System.Management.Automation.Provider.IPropertyCmdletProvider</code> (#14176) (Thanks @powercode!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify new expression part 5 (#14301) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>IDE0075</code>: <code>SimplifyConditionalExpression</code> (#14078) (Thanks @xtqqczze!)</li>
|
||||
<li>Remove unnecessary usings part 9 (#14288) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix StyleCop and MarkdownLint CI failures (#14297) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>SA1000</code>: Keywords should be spaced correctly (#13973) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>RCS1188</code>: Remove redundant auto-property initialization part 1 (#14261) (Thanks @xtqqczze!)</li>
|
||||
<li>Mark <code>private</code> members as <code>static</code> part 10 (#14235) (Thanks @xtqqczze!)</li>
|
||||
<li>Mark <code>private</code> members as <code>static</code> part 9 (#14234) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>SA1642</code> for <code>Microsoft.Management.Infrastructure.CimCmdlets</code> (#14239) (Thanks @xtqqczze!)</li>
|
||||
<li>Use <code>AsSpan</code>/<code>AsMemory</code> slice constructor (#14265) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.6 (#14260) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.5 (#14259) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.3 (#14257) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.2 (#14256) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 2 (#14200) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>SA1643</code>: Destructor summary documentation should begin with standard text (#14236) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify new expression part 4.4 (#14258) (Thanks @xtqqczze!)</li>
|
||||
<li>Use xml documentation child blocks correctly (#14249) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 4.1 (#14255) (Thanks @xtqqczze!)</li>
|
||||
<li>Use consistent spacing in xml documentation tags (#14231) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>IDE0074</code>: Use coalesce compound assignment (#13396) (Thanks @xtqqczze!)</li>
|
||||
<li>Remove unnecessary finalizers (#14248) (Thanks @xtqqczze!)</li>
|
||||
<li>Mark local variable as <code>const</code> (#13217) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0032</code>: <code>UseAutoProperty</code> part 2 (#14244) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0032</code>: <code>UseAutoProperty</code> part 1 (#14243) (Thanks @xtqqczze!)</li>
|
||||
<li>Mark <code>private</code> members as <code>static</code> part 8 (#14233) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 6 (#14229) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 5 (#14228) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 4 (#14227) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 3 (#14226) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 2 (#14225) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 1 (#14224) (Thanks @xtqqczze!)</li>
|
||||
<li>Use <code>see</code> keyword in documentation (#14220) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>CA2211</code>: Non-constant fields should not be visible (#14073) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>CA1816</code>: <code>Dispose</code> methods should call <code>SuppressFinalize</code> (#14074) (Thanks @xtqqczze!)</li>
|
||||
<li>Remove incorrectly implemented finalizer (#14246) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>CA1822</code>: Mark members as <code>static</code> part 7 (#14230) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>SA1122</code>: Use <code>string.Empty</code> for empty strings (#14218) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix various xml documentation issues (#14223) (Thanks @xtqqczze!)</li>
|
||||
<li>Remove unnecessary <code>using</code>s part 8 (#14072) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>SA1006</code>: Preprocessor keywords should not be preceded by space (#14052) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>SA1642</code> for <code>Microsoft.PowerShell.Commands.Utility</code> (#14142) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>CA2216</code>: Disposable types should declare finalizer (#14089) (Thanks @xtqqczze!)</li>
|
||||
<li>Wrap and name <code>LoadBinaryModule</code> arguments (#14193) (Thanks @xtqqczze!)</li>
|
||||
<li>Wrap and name <code>GetListOfFilesFromData</code> arguments (#14194) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>SA1002</code>: Semicolons should be spaced correctly (#14197) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 3 (#14201) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>SA1106</code>: Code should not contain empty statements (#13964) (Thanks @xtqqczze!)</li>
|
||||
<li>Code performance fixes follow-up (#14207) (Thanks @xtqqczze!)</li>
|
||||
<li>Remove uninformative comments (#14199) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix <code>IDE0090</code>: Simplify <code>new</code> expression part 1 (#14027) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>SA1517</code>: Code should not contain blank lines at start of file (#14131) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>SA1131</code>: Use readable conditions (#14132) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>SA1507</code>: Code should not contain multiple blank lines in a row (#14136) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>SA1516</code> Elements should be separated by blank line (#14137) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>IDE0031</code>: Null check can be simplified (#13548) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>CA1065</code>: Do not raise exceptions in unexpected locations (#14117) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable <code>CA1000</code>: Do not declare <code>static</code> members on generic types (#14097) (Thanks @xtqqczze!)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Tools
|
||||
|
||||
- Fixing formatting in `Reset-PWSHSystemPath.ps1` (#13689) (Thanks @dgoldman-msft!)
|
||||
|
||||
### Tests
|
||||
|
||||
- Reinstate `Test-Connection` tests (#13324)
|
||||
- Update markdown test packages with security fixes (#14145)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<ul>
|
||||
<li>Fix a typo in the <code>Get-ChangeLog</code> function (#14129)</li>
|
||||
<li>Update <code>README</code> and <code>metadata.json</code> for <code>7.2.0-preview.1</code> release (#14104)</li>
|
||||
<li>Bump <code>NJsonSchema</code> from <code>10.2.2</code> to <code>10.3.1</code> (#14040)</li>
|
||||
<li>Move windows package signing to use ESRP (#14060)</li>
|
||||
<li>Use one feed in each <code>nuget.config</code> in official builds (#14363)</li>
|
||||
<li>Fix path signed RPMs are uploaded from in release build (#14424)</li>
|
||||
<li>Add <code>Microsoft.PowerShell.MarkdownRender</code> to the package reference list (#14386)</li>
|
||||
<li>Fix issue with unsigned build (#14367)</li>
|
||||
<li>Move macOS and nuget to ESRP signing (#14324)</li>
|
||||
<li>Fix nuget packaging to scrub <code>NullableAttribute</code> (#14344)</li>
|
||||
<li>Bump <code>Microsoft.NET.Test.Sdk</code> from 16.8.0 to 16.8.3 (#14310)</li>
|
||||
<li>Bump <code>Markdig.Signed</code> from 0.22.0 to 0.22.1 (#14305)</li>
|
||||
<li>Bump <code>Microsoft.ApplicationInsights</code> from 2.15.0 to 2.16.0 (#14031)</li>
|
||||
<li>Move Linux to ESRP signing (#14210)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Fix example `nuget.config` (#14349)
|
||||
- Fix a broken link in Code Guidelines doc (#14314) (Thanks @iSazonov!)
|
||||
|
||||
[7.2.0-preview.2]: https://github.com/PowerShell/PowerShell/compare/v7.2.0-preview.1...v7.2.0-preview.2
|
||||
|
||||
## [7.2.0-preview.1] - 2020-11-17
|
||||
|
||||
### Engine Updates and Fixes
|
||||
|
||||
- Change the default fallback encoding for `GetEncoding` in `Start-Transcript` to be `UTF8` without a BOM (#13732) (Thanks @Gimly!)
|
||||
|
||||
### General Cmdlet Updates and Fixes
|
||||
|
||||
- Update `pwsh -?` output to match docs (#13748)
|
||||
- Fix `NullReferenceException` in `Test-Json` (#12942) (Thanks @iSazonov!)
|
||||
- Make `Dispose` in `TranscriptionOption` idempotent (#13839) (Thanks @krishnayalavarthi!)
|
||||
- Add additional Microsoft PowerShell modules to the tracked modules list (#12183)
|
||||
- Relax further `SSL` verification checks for `WSMan` on non-Windows hosts with verification available (#13786) (Thanks @jborean93!)
|
||||
- Add the `OutputTypeAttribute` to `Get-ExperimentalFeature` (#13738) (Thanks @ThomasNieto!)
|
||||
- Fix blocking wait when starting file associated with a Windows application (#13750)
|
||||
- Emit warning if `ConvertTo-Json` exceeds `-Depth` value (#13692)
|
||||
|
||||
### Code Cleanup
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@xtqqczze, @mkswd, @ThomasNieto, @PatLeong, @paul-cheung, @georgettica</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Fix RCS1049: Simplify boolean comparison (#13994) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE0062: Make local function static (#14044) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA2207: Initialize value type static fields inline (#14068) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1837: Use <code>ProcessId</code> and <code>CurrentManagedThreadId</code> from <code>System.Environment</code> (#14063) (Thanks @xtqqczze and @PatLeong!)</li>
|
||||
<li>Remove unnecessary using directives (#14014, #14017, #14021, #14050, #14065, #14066, #13863, #13860, #13861, #13814) (Thanks @xtqqczze and @ThomasNieto!)</li>
|
||||
<li>Remove unnecessary usage of LINQ <code>Count</code> method (#13545) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix SA1518: The code must not contain extra blank lines at the end of the file (#13574) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1829: Use the <code>Length</code> or <code>Count</code> property instead of <code>Count()</code> (#13925) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1827: Do not use <code>Count()</code> or <code>LongCount()</code> when <code>Any()</code> can be used (#13923) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable or fix nullable usage in a few files (#13793, #13805, #13808, #14018, #13804) (Thanks @mkswd and @georgettica!)</li>
|
||||
<li>Enable IDE0040: Add accessibility modifiers (#13962, #13874) (Thanks @xtqqczze!)</li>
|
||||
<li>Make applicable private Guid fields readonly (#14000) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix CA1003: Use generic event handler instances (#13937) (Thanks @xtqqczze!)</li>
|
||||
<li>Simplify delegate creation (#13578) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix RCS1033: Remove redundant boolean literal (#13454) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix RCS1221: Use pattern matching instead of combination of <code>as</code> operator and null check (#13333) (Thanks @xtqqczze!)</li>
|
||||
<li>Use <code>is not</code> syntax (#13338) (Thanks @xtqqczze!)</li>
|
||||
<li>Replace magic number with constant in PDH (#13536) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix accessor order (#13538) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE0054: Use compound assignment (#13546) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix RCS1098: Constant values should be on right side of comparisons (#13833) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1068: <code>CancellationToken</code> parameters must come last (#13867) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA10XX rules with suggestion severity (#13870, #13928, #13924) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE0064: Make Struct fields writable (#13945) (Thanks @xtqqczze!)</li>
|
||||
<li>Run <code>dotnet-format</code> to improve formatting of source code (#13503) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1825: Avoid zero-length array allocations (#13961) (Thanks @xtqqczze!)</li>
|
||||
<li>Add IDE analyzer rule IDs to comments (#13960) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1830: Prefer strongly-typed <code>Append</code> and <code>Insert</code> method overloads on <code>StringBuilder</code> (#13926) (Thanks @xtqqczze!)</li>
|
||||
<li>Enforce code style in build (#13957) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1836: Prefer <code>IsEmpty</code> over <code>Count</code> when available (#13877) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1834: Consider using <code>StringBuilder.Append(char)</code> when applicable (#13878) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix IDE0044: Make field readonly (#13884, #13885, #13888, #13892, #13889, #13886, #13890, #13891, #13887, #13893, #13969, #13967, #13968, #13970, #13971, #13966, #14012) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE0048: Add required parentheses (#13896) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE1005: Invoke delegate with conditional access (#13911) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable IDE0036: Enable the check on the order of modifiers (#13958, #13881) (Thanks @xtqqczze!)</li>
|
||||
<li>Use span-based <code>String.Concat</code> instead of <code>String.Substring</code> (#13500) (Thanks @xtqqczze!)</li>
|
||||
<li>Enable CA1050: Declare types in namespace (#13872) (Thanks @xtqqczze!)</li>
|
||||
<li>Fix minor keyword typo in C# code comment (#13811) (Thanks @paul-cheung!)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Tools
|
||||
|
||||
- Enable `CodeQL` Security scanning (#13894)
|
||||
- Add global `AnalyzerConfig` with default configuration (#13835) (Thanks @xtqqczze!)
|
||||
|
||||
### Build and Packaging Improvements
|
||||
|
||||
<details>
|
||||
|
||||
<summary>
|
||||
|
||||
<p>We thank the following contributors!</p>
|
||||
<p>@mkswd, @xtqqczze</p>
|
||||
|
||||
</summary>
|
||||
|
||||
<ul>
|
||||
<li>Bump <code>Microsoft.NET.Test.Sdk</code> to <code>16.8.0</code> (#14020)</li>
|
||||
<li>Bump <code>Microsoft.CodeAnalysis.CSharp</code> to <code>3.8.0</code> (#14075)</li>
|
||||
<li>Remove workarounds for .NET 5 RTM builds (#14038)</li>
|
||||
<li>Migrate 3rd party signing to ESRP (#14010)</li>
|
||||
<li>Fixes to release pipeline for GA release (#14034)</li>
|
||||
<li>Don't do a shallow checkout (#13992)</li>
|
||||
<li>Add validation and dependencies for Ubuntu 20.04 distribution to packaging script (#13993)</li>
|
||||
<li>Add .NET install workaround for RTM (#13991)</li>
|
||||
<li>Move to ESRP signing for Windows files (#13988)</li>
|
||||
<li>Update <code>PSReadLine</code> version to <code>2.1.0</code> (#13975)</li>
|
||||
<li>Bump .NET to version <code>5.0.100-rtm.20526.5</code> (#13920)</li>
|
||||
<li>Update script to use .NET RTM feeds (#13927)</li>
|
||||
<li>Add checkout step to release build templates (#13840)</li>
|
||||
<li>Turn on <code>/features:strict</code> for all projects (#13383) (Thanks @xtqqczze!)</li>
|
||||
<li>Bump <code>NJsonSchema</code> to <code>10.2.2</code> (#13722, #13751)</li>
|
||||
<li>Add flag to make Linux script publish to production repo (#13714)</li>
|
||||
<li>Bump <code>Markdig.Signed</code> to <code>0.22.0</code> (#13741)</li>
|
||||
<li>Use new release script for Linux packages (#13705)</li>
|
||||
</ul>
|
||||
|
||||
</details>
|
||||
|
||||
### Documentation and Help Content
|
||||
|
||||
- Fix links to LTS versions for Windows (#14070)
|
||||
- Fix `crontab` formatting in example doc (#13712) (Thanks @dgoldman-msft!)
|
||||
|
||||
[7.2.0-preview.1]: https://github.com/PowerShell/PowerShell/compare/v7.1.0...v7.2.0-preview.1
|
||||
|
|
|
@ -1,15 +1,13 @@
|
|||
{
|
||||
"sdk": {
|
||||
"channel": "6.0.1xx",
|
||||
"channel": "6.0.1xx-rc1",
|
||||
"quality": "signed",
|
||||
"qualityFallback": "daily",
|
||||
"packageVersionPattern": "6.0.0",
|
||||
"packageVersionPattern": "6.0.0-rc.1",
|
||||
"sdkImageVersion": "6.0.100",
|
||||
"nextChannel": "6.0.1xx",
|
||||
"azureFeed": "",
|
||||
"sdkImageOverride": ""
|
||||
"nextChannel": "6.0.1xx-rc1"
|
||||
},
|
||||
"internalfeed" : {
|
||||
"url": ""
|
||||
"url": "https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21430.44-shipping/nuget/v2"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -138,7 +138,6 @@
|
|||
<TargetFramework>net6.0</TargetFramework>
|
||||
<LangVersion>10.0</LangVersion>
|
||||
<PublishReadyToRun Condition=" '$(Configuration)' != 'Debug' ">true</PublishReadyToRun>
|
||||
<PublishReadyToRunEmitSymbols>true</PublishReadyToRunEmitSymbols>
|
||||
|
||||
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
|
||||
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
|
||||
|
|
112
README.md
112
README.md
|
@ -30,19 +30,19 @@ You can download and install a PowerShell package for any of the following platf
|
|||
| -------------------------------------------| ------------------------| ------------------------| ----------------------| ------------------------------|
|
||||
| [Windows (x64)][corefx-win] | [.msi][lts-windows-64] | [.msi][rl-windows-64] | [.msi][pv-windows-64] | [Instructions][in-windows] |
|
||||
| [Windows (x86)][corefx-win] | [.msi][lts-windows-86] | [.msi][rl-windows-86] | [.msi][pv-windows-86] | [Instructions][in-windows] |
|
||||
| [Ubuntu 20.04][corefx-linux] | [.deb][lts-deb] | [.deb][rl-ubuntu20] | [.deb][pv-deb] | [Instructions][in-ubuntu20] |
|
||||
| [Ubuntu 18.04][corefx-linux] | [.deb][lts-deb] | [.deb][rl-ubuntu18] | [.deb][pv-deb] | [Instructions][in-ubuntu18] |
|
||||
| [Ubuntu 16.04][corefx-linux] | [.deb][lts-deb] | [.deb][rl-ubuntu16] | [.deb][pv-deb] | [Instructions][in-ubuntu16] |
|
||||
| [Debian 9][corefx-linux] | [.deb][lts-deb] | [.deb][rl-debian9] | [.deb][pv-deb] | [Instructions][in-deb9] |
|
||||
| [Debian 10][corefx-linux] | [.deb][lts-deb] | [.deb][rl-debian10] | [.deb][pv-deb] | [Instructions][in-deb9] |
|
||||
| [Debian 11][corefx-linux] | [.deb][lts-deb] | [.deb][rl-debian11] | [.deb][pv-deb] | |
|
||||
| [CentOS 7][corefx-linux] | [.rpm][lts-rh] | [.rpm][rl-centos] | [.rpm][pv-rpm] | [Instructions][in-centos] |
|
||||
| [CentOS 8][corefx-linux] | [.rpm][lts-rh] | [.rpm][rl-centos8] | [.rpm][pv-rpm] | |
|
||||
| [Red Hat Enterprise Linux 7][corefx-linux] | [.rpm][lts-rh] | [.rpm][rl-centos] | [.rpm][pv-rpm] | [Instructions][in-rhel7] |
|
||||
| [openSUSE 42.3][corefx-linux] | [.rpm][lts-rh] | [.rpm][rl-centos] | [.rpm][pv-rpm] | [Instructions][in-opensuse] |
|
||||
| [Fedora 30][corefx-linux] | [.rpm][lts-rh] | [.rpm][rl-centos] | [.rpm][pv-rpm] | [Instructions][in-fedora] |
|
||||
| [Ubuntu 20.04][corefx-linux] | | [.deb][rl-ubuntu20] | [.deb][pv-deb] | [Instructions][in-ubuntu20] |
|
||||
| [Ubuntu 18.04][corefx-linux] | [.deb][lts-ubuntu18] | [.deb][rl-ubuntu18] | [.deb][pv-deb] | [Instructions][in-ubuntu18] |
|
||||
| [Ubuntu 16.04][corefx-linux] | [.deb][lts-ubuntu16] | [.deb][rl-ubuntu16] | [.deb][pv-deb] | [Instructions][in-ubuntu16] |
|
||||
| [Debian 9][corefx-linux] | [.deb][lts-debian9] | [.deb][rl-debian9] | [.deb][pv-deb] | [Instructions][in-deb9] |
|
||||
| [Debian 10][corefx-linux] | [.deb][lts-debian10] | [.deb][rl-debian10] | [.deb][pv-deb] | [Instructions][in-deb9] |
|
||||
| [Debian 11][corefx-linux] | | [.deb][rl-debian11] | [.deb][pv-deb] | |
|
||||
| [CentOS 7][corefx-linux] | [.rpm][lts-centos] | [.rpm][rl-centos] | [.rpm][pv-rpm] | [Instructions][in-centos] |
|
||||
| [CentOS 8][corefx-linux] | [.rpm][lts-centos8] | [.rpm][rl-centos8] | [.rpm][pv-rpm] | |
|
||||
| [Red Hat Enterprise Linux 7][corefx-linux] | [.rpm][lts-centos] | [.rpm][rl-centos] | [.rpm][pv-rpm] | [Instructions][in-rhel7] |
|
||||
| [openSUSE 42.3][corefx-linux] | [.rpm][lts-centos] | [.rpm][rl-centos] | [.rpm][pv-rpm] | [Instructions][in-opensuse] |
|
||||
| [Fedora 30][corefx-linux] | [.rpm][lts-centos] | [.rpm][rl-centos] | [.rpm][pv-rpm] | [Instructions][in-fedora] |
|
||||
| [macOS 10.13+ (x64)][corefx-macos] | [.pkg][lts-macos] | [.pkg][rl-macos] | [.pkg][pv-macos] | [Instructions][in-macos] |
|
||||
| [macOS 10.13+ (arm64)][corefx-macos] | [.pkg][lts-macos-arm64] | [.pkg][rl-macos-arm64] | [.pkg][pv-macos-arm64]| [Instructions][in-macos] |
|
||||
| [macOS 10.13+ (arm64)][corefx-macos] | | | [.pkg][pv-macos-arm64]| [Instructions][in-macos] |
|
||||
| Docker | | | | [Instructions][in-docker] |
|
||||
|
||||
You can download and install a PowerShell package for any of the following platforms, **which are supported by the community.**
|
||||
|
@ -59,54 +59,55 @@ You can also download the PowerShell binary archives for Windows, macOS and Linu
|
|||
| ---------------| --------------------------------------------------- | ------------------------------------------------| -----------------------------------------------|
|
||||
| Windows | [32-bit][rl-winx86-zip]/[64-bit][rl-winx64-zip] | [32-bit][pv-winx86-zip]/[64-bit][pv-winx64-zip] | [Instructions][in-windows-zip] |
|
||||
| macOS (x64) | [64-bit][rl-macos-tar] | [64-bit][pv-macos-tar] | [Instructions][in-tar-macos] |
|
||||
| macOS (arm64) | [64-bit][rl-macos-tar-arm64] | [64-bit][pv-macos-tar-arm64] | [Instructions][in-tar-macos] |
|
||||
| macOS (arm64) | | [64-bit][pv-macos-tar-arm64] | [Instructions][in-tar-macos] |
|
||||
| Linux | [64-bit][rl-linux-tar] | [64-bit][pv-linux-tar] | [Instructions][in-tar-linux] |
|
||||
| Windows (Arm) | [64-bit][rl-winarm64] (preview) | [64-bit][pv-winarm64] | [Instructions][in-arm] |
|
||||
| Raspbian (Arm) | [32-bit][rl-arm32]/[64-bit][rl-arm64] | [32-bit][pv-arm32]/[64-bit][pv-arm64] | [Instructions][in-raspbian] |
|
||||
|
||||
[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x86.msi
|
||||
[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x64.msi
|
||||
[lts-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-lts_7.2.0-1.deb_amd64.deb
|
||||
[lts-rh]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-lts-7.2.0-1.rh.x86_64.rpm
|
||||
[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-lts-7.2.0-osx-x64.pkg
|
||||
[lts-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-lts-7.2.0-osx-arm64.pkg
|
||||
[lts-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/PowerShell-7.0.7-win-x86.msi
|
||||
[lts-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/PowerShell-7.0.7-win-x64.msi
|
||||
[lts-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts_7.0.7-1.ubuntu.18.04_amd64.deb
|
||||
[lts-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts_7.0.7-1.ubuntu.16.04_amd64.deb
|
||||
[lts-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts_7.0.7-1.debian.9_amd64.deb
|
||||
[lts-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts_7.0.7-1.debian.10_amd64.deb
|
||||
[lts-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts-7.0.7-1.rhel.7.x86_64.rpm
|
||||
[lts-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts-7.0.7-1.centos.8.x86_64.rpm
|
||||
[lts-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.0.7/powershell-lts-7.0.7-osx-x64.pkg
|
||||
|
||||
[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x64.msi
|
||||
[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x86.msi
|
||||
[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
|
||||
[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
|
||||
[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
|
||||
[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
|
||||
[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
|
||||
[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell_7.2.0-1.deb_amd64.deb
|
||||
[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-1.rh.x86_64.rpm
|
||||
[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-1.rh.x86_64.rpm
|
||||
[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-osx-x64.pkg
|
||||
[rl-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-osx-arm64.pkg
|
||||
[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-arm64.zip
|
||||
[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x86.zip
|
||||
[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/PowerShell-7.2.0-win-x64.zip
|
||||
[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-osx-x64.tar.gz
|
||||
[rl-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-osx-arm64.tar.gz
|
||||
[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-linux-x64.tar.gz
|
||||
[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-linux-arm32.tar.gz
|
||||
[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0/powershell-7.2.0-linux-arm64.tar.gz
|
||||
[rl-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x64.msi
|
||||
[rl-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x86.msi
|
||||
[rl-ubuntu20]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.ubuntu.20.04_amd64.deb
|
||||
[rl-ubuntu18]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.ubuntu.18.04_amd64.deb
|
||||
[rl-ubuntu16]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.ubuntu.16.04_amd64.deb
|
||||
[rl-debian9]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.debian.9_amd64.deb
|
||||
[rl-debian10]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.debian.10_amd64.deb
|
||||
[rl-debian11]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell_7.1.4-1.debian.11_amd64.deb
|
||||
[rl-centos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-1.rhel.7.x86_64.rpm
|
||||
[rl-centos8]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-1.centos.8.x86_64.rpm
|
||||
[rl-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-osx-x64.pkg
|
||||
[rl-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-arm64.zip
|
||||
[rl-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x86.zip
|
||||
[rl-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/PowerShell-7.1.4-win-x64.zip
|
||||
[rl-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-osx-x64.tar.gz
|
||||
[rl-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-linux-x64.tar.gz
|
||||
[rl-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-linux-arm32.tar.gz
|
||||
[rl-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.1.4/powershell-7.1.4-linux-arm64.tar.gz
|
||||
[rl-snap]: https://snapcraft.io/powershell
|
||||
|
||||
[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-x64.msi
|
||||
[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-x86.msi
|
||||
[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-preview_7.2.0-rc.1-1.deb_amd64.deb
|
||||
[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-preview-7.2.0_rc.1-1.rh.x86_64.rpm
|
||||
[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-osx-x64.pkg
|
||||
[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-osx-arm64.pkg
|
||||
[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-arm64.zip
|
||||
[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-x86.zip
|
||||
[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/PowerShell-7.2.0-rc.1-win-x64.zip
|
||||
[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-osx-x64.tar.gz
|
||||
[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-osx-arm64.tar.gz
|
||||
[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-linux-x64.tar.gz
|
||||
[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-linux-arm32.tar.gz
|
||||
[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-rc.1/powershell-7.2.0-rc.1-linux-arm64.tar.gz
|
||||
[pv-windows-64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x64.msi
|
||||
[pv-windows-86]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x86.msi
|
||||
[pv-deb]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-preview_7.2.0-preview.9-1.deb_amd64.deb
|
||||
[pv-rpm]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-preview-7.2.0_preview.9-1.rh.x86_64.rpm
|
||||
[pv-macos]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-x64.pkg
|
||||
[pv-macos-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-arm64.pkg
|
||||
[pv-winarm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-arm64.zip
|
||||
[pv-winx86-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x86.zip
|
||||
[pv-winx64-zip]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/PowerShell-7.2.0-preview.9-win-x64.zip
|
||||
[pv-macos-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-x64.tar.gz
|
||||
[pv-macos-tar-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-osx-arm64.tar.gz
|
||||
[pv-linux-tar]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-linux-x64.tar.gz
|
||||
[pv-arm32]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-linux-arm32.tar.gz
|
||||
[pv-arm64]: https://github.com/PowerShell/PowerShell/releases/download/v7.2.0-preview.9/powershell-7.2.0-preview.9-linux-arm64.tar.gz
|
||||
[pv-snap]: https://snapcraft.io/powershell-preview
|
||||
|
||||
[in-windows]: https://docs.microsoft.com/powershell/scripting/install/installing-powershell-core-on-windows
|
||||
|
@ -239,8 +240,9 @@ License: By requesting and using the Container OS Image for Windows containers,
|
|||
|
||||
### Telemetry
|
||||
|
||||
Please visit our [about_Telemetry](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/about/about_telemetry)
|
||||
topic to read details about telemetry gathered by PowerShell.
|
||||
By default, PowerShell collects the OS description and the version of PowerShell (equivalent to `$PSVersionTable.OS` and `$PSVersionTable.GitCommitId`) using [Application Insights](https://azure.microsoft.com/services/application-insights/).
|
||||
To opt-out of sending telemetry, create an environment variable called `POWERSHELL_TELEMETRY_OPTOUT` set to a value of `1` before starting PowerShell from the installed location.
|
||||
The telemetry we collect falls under the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement/).
|
||||
|
||||
## Governance
|
||||
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,42 +1,46 @@
|
|||
## Used to generate a new TPN
|
||||
## Copy this into the additional attributions fields
|
||||
## Copy everything below here, but do not include this line
|
||||
|
||||
-------------------------------------------------------------------
|
||||
---------------------------------------------
|
||||
File: PSReadLine
|
||||
---------------------------------------------
|
||||
|
||||
-------------------------------------------------------------------
|
||||
https://github.com/lzybkr/PSReadLine
|
||||
|
||||
Additional -
|
||||
Copyright (c) 2013, Jason Shirk
|
||||
|
||||
-------------------------------------------------
|
||||
Microsoft.PowerShell.Archive
|
||||
-------------------------------------------------
|
||||
All rights reserved.
|
||||
|
||||
Copyright (c) 2016 Microsoft Corporation.
|
||||
BSD License
|
||||
|
||||
The MIT License (MIT)
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
----------------------------------------------
|
||||
File: Hashtables from ConvertFrom-json
|
||||
----------------------------------------------
|
||||
|
||||
-------------------------------------------------
|
||||
Microsoft.Management.Infrastructure.Runtime.Unix
|
||||
Microsoft.Management.Infrastructure
|
||||
-------------------------------------------------
|
||||
https://stackoverflow.com/questions/22002748/hashtables-from-convertfrom-json-have-different-type-from-powershells-built-in-h
|
||||
|
||||
Copyright (c) Microsoft Corporation
|
||||
Copyright (c) 2015 Dave Wyatt. All rights reserved.
|
||||
|
||||
All rights reserved.
|
||||
|
||||
|
@ -48,6 +52,33 @@ The above copyright notice and this permission notice shall be included in all c
|
|||
|
||||
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
||||
-------------------------------------------------
|
||||
PackageManagement
|
||||
-------------------------------------------------
|
||||
|
||||
Copyright (c) Microsoft Corporation
|
||||
All rights reserved.
|
||||
|
||||
MIT License
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the Software), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
--------------------------------------------------------
|
||||
• NuGet.Common
|
||||
• NuGet.Configuration
|
||||
|
@ -77,116 +108,3 @@ Unless required by applicable law or agreed to in writing, software distributed
|
|||
under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
|
||||
CONDITIONS OF ANY KIND, either express or implied. See the License for the
|
||||
specific language governing permissions and limitations under the License.
|
||||
|
||||
-------------------------------------------------
|
||||
PackageManagement
|
||||
-------------------------------------------------
|
||||
|
||||
Copyright (c) Microsoft Corporation
|
||||
All rights reserved.
|
||||
|
||||
MIT License
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the Software), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
-------------------------------------------------
|
||||
PowerShellGet
|
||||
-------------------------------------------------
|
||||
|
||||
Copyright (c) Microsoft Corporation
|
||||
|
||||
All rights reserved.
|
||||
|
||||
The MIT License (MIT)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
||||
---------------------------------------------
|
||||
File: PSReadLine
|
||||
---------------------------------------------
|
||||
|
||||
https://github.com/PowerShell/PSReadLine
|
||||
|
||||
Copyright (c) 2013, Jason Shirk
|
||||
|
||||
All rights reserved.
|
||||
|
||||
BSD License
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
modification, are permitted provided that the following conditions are met:
|
||||
|
||||
1. Redistributions of source code must retain the above copyright notice, this
|
||||
list of conditions and the following disclaimer.
|
||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||
this list of conditions and the following disclaimer in the documentation
|
||||
and/or other materials provided with the distribution.
|
||||
|
||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
-------------------------------------------------
|
||||
ThreadJob
|
||||
-------------------------------------------------
|
||||
|
||||
Copyright (c) 2018 Paul Higinbotham
|
||||
|
||||
MIT License
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||
SOFTWARE.
|
||||
|
|
|
@ -350,7 +350,7 @@
|
|||
<Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" TabSkip="yes" />
|
||||
<Control Id="Description" Type="Text" X="25" Y="54" Width="280" Height="100" Transparent="yes" NoPrefix="yes" Text="Microsoft Update helps keep your computer secure and up to date for Windows and other Microsoft products, including PowerShell 7. Updates will be delivered based on your current update settings. You can review or change these settings from the Windows Update control panel." TabSkip="yes" />
|
||||
<!-- If the checkboxes are defined first, then they are first in the tab order and can be ticked and unticked using the spacebar -->
|
||||
<Control Id="UseMuCheckBox" Type="CheckBox" X="20" Y="100" Width="290" Height="27" Property="USE_MU" CheckBoxValue="1" Text="Enable updating PowerShell through Microsoft Update or WSUS (recommended)"/>
|
||||
<Control Id="UseMuCheckBox" Type="CheckBox" X="20" Y="100" Width="290" Height="27" Property="USE_MU" CheckBoxValue="1" Text="Enable updating PowerShell through Microsft Update or WSUS (recommended)"/>
|
||||
<Control Id="EnableMuCheckBox" Type="CheckBox" X="20" Y="130" Width="290" Height="17" Property="ENABLE_MU" CheckBoxValue="1" Text="Use Microsoft Update when I check for updates (recommended)">
|
||||
</Control>
|
||||
<Control Id="MuWarningText" Type="Text" X="20" Y="160" Width="290" Height="27" Text="Without Microsoft Update enabled, you will need to use another update solution like WSUS or SCCM in order to receive automatic updates.">
|
||||
|
@ -361,7 +361,7 @@
|
|||
<Text><![CDATA[<a href="https://aka.ms/PowerShell-Microsoft-Update-FAQ">See the Microsoft Update FAQ</a>]]></Text>
|
||||
</Control>
|
||||
<Control Id="PrivacyLink" Type="Hyperlink" X="20" Y="210" Width="290" Height="17">
|
||||
<Text><![CDATA[<a href="https://aka.ms/PowerShell-Microsoft-Update-Privacy-Statement">Read the Microsoft Update Privacy Statement</a>]]></Text>
|
||||
<Text><![CDATA[<a href="https://aka.ms/PowerShell-Microsoft-Update-Privacy-Statement">Read the Microsoft Update Priacy Statement</a>]]></Text>
|
||||
</Control>
|
||||
<!-- divider and bottom buttons -->
|
||||
<Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" TabSkip="yes"/>
|
||||
|
|
|
@ -1987,12 +1987,6 @@
|
|||
<Component Id="cmp57D197B18F1F4A6AAB704B28CF61B535">
|
||||
<File Id="fil71B3802CB88348AC888B9902212CADA2" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\Microsoft.VisualBasic.Forms.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp690BAC3241424F59B5D30DE0E846D03E">
|
||||
<File Id="filDBDCB9BFFF9F425B8CF7F7A5F05D42B1" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp5B67AE2852E04C26970FD2016CA76E07">
|
||||
<File Id="fil42D10EBCB41B426BAFBF26BB053A9E84" KeyPath="yes" Source="$(var.ProductSourcePath)\cs\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirEA0127D6607E68B508B9DB9CE315A2CE" Name="de">
|
||||
<Component Id="cmpF2941A91B17EEA22CD6DAB34693D9AC0">
|
||||
|
@ -2052,12 +2046,6 @@
|
|||
<Component Id="cmpB40EE0CC916B4928987F62F5909AE709">
|
||||
<File Id="filA21E2DDEAEAE4E0D94346C5671D9D29F" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Windows.Forms.Primitives.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC">
|
||||
<File Id="filE106C77258F047E8A384E1E75B7EF6B8" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE">
|
||||
<File Id="filFCCE95BFDDD540E1AA243049872EF5D0" KeyPath="yes" Source="$(var.ProductSourcePath)\de\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir5B65D7353FBDCD17AB60A674B3FDF93B" Name="es">
|
||||
<Component Id="cmpBEB5F3CF75675537751F0D0B32125BF1">
|
||||
|
@ -2117,12 +2105,6 @@
|
|||
<Component Id="cmpB944176DE7924A268269903DC0B5D510">
|
||||
<File Id="filBA47C41DFB3849228624C99949FB61FC" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Windows.Forms.Primitives.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA">
|
||||
<File Id="fil186134FCB6984F1484A8308DF4F2B917" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpF96C036EAE3B436DB096888697193FAF">
|
||||
<File Id="fil761ECB84FAFA4674AB5712669532C569" KeyPath="yes" Source="$(var.ProductSourcePath)\es\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir23063512FA8C884E1B4F08FDF0A44516" Name="fr">
|
||||
<Component Id="cmp1DEB513A065956086898BCDACC5887B6">
|
||||
|
@ -2182,12 +2164,6 @@
|
|||
<Component Id="cmp7B5948A1A366409F99B871F0E772B945">
|
||||
<File Id="filCCA6A5EE7ED9459C93A8C05B0A93880F" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Windows.Forms.Primitives.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5">
|
||||
<File Id="fil93C038D9EED945F5A984CF3C98EDB72B" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4">
|
||||
<File Id="fil70A83BE26FCF4905B220521A6B75198D" KeyPath="yes" Source="$(var.ProductSourcePath)\fr\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir42B03840AE19D1498CC524F2B6C0389D" Name="it">
|
||||
<Component Id="cmp3EC91B8BF4282E77113321E5D1ED27B2">
|
||||
|
@ -2247,12 +2223,6 @@
|
|||
<Component Id="cmp28349C4ACD6D42D3967853E0A1D7DC4E">
|
||||
<File Id="filDF0828378FCA4CAC8F7DA90DC4F802CC" KeyPath="yes" Source="$(var.ProductSourcePath)\it\Microsoft.VisualBasic.Forms.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp166B17F72C954B0087DF991E560B399A">
|
||||
<File Id="fil528F0FBF10C246568FCE1F5B10E541D1" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp0173AE0CBFA44C269D93361F6C98F99B">
|
||||
<File Id="fil3767F5D3C1264EC596A9F335355521C6" KeyPath="yes" Source="$(var.ProductSourcePath)\it\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir086D21BE309BE4C7081FC60E3524890F" Name="ja">
|
||||
<Component Id="cmp867E4E51FE7BC09AAD5D59FD76716FBC">
|
||||
|
@ -2312,12 +2282,6 @@
|
|||
<Component Id="cmp26335B5D1FE94E87A6B6EBD56A22C2B9">
|
||||
<File Id="filD585A7E89ACF4E4CB9DB8EAD4ACB7092" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Windows.Forms.Primitives.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp529A2B5343FD466884FAF627E37C648D">
|
||||
<File Id="fil265B2A6A67EF4C6E8C17BDC3AAD8F729" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp5492F78ACB1A4391BBED371FDFC06B9E">
|
||||
<File Id="fil54F7909E28E54B0687222DFD1D95009D" KeyPath="yes" Source="$(var.ProductSourcePath)\ja\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir43D6CAD5F3ED1060009918D06D84FB18" Name="ko">
|
||||
<Component Id="cmpAA026CCA623F0E8FB5BAE9F201C5B89D">
|
||||
|
@ -2377,12 +2341,6 @@
|
|||
<Component Id="cmpF4093A1E8AB94B43AB0F852EB647CE7F">
|
||||
<File Id="filCE28F42A54C24F5DA508904E60E23BBD" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Windows.Forms.Primitives.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp4EE1633EE4864CE5B9015BF76BD31D14">
|
||||
<File Id="fil688FE14A80204086A48DE1BDC6591EB0" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp3B07F4E4B6034F3284288C18F4638CA7">
|
||||
<File Id="filA52AFEA335CA41D98DB28358CE344EB5" KeyPath="yes" Source="$(var.ProductSourcePath)\ko\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirE8201C74A7184D11233BAD63C6DB37BD" Name="pl">
|
||||
<Component Id="cmpA656A18FE14D3C8EB02C31AE474054E3">
|
||||
|
@ -2442,12 +2400,6 @@
|
|||
<Component Id="cmp705598FEC8EA43D7A9B239787BA5DB09">
|
||||
<File Id="filD8ECB20D015F4477ABD58505B48D02D1" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Windows.Forms.Primitives.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpC8C68DB0DEE44CF49D98532D2C26395E">
|
||||
<File Id="fil1959B05E9F214DCFA6670F1892EE2E7D" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpA8A66545C44F428BB552B55EEE353BB0">
|
||||
<File Id="filC0107BEFC31E4F9AB5037537B82D92EF" KeyPath="yes" Source="$(var.ProductSourcePath)\pl\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir47ED939BFA870848E0764E862CD6B4D7" Name="pt-BR">
|
||||
<Component Id="cmp3D20E940BDBF41630242C63011A80CE5">
|
||||
|
@ -2507,12 +2459,6 @@
|
|||
<Component Id="cmpFAA0CCBA17FE4E8FAE5FE4B5F679DF52">
|
||||
<File Id="fil6A42B845F64A4B2490AFFA079E0FB086" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Windows.Forms.Primitives.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpF3C18F07C6A148638CBC858EB02E3A6D">
|
||||
<File Id="filE6672552F1EE45D3AC3021E02DB093CB" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp0C4751F9D5C14419A45F234152D21DA9">
|
||||
<File Id="filF6E3EF23DEEF4D3BB3CA9C9D084FB607" KeyPath="yes" Source="$(var.ProductSourcePath)\pt-BR\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir37B8DFAE26D5F8E9948851F7D19F9E20" Name="ru">
|
||||
<Component Id="cmpFDCD51BD80926ABECCE27D0D66A47C8F">
|
||||
|
@ -2572,12 +2518,6 @@
|
|||
<Component Id="cmpA6FA5B27C61E482D8BBC5F1806D3B223">
|
||||
<File Id="filD4732A3ABFD342B890F75CCB5DE1CAE8" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Windows.Forms.Primitives.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpBD958F4B8F9146499DE2CA6321C65F96">
|
||||
<File Id="fil6A1EB9311FE546F69F28948794DC43BF" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp6ADB50DF9F2D4BCA9E682AA6D1C7C03B">
|
||||
<File Id="fil7FECA5AED84D4C84968358F2C065BBEC" KeyPath="yes" Source="$(var.ProductSourcePath)\ru\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirA7E9CC01273A7FED89FC8D3A368E00CC" Name="tr">
|
||||
<Component Id="cmp286FCD0B19BF06446A7274672A2491CA">
|
||||
|
@ -2637,12 +2577,6 @@
|
|||
<Component Id="cmp10773057C33543FA93222022DEC0847D">
|
||||
<File Id="filD2D3E621E5C54C5EBF044078C9073C2B" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\Microsoft.VisualBasic.Forms.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp2B8239B905B146A69CD5D55A353AC131">
|
||||
<File Id="fil618AA430D1794A45A1D2BAA2451BECB2" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp9FCFAEB797D9475C873E21B4B5A89E28">
|
||||
<File Id="filC4BDA69F669843EAAD7B6D8714CB1420" KeyPath="yes" Source="$(var.ProductSourcePath)\tr\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dir47E993970F74AA9F393D23500827D12C" Name="zh-Hans">
|
||||
<Component Id="cmp34C4A21743AC68583599BF2B139F39F2">
|
||||
|
@ -2702,12 +2636,6 @@
|
|||
<Component Id="cmp33364765C98D4BE09BD26DC1E6B95B86">
|
||||
<File Id="filB57C4C58936D4A7587CEA358B1AF57C2" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\Microsoft.VisualBasic.Forms.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp582595AE8291444E837793472E0A259C">
|
||||
<File Id="fil7044506B31FA4130B2E375147032298D" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E">
|
||||
<File Id="fil0AF0C0F933404EABBC94B10ED8740042" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hans\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Id="dirB1FFB91EED6FD71EA866548CEA3A5298" Name="zh-Hant">
|
||||
<Component Id="cmpBC28FE8B65954B00AECA9C534639596D">
|
||||
|
@ -2767,12 +2695,6 @@
|
|||
<Component Id="cmpB9B22A80E70F414B8778B852E29D6492">
|
||||
<File Id="fil46C0F341CAB64BD390BEA73E1FE0F552" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\Microsoft.VisualBasic.Forms.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp91C27D1766E84B8BB0F0C70888F03C2E">
|
||||
<File Id="filC888727CE05A4A9FA0DB66EE0F15097C" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\System.Private.ServiceModel.resources.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpD55F08F6CF51498E9E8551067BA57040">
|
||||
<File Id="fil46C47F01171F45A898A7AD6A14ACE432" KeyPath="yes" Source="$(var.ProductSourcePath)\zh-Hant\System.Web.Services.Description.resources.dll" />
|
||||
</Component>
|
||||
</Directory>
|
||||
<Directory Name="Schemas" Id="dir1DB5B24CC3494785974A51F28F128069">
|
||||
<Directory Name="PSMaml" Id="dirAC38B2C7629B42DC836E01F976A10EC9">
|
||||
|
@ -3132,27 +3054,8 @@
|
|||
<Component Id="cmp957498053E01454DA1E21E6D7317DCD6">
|
||||
<File Id="fil2AA6F0D8A51D4BB89F33F2B73AB12391" KeyPath="yes" Source="$(var.ProductSourcePath)\msquic.dll" />
|
||||
</Component>
|
||||
<Directory Name="_manifest" Id="dir81094D6B916B4BC8B1BA0E1DADB93A02">
|
||||
<Directory Name="spdx_2.2" Id="dirA36413FB3A534FDF8657D62728080E9F">
|
||||
<Component Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0">
|
||||
<File Id="fil2146848B6ACB45FCA8E9C8FEE3BECDD8" KeyPath="yes" Source="$(var.ProductSourcePath)\_manifest\spdx_2.2\manifest.spdx.json" />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
<Component Id="cmpA6276F9EAB41411AAAEC496E67A3DBAE">
|
||||
<File Id="filC840646CDE814D33B16DA3A5BBDDC88D" KeyPath="yes" Source="$(var.ProductSourcePath)\psoptions.json" />
|
||||
</Component>
|
||||
<Component Id="cmp3CF3F69A352F4438B8F2F73EBBD12996">
|
||||
<File Id="filB8F63979F96B4007BA9C0CE6BD3531D0" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Extensions.ObjectPool.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp09155DA101E1424B98832A789E93E835">
|
||||
<File Id="fil7D748565EBF5423A84CFC6D25D21F43C" KeyPath="yes" Source="$(var.ProductSourcePath)\Microsoft.Bcl.AsyncInterfaces.dll" />
|
||||
</Component>
|
||||
<Component Id="cmp22840874A8C84AA796496634FBEBF09C">
|
||||
<File Id="fil2067B616D1FA4B30932A0240ABE06089" KeyPath="yes" Source="$(var.ProductSourcePath)\System.Web.Services.Description.dll" />
|
||||
</Component>
|
||||
<Component Id="cmpFB17CABA17334B2BBA1ED6CBF757B310">
|
||||
<File Id="fil1621E0132D2C49B89068166196075157" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.52210.dll" />
|
||||
<Component Id="cmpC0B842EBB4D244718CA6CEF819EE242B">
|
||||
<File Id="fil229AFC7374F34B97AC3E4296BCB45CE7" KeyPath="yes" Source="$(var.ProductSourcePath)\mscordaccore_$(var.FileArchitecture)_$(var.FileArchitecture)_6.0.21.43011.dll" />
|
||||
</Component>
|
||||
</DirectoryRef>
|
||||
</Fragment>
|
||||
|
@ -4138,38 +4041,7 @@
|
|||
<ComponentRef Id="cmp708913639F7A46E784CC0FA862A1A2CE" />
|
||||
<ComponentRef Id="cmpA75DEF5617C54DA1937CB37D5824BF79" />
|
||||
<ComponentRef Id="cmp957498053E01454DA1E21E6D7317DCD6" />
|
||||
<ComponentRef Id="cmp408A3AF905EB47ADA35FBC5A6B1465A0" />
|
||||
<ComponentRef Id="cmpA6276F9EAB41411AAAEC496E67A3DBAE" />
|
||||
<ComponentRef Id="cmp91C27D1766E84B8BB0F0C70888F03C2E" />
|
||||
<ComponentRef Id="cmpCC4A42AA70EE4418926986F5A4B8D3FA" />
|
||||
<ComponentRef Id="cmp690BAC3241424F59B5D30DE0E846D03E" />
|
||||
<ComponentRef Id="cmp3CF3F69A352F4438B8F2F73EBBD12996" />
|
||||
<ComponentRef Id="cmp09155DA101E1424B98832A789E93E835" />
|
||||
<ComponentRef Id="cmpC8C68DB0DEE44CF49D98532D2C26395E" />
|
||||
<ComponentRef Id="cmpB43ED7BA30C844E2B5C38F7B747EEFDC" />
|
||||
<ComponentRef Id="cmpF3C18F07C6A148638CBC858EB02E3A6D" />
|
||||
<ComponentRef Id="cmp582595AE8291444E837793472E0A259C" />
|
||||
<ComponentRef Id="cmp2B8239B905B146A69CD5D55A353AC131" />
|
||||
<ComponentRef Id="cmpBD958F4B8F9146499DE2CA6321C65F96" />
|
||||
<ComponentRef Id="cmp166B17F72C954B0087DF991E560B399A" />
|
||||
<ComponentRef Id="cmp529A2B5343FD466884FAF627E37C648D" />
|
||||
<ComponentRef Id="cmp4EE1633EE4864CE5B9015BF76BD31D14" />
|
||||
<ComponentRef Id="cmpE7BE9D8F63E04798870E57BA1EABB9A5" />
|
||||
<ComponentRef Id="cmp5B67AE2852E04C26970FD2016CA76E07" />
|
||||
<ComponentRef Id="cmp6ADB50DF9F2D4BCA9E682AA6D1C7C03B" />
|
||||
<ComponentRef Id="cmpA8A66545C44F428BB552B55EEE353BB0" />
|
||||
<ComponentRef Id="cmp5492F78ACB1A4391BBED371FDFC06B9E" />
|
||||
<ComponentRef Id="cmp22840874A8C84AA796496634FBEBF09C" />
|
||||
<ComponentRef Id="cmp0173AE0CBFA44C269D93361F6C98F99B" />
|
||||
<ComponentRef Id="cmpFB17CABA17334B2BBA1ED6CBF757B310" />
|
||||
<ComponentRef Id="cmpD55F08F6CF51498E9E8551067BA57040" />
|
||||
<ComponentRef Id="cmp777DF202EF2542F2ACFCCF0481E8D6EE" />
|
||||
<ComponentRef Id="cmpF24D3B9F29F84B4D9C47577B7926FC2E" />
|
||||
<ComponentRef Id="cmp3B07F4E4B6034F3284288C18F4638CA7" />
|
||||
<ComponentRef Id="cmp9FCFAEB797D9475C873E21B4B5A89E28" />
|
||||
<ComponentRef Id="cmp0C4751F9D5C14419A45F234152D21DA9" />
|
||||
<ComponentRef Id="cmpF96C036EAE3B436DB096888697193FAF" />
|
||||
<ComponentRef Id="cmp789F545EA2CB4AC5A2688CF730A5F6B4" />
|
||||
<ComponentRef Id="cmpC0B842EBB4D244718CA6CEF819EE242B" />
|
||||
</ComponentGroup>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
|
|
431
build.psm1
431
build.psm1
|
@ -6,8 +6,6 @@ param(
|
|||
[parameter(Mandatory = $false)][switch]$SkipLinuxDistroCheck = $false
|
||||
)
|
||||
|
||||
. "$PSScriptRoot\tools\buildCommon\startNativeExecution.ps1"
|
||||
|
||||
Set-StrictMode -Version 3.0
|
||||
|
||||
# On Unix paths is separated by colon
|
||||
|
@ -18,8 +16,6 @@ $script:Options = $null
|
|||
$dotnetMetadata = Get-Content $PSScriptRoot/DotnetRuntimeMetadata.json | ConvertFrom-Json
|
||||
$dotnetCLIChannel = $dotnetMetadata.Sdk.Channel
|
||||
$dotnetCLIQuality = $dotnetMetadata.Sdk.Quality
|
||||
$dotnetAzureFeed = $dotnetMetadata.Sdk.azureFeed
|
||||
$dotnetSDKVersionOveride = $dotnetMetadata.Sdk.sdkImageOverride
|
||||
$dotnetCLIRequiredVersion = $(Get-Content $PSScriptRoot/global.json | ConvertFrom-Json).Sdk.Version
|
||||
|
||||
# Track if tags have been sync'ed
|
||||
|
@ -318,13 +314,14 @@ function Start-PSBuild {
|
|||
[ValidateSet('Debug', 'Release', 'CodeCoverage', '')] # We might need "Checked" as well
|
||||
[string]$Configuration,
|
||||
|
||||
[switch]$CrossGen,
|
||||
|
||||
[ValidatePattern("^v\d+\.\d+\.\d+(-\w+(\.\d{1,2})?)?$")]
|
||||
[ValidateNotNullOrEmpty()]
|
||||
[string]$ReleaseTag,
|
||||
[switch]$Detailed,
|
||||
[switch]$InteractiveAuth,
|
||||
[switch]$SkipRoslynAnalyzers,
|
||||
[string]$PSOptionsPath
|
||||
[switch]$SkipRoslynAnalyzers
|
||||
)
|
||||
|
||||
if ($ReleaseTag -and $ReleaseTag -notmatch "^v\d+\.\d+\.\d+(-(preview|rc)(\.\d{1,2})?)?$") {
|
||||
|
@ -345,6 +342,10 @@ function Start-PSBuild {
|
|||
}
|
||||
|
||||
if ($ForMinimalSize) {
|
||||
if ($CrossGen) {
|
||||
throw "Build for the minimal size requires the minimal disk footprint, so `CrossGen` is not allowed"
|
||||
}
|
||||
|
||||
if ($Runtime -and "linux-x64", "win7-x64", "osx-x64" -notcontains $Runtime) {
|
||||
throw "Build for the minimal size is enabled only for following runtimes: 'linux-x64', 'win7-x64', 'osx-x64'"
|
||||
}
|
||||
|
@ -390,8 +391,7 @@ function Start-PSBuild {
|
|||
}
|
||||
|
||||
# Verify if the dotnet in-use is the required version
|
||||
$dotnetCLIInstalledVersion = Get-LatestInstalledSDK
|
||||
|
||||
$dotnetCLIInstalledVersion = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode
|
||||
If ($dotnetCLIInstalledVersion -ne $dotnetCLIRequiredVersion) {
|
||||
Write-Warning @"
|
||||
The currently installed .NET Command Line Tools is not the required version.
|
||||
|
@ -413,6 +413,7 @@ Fix steps:
|
|||
|
||||
# set output options
|
||||
$OptionsArguments = @{
|
||||
CrossGen=$CrossGen
|
||||
Output=$Output
|
||||
Runtime=$Runtime
|
||||
Configuration=$Configuration
|
||||
|
@ -439,10 +440,6 @@ Fix steps:
|
|||
# Add --self-contained due to "warning NETSDK1179: One of '--self-contained' or '--no-self-contained' options are required when '--runtime' is used."
|
||||
if ($Options.Runtime -like 'fxdependent*') {
|
||||
$Arguments += "--no-self-contained"
|
||||
# The UseAppHost = false property avoids creating ".exe" for the fxdependent packages.
|
||||
# The ".exe" is not a cross-platform executable, but specific to the platform that it was built on.
|
||||
# We do not need to ship that.
|
||||
$Arguments += "/property:UseAppHost=false"
|
||||
}
|
||||
else {
|
||||
$Arguments += "--self-contained"
|
||||
|
@ -527,6 +524,12 @@ Fix steps:
|
|||
Write-Log -message "Run dotnet $Arguments from $PWD"
|
||||
Start-NativeExecution { dotnet $Arguments }
|
||||
Write-Log -message "PowerShell output: $($Options.Output)"
|
||||
|
||||
if ($CrossGen) {
|
||||
# fxdependent package cannot be CrossGen'ed
|
||||
Start-CrossGen -PublishPath $publishPath -Runtime $script:Options.Runtime
|
||||
Write-Log -message "pwsh.exe with ngen binaries is available at: $($Options.Output)"
|
||||
}
|
||||
} else {
|
||||
$globalToolSrcFolder = Resolve-Path (Join-Path $Options.Top "../Microsoft.PowerShell.GlobalTool.Shim") | Select-Object -ExpandProperty Path
|
||||
|
||||
|
@ -665,15 +668,6 @@ Fix steps:
|
|||
if ($CI) {
|
||||
Restore-PSPester -Destination (Join-Path $publishPath "Modules")
|
||||
}
|
||||
|
||||
if ($PSOptionsPath) {
|
||||
$resolvedPSOptionsPath = $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($PSOptionsPath)
|
||||
$parent = Split-Path -Path $resolvedPSOptionsPath
|
||||
if (!(Test-Path $parent)) {
|
||||
$null = New-Item -ItemType Directory -Path $parent
|
||||
}
|
||||
Save-PSOptions -PSOptionsPath $PSOptionsPath -Options $Options
|
||||
}
|
||||
}
|
||||
|
||||
function Restore-PSPackage
|
||||
|
@ -829,6 +823,8 @@ function New-PSOptions {
|
|||
"win7-x86")]
|
||||
[string]$Runtime,
|
||||
|
||||
[switch]$CrossGen,
|
||||
|
||||
# Accept a path to the output directory
|
||||
# If not null or empty, name of the executable will be appended to
|
||||
# this path, otherwise, to the default path, and then the full path
|
||||
|
@ -934,6 +930,7 @@ function New-PSOptions {
|
|||
-RootInfo ([PSCustomObject]$RootInfo) `
|
||||
-Top $Top `
|
||||
-Runtime $Runtime `
|
||||
-Crossgen $Crossgen.IsPresent `
|
||||
-Configuration $Configuration `
|
||||
-PSModuleRestore $PSModuleRestore.IsPresent `
|
||||
-Framework $Framework `
|
||||
|
@ -1751,13 +1748,6 @@ function Install-Dotnet {
|
|||
[string]$FeedCredential
|
||||
)
|
||||
|
||||
Write-Verbose -Verbose "In install-dotnet"
|
||||
|
||||
# This is needed workaround for RTM pre-release build as the SDK version is always 6.0.100 after installation for every pre-release
|
||||
if ($dotnetCLIRequiredVersion -like '6.0.100-rtm.*') {
|
||||
$dotnetCLIRequiredVersion = '6.0.100'
|
||||
}
|
||||
|
||||
# This allows sudo install to be optional; needed when running in containers / as root
|
||||
# Note that when it is null, Invoke-Expression (but not &) must be used to interpolate properly
|
||||
$sudo = if (!$NoSudo) { "sudo" }
|
||||
|
@ -1785,12 +1775,10 @@ function Install-Dotnet {
|
|||
Write-Warning "This script only removes prior versions of dotnet for Ubuntu and OS X"
|
||||
}
|
||||
|
||||
Write-Verbose -Verbose "Invoking install script"
|
||||
|
||||
# Install new dotnet 1.1.0 preview packages
|
||||
$installScript = "dotnet-install.sh"
|
||||
|
||||
Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose
|
||||
Start-NativeExecution {
|
||||
Write-Verbose -Message "downloading install script from $installObtainUrl/$installScript ..." -Verbose
|
||||
& $wget $installObtainUrl/$installScript
|
||||
|
||||
if ((Get-ChildItem "./$installScript").Length -eq 0) {
|
||||
|
@ -1809,16 +1797,9 @@ function Install-Dotnet {
|
|||
}
|
||||
|
||||
if ($AzureFeed) {
|
||||
$bashArgs += @('-AzureFeed', $AzureFeed)
|
||||
$bashArgs += @('-AzureFeed', $AzureFeed, '-FeedCredential', $FeedCredential)
|
||||
}
|
||||
|
||||
if ($FeedCredential) {
|
||||
$bashArgs += @('-FeedCredential', $FeedCredential)
|
||||
}
|
||||
|
||||
$bashArgs | Out-String | Write-Verbose -Verbose
|
||||
|
||||
Start-NativeExecution {
|
||||
bash @bashArgs
|
||||
}
|
||||
} elseif ($environment.IsWindows) {
|
||||
|
@ -1841,44 +1822,35 @@ function Install-Dotnet {
|
|||
}
|
||||
|
||||
if ($AzureFeed) {
|
||||
$installArgs += @{AzureFeed = $AzureFeed}
|
||||
$installArgs += @{
|
||||
AzureFeed = $AzureFeed
|
||||
$FeedCredential = $FeedCredential
|
||||
}
|
||||
}
|
||||
|
||||
if ($FeedCredential) {
|
||||
$installArgs += @{FeedCredential = $FeedCredential}
|
||||
}
|
||||
|
||||
$installArgs | Out-String | Write-Verbose -Verbose
|
||||
|
||||
& ./$installScript @installArgs
|
||||
}
|
||||
else {
|
||||
# dotnet-install.ps1 uses APIs that are not supported in .NET Core, so we run it with Windows PowerShell
|
||||
$fullPSPath = Join-Path -Path $env:windir -ChildPath "System32\WindowsPowerShell\v1.0\powershell.exe"
|
||||
$fullDotnetInstallPath = Join-Path -Path $PWD.Path -ChildPath $installScript
|
||||
|
||||
if ($Version) {
|
||||
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version, '-Quality', $Quality)
|
||||
}
|
||||
elseif ($Channel) {
|
||||
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
|
||||
}
|
||||
|
||||
if ($InstallDir) {
|
||||
$psArgs += @('-InstallDir', $InstallDir)
|
||||
}
|
||||
|
||||
if ($AzureFeed) {
|
||||
$psArgs += @('-AzureFeed', $AzureFeed)
|
||||
}
|
||||
|
||||
if ($FeedCredential) {
|
||||
$psArgs += @('-FeedCredential', $FeedCredential)
|
||||
}
|
||||
|
||||
$psArgs | Out-String | Write-Verbose -Verbose
|
||||
|
||||
Start-NativeExecution {
|
||||
|
||||
if ($Version) {
|
||||
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Version', $Version, '-Quality', $Quality)
|
||||
}
|
||||
elseif ($Channel) {
|
||||
$psArgs = @('-NoLogo', '-NoProfile', '-File', $fullDotnetInstallPath, '-Channel', $Channel, '-Quality', $Quality)
|
||||
}
|
||||
|
||||
if ($InstallDir) {
|
||||
$psArgs += @('-InstallDir', $InstallDir)
|
||||
}
|
||||
|
||||
if ($AzureFeed) {
|
||||
$psArgs += @('-AzureFeed', $AzureFeed, '-FeedCredential', $FeedCredential)
|
||||
}
|
||||
|
||||
& $fullPSPath @psArgs
|
||||
}
|
||||
}
|
||||
|
@ -1912,10 +1884,6 @@ function Start-PSBootstrap {
|
|||
|
||||
Push-Location $PSScriptRoot/tools
|
||||
|
||||
if ($dotnetSDKVersionOveride) {
|
||||
$Version = $dotnetSDKVersionOveride
|
||||
}
|
||||
|
||||
try {
|
||||
if ($environment.IsLinux -or $environment.IsMacOS) {
|
||||
# This allows sudo install to be optional; needed when running in containers / as root
|
||||
|
@ -2013,9 +1981,6 @@ function Start-PSBootstrap {
|
|||
# Build tools
|
||||
$Deps += "cmake"
|
||||
|
||||
# wget for downloading dotnet
|
||||
$Deps += "wget"
|
||||
|
||||
# .NET Core required runtime libraries
|
||||
$Deps += "openssl"
|
||||
|
||||
|
@ -2023,7 +1988,7 @@ function Start-PSBootstrap {
|
|||
# ignore exitcode, because they may be already installed
|
||||
Start-NativeExecution ([ScriptBlock]::Create("$PackageManager install $Deps")) -IgnoreExitcode
|
||||
} elseif ($environment.IsLinux -and $environment.IsAlpine) {
|
||||
$Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl', 'wget'
|
||||
$Deps += 'libunwind', 'libcurl', 'bash', 'cmake', 'clang', 'build-base', 'git', 'curl'
|
||||
|
||||
Start-NativeExecution {
|
||||
Invoke-Expression "apk add $Deps"
|
||||
|
@ -2048,18 +2013,14 @@ function Start-PSBootstrap {
|
|||
}
|
||||
}
|
||||
|
||||
Write-Verbose -Verbose "Calling Find-Dotnet from Start-PSBootstrap"
|
||||
|
||||
# Try to locate dotnet-SDK before installing it
|
||||
Find-Dotnet
|
||||
|
||||
Write-Verbose -Verbose "Back from calling Find-Dotnet from Start-PSBootstrap"
|
||||
|
||||
# Install dotnet-SDK
|
||||
$dotNetExists = precheck 'dotnet' $null
|
||||
$dotNetVersion = [string]::Empty
|
||||
if($dotNetExists) {
|
||||
$dotNetVersion = Get-LatestInstalledSDK
|
||||
$dotNetVersion = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode
|
||||
}
|
||||
|
||||
if(!$dotNetExists -or $dotNetVersion -ne $dotnetCLIRequiredVersion -or $Force.IsPresent) {
|
||||
|
@ -2074,12 +2035,6 @@ function Start-PSBootstrap {
|
|||
}
|
||||
|
||||
$DotnetArguments = @{ Channel=$Channel; Version=$Version; NoSudo=$NoSudo }
|
||||
|
||||
if ($dotnetAzureFeed) {
|
||||
$null = $DotnetArguments.Add("AzureFeed", $dotnetAzureFeed)
|
||||
$null = $DotnetArguments.Add("FeedCredential", $null)
|
||||
}
|
||||
|
||||
Install-Dotnet @DotnetArguments
|
||||
}
|
||||
else {
|
||||
|
@ -2101,12 +2056,6 @@ function Start-PSBootstrap {
|
|||
}
|
||||
}
|
||||
|
||||
function Get-LatestInstalledSDK {
|
||||
Start-NativeExecution -sb {
|
||||
dotnet --list-sdks | Select-String -Pattern '\d*.\d*.\d*(-\w*\.\d*)?' | ForEach-Object { [System.Management.Automation.SemanticVersion]::new($_.matches.value) } | Sort-Object -Descending | Select-Object -First 1
|
||||
} -IgnoreExitcode 2> $null
|
||||
}
|
||||
|
||||
function Start-DevPowerShell {
|
||||
[CmdletBinding(DefaultParameterSetName='ConfigurationParamSet')]
|
||||
param(
|
||||
|
@ -2239,29 +2188,17 @@ function Start-ResGen
|
|||
}
|
||||
|
||||
function Find-Dotnet() {
|
||||
Write-Verbose -Verbose "In Find-DotNet"
|
||||
|
||||
$originalPath = $env:PATH
|
||||
$dotnetPath = if ($environment.IsWindows) { "$env:LocalAppData\Microsoft\dotnet" } else { "$env:HOME/.dotnet" }
|
||||
|
||||
$chosenDotNetVersion = if($dotnetSDKVersionOveride) {
|
||||
$dotnetSDKVersionOveride
|
||||
}
|
||||
else {
|
||||
$dotnetCLIRequiredVersion
|
||||
}
|
||||
|
||||
# If there dotnet is already in the PATH, check to see if that version of dotnet can find the required SDK
|
||||
# This is "typically" the globally installed dotnet
|
||||
if (precheck dotnet) {
|
||||
# Must run from within repo to ensure global.json can specify the required SDK version
|
||||
Push-Location $PSScriptRoot
|
||||
$dotnetCLIInstalledVersion = Get-LatestInstalledSDK
|
||||
$dotnetCLIInstalledVersion = Start-NativeExecution -sb { dotnet --version } -IgnoreExitcode 2> $null
|
||||
Pop-Location
|
||||
|
||||
Write-Verbose -Verbose "dotnetCLIInstalledVersion = $dotnetCLIInstalledVersion`nchosenDotNetVersion = $chosenDotNetVersion"
|
||||
|
||||
if ($dotnetCLIInstalledVersion -ne $chosenDotNetVersion) {
|
||||
if ($dotnetCLIInstalledVersion -ne $dotnetCLIRequiredVersion) {
|
||||
Write-Warning "The 'dotnet' in the current path can't find SDK version ${dotnetCLIRequiredVersion}, prepending $dotnetPath to PATH."
|
||||
# Globally installed dotnet doesn't have the required SDK version, prepend the user local dotnet location
|
||||
$env:PATH = $dotnetPath + [IO.Path]::PathSeparator + $env:PATH
|
||||
|
@ -2359,6 +2296,258 @@ function script:precheck([string]$command, [string]$missedMessage) {
|
|||
}
|
||||
}
|
||||
|
||||
# this function wraps native command Execution
|
||||
# for more information, read https://mnaoumov.wordpress.com/2015/01/11/execution-of-external-commands-in-powershell-done-right/
|
||||
function script:Start-NativeExecution
|
||||
{
|
||||
param(
|
||||
[scriptblock]$sb,
|
||||
[switch]$IgnoreExitcode,
|
||||
[switch]$VerboseOutputOnError
|
||||
)
|
||||
$backupEAP = $ErrorActionPreference
|
||||
$ErrorActionPreference = "Continue"
|
||||
try {
|
||||
if($VerboseOutputOnError.IsPresent)
|
||||
{
|
||||
$output = & $sb 2>&1
|
||||
}
|
||||
else
|
||||
{
|
||||
& $sb
|
||||
}
|
||||
|
||||
# note, if $sb doesn't have a native invocation, $LASTEXITCODE will
|
||||
# point to the obsolete value
|
||||
if ($LASTEXITCODE -ne 0 -and -not $IgnoreExitcode) {
|
||||
if($VerboseOutputOnError.IsPresent -and $output)
|
||||
{
|
||||
$output | Out-String | Write-Verbose -Verbose
|
||||
}
|
||||
|
||||
# Get caller location for easier debugging
|
||||
$caller = Get-PSCallStack -ErrorAction SilentlyContinue
|
||||
if($caller)
|
||||
{
|
||||
$callerLocationParts = $caller[1].Location -split ":\s*line\s*"
|
||||
$callerFile = $callerLocationParts[0]
|
||||
$callerLine = $callerLocationParts[1]
|
||||
|
||||
$errorMessage = "Execution of {$sb} by ${callerFile}: line $callerLine failed with exit code $LASTEXITCODE"
|
||||
throw $errorMessage
|
||||
}
|
||||
throw "Execution of {$sb} failed with exit code $LASTEXITCODE"
|
||||
}
|
||||
} finally {
|
||||
$ErrorActionPreference = $backupEAP
|
||||
}
|
||||
}
|
||||
|
||||
function Start-CrossGen {
|
||||
[CmdletBinding()]
|
||||
param(
|
||||
[Parameter(Mandatory= $true)]
|
||||
[ValidateNotNullOrEmpty()]
|
||||
[String]
|
||||
$PublishPath,
|
||||
|
||||
[Parameter(Mandatory=$true)]
|
||||
[ValidateSet("alpine-x64",
|
||||
"linux-arm",
|
||||
"linux-arm64",
|
||||
"linux-x64",
|
||||
"osx-arm64",
|
||||
"osx-x64",
|
||||
"win-arm",
|
||||
"win-arm64",
|
||||
"win7-x64",
|
||||
"win7-x86")]
|
||||
[string]
|
||||
$Runtime
|
||||
)
|
||||
|
||||
function New-CrossGenAssembly {
|
||||
param (
|
||||
[Parameter(Mandatory = $true)]
|
||||
[ValidateNotNullOrEmpty()]
|
||||
[String[]]
|
||||
$AssemblyPath,
|
||||
|
||||
[Parameter(Mandatory = $true)]
|
||||
[ValidateNotNullOrEmpty()]
|
||||
[String]
|
||||
$CrossgenPath,
|
||||
|
||||
[Parameter(Mandatory = $true)]
|
||||
[ValidateSet("alpine-x64",
|
||||
"linux-arm",
|
||||
"linux-arm64",
|
||||
"linux-x64",
|
||||
"osx-arm64",
|
||||
"osx-x64",
|
||||
"win-arm",
|
||||
"win-arm64",
|
||||
"win7-x64",
|
||||
"win7-x86")]
|
||||
[string]
|
||||
$Runtime
|
||||
)
|
||||
|
||||
$platformAssembliesPath = Split-Path $AssemblyPath[0] -Parent
|
||||
|
||||
$targetOS, $targetArch = $Runtime -split '-'
|
||||
|
||||
# Special cases where OS / Arch does not conform with runtime names
|
||||
switch ($Runtime) {
|
||||
'alpine-x64' {
|
||||
$targetOS = 'linux'
|
||||
$targetArch = 'x64'
|
||||
}
|
||||
'win-arm' {
|
||||
$targetOS = 'windows'
|
||||
$targetArch = 'arm'
|
||||
}
|
||||
'win-arm64' {
|
||||
$targetOS = 'windows'
|
||||
$targetArch = 'arm64'
|
||||
}
|
||||
'win7-x64' {
|
||||
$targetOS = 'windows'
|
||||
$targetArch = 'x64'
|
||||
}
|
||||
'win7-x86' {
|
||||
$targetOS = 'windows'
|
||||
$targetArch = 'x86'
|
||||
}
|
||||
}
|
||||
|
||||
$generatePdb = $targetos -eq 'windows'
|
||||
|
||||
# The path to folder must end with directory separator
|
||||
$dirSep = [System.IO.Path]::DirectorySeparatorChar
|
||||
$platformAssembliesPath = if (-not $platformAssembliesPath.EndsWith($dirSep)) { $platformAssembliesPath + $dirSep }
|
||||
|
||||
Start-NativeExecution {
|
||||
$crossgen2Params = @(
|
||||
"-r"
|
||||
$platformAssembliesPath
|
||||
"--out-near-input"
|
||||
"--single-file-compilation"
|
||||
"-O"
|
||||
"--targetos"
|
||||
$targetOS
|
||||
"--targetarch"
|
||||
$targetArch
|
||||
)
|
||||
|
||||
if ($generatePdb) {
|
||||
$crossgen2Params += "--pdb"
|
||||
}
|
||||
|
||||
$crossgen2Params += $AssemblyPath
|
||||
|
||||
& $CrossgenPath $crossgen2Params
|
||||
}
|
||||
}
|
||||
|
||||
if (-not (Test-Path $PublishPath)) {
|
||||
throw "Path '$PublishPath' does not exist."
|
||||
}
|
||||
|
||||
# Get the path to crossgen
|
||||
$crossGenExe = if ($environment.IsWindows) { "crossgen2.exe" } else { "crossgen2" }
|
||||
|
||||
# The crossgen tool is only published for these particular runtimes
|
||||
$crossGenRuntime = if ($environment.IsWindows) {
|
||||
# for windows the tool architecture is the host machine architecture, so it is always x64.
|
||||
# we can cross compile for x86, arm and arm64
|
||||
"win-x64"
|
||||
} else {
|
||||
$Runtime
|
||||
}
|
||||
|
||||
if (-not $crossGenRuntime) {
|
||||
throw "crossgen is not available for this platform"
|
||||
}
|
||||
|
||||
$dotnetRuntimeVersion = $script:Options.Framework -replace 'net'
|
||||
|
||||
# Get the CrossGen.exe for the correct runtime with the latest version
|
||||
$crossGenPath = Get-ChildItem $script:Environment.nugetPackagesRoot $crossGenExe -Recurse | `
|
||||
Where-Object { $_.FullName -match $crossGenRuntime } | `
|
||||
Where-Object { $_.FullName -match $dotnetRuntimeVersion } | `
|
||||
Where-Object { (Split-Path $_.FullName -Parent).EndsWith('tools') } | `
|
||||
Sort-Object -Property FullName -Descending | `
|
||||
Select-Object -First 1 | `
|
||||
ForEach-Object { $_.FullName }
|
||||
if (-not $crossGenPath) {
|
||||
throw "Unable to find latest version of crossgen2.exe. 'Please run Start-PSBuild -Clean' first, and then try again."
|
||||
}
|
||||
Write-Verbose "Matched CrossGen2.exe: $crossGenPath" -Verbose
|
||||
|
||||
# Common assemblies used by Add-Type or assemblies with high JIT and no pdbs to crossgen
|
||||
$commonAssembliesForAddType = @(
|
||||
"Microsoft.CodeAnalysis.CSharp.dll"
|
||||
"Microsoft.CodeAnalysis.dll"
|
||||
"System.Linq.Expressions.dll"
|
||||
"Microsoft.CSharp.dll"
|
||||
"System.Runtime.Extensions.dll"
|
||||
"System.Linq.dll"
|
||||
"System.Collections.Concurrent.dll"
|
||||
"System.Collections.dll"
|
||||
"Newtonsoft.Json.dll"
|
||||
"System.IO.FileSystem.dll"
|
||||
"System.Diagnostics.Process.dll"
|
||||
"System.Threading.Tasks.Parallel.dll"
|
||||
"System.Security.AccessControl.dll"
|
||||
"System.Text.Encoding.CodePages.dll"
|
||||
"System.Private.Uri.dll"
|
||||
"System.Threading.dll"
|
||||
"System.Security.Principal.Windows.dll"
|
||||
"System.Console.dll"
|
||||
"Microsoft.Win32.Registry.dll"
|
||||
"System.IO.Pipes.dll"
|
||||
"System.Diagnostics.FileVersionInfo.dll"
|
||||
"System.Collections.Specialized.dll"
|
||||
"Microsoft.ApplicationInsights.dll"
|
||||
)
|
||||
|
||||
$fullAssemblyList = $commonAssembliesForAddType
|
||||
|
||||
$assemblyFullPaths = @()
|
||||
$assemblyFullPaths += foreach ($assemblyName in $fullAssemblyList) {
|
||||
Join-Path $PublishPath $assemblyName
|
||||
}
|
||||
|
||||
New-CrossGenAssembly -CrossgenPath $crossGenPath -AssemblyPath $assemblyFullPaths -Runtime $Runtime
|
||||
|
||||
#
|
||||
# With the latest dotnet.exe, the default load context is only able to load TPAs, and TPA
|
||||
# only contains IL assembly names. In order to make the default load context able to load
|
||||
# the NI PS assemblies, we need to replace the IL PS assemblies with the corresponding NI
|
||||
# PS assemblies, but with the same IL assembly names.
|
||||
#
|
||||
Write-Verbose "PowerShell Ngen assemblies have been generated. Deploying ..." -Verbose
|
||||
foreach ($assemblyName in $fullAssemblyList) {
|
||||
|
||||
# Remove the IL assembly and its symbols.
|
||||
$assemblyPath = Join-Path $PublishPath $assemblyName
|
||||
$symbolsPath = [System.IO.Path]::ChangeExtension($assemblyPath, ".pdb")
|
||||
|
||||
Remove-Item $assemblyPath -Force -ErrorAction Stop
|
||||
|
||||
# Rename the corresponding ni.dll assembly to be the same as the IL assembly
|
||||
$niAssemblyPath = [System.IO.Path]::ChangeExtension($assemblyPath, "ni.dll")
|
||||
Rename-Item $niAssemblyPath $assemblyPath -Force -ErrorAction Stop
|
||||
|
||||
# No symbols are available for Microsoft.CodeAnalysis.CSharp.dll, Microsoft.CodeAnalysis.dll,
|
||||
# Microsoft.CodeAnalysis.VisualBasic.dll, and Microsoft.CSharp.dll.
|
||||
if ($commonAssembliesForAddType -notcontains $assemblyName) {
|
||||
Remove-Item $symbolsPath -Force -ErrorAction Stop
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Cleans the PowerShell repo - everything but the root folder
|
||||
function Clear-PSRepo
|
||||
{
|
||||
|
@ -2881,6 +3070,7 @@ function Restore-PSOptions {
|
|||
-RootInfo $options.RootInfo `
|
||||
-Top $options.Top `
|
||||
-Runtime $options.Runtime `
|
||||
-Crossgen $options.Crossgen `
|
||||
-Configuration $options.Configuration `
|
||||
-PSModuleRestore $options.PSModuleRestore `
|
||||
-Framework $options.Framework `
|
||||
|
@ -2904,6 +3094,10 @@ function New-PSOptionsObject
|
|||
[String]
|
||||
$Runtime,
|
||||
|
||||
[Parameter(Mandatory)]
|
||||
[Bool]
|
||||
$CrossGen,
|
||||
|
||||
[Parameter(Mandatory)]
|
||||
[String]
|
||||
$Configuration,
|
||||
|
@ -2932,6 +3126,7 @@ function New-PSOptionsObject
|
|||
Framework = $Framework
|
||||
Runtime = $Runtime
|
||||
Output = $Output
|
||||
CrossGen = $CrossGen
|
||||
PSModuleRestore = $PSModuleRestore
|
||||
ForMinimalSize = $ForMinimalSize
|
||||
}
|
||||
|
@ -3191,23 +3386,3 @@ function New-NugetConfigFile
|
|||
|
||||
Set-Content -Path (Join-Path $Destination 'nuget.config') -Value $content -Force
|
||||
}
|
||||
|
||||
function Set-CorrectLocale
|
||||
{
|
||||
if (-not $IsLinux)
|
||||
{
|
||||
return
|
||||
}
|
||||
|
||||
$environment = Get-EnvironmentInformation
|
||||
if ($environment.IsUbuntu -and $environment.IsUbuntu20)
|
||||
{
|
||||
$env:LC_ALL = 'en_US.UTF-8'
|
||||
$env:LANG = 'en_US.UTF-8'
|
||||
sudo locale-gen $env:LANG
|
||||
sudo update-locale
|
||||
}
|
||||
|
||||
# Output the locale to log it
|
||||
locale
|
||||
}
|
||||
|
|
1424
cgmanifest.json
1424
cgmanifest.json
File diff suppressed because it is too large
Load diff
25
docker/tests/README.md
Normal file
25
docker/tests/README.md
Normal file
|
@ -0,0 +1,25 @@
|
|||
# Docker tests
|
||||
|
||||
## Windows and Linux containers
|
||||
|
||||
The tests must be run separately on the Windows and Linux docker daemons. You can use the Linux docker daemon on Windows, but that will only test Linux containers not Windows Containers.
|
||||
|
||||
## To building and basic behavior of the containers
|
||||
|
||||
```PowerShell
|
||||
Invoke-Pester
|
||||
```
|
||||
|
||||
Note: be sure to do this using both the Windows and Linux docker daemon.
|
||||
|
||||
## To test the productions containers
|
||||
|
||||
```PowerShell
|
||||
Invoke-Pester -Tag Behavior
|
||||
```
|
||||
|
||||
## To test only building the containers
|
||||
|
||||
```PowerShell
|
||||
Invoke-Pester -Tag Build
|
||||
```
|
23
docker/tests/Templates/centos7/Dockerfile
Normal file
23
docker/tests/Templates/centos7/Dockerfile
Normal file
|
@ -0,0 +1,23 @@
|
|||
FROM centos:7
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN yum install -y \
|
||||
curl \
|
||||
glibc-locale-source \
|
||||
git
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
|
||||
|
||||
RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME \
|
||||
&& yum install -y $PACKAGENAME
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
29
docker/tests/Templates/debian.9/Dockerfile
Normal file
29
docker/tests/Templates/debian.9/Dockerfile
Normal file
|
@ -0,0 +1,29 @@
|
|||
FROM debian:stretch
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apt-utils \
|
||||
ca-certificates \
|
||||
curl \
|
||||
apt-transport-https \
|
||||
locales \
|
||||
git \
|
||||
&& apt-get clean
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN locale-gen $LANG && update-locale
|
||||
|
||||
RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
|
||||
RUN dpkg -i $PACKAGENAME || :
|
||||
RUN apt-get install -y -f --no-install-recommends
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
26
docker/tests/Templates/fedora28/Dockerfile
Normal file
26
docker/tests/Templates/fedora28/Dockerfile
Normal file
|
@ -0,0 +1,26 @@
|
|||
FROM fedora:28
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN dnf install -y \
|
||||
curl \
|
||||
glibc-locale-source \
|
||||
git \
|
||||
compat-openssl10 \
|
||||
&& dnf upgrade-minimal -y --security \
|
||||
&& dnf clean all
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
|
||||
|
||||
RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
|
||||
RUN dnf install -y $PACKAGENAME
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
31
docker/tests/Templates/fxdependent-centos7/Dockerfile
Normal file
31
docker/tests/Templates/fxdependent-centos7/Dockerfile
Normal file
|
@ -0,0 +1,31 @@
|
|||
FROM centos:7
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN yum install -y \
|
||||
glibc-locale-source \
|
||||
git
|
||||
|
||||
# Install dotnet-runtime
|
||||
RUN rpm -Uvh https://packages.microsoft.com/config/rhel/7/packages-microsoft-prod.rpm
|
||||
RUN yum install -y \
|
||||
dotnet-runtime-2.1
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
|
||||
|
||||
# Install PowerShell package
|
||||
ADD $PACKAGELOCATION/$PACKAGENAME .
|
||||
RUN mkdir -p /opt/microsoft/powershell
|
||||
RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
|
||||
|
||||
# Download and run tests
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
31
docker/tests/Templates/fxdependent-debian.9/Dockerfile
Normal file
31
docker/tests/Templates/fxdependent-debian.9/Dockerfile
Normal file
|
@ -0,0 +1,31 @@
|
|||
FROM microsoft/dotnet:2.1.7-runtime-stretch-slim
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apt-utils \
|
||||
ca-certificates \
|
||||
apt-transport-https \
|
||||
locales \
|
||||
git \
|
||||
&& apt-get clean
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN locale-gen $LANG && update-locale
|
||||
|
||||
# Install PowerShell package
|
||||
ADD $PACKAGELOCATION/$PACKAGENAME .
|
||||
RUN mkdir -p /opt/microsoft/powershell
|
||||
RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
|
||||
|
||||
# Download and run tests
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
|
@ -0,0 +1,31 @@
|
|||
FROM microsoft/dotnet:3.0.100-preview-sdk
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apt-utils \
|
||||
ca-certificates \
|
||||
apt-transport-https \
|
||||
locales \
|
||||
git \
|
||||
&& apt-get clean
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN locale-gen $LANG && update-locale
|
||||
|
||||
# Install PowerShell package
|
||||
ADD $PACKAGELOCATION/$PACKAGENAME .
|
||||
RUN mkdir -p /opt/microsoft/powershell \
|
||||
&& tar zxf $PACKAGENAME -C /opt/microsoft/powershell
|
||||
|
||||
# Download and run tests
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
38
docker/tests/Templates/fxdependent-fedora28/Dockerfile
Normal file
38
docker/tests/Templates/fxdependent-fedora28/Dockerfile
Normal file
|
@ -0,0 +1,38 @@
|
|||
FROM fedora:28
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN dnf install -y \
|
||||
glibc-locale-source \
|
||||
git \
|
||||
compat-openssl10 \
|
||||
&& dnf upgrade-minimal -y --security \
|
||||
&& dnf clean all
|
||||
|
||||
# Install dotnet-runtime
|
||||
RUN rpm --import https://packages.microsoft.com/keys/microsoft.asc
|
||||
ADD https://packages.microsoft.com/config/fedora/27/prod.repo .
|
||||
RUN mv prod.repo /etc/yum.repos.d/microsoft-prod.repo
|
||||
RUN dnf install -y \
|
||||
dotnet-runtime-2.1 \
|
||||
&& dnf upgrade-minimal -y --security \
|
||||
&& dnf clean all
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
|
||||
|
||||
# Install PowerShell package
|
||||
ADD $PACKAGELOCATION/$PACKAGENAME .
|
||||
RUN mkdir -p /opt/microsoft/powershell \
|
||||
&& tar zxf $PACKAGENAME -C /opt/microsoft/powershell
|
||||
|
||||
# Download and run tests
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
41
docker/tests/Templates/fxdependent-opensuse42.3/Dockerfile
Normal file
41
docker/tests/Templates/fxdependent-opensuse42.3/Dockerfile
Normal file
|
@ -0,0 +1,41 @@
|
|||
FROM opensuse:42.3
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN zypper --non-interactive update --skip-interactive \
|
||||
&& zypper --non-interactive install \
|
||||
glibc-locale \
|
||||
glibc-i18ndata \
|
||||
tar \
|
||||
libunwind \
|
||||
libicu \
|
||||
openssl \
|
||||
git
|
||||
|
||||
# Install dotnet-runtime
|
||||
ADD https://packages.microsoft.com/keys/microsoft.asc .
|
||||
RUN rpmkeys --import microsoft.asc
|
||||
ADD https://packages.microsoft.com/config/opensuse/42.2/prod.repo .
|
||||
RUN mv prod.repo /etc/zypp/repos.d/microsoft-prod.repo
|
||||
RUN zypper --non-interactive update --skip-interactive \
|
||||
&& zypper --non-interactive install \
|
||||
dotnet-runtime-2.1
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
|
||||
|
||||
# Install PowerShell package
|
||||
ADD $PACKAGELOCATION/$PACKAGENAME .
|
||||
RUN mkdir -p /opt/microsoft/powershell
|
||||
RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
|
||||
|
||||
# Download and run tests
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
39
docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile
Normal file
39
docker/tests/Templates/fxdependent-ubuntu16.04/Dockerfile
Normal file
|
@ -0,0 +1,39 @@
|
|||
FROM ubuntu:xenial
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apt-utils \
|
||||
ca-certificates \
|
||||
apt-transport-https \
|
||||
locales \
|
||||
git \
|
||||
&& apt-get clean
|
||||
|
||||
# Install dotnet-runtime
|
||||
ADD https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb .
|
||||
RUN dpkg -i packages-microsoft-prod.deb
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
dotnet-runtime-2.1 \
|
||||
&& apt-get clean
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN locale-gen $LANG && update-locale
|
||||
|
||||
# Install PowerShell package
|
||||
ADD $PACKAGELOCATION/$PACKAGENAME .
|
||||
RUN mkdir -p /opt/microsoft/powershell \
|
||||
&& tar zxf $PACKAGENAME -C /opt/microsoft/powershell
|
||||
|
||||
# Download and run tests
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
31
docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile
Normal file
31
docker/tests/Templates/fxdependent-ubuntu18.04/Dockerfile
Normal file
|
@ -0,0 +1,31 @@
|
|||
FROM microsoft/dotnet:2.1.7-runtime-bionic
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apt-utils \
|
||||
ca-certificates \
|
||||
apt-transport-https \
|
||||
locales \
|
||||
git \
|
||||
&& apt-get clean
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN locale-gen $LANG && update-locale
|
||||
|
||||
# Install PowerShell package
|
||||
ADD $PACKAGELOCATION/$PACKAGENAME .
|
||||
RUN mkdir -p /opt/microsoft/powershell \
|
||||
&& tar zxf $PACKAGENAME -C /opt/microsoft/powershell
|
||||
|
||||
# Download and run tests
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN dotnet /opt/microsoft/powershell/pwsh.dll -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
39
docker/tests/Templates/opensuse42.3/Dockerfile
Normal file
39
docker/tests/Templates/opensuse42.3/Dockerfile
Normal file
|
@ -0,0 +1,39 @@
|
|||
FROM opensuse:42.3
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
ARG POWERSHELL_LINKFILE=/usr/bin/pwsh
|
||||
|
||||
# Install dependencies
|
||||
RUN zypper --non-interactive update --skip-interactive \
|
||||
&& zypper --non-interactive install \
|
||||
glibc-locale \
|
||||
glibc-i18ndata \
|
||||
tar \
|
||||
curl \
|
||||
libunwind \
|
||||
libicu \
|
||||
openssl \
|
||||
git
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN localedef --charmap=UTF-8 --inputfile=en_US $LANG
|
||||
|
||||
RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
|
||||
|
||||
# Create the target folder where powershell will be placed
|
||||
RUN mkdir -p /opt/microsoft/powershell
|
||||
# Expand powershell to the target folder
|
||||
RUN tar zxf $PACKAGENAME -C /opt/microsoft/powershell
|
||||
|
||||
# Create the symbolic link that points to powershell
|
||||
RUN ln -s /opt/microsoft/powershell/pwsh $POWERSHELL_LINKFILE
|
||||
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN pwsh -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
29
docker/tests/Templates/ubuntu16.04/Dockerfile
Normal file
29
docker/tests/Templates/ubuntu16.04/Dockerfile
Normal file
|
@ -0,0 +1,29 @@
|
|||
FROM ubuntu:xenial
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apt-utils \
|
||||
ca-certificates \
|
||||
curl \
|
||||
apt-transport-https \
|
||||
locales \
|
||||
git \
|
||||
&& apt-get clean
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN locale-gen $LANG && update-locale
|
||||
|
||||
RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
|
||||
RUN dpkg -i $PACKAGENAME || :
|
||||
RUN apt-get install -y -f --no-install-recommends
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
29
docker/tests/Templates/ubuntu18.04/Dockerfile
Normal file
29
docker/tests/Templates/ubuntu18.04/Dockerfile
Normal file
|
@ -0,0 +1,29 @@
|
|||
FROM ubuntu:bionic
|
||||
|
||||
ARG PACKAGENAME
|
||||
ARG PACKAGELOCATION
|
||||
ARG PREVIEWSUFFIX=
|
||||
ARG TESTLIST=/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module
|
||||
ARG TESTDOWNLOADCOMMAND="git clone --recursive https://github.com/PowerShell/PowerShell.git"
|
||||
|
||||
# Install dependencies
|
||||
RUN apt-get update \
|
||||
&& apt-get install -y --no-install-recommends \
|
||||
apt-utils \
|
||||
ca-certificates \
|
||||
curl \
|
||||
apt-transport-https \
|
||||
locales \
|
||||
git \
|
||||
&& apt-get clean
|
||||
|
||||
# Setup the locale
|
||||
ENV LANG en_US.UTF-8
|
||||
ENV LC_ALL $LANG
|
||||
RUN locale-gen $LANG && update-locale
|
||||
|
||||
RUN curl -L -o $PACKAGENAME $PACKAGELOCATION/$PACKAGENAME
|
||||
RUN dpkg -i $PACKAGENAME || :
|
||||
RUN apt-get install -y -f --no-install-recommends
|
||||
RUN $TESTDOWNLOADCOMMAND
|
||||
RUN pwsh$PREVIEWSUFFIX -c "Import-Module /PowerShell/build.psm1;\$dir='/usr/local/share/powershell/Modules';\$null=New-Item -Type Directory -Path \$dir -ErrorAction SilentlyContinue;Restore-PSPester -Destination \$dir;exit (Invoke-Pester $TESTLIST -PassThru).FailedCount"
|
370
docker/tests/containerTestCommon.psm1
Normal file
370
docker/tests/containerTestCommon.psm1
Normal file
|
@ -0,0 +1,370 @@
|
|||
# Copyright (c) Microsoft Corporation.
|
||||
# Licensed under the MIT License.
|
||||
|
||||
$script:forcePull = $true
|
||||
# Get docker Engine OS
|
||||
function Get-DockerEngineOs
|
||||
{
|
||||
docker info --format '{{ .OperatingSystem }}'
|
||||
}
|
||||
|
||||
# Call Docker with appropriate result checksfunction Invoke-Docker
|
||||
function Invoke-Docker
|
||||
{
|
||||
param(
|
||||
[Parameter(Mandatory=$true)]
|
||||
[string[]]
|
||||
$Command,
|
||||
[ValidateSet("error","warning",'ignore')]
|
||||
$FailureAction = 'error',
|
||||
|
||||
[Parameter(Mandatory=$true)]
|
||||
[string[]]
|
||||
$Params,
|
||||
|
||||
[switch]
|
||||
$PassThru,
|
||||
[switch]
|
||||
$SuppressHostOutput
|
||||
)
|
||||
|
||||
$ErrorActionPreference = 'Continue'
|
||||
|
||||
# Log how we are running docker for troubleshooting issues
|
||||
Write-Verbose "Running docker $command $params" -Verbose
|
||||
if($SuppressHostOutput.IsPresent)
|
||||
{
|
||||
$result = docker $command $params 2>&1
|
||||
}
|
||||
else
|
||||
{
|
||||
&'docker' $command $params 2>&1 | Tee-Object -Variable result -ErrorAction SilentlyContinue | Out-String -Stream -ErrorAction SilentlyContinue | Write-Host -ErrorAction SilentlyContinue
|
||||
}
|
||||
|
||||
$dockerExitCode = $LASTEXITCODE
|
||||
if($PassThru.IsPresent)
|
||||
{
|
||||
Write-Verbose "passing through docker result$($result.length)..." -Verbose
|
||||
return $result
|
||||
}
|
||||
elseif($dockerExitCode -ne 0 -and $FailureAction -eq 'error')
|
||||
{
|
||||
Write-Error "docker $command failed with: $result" -ErrorAction Stop
|
||||
return $false
|
||||
}
|
||||
elseif($dockerExitCode -ne 0 -and $FailureAction -eq 'warning')
|
||||
{
|
||||
Write-Warning "docker $command failed with: $result"
|
||||
return $false
|
||||
}
|
||||
elseif($dockerExitCode -ne 0)
|
||||
{
|
||||
return $false
|
||||
}
|
||||
|
||||
return $true
|
||||
}
|
||||
|
||||
# Return a list of Linux Container Test Cases
|
||||
function Get-LinuxContainer
|
||||
{
|
||||
foreach($os in 'centos7','ubuntu16.04')
|
||||
{
|
||||
Write-Output @{
|
||||
Name = $os
|
||||
Path = "$PSScriptRoot/../release/$os"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
# Return a list of Windows Container Test Cases
|
||||
function Get-WindowsContainer
|
||||
{
|
||||
foreach($os in 'windowsservercore','nanoserver')
|
||||
{
|
||||
Write-Output @{
|
||||
Name = $os
|
||||
Path = "$PSScriptRoot/../release/$os"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$script:repoName = 'microsoft/powershell'
|
||||
function Get-RepoName
|
||||
{
|
||||
return $script:repoName
|
||||
}
|
||||
|
||||
function Set-RepoName
|
||||
{
|
||||
param([string]$RepoName)
|
||||
|
||||
$script:repoName = $RepoName
|
||||
$script:forcePull = $false
|
||||
}
|
||||
|
||||
function Test-SkipWindows
|
||||
{
|
||||
[bool] $canRunWindows = (Get-DockerEngineOs) -like 'Windows*'
|
||||
return ($IsLinux -or $IsMacOS -or !$canRunWindows)
|
||||
}
|
||||
|
||||
function Test-SkipLinux
|
||||
{
|
||||
$os = Get-DockerEngineOs
|
||||
|
||||
switch -wildcard ($os)
|
||||
{
|
||||
'*Linux*' {
|
||||
return $false
|
||||
}
|
||||
'*Mac' {
|
||||
return $false
|
||||
}
|
||||
# Docker for Windows means we are running the linux kernel
|
||||
'Docker for Windows' {
|
||||
return $false
|
||||
}
|
||||
'Windows*' {
|
||||
return $true
|
||||
}
|
||||
default {
|
||||
throw "Unknown docker os '$os'"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function Get-TestContext
|
||||
{
|
||||
param(
|
||||
[ValidateSet('Linux','Windows','macOS')]
|
||||
[string]$Type
|
||||
)
|
||||
|
||||
$resultFileName = 'results.xml'
|
||||
$logFileName = 'results.log'
|
||||
$containerTestDrive = '/test'
|
||||
|
||||
# Return a windows context if the Context in Windows *AND*
|
||||
# the current system is windows, otherwise Join-path will fail.
|
||||
if($Type -eq 'Windows' -and $IsWindows)
|
||||
{
|
||||
$ContainerTestDrive = 'C:\test'
|
||||
}
|
||||
$resolvedTestDrive = (Resolve-Path "Testdrive:\").providerPath
|
||||
|
||||
return @{
|
||||
ResolvedTestDrive = $resolvedTestDrive
|
||||
ResolvedXmlPath = Join-Path $resolvedTestDrive -ChildPath $resultFileName
|
||||
ResolvedLogPath = Join-Path $resolvedTestDrive -ChildPath $logFileName
|
||||
ContainerTestDrive = $ContainerTestDrive
|
||||
ContainerXmlPath = Join-Path $containerTestDrive -ChildPath $resultFileName
|
||||
ContainerLogPath = Join-Path $containerTestDrive -ChildPath $logFileName
|
||||
Type = $Type
|
||||
ForcePull = $script:forcePull
|
||||
}
|
||||
}
|
||||
|
||||
function Get-ContainerPowerShellVersion
|
||||
{
|
||||
param(
|
||||
[HashTable] $TestContext,
|
||||
[string] $RepoName,
|
||||
[string] $Name
|
||||
)
|
||||
|
||||
$imageTag = "${script:repoName}:${Name}"
|
||||
|
||||
if($TestContext.ForcePull)
|
||||
{
|
||||
$null=Invoke-Docker -Command 'image', 'pull' -Params $imageTag -SuppressHostOutput
|
||||
}
|
||||
|
||||
$runParams = @()
|
||||
$localVolumeName = $testContext.resolvedTestDrive
|
||||
$runParams += '--rm'
|
||||
if($TestContext.Type -ne 'Windows' -and $IsWindows)
|
||||
{
|
||||
# use a container volume on windows because host volumes are not automatic
|
||||
$volumeName = "test-volume-" + (Get-Random -Minimum 100 -Maximum 999)
|
||||
|
||||
# using alpine because it's tiny
|
||||
$null=Invoke-Docker -Command create -Params '-v', '/test', '--name', $volumeName, 'alpine' -SuppressHostOutput
|
||||
$runParams += '--volumes-from'
|
||||
$runParams += $volumeName
|
||||
}
|
||||
else {
|
||||
$runParams += '-v'
|
||||
$runParams += "${localVolumeName}:$($testContext.containerTestDrive)"
|
||||
}
|
||||
|
||||
$runParams += $imageTag
|
||||
$runParams += 'pwsh'
|
||||
$runParams += '-c'
|
||||
$runParams += ('$PSVersionTable.PSVersion.ToString() | out-string | out-file -encoding ascii -FilePath '+$testContext.containerLogPath)
|
||||
|
||||
$null = Invoke-Docker -Command run -Params $runParams -SuppressHostOutput
|
||||
if($TestContext.Type -ne 'Windows' -and $IsWindows)
|
||||
{
|
||||
$null = Invoke-Docker -Command cp -Params "${volumeName}:$($testContext.containerLogPath)", $TestContext.ResolvedLogPath
|
||||
$null = Invoke-Docker -Command container, rm -Params $volumeName, '--force' -SuppressHostOutput
|
||||
}
|
||||
return (Get-Content -Encoding Ascii $testContext.resolvedLogPath)[0]
|
||||
}
|
||||
|
||||
# Function defines a config mapping for testing Preview packages.
|
||||
# The list of supported OS for each release can be found here:
|
||||
# https://github.com/PowerShell/PowerShell-Docs/blob/staging/reference/docs-conceptual/PowerShell-Core-Support.md#supported-platforms
|
||||
function Get-DefaultPreviewConfigForPackageValidation
|
||||
{
|
||||
# format: <DockerfileFolderName>=<PartOfPackageFilename>
|
||||
@{ 'centos7'='rhel.7';
|
||||
'debian.9'='debian.9';
|
||||
'fedora28'='rhel.7';
|
||||
'opensuse42.3'='linux-x64.tar.gz';
|
||||
'ubuntu16.04'='ubuntu.16.04';
|
||||
'ubuntu18.04'='ubuntu.18.04';
|
||||
'fxdependent-centos7'='linux-x64-fxdependent.tar.gz';
|
||||
'fxdependent-debian.9'='linux-x64-fxdependent.tar.gz';
|
||||
'fxdependent-fedora28'='linux-x64-fxdependent.tar.gz';
|
||||
'fxdependent-opensuse42.3'='linux-x64-fxdependent.tar.gz';
|
||||
'fxdependent-ubuntu16.04'='linux-x64-fxdependent.tar.gz';
|
||||
'fxdependent-ubuntu18.04'='linux-x64-fxdependent.tar.gz';
|
||||
'fxdependent-dotnetsdk-latest'='linux-x64-fxd-dotnetsdk.tar.gz'
|
||||
}
|
||||
}
|
||||
|
||||
# Function defines a config mapping for testing Stable packages.
|
||||
# The list of supported OS for each release can be found here:
|
||||
# https://github.com/PowerShell/PowerShell-Docs/blob/staging/reference/docs-conceptual/PowerShell-Core-Support.md#supported-platforms
|
||||
function Get-DefaultStableConfigForPackageValidation
|
||||
{
|
||||
# format: <DockerfileFolderName>=<PartOfPackageFilename>
|
||||
@{ 'centos7'='rhel.7';
|
||||
'debian.9'='debian.9';
|
||||
'opensuse42.3'='linux-x64.tar.gz';
|
||||
'ubuntu16.04'='ubuntu.16.04';
|
||||
'fxdependent-centos7'='linux-x64-fxdependent.tar.gz';
|
||||
'fxdependent-debian.9'='linux-x64-fxdependent.tar.gz';
|
||||
'fxdependent-opensuse42.3'='linux-x64-fxdependent.tar.gz';
|
||||
'fxdependent-ubuntu16.04'='linux-x64-fxdependent.tar.gz'
|
||||
}
|
||||
}
|
||||
|
||||
# Returns a list of files in a specified Azure container.
|
||||
function Get-PackageNamesOnAzureBlob
|
||||
{
|
||||
param(
|
||||
[string]
|
||||
$ContainerUrl,
|
||||
|
||||
# $SAS (shared access signature) param should include beginning '?' and trailing '&'
|
||||
[string]
|
||||
$SAS
|
||||
)
|
||||
|
||||
|
||||
$response = Invoke-RestMethod -Method Get -Uri $($ContainerUrl + $SAS + 'restype=container&comp=list')
|
||||
|
||||
$xmlResponce = [xml]$response.Substring($response.IndexOf('<EnumerationResults')) # remove some bad chars in the beginning that break XML parsing
|
||||
($xmlResponce.EnumerationResults.Blobs.Blob).Name
|
||||
}
|
||||
|
||||
# This function is used for basic validation of PS packages during a release;
|
||||
# During the process Docker files are filled out and executed with Docker build;
|
||||
# During the build PS packages are downloaded onto Docker containers, installed and selected Pester tests from PowerShell Github repo are executed.
|
||||
# This function must be run on a Docker host machine in 'Linux containers' mode, such as Windows 10 server with Hyper-V role installed.
|
||||
function Test-PSPackage
|
||||
{
|
||||
param(
|
||||
[string]
|
||||
[Parameter(Mandatory=$true)]
|
||||
$PSPackageLocation, # e.g. Azure container storage url
|
||||
[string]
|
||||
$SAS,# $SAS (shared access signature) param should include beginning '?' and trailing '&'
|
||||
[Hashtable]
|
||||
$Config, # hashtable that maps packages to dockerfiles; for example see Get-DefaultConfigForPackageValidation
|
||||
[string]
|
||||
$TestList = "/PowerShell/test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1,/PowerShell/test/powershell/engine/Module",
|
||||
[string]
|
||||
$TestDownloadCommand = "git clone --recursive https://github.com/PowerShell/PowerShell.git",
|
||||
[switch]
|
||||
$Preview = $false
|
||||
)
|
||||
|
||||
$PSPackageLocation = $PSPackageLocation.TrimEnd('/','\') # code below assumes there is no trailing separator in PSPackageLocation url
|
||||
$RootFolder = Join-Path $PSScriptRoot 'Templates'
|
||||
|
||||
|
||||
$packageList = Get-PackageNamesOnAzureBlob -ContainerUrl $PSPackageLocation -SAS $SAS
|
||||
if (!$Config)
|
||||
{
|
||||
if ($Preview)
|
||||
{
|
||||
$Config = Get-DefaultPreviewConfigForPackageValidation
|
||||
}
|
||||
else
|
||||
{
|
||||
$Config = Get-DefaultStableConfigForPackageValidation
|
||||
}
|
||||
}
|
||||
|
||||
# pre-process $Config: verify build directories and packages exist
|
||||
$map = @{}
|
||||
foreach($kp in $Config.GetEnumerator())
|
||||
{
|
||||
$buildDir = Join-Path $RootFolder $kp.Key
|
||||
$packageName = $packageList | Where-Object {$_ -like $('*'+$kp.Value+'*')}
|
||||
|
||||
if (-not (Test-Path $buildDir))
|
||||
{
|
||||
Write-Error "Directory does Not exist - $buildDir; Check `$Config parameter and '$RootFolder' folder"
|
||||
}
|
||||
elseif (-not ($packageName))
|
||||
{
|
||||
Write-Error "Can not find package that matches filter *$($kp.Value)*; Check `$Config parameter and '$PSPackageLocation'"
|
||||
}
|
||||
else
|
||||
{
|
||||
$map.Add($buildDir, $packageName)
|
||||
}
|
||||
}
|
||||
|
||||
Write-Verbose "Using configuration:" -Verbose
|
||||
Write-Verbose ($map | Format-List | Out-String) -Verbose
|
||||
|
||||
$results = @{}
|
||||
$returnValue = $true
|
||||
|
||||
# run builds sequentially, but don't block for errors so that configs after failed one can run
|
||||
foreach($kp in $map.GetEnumerator())
|
||||
{
|
||||
$dockerDirPath = $kp.Key
|
||||
$packageFileName = $kp.Value
|
||||
|
||||
$buildArgs = @()
|
||||
|
||||
$buildArgs += "--build-arg","PACKAGENAME=$packageFileName"
|
||||
$buildArgs += "--build-arg","PACKAGELOCATION=$PSPackageLocation"
|
||||
if ($Preview)
|
||||
{
|
||||
$buildArgs += "--build-arg","PREVIEWSUFFIX=-preview"
|
||||
}
|
||||
$buildArgs += "--build-arg","TESTLIST=$TestList"
|
||||
$buildArgs += "--build-arg","TESTDOWNLOADCOMMAND=$TestDownloadCommand"
|
||||
$buildArgs += "--no-cache"
|
||||
$buildArgs += $dockerDirPath
|
||||
|
||||
$dockerResult = Invoke-Docker -Command 'build' -Params $buildArgs -FailureAction warning
|
||||
|
||||
$confName = Split-Path -Leaf $dockerDirPath
|
||||
$results.Add($confName, $dockerResult)
|
||||
if (-not $dockerResult) {$returnValue = $false}
|
||||
}
|
||||
|
||||
# in the end print results for all configurations
|
||||
Write-Verbose "Package validation results:" -Verbose
|
||||
$results
|
||||
|
||||
return $returnValue
|
||||
}
|
|
@ -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/net6.0/linux-x64/publish/pwsh`.
|
||||
`./src/powershell-unix/bin/Debug/net5.0/linux-x64/publish/pwsh`.
|
||||
|
||||
You should now be running the PowerShell Core that you just built, if you run the above executable.
|
||||
You can run our cross-platform Pester tests with `Start-PSPester`, and our xUnit tests with `Start-PSxUnit`.
|
||||
|
|
|
@ -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/net6.0/osx-x64/publish/pwsh`.
|
||||
After building, PowerShell will be at `./src/powershell-unix/bin/Debug/net5.0/osx-x64/publish/pwsh`.
|
||||
|
|
|
@ -59,11 +59,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/net6.0/win7-x64/publish/pwsh.exe`.
|
||||
Congratulations! If everything went right, PowerShell is now built and executable as `./src/powershell-win-core/bin/Debug/net5.0/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 `net6.0`, runtime identifier is `win7-x64` by default,
|
||||
framework is `net5.0`, 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)`.
|
||||
|
|
|
@ -27,6 +27,7 @@ The PowerShell Committee and its members (aka Committee Members) are the primary
|
|||
|
||||
* Bruce Payette ([BrucePay](https://github.com/BrucePay))
|
||||
* Jim Truher ([JamesWTruher](https://github.com/JamesWTruher))
|
||||
* Joey Aiello ([joeyaiello](https://github.com/joeyaiello))
|
||||
* Paul Higinbotham ([paulhigin](https://github.com/paulhigin))
|
||||
* Rob Holt ([rjmholt](https://github.com/rjmholt))
|
||||
* Steve Lee ([SteveL-MSFT](https://github.com/SteveL-MSFT))
|
||||
|
|
|
@ -19,6 +19,7 @@ Today, DSC is integrated into the PowerShell language, and we need to manage it
|
|||
|
||||
* @TravisEz13
|
||||
* @theJasonHelmick
|
||||
* @joeyaiello
|
||||
* @anmenaga
|
||||
|
||||
## Developer Experience
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
{
|
||||
"sdk": {
|
||||
"version": "6.0.100"
|
||||
"version": "6.0.100-rc.1.21430.44"
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
<configuration>
|
||||
<packageSources>
|
||||
<clear />
|
||||
<add key="dotnet" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v2" />
|
||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||
<add key="dotnet-internal" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/6.0.100-rc.1.21430.44-shipping/nuget/v2" />
|
||||
</packageSources>
|
||||
<disabledPackageSources>
|
||||
<clear />
|
||||
</disabledPackageSources>
|
||||
</configuration>
|
||||
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
|
||||
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
|
||||
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21430.11" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
|
||||
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0" />
|
||||
<PackageReference Include="Microsoft.PowerShell.MarkdownRender" Version="7.2.0-preview.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
@ -31,9 +31,9 @@
|
|||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-6.final" />
|
||||
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.0.0-4.21430.4" />
|
||||
<PackageReference Include="System.Threading.AccessControl" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.Drawing.Common" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="NJsonSchema" Version="10.5.2" />
|
||||
</ItemGroup>
|
||||
|
||||
|
|
|
@ -11,7 +11,6 @@ using System.IO;
|
|||
using System.Linq;
|
||||
using System.Management.Automation;
|
||||
using System.Management.Automation.Internal;
|
||||
using System.Management.Automation.Security;
|
||||
using System.Reflection;
|
||||
using System.Runtime.Loader;
|
||||
using System.Security;
|
||||
|
@ -550,10 +549,8 @@ namespace Microsoft.PowerShell.Commands
|
|||
/// </summary>
|
||||
protected override void BeginProcessing()
|
||||
{
|
||||
// Prevent code compilation in ConstrainedLanguage mode, or NoLanguage mode under system lock down.
|
||||
if (SessionState.LanguageMode == PSLanguageMode.ConstrainedLanguage ||
|
||||
(SessionState.LanguageMode == PSLanguageMode.NoLanguage &&
|
||||
SystemPolicy.GetSystemLockdownPolicy() == SystemEnforcementMode.Enforce))
|
||||
// Prevent code compilation in ConstrainedLanguage mode
|
||||
if (SessionState.LanguageMode == PSLanguageMode.ConstrainedLanguage)
|
||||
{
|
||||
ThrowTerminatingError(
|
||||
new ErrorRecord(
|
||||
|
|
|
@ -2823,14 +2823,13 @@ function Get-PSImplicitRemotingClientSideParameters
|
|||
|
||||
$clientSideParameters = Get-PSImplicitRemotingClientSideParameters $PSBoundParameters ${8}
|
||||
|
||||
$scriptCmd = {{
|
||||
& $script:InvokeCommand `
|
||||
@clientSideParameters `
|
||||
-HideComputerName `
|
||||
-Session (Get-PSImplicitRemotingSession -CommandName '{0}') `
|
||||
-Arg ('{0}', $PSBoundParameters, $positionalArguments) `
|
||||
-Script {{ param($name, $boundParams, $unboundParams) & $name @boundParams @unboundParams }} `
|
||||
}}
|
||||
$scriptCmd = {{ & $script:InvokeCommand `
|
||||
@clientSideParameters `
|
||||
-HideComputerName `
|
||||
-Session (Get-PSImplicitRemotingSession -CommandName '{0}') `
|
||||
-Arg ('{0}', $PSBoundParameters, $positionalArguments) `
|
||||
-Script {{ param($name, $boundParams, $unboundParams) & $name @boundParams @unboundParams }} `
|
||||
}}
|
||||
|
||||
$steppablePipeline = $scriptCmd.GetSteppablePipeline($myInvocation.CommandOrigin)
|
||||
$steppablePipeline.Begin($myInvocation.ExpectingInput, $ExecutionContext)
|
||||
|
|
|
@ -219,7 +219,7 @@ namespace Microsoft.PowerShell.Commands
|
|||
|
||||
if (s_inputFieldRegex == null)
|
||||
{
|
||||
s_inputFieldRegex = new Regex(@"<input\s+[^>]*(/?>|>.*?</input>)",
|
||||
s_inputFieldRegex = new Regex(@"<input\s+[^>]*(/>|>.*?</input>)",
|
||||
RegexOptions.Singleline | RegexOptions.IgnoreCase | RegexOptions.Compiled);
|
||||
}
|
||||
|
||||
|
|
|
@ -1,51 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT License.
|
||||
|
||||
#nullable enable
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Management.Automation;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
|
||||
namespace Microsoft.PowerShell.Commands
|
||||
{
|
||||
/// <summary>
|
||||
/// A completer for HTTP version names.
|
||||
/// </summary>
|
||||
internal sealed class HttpVersionCompletionsAttribute : ArgumentCompletionsAttribute
|
||||
{
|
||||
public static readonly string[] AllowedVersions;
|
||||
|
||||
static HttpVersionCompletionsAttribute()
|
||||
{
|
||||
FieldInfo[] fields = typeof(HttpVersion).GetFields(BindingFlags.Static | BindingFlags.Public);
|
||||
|
||||
var versions = new List<string>(fields.Length - 1);
|
||||
|
||||
for (int i = 0; i < fields.Length; i++)
|
||||
{
|
||||
// skip field Unknown and not Version type
|
||||
if (fields[i].Name == nameof(HttpVersion.Unknown) || fields[i].FieldType != typeof(Version))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var version = (Version?)fields[i].GetValue(null);
|
||||
|
||||
if (version is not null)
|
||||
{
|
||||
versions.Add(version.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
AllowedVersions = versions.ToArray();
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public HttpVersionCompletionsAttribute() : base(AllowedVersions)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
|
@ -107,18 +107,6 @@ namespace Microsoft.PowerShell.Commands
|
|||
|
||||
#endregion
|
||||
|
||||
#region HTTP Version
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the HTTP Version property.
|
||||
/// </summary>
|
||||
[Parameter]
|
||||
[ArgumentToVersionTransformation]
|
||||
[HttpVersionCompletions]
|
||||
public virtual Version HttpVersion { get; set; }
|
||||
|
||||
#endregion
|
||||
|
||||
#region Session
|
||||
/// <summary>
|
||||
/// Gets or sets the Session property.
|
||||
|
@ -1093,11 +1081,6 @@ namespace Microsoft.PowerShell.Commands
|
|||
// create the base WebRequest object
|
||||
var request = new HttpRequestMessage(httpMethod, requestUri);
|
||||
|
||||
if (HttpVersion is not null)
|
||||
{
|
||||
request.Version = HttpVersion;
|
||||
}
|
||||
|
||||
// pull in session data
|
||||
if (WebSession.Headers.Count > 0)
|
||||
{
|
||||
|
@ -1430,7 +1413,6 @@ namespace Microsoft.PowerShell.Commands
|
|||
string reqVerboseMsg = string.Format(
|
||||
CultureInfo.CurrentCulture,
|
||||
WebCmdletStrings.WebMethodInvocationVerboseMsg,
|
||||
requestWithoutRange.Version,
|
||||
requestWithoutRange.Method,
|
||||
requestWithoutRange.RequestUri,
|
||||
requestContentLength);
|
||||
|
@ -1523,14 +1505,10 @@ namespace Microsoft.PowerShell.Commands
|
|||
if (request.Content != null)
|
||||
requestContentLength = request.Content.Headers.ContentLength.Value;
|
||||
|
||||
string reqVerboseMsg = string.Format(
|
||||
CultureInfo.CurrentCulture,
|
||||
string reqVerboseMsg = string.Format(CultureInfo.CurrentCulture,
|
||||
WebCmdletStrings.WebMethodInvocationVerboseMsg,
|
||||
request.Version,
|
||||
request.Method,
|
||||
request.RequestUri,
|
||||
requestContentLength);
|
||||
|
||||
WriteVerbose(reqVerboseMsg);
|
||||
|
||||
HttpResponseMessage response = GetResponse(client, request, keepAuthorization);
|
||||
|
|
|
@ -27,13 +27,15 @@ namespace Microsoft.PowerShell.Commands
|
|||
|
||||
private int _depth = 2;
|
||||
|
||||
private const int maxDepthAllowed = 100;
|
||||
|
||||
private readonly CancellationTokenSource _cancellationSource = new();
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the Depth property.
|
||||
/// </summary>
|
||||
[Parameter]
|
||||
[ValidateRange(0, 100)]
|
||||
[ValidateRange(0, int.MaxValue)]
|
||||
public int Depth
|
||||
{
|
||||
get { return _depth; }
|
||||
|
@ -97,7 +99,23 @@ namespace Microsoft.PowerShell.Commands
|
|||
_cancellationSource.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Prerequisite checks.
|
||||
/// </summary>
|
||||
protected override void BeginProcessing()
|
||||
{
|
||||
if (_depth > maxDepthAllowed)
|
||||
{
|
||||
string errorMessage = StringUtil.Format(WebCmdletStrings.ReachedMaximumDepthAllowed, maxDepthAllowed);
|
||||
ThrowTerminatingError(new ErrorRecord(
|
||||
new InvalidOperationException(errorMessage),
|
||||
"ReachedMaximumDepthAllowed",
|
||||
ErrorCategory.InvalidOperation,
|
||||
null));
|
||||
}
|
||||
}
|
||||
|
||||
private readonly List<object> _inputObjects = new();
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -129,7 +129,7 @@
|
|||
<data name="AuthenticationCredentialNotSupplied" xml:space="preserve">
|
||||
<value>The cmdlet cannot run because the following parameter is not specified: Credential. The supplied Authentication type requires a Credential. Specify Credential, then retry.</value>
|
||||
</data>
|
||||
<data name="AuthenticationTokenNotSupplied" xml:space="preserve">
|
||||
<data name="AuthenticationTokenNotSupplied" xml:space="preserve">
|
||||
<value>The cmdlet cannot run because the following parameter is not specified: Token. The supplied Authentication type requires a Token. Specify Token, then retry.</value>
|
||||
</data>
|
||||
<data name="AuthenticationTokenConflict" xml:space="preserve">
|
||||
|
@ -237,6 +237,9 @@
|
|||
<data name="JsonNetModuleFilesRequired" xml:space="preserve">
|
||||
<value>Ensure 'Json.Net.psd1' and 'Newtonsoft.Json.dll' are available in a versioned subdirectory of '{0}'.</value>
|
||||
</data>
|
||||
<data name="ReachedMaximumDepthAllowed" xml:space="preserve">
|
||||
<value>The maximum depth allowed for serialization is {0}.</value>
|
||||
</data>
|
||||
<data name="JsonDeserializationFailed" xml:space="preserve">
|
||||
<value>Conversion from JSON failed with error: {0}</value>
|
||||
</data>
|
||||
|
@ -247,7 +250,7 @@
|
|||
<value>Following rel link {0}</value>
|
||||
</data>
|
||||
<data name="WebMethodInvocationVerboseMsg" xml:space="preserve">
|
||||
<value>HTTP/{0} {1} {2} with {3}-byte payload</value>
|
||||
<value>{0} with {1}-byte payload</value>
|
||||
</data>
|
||||
<data name="WebMethodResumeFailedVerboseMsg" xml:space="preserve">
|
||||
<value>The remote server indicated it could not resume downloading. The local file will be overwritten.</value>
|
||||
|
|
|
@ -432,7 +432,7 @@ namespace Microsoft.PowerShell
|
|||
host.ShouldEndSession = shouldEndSession;
|
||||
}
|
||||
|
||||
// Creation of the thread and starting it should be an atomic operation.
|
||||
// Creation of the tread and starting it should be an atomic operation.
|
||||
// otherwise the code in Run method can get instance of the breakhandlerThread
|
||||
// after it is created and before started and call join on it. This will result
|
||||
// in ThreadStateException.
|
||||
|
|
|
@ -729,7 +729,7 @@ namespace Microsoft.PowerShell
|
|||
}
|
||||
|
||||
TextWriter writer = Console.IsOutputRedirected ? Console.Out : _parent.ConsoleTextWriter;
|
||||
value = GetOutputString(value, SupportsVirtualTerminal, Console.IsOutputRedirected);
|
||||
value = Utils.GetOutputString(value, isHost: true, SupportsVirtualTerminal, Console.IsOutputRedirected);
|
||||
|
||||
if (_parent.IsRunningAsync)
|
||||
{
|
||||
|
@ -1215,7 +1215,7 @@ namespace Microsoft.PowerShell
|
|||
{
|
||||
if (SupportsVirtualTerminal)
|
||||
{
|
||||
WriteLine(GetFormatStyleString(FormatStyle.Debug, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message) + PSStyle.Instance.Reset);
|
||||
WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Debug) + StringUtil.Format(ConsoleHostUserInterfaceStrings.DebugFormatString, message) + PSStyle.Instance.Reset);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1276,7 +1276,7 @@ namespace Microsoft.PowerShell
|
|||
{
|
||||
if (SupportsVirtualTerminal)
|
||||
{
|
||||
WriteLine(GetFormatStyleString(FormatStyle.Verbose, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message) + PSStyle.Instance.Reset);
|
||||
WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Verbose) + StringUtil.Format(ConsoleHostUserInterfaceStrings.VerboseFormatString, message) + PSStyle.Instance.Reset);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@ -1320,7 +1320,7 @@ namespace Microsoft.PowerShell
|
|||
{
|
||||
if (SupportsVirtualTerminal)
|
||||
{
|
||||
WriteLine(GetFormatStyleString(FormatStyle.Warning, Console.IsOutputRedirected) + StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message) + PSStyle.Instance.Reset);
|
||||
WriteLine(Utils.GetFormatStyleString(Utils.FormatStyle.Warning) + StringUtil.Format(ConsoleHostUserInterfaceStrings.WarningFormatString, message) + PSStyle.Instance.Reset);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
|
||||
<ItemGroup>
|
||||
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
|
||||
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0" />
|
||||
<PackageReference Include="System.Diagnostics.EventLog" Version="6.0.0-rc.1.21430.11" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -6,7 +6,6 @@
|
|||
<AssemblyName>Microsoft.PowerShell.GlobalTool.Shim</AssemblyName>
|
||||
<OutputType>EXE</OutputType>
|
||||
<RootNamespace>Microsoft.PowerShell.GlobalTool.Shim</RootNamespace>
|
||||
<UseAppHost>False</UseAppHost>
|
||||
</PropertyGroup>
|
||||
|
||||
<Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" Condition="'$(SDKToUse)' == 'Microsoft.NET.Sdk' " />
|
||||
|
|
|
@ -16,21 +16,21 @@
|
|||
|
||||
<ItemGroup>
|
||||
<!-- the following package(s) are from https://github.com/dotnet/fxdac -->
|
||||
<PackageReference Include="System.Data.SqlClient" Version="4.8.3" />
|
||||
<PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
|
||||
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
|
||||
<PackageReference Include="System.IO.Packaging" Version="6.0.0" />
|
||||
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0" />
|
||||
<PackageReference Include="System.IO.Packaging" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.Net.Http.WinHttpHandler" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.Text.Encodings.Web" Version="6.0.0-rc.1.21430.11" />
|
||||
<!-- the following package(s) are from https://github.com/dotnet/wcf -->
|
||||
<PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0" />
|
||||
<PackageReference Include="System.ServiceModel.Http" Version="4.9.0" />
|
||||
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.9.0" />
|
||||
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0" />
|
||||
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0" />
|
||||
<PackageReference Include="System.Private.ServiceModel" Version="4.9.0" />
|
||||
<PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0-preview1.21220.1" />
|
||||
<PackageReference Include="System.ServiceModel.Http" Version="4.9.0-preview1.21220.1" />
|
||||
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.9.0-preview1.21220.1" />
|
||||
<PackageReference Include="System.ServiceModel.Primitives" Version="4.9.0-preview1.21220.1" />
|
||||
<PackageReference Include="System.ServiceModel.Security" Version="4.9.0-preview1.21220.1" />
|
||||
<PackageReference Include="System.Private.ServiceModel" Version="4.9.0-preview1.21220.1" />
|
||||
<!-- the source could not be found for the following package(s) -->
|
||||
<PackageReference Include="Microsoft.NETCore.Windows.ApiSets" Version="1.0.1" />
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0-rc.1.21430.11" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
<ProjectReference Include="..\System.Management.Automation\System.Management.Automation.csproj" />
|
||||
<ProjectReference Include="..\Microsoft.WSMan.Runtime\Microsoft.WSMan.Runtime.csproj" />
|
||||
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
|
||||
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0" />
|
||||
<PackageReference Include="System.ServiceProcess.ServiceController" Version="6.0.0-rc.1.21430.11" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
@ -184,7 +184,7 @@ namespace System.Management.Automation
|
|||
#endif
|
||||
|
||||
// format files
|
||||
internal static readonly string[] FormatFileNames = new string[]
|
||||
internal static readonly List<string> FormatFileNames = new()
|
||||
{
|
||||
"Certificate.format.ps1xml",
|
||||
"Diagnostics.format.ps1xml",
|
||||
|
@ -516,6 +516,11 @@ namespace System.Management.Automation
|
|||
return Unix.IsHardLink(fileInfo);
|
||||
}
|
||||
|
||||
internal static string NonWindowsInternalGetTarget(string path)
|
||||
{
|
||||
return Unix.NativeMethods.FollowSymLink(path);
|
||||
}
|
||||
|
||||
internal static string NonWindowsGetUserFromPid(int path)
|
||||
{
|
||||
return Unix.NativeMethods.GetUserFromPid(path);
|
||||
|
@ -1134,6 +1139,10 @@ namespace System.Management.Automation
|
|||
internal static extern int CreateHardLink([MarshalAs(UnmanagedType.LPStr)] string filePath,
|
||||
[MarshalAs(UnmanagedType.LPStr)] string target);
|
||||
|
||||
[DllImport(psLib, CharSet = CharSet.Ansi, SetLastError = true)]
|
||||
[return: MarshalAs(UnmanagedType.LPStr)]
|
||||
internal static extern string FollowSymLink([MarshalAs(UnmanagedType.LPStr)] string filePath);
|
||||
|
||||
[DllImport(psLib, CharSet = CharSet.Ansi, SetLastError = true)]
|
||||
[return: MarshalAs(UnmanagedType.LPStr)]
|
||||
internal static extern string GetUserFromPid(int pid);
|
||||
|
|
|
@ -2082,37 +2082,37 @@ namespace System.Management.Automation.Runspaces
|
|||
.AddItemScriptBlock(@"""$($_.FileInfo.Executable)$($_.FileInfo.Executable.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "FileInfo.Executable")
|
||||
.AddItemScriptBlock(@"""$([string]::Join(',',$_.FileInfo.Extension.Keys))""", label: "FileInfo.Extension")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.Black)$($_.Foreground.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Black")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.BrightBlack)$($_.Foreground.BrightBlack.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightBlack")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.White)$($_.Foreground.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.White")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.BrightWhite)$($_.Foreground.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightWhite")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.DarkGray)$($_.Foreground.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.DarkGray")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.LightGray)$($_.Foreground.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightGray")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.Red)$($_.Foreground.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Red")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.BrightRed)$($_.Foreground.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightRed")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.LightRed)$($_.Foreground.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightRed")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.Magenta)$($_.Foreground.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Magenta")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.BrightMagenta)$($_.Foreground.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightMagenta")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.LightMagenta)$($_.Foreground.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightMagenta")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.Blue)$($_.Foreground.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Blue")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.BrightBlue)$($_.Foreground.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightBlue")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.LightBlue)$($_.Foreground.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightBlue")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.Cyan)$($_.Foreground.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Cyan")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.BrightCyan)$($_.Foreground.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightCyan")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.LightCyan)$($_.Foreground.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightCyan")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.Green)$($_.Foreground.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Green")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.BrightGreen)$($_.Foreground.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightGreen")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.LightGreen)$($_.Foreground.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightGreen")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.Yellow)$($_.Foreground.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.Yellow")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.BrightYellow)$($_.Foreground.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.BrightYellow")
|
||||
.AddItemScriptBlock(@"""$($_.Foreground.LightYellow)$($_.Foreground.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Foreground.LightYellow")
|
||||
.AddItemScriptBlock(@"""$($_.Background.Black)$($_.Background.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Black")
|
||||
.AddItemScriptBlock(@"""$($_.Background.BrightBlack)$($_.Background.BrightBlack.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightBlack")
|
||||
.AddItemScriptBlock(@"""$($_.Background.White)$($_.Background.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.White")
|
||||
.AddItemScriptBlock(@"""$($_.Background.BrightWhite)$($_.Background.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightWhite")
|
||||
.AddItemScriptBlock(@"""$($_.Background.DarkGray)$($_.Background.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.DarkGray")
|
||||
.AddItemScriptBlock(@"""$($_.Background.LightGray)$($_.Background.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightGray")
|
||||
.AddItemScriptBlock(@"""$($_.Background.Red)$($_.Background.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Red")
|
||||
.AddItemScriptBlock(@"""$($_.Background.BrightRed)$($_.Background.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightRed")
|
||||
.AddItemScriptBlock(@"""$($_.Background.LightRed)$($_.Background.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightRed")
|
||||
.AddItemScriptBlock(@"""$($_.Background.Magenta)$($_.Background.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Magenta")
|
||||
.AddItemScriptBlock(@"""$($_.Background.BrightMagenta)$($_.Background.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightMagenta")
|
||||
.AddItemScriptBlock(@"""$($_.Background.LightMagenta)$($_.Background.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightMagenta")
|
||||
.AddItemScriptBlock(@"""$($_.Background.Blue)$($_.Background.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Blue")
|
||||
.AddItemScriptBlock(@"""$($_.Background.BrightBlue)$($_.Background.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightBlue")
|
||||
.AddItemScriptBlock(@"""$($_.Background.LightBlue)$($_.Background.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightBlue")
|
||||
.AddItemScriptBlock(@"""$($_.Background.Cyan)$($_.Background.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Cyan")
|
||||
.AddItemScriptBlock(@"""$($_.Background.BrightCyan)$($_.Background.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightCyan")
|
||||
.AddItemScriptBlock(@"""$($_.Background.LightCyan)$($_.Background.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightCyan")
|
||||
.AddItemScriptBlock(@"""$($_.Background.Green)$($_.Background.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Green")
|
||||
.AddItemScriptBlock(@"""$($_.Background.BrightGreen)$($_.Background.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightGreen")
|
||||
.AddItemScriptBlock(@"""$($_.Background.LightGreen)$($_.Background.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightGreen")
|
||||
.AddItemScriptBlock(@"""$($_.Background.Yellow)$($_.Background.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.Yellow")
|
||||
.AddItemScriptBlock(@"""$($_.Background.BrightYellow)$($_.Background.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.BrightYellow")
|
||||
.AddItemScriptBlock(@"""$($_.Background.LightYellow)$($_.Background.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Background.LightYellow")
|
||||
.EndEntry()
|
||||
.EndList());
|
||||
}
|
||||
|
@ -2185,46 +2185,46 @@ namespace System.Management.Automation.Runspaces
|
|||
ListControl.Create()
|
||||
.StartEntry()
|
||||
.AddItemScriptBlock(@"""$($_.Black)$($_.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Black")
|
||||
.AddItemScriptBlock(@"""$($_.BrightBlack)$($_.BrightBlack.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlack")
|
||||
.AddItemScriptBlock(@"""$($_.White)$($_.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "White")
|
||||
.AddItemScriptBlock(@"""$($_.BrightWhite)$($_.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightWhite")
|
||||
.AddItemScriptBlock(@"""$($_.DarkGray)$($_.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "DarkGray")
|
||||
.AddItemScriptBlock(@"""$($_.LightGray)$($_.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGray")
|
||||
.AddItemScriptBlock(@"""$($_.Red)$($_.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Red")
|
||||
.AddItemScriptBlock(@"""$($_.BrightRed)$($_.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightRed")
|
||||
.AddItemScriptBlock(@"""$($_.LightRed)$($_.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightRed")
|
||||
.AddItemScriptBlock(@"""$($_.Magenta)$($_.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Magenta")
|
||||
.AddItemScriptBlock(@"""$($_.BrightMagenta)$($_.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightMagenta")
|
||||
.AddItemScriptBlock(@"""$($_.LightMagenta)$($_.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightMagenta")
|
||||
.AddItemScriptBlock(@"""$($_.Blue)$($_.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Blue")
|
||||
.AddItemScriptBlock(@"""$($_.BrightBlue)$($_.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlue")
|
||||
.AddItemScriptBlock(@"""$($_.LightBlue)$($_.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightBlue")
|
||||
.AddItemScriptBlock(@"""$($_.Cyan)$($_.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Cyan")
|
||||
.AddItemScriptBlock(@"""$($_.BrightCyan)$($_.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightCyan")
|
||||
.AddItemScriptBlock(@"""$($_.LightCyan)$($_.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightCyan")
|
||||
.AddItemScriptBlock(@"""$($_.Green)$($_.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Green")
|
||||
.AddItemScriptBlock(@"""$($_.BrightGreen)$($_.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightGreen")
|
||||
.AddItemScriptBlock(@"""$($_.LightGreen)$($_.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGreen")
|
||||
.AddItemScriptBlock(@"""$($_.Yellow)$($_.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Yellow")
|
||||
.AddItemScriptBlock(@"""$($_.BrightYellow)$($_.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightYellow")
|
||||
.AddItemScriptBlock(@"""$($_.LightYellow)$($_.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightYellow")
|
||||
.EndEntry()
|
||||
.EndList());
|
||||
}
|
||||
|
||||
private static IEnumerable<FormatViewDefinition> ViewsOf_System_Management_Automation_PSStyleBackgroundColor()
|
||||
{
|
||||
yield return new FormatViewDefinition("System.Management.Automation.PSStyle+BackgroundColor",
|
||||
yield return new FormatViewDefinition("System.Management.Automation.PSStyle+ForegroundColor",
|
||||
ListControl.Create()
|
||||
.StartEntry()
|
||||
.AddItemScriptBlock(@"""$($_.Black)$($_.Black.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Black")
|
||||
.AddItemScriptBlock(@"""$($_.BrightBlack)$($_.BrightBlack.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlack")
|
||||
.AddItemScriptBlock(@"""$($_.White)$($_.White.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "White")
|
||||
.AddItemScriptBlock(@"""$($_.BrightWhite)$($_.BrightWhite.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightWhite")
|
||||
.AddItemScriptBlock(@"""$($_.DarkGray)$($_.DarkGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "DarkGray")
|
||||
.AddItemScriptBlock(@"""$($_.LightGray)$($_.LightGray.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGray")
|
||||
.AddItemScriptBlock(@"""$($_.Red)$($_.Red.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Red")
|
||||
.AddItemScriptBlock(@"""$($_.BrightRed)$($_.BrightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightRed")
|
||||
.AddItemScriptBlock(@"""$($_.LightRed)$($_.LightRed.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightRed")
|
||||
.AddItemScriptBlock(@"""$($_.Magenta)$($_.Magenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Magenta")
|
||||
.AddItemScriptBlock(@"""$($_.BrightMagenta)$($_.BrightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightMagenta")
|
||||
.AddItemScriptBlock(@"""$($_.LightMagenta)$($_.LightMagenta.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightMagenta")
|
||||
.AddItemScriptBlock(@"""$($_.Blue)$($_.Blue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Blue")
|
||||
.AddItemScriptBlock(@"""$($_.BrightBlue)$($_.BrightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightBlue")
|
||||
.AddItemScriptBlock(@"""$($_.LightBlue)$($_.LightBlue.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightBlue")
|
||||
.AddItemScriptBlock(@"""$($_.Cyan)$($_.Cyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Cyan")
|
||||
.AddItemScriptBlock(@"""$($_.BrightCyan)$($_.BrightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightCyan")
|
||||
.AddItemScriptBlock(@"""$($_.LightCyan)$($_.LightCyan.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightCyan")
|
||||
.AddItemScriptBlock(@"""$($_.Green)$($_.Green.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Green")
|
||||
.AddItemScriptBlock(@"""$($_.BrightGreen)$($_.BrightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightGreen")
|
||||
.AddItemScriptBlock(@"""$($_.LightGreen)$($_.LightGreen.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightGreen")
|
||||
.AddItemScriptBlock(@"""$($_.Yellow)$($_.Yellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "Yellow")
|
||||
.AddItemScriptBlock(@"""$($_.BrightYellow)$($_.BrightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "BrightYellow")
|
||||
.AddItemScriptBlock(@"""$($_.LightYellow)$($_.LightYellow.Replace(""""`e"""",'`e'))$($PSStyle.Reset)""", label: "LightYellow")
|
||||
.EndEntry()
|
||||
.EndList());
|
||||
}
|
||||
|
|
|
@ -4,7 +4,6 @@
|
|||
using System.Globalization;
|
||||
using System.IO;
|
||||
using System.Management.Automation;
|
||||
using System.Management.Automation.Host;
|
||||
using System.Management.Automation.Internal;
|
||||
using System.Text;
|
||||
|
||||
|
@ -414,7 +413,7 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
|
|||
{
|
||||
CheckStopProcessing();
|
||||
|
||||
s = PSHostUserInterface.GetOutputString(s, isHost: false);
|
||||
s = Utils.GetOutputString(s, isHost: false);
|
||||
|
||||
if (_suppressNewline)
|
||||
{
|
||||
|
|
|
@ -35,7 +35,7 @@ namespace System.Management.Automation
|
|||
/// <summary>Classic rendering of progress.</summary>
|
||||
Classic = 1,
|
||||
}
|
||||
|
||||
|
||||
#region PSStyle
|
||||
/// <summary>
|
||||
/// Contains configuration for how PowerShell renders text.
|
||||
|
@ -52,80 +52,80 @@ namespace System.Management.Automation
|
|||
/// </summary>
|
||||
public string Black { get; } = "\x1b[30m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color red.
|
||||
/// </summary>
|
||||
public string Red { get; } = "\x1b[31m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color green.
|
||||
/// </summary>
|
||||
public string Green { get; } = "\x1b[32m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color yellow.
|
||||
/// </summary>
|
||||
public string Yellow { get; } = "\x1b[33m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color blue.
|
||||
/// </summary>
|
||||
public string Blue { get; } = "\x1b[34m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color magenta.
|
||||
/// </summary>
|
||||
public string Magenta { get; } = "\x1b[35m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color cyan.
|
||||
/// </summary>
|
||||
public string Cyan { get; } = "\x1b[36m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color dark gray.
|
||||
/// </summary>
|
||||
public string DarkGray { get; } = "\x1b[90m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color green.
|
||||
/// </summary>
|
||||
public string Green { get; } = "\x1b[32m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light blue.
|
||||
/// </summary>
|
||||
public string LightBlue { get; } = "\x1b[94m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light cyan.
|
||||
/// </summary>
|
||||
public string LightCyan { get; } = "\x1b[96m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light gray.
|
||||
/// </summary>
|
||||
public string LightGray { get; } = "\x1b[97m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light green.
|
||||
/// </summary>
|
||||
public string LightGreen { get; } = "\x1b[92m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light magenta.
|
||||
/// </summary>
|
||||
public string LightMagenta { get; } = "\x1b[95m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light red.
|
||||
/// </summary>
|
||||
public string LightRed { get; } = "\x1b[91m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light yellow.
|
||||
/// </summary>
|
||||
public string LightYellow { get; } = "\x1b[93m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color magenta.
|
||||
/// </summary>
|
||||
public string Magenta { get; } = "\x1b[35m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color read.
|
||||
/// </summary>
|
||||
public string Red { get; } = "\x1b[31m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color white.
|
||||
/// </summary>
|
||||
public string White { get; } = "\x1b[37m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright black.
|
||||
/// Gets the color yellow.
|
||||
/// </summary>
|
||||
public string BrightBlack { get; } = "\x1b[90m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright red.
|
||||
/// </summary>
|
||||
public string BrightRed { get; } = "\x1b[91m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright green.
|
||||
/// </summary>
|
||||
public string BrightGreen { get; } = "\x1b[92m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright yellow.
|
||||
/// </summary>
|
||||
public string BrightYellow { get; } = "\x1b[93m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright blue.
|
||||
/// </summary>
|
||||
public string BrightBlue { get; } = "\x1b[94m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright magenta.
|
||||
/// </summary>
|
||||
public string BrightMagenta { get; } = "\x1b[95m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright cyan.
|
||||
/// </summary>
|
||||
public string BrightCyan { get; } = "\x1b[96m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright white.
|
||||
/// </summary>
|
||||
public string BrightWhite { get; } = "\x1b[97m";
|
||||
public string Yellow { get; } = "\x1b[33m";
|
||||
|
||||
/// <summary>
|
||||
/// Set as RGB (Red, Green, Blue).
|
||||
|
@ -167,80 +167,80 @@ namespace System.Management.Automation
|
|||
/// </summary>
|
||||
public string Black { get; } = "\x1b[40m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color red.
|
||||
/// </summary>
|
||||
public string Red { get; } = "\x1b[41m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color green.
|
||||
/// </summary>
|
||||
public string Green { get; } = "\x1b[42m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color yellow.
|
||||
/// </summary>
|
||||
public string Yellow { get; } = "\x1b[43m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color blue.
|
||||
/// </summary>
|
||||
public string Blue { get; } = "\x1b[44m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color magenta.
|
||||
/// </summary>
|
||||
public string Magenta { get; } = "\x1b[45m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color cyan.
|
||||
/// </summary>
|
||||
public string Cyan { get; } = "\x1b[46m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color dark gray.
|
||||
/// </summary>
|
||||
public string DarkGray { get; } = "\x1b[100m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color green.
|
||||
/// </summary>
|
||||
public string Green { get; } = "\x1b[42m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light blue.
|
||||
/// </summary>
|
||||
public string LightBlue { get; } = "\x1b[104m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light cyan.
|
||||
/// </summary>
|
||||
public string LightCyan { get; } = "\x1b[106m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light gray.
|
||||
/// </summary>
|
||||
public string LightGray { get; } = "\x1b[107m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light green.
|
||||
/// </summary>
|
||||
public string LightGreen { get; } = "\x1b[102m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light magenta.
|
||||
/// </summary>
|
||||
public string LightMagenta { get; } = "\x1b[105m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light red.
|
||||
/// </summary>
|
||||
public string LightRed { get; } = "\x1b[101m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color light yellow.
|
||||
/// </summary>
|
||||
public string LightYellow { get; } = "\x1b[103m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color magenta.
|
||||
/// </summary>
|
||||
public string Magenta { get; } = "\x1b[45m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color read.
|
||||
/// </summary>
|
||||
public string Red { get; } = "\x1b[41m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color white.
|
||||
/// </summary>
|
||||
public string White { get; } = "\x1b[47m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright black.
|
||||
/// Gets the color yellow.
|
||||
/// </summary>
|
||||
public string BrightBlack { get; } = "\x1b[100m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright red.
|
||||
/// </summary>
|
||||
public string BrightRed { get; } = "\x1b[101m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright green.
|
||||
/// </summary>
|
||||
public string BrightGreen { get; } = "\x1b[102m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright yellow.
|
||||
/// </summary>
|
||||
public string BrightYellow { get; } = "\x1b[103m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright blue.
|
||||
/// </summary>
|
||||
public string BrightBlue { get; } = "\x1b[104m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright magenta.
|
||||
/// </summary>
|
||||
public string BrightMagenta { get; } = "\x1b[105m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright cyan.
|
||||
/// </summary>
|
||||
public string BrightCyan { get; } = "\x1b[106m";
|
||||
|
||||
/// <summary>
|
||||
/// Gets the color bright white.
|
||||
/// </summary>
|
||||
public string BrightWhite { get; } = "\x1b[107m";
|
||||
public string Yellow { get; } = "\x1b[43m";
|
||||
|
||||
/// <summary>
|
||||
/// The color set as RGB (Red, Green, Blue).
|
||||
|
@ -365,7 +365,7 @@ namespace System.Management.Automation
|
|||
get => _error;
|
||||
set => _error = ValidateNoContent(value);
|
||||
}
|
||||
|
||||
|
||||
private string _error = "\x1b[31;1m";
|
||||
|
||||
/// <summary>
|
||||
|
@ -397,7 +397,7 @@ namespace System.Management.Automation
|
|||
{
|
||||
get => _debug;
|
||||
set => _debug = ValidateNoContent(value);
|
||||
}
|
||||
}
|
||||
|
||||
private string _debug = "\x1b[33;1m";
|
||||
}
|
||||
|
@ -467,16 +467,6 @@ namespace System.Management.Automation
|
|||
_extensionDictionary.Add(ValidateExtension(extension), ValidateNoContent(decoration));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Add new extension and decoration to dictionary without validation.
|
||||
/// </summary>
|
||||
/// <param name="extension">Extension to add.</param>
|
||||
/// <param name="decoration">ANSI string value to add.</param>
|
||||
internal void AddWithoutValidation(string extension, string decoration)
|
||||
{
|
||||
_extensionDictionary.Add(extension, decoration);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Remove an extension from dictionary.
|
||||
/// </summary>
|
||||
|
@ -553,19 +543,19 @@ namespace System.Management.Automation
|
|||
Extension = new FileExtensionDictionary();
|
||||
|
||||
// archives
|
||||
Extension.AddWithoutValidation(".zip", "\x1b[31;1m");
|
||||
Extension.AddWithoutValidation(".tgz", "\x1b[31;1m");
|
||||
Extension.AddWithoutValidation(".gz", "\x1b[31;1m");
|
||||
Extension.AddWithoutValidation(".tar", "\x1b[31;1m");
|
||||
Extension.AddWithoutValidation(".nupkg", "\x1b[31;1m");
|
||||
Extension.AddWithoutValidation(".cab", "\x1b[31;1m");
|
||||
Extension.AddWithoutValidation(".7z", "\x1b[31;1m");
|
||||
Extension.Add(".zip", "\x1b[31;1m");
|
||||
Extension.Add(".tgz", "\x1b[31;1m");
|
||||
Extension.Add(".gz", "\x1b[31;1m");
|
||||
Extension.Add(".tar", "\x1b[31;1m");
|
||||
Extension.Add(".nupkg", "\x1b[31;1m");
|
||||
Extension.Add(".cab", "\x1b[31;1m");
|
||||
Extension.Add(".7z", "\x1b[31;1m");
|
||||
|
||||
// powershell
|
||||
Extension.AddWithoutValidation(".ps1", "\x1b[33;1m");
|
||||
Extension.AddWithoutValidation(".psd1", "\x1b[33;1m");
|
||||
Extension.AddWithoutValidation(".psm1", "\x1b[33;1m");
|
||||
Extension.AddWithoutValidation(".ps1xml", "\x1b[33;1m");
|
||||
Extension.Add(".ps1", "\x1b[33;1m");
|
||||
Extension.Add(".psd1", "\x1b[33;1m");
|
||||
Extension.Add(".psm1", "\x1b[33;1m");
|
||||
Extension.Add(".ps1xml", "\x1b[33;1m");
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -698,7 +688,7 @@ namespace System.Management.Automation
|
|||
|
||||
private static string ValidateNoContent(string text)
|
||||
{
|
||||
var decorartedString = new ValueStringDecorated(text);
|
||||
var decorartedString = new StringDecorated(text);
|
||||
if (decorartedString.ContentLength > 0)
|
||||
{
|
||||
throw new ArgumentException(string.Format(PSStyleStrings.TextContainsContent, decorartedString.ToString(OutputRendering.PlainText)));
|
||||
|
|
|
@ -14,21 +14,21 @@
|
|||
<!-- the following package(s) are from https://github.com/JamesNK/Newtonsoft.Json -->
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
|
||||
<!-- the Application Insights package -->
|
||||
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.19.0" />
|
||||
<PackageReference Include="Microsoft.ApplicationInsights" Version="2.18.0" />
|
||||
<!-- the following package(s) are from https://github.com/dotnet/corefx -->
|
||||
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0" />
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
|
||||
<PackageReference Include="System.DirectoryServices" Version="6.0.0" />
|
||||
<!--PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" /-->
|
||||
<PackageReference Include="System.Management" Version="6.0.0" />
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
|
||||
<PackageReference Include="System.Security.AccessControl" Version="6.0.0" />
|
||||
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0" />
|
||||
<PackageReference Include="System.Security.Permissions" Version="6.0.0" />
|
||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
|
||||
<PackageReference Include="Microsoft.Win32.Registry.AccessControl" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.DirectoryServices" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="6.0.0-preview.5.21301.5" />
|
||||
<PackageReference Include="System.Management" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.Security.AccessControl" Version="6.0.0-preview.5.21301.5" />
|
||||
<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.Security.Permissions" Version="6.0.0-rc.1.21430.11" />
|
||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0-rc.1.21430.11" />
|
||||
<!-- the following package(s) are from the powershell org -->
|
||||
<PackageReference Include="Microsoft.Management.Infrastructure" Version="2.0.0" />
|
||||
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.2.0" />
|
||||
<PackageReference Include="Microsoft.PowerShell.Native" Version="7.2.0-preview.2" />
|
||||
</ItemGroup>
|
||||
|
||||
<PropertyGroup>
|
||||
|
|
|
@ -1,58 +0,0 @@
|
|||
// Copyright (c) Microsoft Corporation.
|
||||
// Licensed under the MIT License.
|
||||
|
||||
#nullable enable
|
||||
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics.CodeAnalysis;
|
||||
|
||||
namespace System.Management.Automation
|
||||
{
|
||||
/// <summary>
|
||||
/// To make it easier to specify a version, we add some conversions that wouldn't happen otherwise:
|
||||
/// * A simple integer, i.e. 2;
|
||||
/// * A string without a dot, i.e. "2".
|
||||
/// </summary>
|
||||
internal class ArgumentToVersionTransformationAttribute : ArgumentTransformationAttribute
|
||||
{
|
||||
/// <inheritdoc/>
|
||||
public override object Transform(EngineIntrinsics engineIntrinsics, object inputData)
|
||||
{
|
||||
object version = PSObject.Base(inputData);
|
||||
|
||||
if (version is string versionStr)
|
||||
{
|
||||
if (TryConvertFromString(versionStr, out var convertedVersion))
|
||||
{
|
||||
return convertedVersion;
|
||||
}
|
||||
|
||||
if (versionStr.Contains('.'))
|
||||
{
|
||||
// If the string contains a '.', let the Version constructor handle the conversion.
|
||||
return inputData;
|
||||
}
|
||||
}
|
||||
|
||||
if (version is double)
|
||||
{
|
||||
// The conversion to int below is wrong, but the usual conversions will turn
|
||||
// the double into a string, so just return the original object.
|
||||
return inputData;
|
||||
}
|
||||
|
||||
if (LanguagePrimitives.TryConvertTo<int>(version, out var majorVersion))
|
||||
{
|
||||
return new Version(majorVersion, 0);
|
||||
}
|
||||
|
||||
return inputData;
|
||||
}
|
||||
|
||||
protected virtual bool TryConvertFromString(string versionString, [NotNullWhen(true)] out Version? version)
|
||||
{
|
||||
version = null;
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
|
@ -233,13 +233,6 @@ namespace System.Management.Automation.Internal
|
|||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// When overridden in the derived class, performs clean-up after the command execution.
|
||||
/// </summary>
|
||||
internal virtual void DoCleanResource()
|
||||
{
|
||||
}
|
||||
|
||||
#endregion Override
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -1813,14 +1813,9 @@ namespace System.Management.Automation
|
|||
}
|
||||
}
|
||||
}
|
||||
if (completionContext.TokenAtCursor.TokenFlags == TokenFlags.MemberName)
|
||||
{
|
||||
result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
|
||||
if (result is not null)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
result = GetResultForAttributeArgument(completionContext, ref replacementIndex, ref replacementLength);
|
||||
if (result != null) return result;
|
||||
|
||||
if ((tokenAtCursor.TokenFlags & TokenFlags.CommandName) != 0)
|
||||
{
|
||||
|
|
|
@ -529,7 +529,7 @@ namespace System.Management.Automation
|
|||
processor = scriptCommand != null
|
||||
? new CommandProcessor(scriptCommand, _context, useLocalScope: true, fromScriptFile: false,
|
||||
sessionState: scriptCommand.ScriptBlock.SessionStateInternal ?? Context.EngineSessionState)
|
||||
: new CommandProcessor((CmdletInfo)this, _context);
|
||||
: new CommandProcessor((CmdletInfo)this, _context) { UseLocalScope = true };
|
||||
|
||||
ParameterBinderController.AddArgumentsToCommandProcessor(processor, Arguments);
|
||||
CommandProcessorBase oldCurrentCommandProcessor = Context.CurrentCommandProcessor;
|
||||
|
|
|
@ -875,11 +875,8 @@ process
|
|||
|
||||
end
|
||||
{{{5}}}
|
||||
|
||||
clean
|
||||
{{{6}}}
|
||||
<#
|
||||
{7}
|
||||
{6}
|
||||
#>
|
||||
",
|
||||
GetDecl(),
|
||||
|
@ -888,7 +885,6 @@ clean
|
|||
GetBeginBlock(),
|
||||
GetProcessBlock(),
|
||||
GetEndBlock(),
|
||||
GetCleanBlock(),
|
||||
CodeGeneration.EscapeBlockCommentContent(helpComment));
|
||||
|
||||
return result;
|
||||
|
@ -1067,11 +1063,6 @@ clean
|
|||
|
||||
internal string GetProcessBlock()
|
||||
{
|
||||
// The reason we wrap scripts in 'try { } catch { throw }' (here and elsewhere) is to turn
|
||||
// an exception that could be thrown from .NET method invocation into a terminating error
|
||||
// that can be propagated up.
|
||||
// By default, an exception thrown from .NET method is not terminating, but when enclosed
|
||||
// in try/catch, it will be turned into a terminating error.
|
||||
return @"
|
||||
try {
|
||||
$steppablePipeline.Process($_)
|
||||
|
@ -1122,16 +1113,6 @@ clean
|
|||
";
|
||||
}
|
||||
|
||||
internal string GetCleanBlock()
|
||||
{
|
||||
// Here we don't need to enclose the script in a 'try/catch' like elsewhere, because
|
||||
// 1. the 'Clean' block doesn't propagate up any exception (terminating error);
|
||||
// 2. only one expression in the script, so nothing else needs to be stopped when invoking the method fails.
|
||||
return @"
|
||||
$steppablePipeline.Clean()
|
||||
";
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Helper methods for restricting commands needed by implicit and interactive remoting
|
||||
|
|
|
@ -309,11 +309,13 @@ namespace System.Management.Automation
|
|||
internal override void ProcessRecord()
|
||||
{
|
||||
// Invoke the Command method with the request object
|
||||
|
||||
if (!this.RanBeginAlready)
|
||||
{
|
||||
RanBeginAlready = true;
|
||||
try
|
||||
{
|
||||
// NOTICE-2004/06/08-JonN 959638
|
||||
using (commandRuntime.AllowThisCommandToWrite(true))
|
||||
{
|
||||
if (Context._debuggingMode > 0 && Command is not PSScriptCmdlet)
|
||||
|
@ -324,9 +326,12 @@ namespace System.Management.Automation
|
|||
Command.DoBeginProcessing();
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
// 2004/03/18-JonN This is understood to be
|
||||
// an FXCOP violation, cleared by KCwalina.
|
||||
catch (Exception e) // Catch-all OK, 3rd party callout.
|
||||
{
|
||||
// This cmdlet threw an exception, so wrap it and bubble it up.
|
||||
// This cmdlet threw an exception, so
|
||||
// wrap it and bubble it up.
|
||||
throw ManageInvocationException(e);
|
||||
}
|
||||
}
|
||||
|
@ -361,7 +366,6 @@ namespace System.Management.Automation
|
|||
|
||||
// NOTICE-2004/06/08-JonN 959638
|
||||
using (commandRuntime.AllowThisCommandToWrite(true))
|
||||
using (ParameterBinderBase.bindingTracer.TraceScope("CALLING ProcessRecord"))
|
||||
{
|
||||
if (CmdletParameterBinderController.ObsoleteParameterWarningList != null &&
|
||||
CmdletParameterBinderController.ObsoleteParameterWarningList.Count > 0)
|
||||
|
@ -396,13 +400,14 @@ namespace System.Management.Automation
|
|||
}
|
||||
catch (LoopFlowException)
|
||||
{
|
||||
// Don't wrap LoopFlowException, we incorrectly raise a PipelineStoppedException
|
||||
// Win8:84066 - Don't wrap LoopFlowException, we incorrectly raise a PipelineStoppedException
|
||||
// which gets caught by a script try/catch if we wrap here.
|
||||
throw;
|
||||
}
|
||||
catch (Exception e)
|
||||
// 2004/03/18-JonN This is understood to be
|
||||
// an FXCOP violation, cleared by KCwalina.
|
||||
catch (Exception e) // Catch-all OK, 3rd party callout.
|
||||
{
|
||||
// Catch-all OK, 3rd party callout.
|
||||
exceptionToThrow = e;
|
||||
}
|
||||
finally
|
||||
|
|
|
@ -5,7 +5,8 @@ using System.Collections;
|
|||
using System.Collections.ObjectModel;
|
||||
using System.Management.Automation.Internal;
|
||||
using System.Management.Automation.Language;
|
||||
using System.Runtime.InteropServices;
|
||||
|
||||
using Dbg = System.Management.Automation.Diagnostics;
|
||||
|
||||
namespace System.Management.Automation
|
||||
{
|
||||
|
@ -45,7 +46,6 @@ namespace System.Management.Automation
|
|||
string errorTemplate = expAttribute.ExperimentAction == ExperimentAction.Hide
|
||||
? DiscoveryExceptions.ScriptDisabledWhenFeatureOn
|
||||
: DiscoveryExceptions.ScriptDisabledWhenFeatureOff;
|
||||
|
||||
string errorMsg = StringUtil.Format(errorTemplate, expAttribute.ExperimentName);
|
||||
ErrorRecord errorRecord = new ErrorRecord(
|
||||
new InvalidOperationException(errorMsg),
|
||||
|
@ -54,8 +54,6 @@ namespace System.Management.Automation
|
|||
commandInfo);
|
||||
throw new CmdletInvocationException(errorRecord);
|
||||
}
|
||||
|
||||
HasCleanBlock = scriptCommand.ScriptBlock.HasCleanBlock;
|
||||
}
|
||||
|
||||
CommandInfo = commandInfo;
|
||||
|
@ -89,11 +87,6 @@ namespace System.Management.Automation
|
|||
/// <value></value>
|
||||
internal CommandInfo CommandInfo { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets whether the command has a 'Clean' block defined.
|
||||
/// </summary>
|
||||
internal bool HasCleanBlock { get; }
|
||||
|
||||
/// <summary>
|
||||
/// This indicates whether this command processor is created from
|
||||
/// a script file.
|
||||
|
@ -378,10 +371,13 @@ namespace System.Management.Automation
|
|||
|
||||
Context.EngineSessionState = _previousCommandSessionState;
|
||||
|
||||
// Restore the scope but use the same session state instance we
|
||||
// got it from because the command may have changed the execution context
|
||||
// session state...
|
||||
CommandSessionState.CurrentScope = _previousScope;
|
||||
if (_previousScope != null)
|
||||
{
|
||||
// Restore the scope but use the same session state instance we
|
||||
// got it from because the command may have changed the execution context
|
||||
// session state...
|
||||
CommandSessionState.CurrentScope = _previousScope;
|
||||
}
|
||||
}
|
||||
|
||||
private SessionStateScope _previousScope;
|
||||
|
@ -456,14 +452,16 @@ namespace System.Management.Automation
|
|||
HandleObsoleteCommand(ObsoleteAttribute);
|
||||
}
|
||||
}
|
||||
catch (InvalidComObjectException e)
|
||||
catch (Exception)
|
||||
{
|
||||
// This type of exception could be thrown from parameter binding.
|
||||
string msg = StringUtil.Format(ParserStrings.InvalidComObjectException, e.Message);
|
||||
var newEx = new RuntimeException(msg, e);
|
||||
if (_useLocalScope)
|
||||
{
|
||||
// If we had an exception during Prepare, we're done trying to execute the command
|
||||
// so the scope we created needs to release any resources it hold.s
|
||||
CommandSessionState.RemoveScope(CommandScope);
|
||||
}
|
||||
|
||||
newEx.SetErrorId("InvalidComObjectException");
|
||||
throw newEx;
|
||||
throw;
|
||||
}
|
||||
finally
|
||||
{
|
||||
|
@ -510,23 +508,26 @@ namespace System.Management.Automation
|
|||
// The RedirectShellErrorOutputPipe flag is used by the V2 hosting API to force the
|
||||
// redirection.
|
||||
//
|
||||
if (RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe is not null)
|
||||
if (this.RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe != null)
|
||||
{
|
||||
_context.ShellFunctionErrorOutputPipe = commandRuntime.ErrorOutputPipe;
|
||||
_context.ShellFunctionErrorOutputPipe = this.commandRuntime.ErrorOutputPipe;
|
||||
}
|
||||
|
||||
_context.CurrentCommandProcessor = this;
|
||||
SetCurrentScopeToExecutionScope();
|
||||
|
||||
using (commandRuntime.AllowThisCommandToWrite(true))
|
||||
using (ParameterBinderBase.bindingTracer.TraceScope("CALLING BeginProcessing"))
|
||||
{
|
||||
if (Context._debuggingMode > 0 && Command is not PSScriptCmdlet)
|
||||
using (ParameterBinderBase.bindingTracer.TraceScope(
|
||||
"CALLING BeginProcessing"))
|
||||
{
|
||||
Context.Debugger.CheckCommand(Command.MyInvocation);
|
||||
}
|
||||
SetCurrentScopeToExecutionScope();
|
||||
|
||||
Command.DoBeginProcessing();
|
||||
if (Context._debuggingMode > 0 && Command is not PSScriptCmdlet)
|
||||
{
|
||||
Context.Debugger.CheckCommand(this.Command.MyInvocation);
|
||||
}
|
||||
|
||||
Command.DoBeginProcessing();
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
|
@ -588,14 +589,20 @@ namespace System.Management.Automation
|
|||
try
|
||||
{
|
||||
using (commandRuntime.AllowThisCommandToWrite(true))
|
||||
using (ParameterBinderBase.bindingTracer.TraceScope("CALLING EndProcessing"))
|
||||
{
|
||||
this.Command.DoEndProcessing();
|
||||
using (ParameterBinderBase.bindingTracer.TraceScope(
|
||||
"CALLING EndProcessing"))
|
||||
{
|
||||
this.Command.DoEndProcessing();
|
||||
}
|
||||
}
|
||||
}
|
||||
// 2004/03/18-JonN This is understood to be
|
||||
// an FXCOP violation, cleared by KCwalina.
|
||||
catch (Exception e)
|
||||
{
|
||||
// This cmdlet threw an exception, wrap it as needed and bubble it up.
|
||||
// This cmdlet threw an exception, so
|
||||
// wrap it and bubble it up.
|
||||
throw ManageInvocationException(e);
|
||||
}
|
||||
}
|
||||
|
@ -624,119 +631,44 @@ namespace System.Management.Automation
|
|||
// The RedirectShellErrorOutputPipe flag is used by the V2 hosting API to force the
|
||||
// redirection.
|
||||
//
|
||||
if (RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe is not null)
|
||||
if (this.RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe != null)
|
||||
{
|
||||
_context.ShellFunctionErrorOutputPipe = commandRuntime.ErrorOutputPipe;
|
||||
_context.ShellFunctionErrorOutputPipe = this.commandRuntime.ErrorOutputPipe;
|
||||
}
|
||||
|
||||
_context.CurrentCommandProcessor = this;
|
||||
|
||||
SetCurrentScopeToExecutionScope();
|
||||
Complete();
|
||||
}
|
||||
finally
|
||||
{
|
||||
OnRestorePreviousScope();
|
||||
|
||||
_context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
|
||||
_context.CurrentCommandProcessor = oldCurrentCommandProcessor;
|
||||
|
||||
RestorePreviousScope();
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void CleanResource()
|
||||
{
|
||||
try
|
||||
{
|
||||
using (commandRuntime.AllowThisCommandToWrite(permittedToWriteToPipeline: true))
|
||||
using (ParameterBinderBase.bindingTracer.TraceScope("CALLING CleanResource"))
|
||||
// Destroy the local scope at this point if there is one...
|
||||
if (_useLocalScope && CommandScope != null)
|
||||
{
|
||||
Command.DoCleanResource();
|
||||
}
|
||||
}
|
||||
catch (HaltCommandException)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
catch (FlowControlException)
|
||||
{
|
||||
throw;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// This cmdlet threw an exception, so wrap it and bubble it up.
|
||||
throw ManageInvocationException(e);
|
||||
}
|
||||
}
|
||||
|
||||
internal void DoCleanup()
|
||||
{
|
||||
// The property 'PropagateExceptionsToEnclosingStatementBlock' controls whether a general exception
|
||||
// (an exception thrown from a .NET method invocation, or an expression like '1/0') will be turned
|
||||
// into a terminating error, which will be propagated up and thus stop the rest of the running script.
|
||||
// It is usually used by TryStatement and TrapStatement, which makes the general exception catch-able.
|
||||
//
|
||||
// For the 'Clean' block, we don't want to bubble up the general exception when the command is enclosed
|
||||
// in a TryStatement or has TrapStatement accompanying, because no exception can escape from 'Clean' and
|
||||
// thus it's pointless to bubble up the general exception in this case.
|
||||
//
|
||||
// Therefore we set this property to 'false' here to mask off the previous setting that could be from a
|
||||
// TryStatement or TrapStatement. Example:
|
||||
// PS:1> function b { end {} clean { 1/0; Write-Host 'clean' } }
|
||||
// PS:2> b
|
||||
// RuntimeException: Attempted to divide by zero.
|
||||
// clean
|
||||
// ## Note that, outer 'try/trap' doesn't affect the general exception happens in 'Clean' block.
|
||||
// ## so its behavior is consistent regardless of whether the command is enclosed by 'try/catch' or not.
|
||||
// PS:3> try { b } catch { 'outer catch' }
|
||||
// RuntimeException: Attempted to divide by zero.
|
||||
// clean
|
||||
//
|
||||
// Be noted that, this doesn't affect the TryStatement/TrapStatement within the 'Clean' block. Example:
|
||||
// ## 'try/trap' within 'Clean' block makes the general exception catch-able.
|
||||
// PS:3> function a { end {} clean { try { 1/0; Write-Host 'clean' } catch { Write-Host "caught: $_" } } }
|
||||
// PS:4> a
|
||||
// caught: Attempted to divide by zero.
|
||||
bool oldExceptionPropagationState = _context.PropagateExceptionsToEnclosingStatementBlock;
|
||||
_context.PropagateExceptionsToEnclosingStatementBlock = false;
|
||||
|
||||
Pipe oldErrorOutputPipe = _context.ShellFunctionErrorOutputPipe;
|
||||
CommandProcessorBase oldCurrentCommandProcessor = _context.CurrentCommandProcessor;
|
||||
|
||||
try
|
||||
{
|
||||
if (RedirectShellErrorOutputPipe || _context.ShellFunctionErrorOutputPipe is not null)
|
||||
{
|
||||
_context.ShellFunctionErrorOutputPipe = commandRuntime.ErrorOutputPipe;
|
||||
CommandSessionState.RemoveScope(CommandScope);
|
||||
}
|
||||
|
||||
_context.CurrentCommandProcessor = this;
|
||||
SetCurrentScopeToExecutionScope();
|
||||
CleanResource();
|
||||
// and the previous scope...
|
||||
if (_previousScope != null)
|
||||
{
|
||||
// Restore the scope but use the same session state instance we
|
||||
// got it from because the command may have changed the execution context
|
||||
// session state...
|
||||
CommandSessionState.CurrentScope = _previousScope;
|
||||
}
|
||||
|
||||
// Restore the previous session state
|
||||
if (_previousCommandSessionState != null)
|
||||
{
|
||||
Context.EngineSessionState = _previousCommandSessionState;
|
||||
}
|
||||
}
|
||||
finally
|
||||
{
|
||||
_context.PropagateExceptionsToEnclosingStatementBlock = oldExceptionPropagationState;
|
||||
_context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
|
||||
_context.CurrentCommandProcessor = oldCurrentCommandProcessor;
|
||||
|
||||
RestorePreviousScope();
|
||||
}
|
||||
}
|
||||
|
||||
internal void ReportCleanupError(Exception exception)
|
||||
{
|
||||
var error = exception is IContainsErrorRecord icer
|
||||
? icer.ErrorRecord
|
||||
: new ErrorRecord(exception, "Clean.ReportException", ErrorCategory.NotSpecified, targetObject: null);
|
||||
|
||||
PSObject errorWrap = PSObject.AsPSObject(error);
|
||||
errorWrap.WriteStream = WriteStreamType.Error;
|
||||
|
||||
var errorPipe = commandRuntime.ErrorMergeTo == MshCommandRuntime.MergeDataStream.Output
|
||||
? commandRuntime.OutputPipe
|
||||
: commandRuntime.ErrorOutputPipe;
|
||||
|
||||
errorPipe.Add(errorWrap);
|
||||
_context.QuestionMarkVariableValue = false;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@ -845,16 +777,23 @@ namespace System.Management.Automation
|
|||
{
|
||||
do // false loop
|
||||
{
|
||||
if (e is ProviderInvocationException pie)
|
||||
ProviderInvocationException pie = e as ProviderInvocationException;
|
||||
if (pie != null)
|
||||
{
|
||||
// If a ProviderInvocationException occurred, discard the ProviderInvocationException
|
||||
// and re-wrap it in CmdletProviderInvocationException.
|
||||
e = new CmdletProviderInvocationException(pie, Command.MyInvocation);
|
||||
// If a ProviderInvocationException occurred,
|
||||
// discard the ProviderInvocationException and
|
||||
// re-wrap in CmdletProviderInvocationException
|
||||
e = new CmdletProviderInvocationException(
|
||||
pie,
|
||||
Command.MyInvocation);
|
||||
break;
|
||||
}
|
||||
|
||||
// HaltCommandException will cause the command to stop, but not be reported as an error.
|
||||
// FlowControlException should not be wrapped.
|
||||
// 1021203-2005/05/09-JonN
|
||||
// HaltCommandException will cause the command
|
||||
// to stop, but not be reported as an error.
|
||||
// 906445-2005/05/16-JonN
|
||||
// FlowControlException should not be wrapped
|
||||
if (e is PipelineStoppedException
|
||||
|| e is CmdletInvocationException
|
||||
|| e is ActionPreferenceStopException
|
||||
|
@ -874,7 +813,9 @@ namespace System.Management.Automation
|
|||
}
|
||||
|
||||
// wrap all other exceptions
|
||||
e = new CmdletInvocationException(e, Command.MyInvocation);
|
||||
e = new CmdletInvocationException(
|
||||
e,
|
||||
Command.MyInvocation);
|
||||
} while (false);
|
||||
|
||||
// commandRuntime.ManageException will always throw PipelineStoppedException
|
||||
|
@ -1002,27 +943,15 @@ namespace System.Management.Automation
|
|||
private void Dispose(bool disposing)
|
||||
{
|
||||
if (_disposed)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if (disposing)
|
||||
{
|
||||
if (UseLocalScope)
|
||||
{
|
||||
// Clean up the PS drives that are associated with this local scope.
|
||||
// This operation may be needed at multiple stages depending on whether the 'clean' block is declared:
|
||||
// 1. when there is a 'clean' block, it needs to be done only after 'clean' block runs, because the scope
|
||||
// needs to be preserved until the 'clean' block finish execution.
|
||||
// 2. when there is no 'clean' block, it needs to be done when
|
||||
// (1) there is any exception thrown from 'DoPrepare()', 'DoBegin()', 'DoExecute()', or 'DoComplete';
|
||||
// (2) OR, the command runs to the end successfully;
|
||||
// Doing this cleanup at those multiple stages is cumbersome. Since we will always dispose the command in
|
||||
// the end, doing this cleanup here will cover all the above cases.
|
||||
CommandSessionState.RemoveScope(CommandScope);
|
||||
}
|
||||
|
||||
if (Command is IDisposable id)
|
||||
// 2004/03/05-JonN Look into using metadata to check
|
||||
// whether IDisposable is implemented, in order to avoid
|
||||
// this expensive reflection cast.
|
||||
IDisposable id = Command as IDisposable;
|
||||
if (id != null)
|
||||
{
|
||||
id.Dispose();
|
||||
}
|
||||
|
|
|
@ -783,6 +783,11 @@ namespace System.Management.Automation
|
|||
return oldPipe;
|
||||
}
|
||||
|
||||
internal void RestoreErrorPipe(Pipe pipe)
|
||||
{
|
||||
ShellFunctionErrorOutputPipe = pipe;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Reset all of the redirection book keeping variables. This routine should be called when starting to
|
||||
/// execute a script.
|
||||
|
@ -835,13 +840,15 @@ namespace System.Management.Automation
|
|||
internal void AppendDollarError(object obj)
|
||||
{
|
||||
ErrorRecord objAsErrorRecord = obj as ErrorRecord;
|
||||
if (objAsErrorRecord is null && obj is not Exception)
|
||||
if (objAsErrorRecord == null && obj is not Exception)
|
||||
{
|
||||
Diagnostics.Assert(false, "Object to append was neither an ErrorRecord nor an Exception in ExecutionContext.AppendDollarError");
|
||||
return;
|
||||
}
|
||||
|
||||
if (DollarErrorVariable is not ArrayList arraylist)
|
||||
object old = this.DollarErrorVariable;
|
||||
ArrayList arraylist = old as ArrayList;
|
||||
if (arraylist == null)
|
||||
{
|
||||
Diagnostics.Assert(false, "$error should be a global constant ArrayList");
|
||||
return;
|
||||
|
|
|
@ -23,8 +23,6 @@ namespace System.Management.Automation
|
|||
internal const string EngineSource = "PSEngine";
|
||||
internal const string PSNativeCommandArgumentPassingFeatureName = "PSNativeCommandArgumentPassing";
|
||||
internal const string PSNativeCommandErrorActionPreferenceFeatureName = "PSNativeCommandErrorActionPreference";
|
||||
internal const string PSRemotingSSHTransportErrorHandling = "PSRemotingSSHTransportErrorHandling";
|
||||
internal const string PSCleanBlockFeatureName = "PSCleanBlock";
|
||||
|
||||
#endregion
|
||||
|
||||
|
@ -128,12 +126,6 @@ namespace System.Management.Automation
|
|||
new ExperimentalFeature(
|
||||
name: PSNativeCommandErrorActionPreferenceFeatureName,
|
||||
description: "Native commands with non-zero exit codes issue errors according to $ErrorActionPreference when $PSNativeCommandUseErrorActionPreference is $true"),
|
||||
new ExperimentalFeature(
|
||||
name: PSRemotingSSHTransportErrorHandling,
|
||||
description: "Removes the SSH remoting transport stdErr stream message handling as terminating errors, and instead just writes error messages to console."),
|
||||
new ExperimentalFeature(
|
||||
name: PSCleanBlockFeatureName,
|
||||
description: "Add support of a 'Clean' block to functions and script cmdlets for easy resource cleanup"),
|
||||
};
|
||||
|
||||
EngineExperimentalFeatures = new ReadOnlyCollection<ExperimentalFeature>(engineFeatures);
|
||||
|
|
|
@ -1434,6 +1434,9 @@ namespace System.Management.Automation.Runspaces
|
|||
return iss;
|
||||
}
|
||||
|
||||
// Porting note: moved to Platform so we have one list to maintain
|
||||
private static readonly string[] s_PSCoreFormatFileNames = Platform.FormatFileNames.ToArray();
|
||||
|
||||
private static void IncludePowerShellCoreFormats(InitialSessionState iss)
|
||||
{
|
||||
string psHome = Utils.DefaultPowerShellAppBase;
|
||||
|
@ -1443,7 +1446,7 @@ namespace System.Management.Automation.Runspaces
|
|||
}
|
||||
|
||||
iss.Formats.Clear();
|
||||
foreach (var coreFormat in Platform.FormatFileNames)
|
||||
foreach (var coreFormat in s_PSCoreFormatFileNames)
|
||||
{
|
||||
iss.Formats.Add(new SessionStateFormatEntry(Path.Combine(psHome, coreFormat)));
|
||||
}
|
||||
|
|
|
@ -6,6 +6,7 @@ using System.Collections;
|
|||
using System.Collections.Generic;
|
||||
using System.Dynamic;
|
||||
using System.Globalization;
|
||||
using System.Linq;
|
||||
using System.Linq.Expressions;
|
||||
using System.Management.Automation;
|
||||
using System.Management.Automation.Internal;
|
||||
|
@ -14,10 +15,8 @@ using System.Management.Automation.PSTasks;
|
|||
using System.Runtime.CompilerServices;
|
||||
using System.Text;
|
||||
using System.Threading;
|
||||
|
||||
using CommonParamSet = System.Management.Automation.Internal.CommonParameters;
|
||||
using Dbg = System.Management.Automation.Diagnostics;
|
||||
using NotNullWhen = System.Diagnostics.CodeAnalysis.NotNullWhenAttribute;
|
||||
|
||||
namespace Microsoft.PowerShell.Commands
|
||||
{
|
||||
|
@ -2648,19 +2647,46 @@ namespace Microsoft.PowerShell.Commands
|
|||
private SwitchParameter _off;
|
||||
|
||||
/// <summary>
|
||||
/// Handle 'latest', which we interpret to be the current version of PowerShell.
|
||||
/// To make it easier to specify a version, we add some conversions that wouldn't happen otherwise:
|
||||
/// * A simple integer, i.e. 2
|
||||
/// * A string without a dot, i.e. "2"
|
||||
/// * The string 'latest', which we interpret to be the current version of PowerShell.
|
||||
/// </summary>
|
||||
private sealed class ArgumentToPSVersionTransformationAttribute : ArgumentToVersionTransformationAttribute
|
||||
private sealed class ArgumentToVersionTransformationAttribute : ArgumentTransformationAttribute
|
||||
{
|
||||
protected override bool TryConvertFromString(string versionString, [NotNullWhen(true)] out Version version)
|
||||
public override object Transform(EngineIntrinsics engineIntrinsics, object inputData)
|
||||
{
|
||||
if (string.Equals("latest", versionString, StringComparison.OrdinalIgnoreCase))
|
||||
object version = PSObject.Base(inputData);
|
||||
|
||||
string versionStr = version as string;
|
||||
if (versionStr != null)
|
||||
{
|
||||
version = PSVersionInfo.PSVersion;
|
||||
return true;
|
||||
if (versionStr.Equals("latest", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
return PSVersionInfo.PSVersion;
|
||||
}
|
||||
|
||||
if (versionStr.Contains('.'))
|
||||
{
|
||||
// If the string contains a '.', let the Version constructor handle the conversion.
|
||||
return inputData;
|
||||
}
|
||||
}
|
||||
|
||||
return base.TryConvertFromString(versionString, out version);
|
||||
if (version is double)
|
||||
{
|
||||
// The conversion to int below is wrong, but the usual conversions will turn
|
||||
// the double into a string, so just return the original object.
|
||||
return inputData;
|
||||
}
|
||||
|
||||
int majorVersion;
|
||||
if (LanguagePrimitives.TryConvertTo<int>(version, out majorVersion))
|
||||
{
|
||||
return new Version(majorVersion, 0);
|
||||
}
|
||||
|
||||
return inputData;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -2685,7 +2711,7 @@ namespace Microsoft.PowerShell.Commands
|
|||
/// Gets or sets strict mode in the current scope.
|
||||
/// </summary>
|
||||
[Parameter(ParameterSetName = "Version", Mandatory = true)]
|
||||
[ArgumentToPSVersionTransformation]
|
||||
[ArgumentToVersionTransformation]
|
||||
[ValidateVersion]
|
||||
[Alias("v")]
|
||||
public Version Version
|
||||
|
|
|
@ -674,46 +674,40 @@ namespace System.Management.Automation
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
/// Executes a piece of text as a script synchronously in the caller's session state.
|
||||
/// The given text will be executed in a child scope rather than dot-sourced.
|
||||
/// Executes a piece of text as a script synchronously.
|
||||
/// </summary>
|
||||
/// <param name="script">The script text to evaluate.</param>
|
||||
/// <returns>A collection of MshCobjects generated by the script. Never null, but may be empty.</returns>
|
||||
/// <returns>A collection of MshCobjects generated by the script.</returns>
|
||||
/// <exception cref="ParseException">Thrown if there was a parsing error in the script.</exception>
|
||||
/// <exception cref="RuntimeException">Represents a script-level exception.</exception>
|
||||
/// <exception cref="FlowControlException"></exception>
|
||||
public Collection<PSObject> InvokeScript(string script)
|
||||
{
|
||||
return InvokeScript(script, useNewScope: true, PipelineResultTypes.None, input: null);
|
||||
return InvokeScript(script, true, PipelineResultTypes.None, null);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Executes a piece of text as a script synchronously in the caller's session state.
|
||||
/// The given text will be executed in a child scope rather than dot-sourced.
|
||||
/// Executes a piece of text as a script synchronously.
|
||||
/// </summary>
|
||||
/// <param name="script">The script text to evaluate.</param>
|
||||
/// <param name="args">The arguments to the script, available as $args.</param>
|
||||
/// <returns>A collection of MshCobjects generated by the script. Never null, but may be empty.</returns>
|
||||
/// <param name="args">The arguments to the script.</param>
|
||||
/// <returns>A collection of MshCobjects generated by the script.</returns>
|
||||
/// <exception cref="ParseException">Thrown if there was a parsing error in the script.</exception>
|
||||
/// <exception cref="RuntimeException">Represents a script-level exception.</exception>
|
||||
/// <exception cref="FlowControlException"></exception>
|
||||
public Collection<PSObject> InvokeScript(string script, params object[] args)
|
||||
{
|
||||
return InvokeScript(script, useNewScope: true, PipelineResultTypes.None, input: null, args);
|
||||
return InvokeScript(script, true, PipelineResultTypes.None, null, args);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Executes a given scriptblock synchonously in the given session state.
|
||||
/// The scriptblock will be executed in the calling scope (dot-sourced) rather than in a new child scope.
|
||||
/// </summary>
|
||||
/// <param name="sessionState">The session state in which to execute the scriptblock.</param>
|
||||
/// <param name="scriptBlock">The scriptblock to execute.</param>
|
||||
/// <param name="args">The arguments to the scriptblock, available as $args.</param>
|
||||
/// <returns>A collection of the PSObjects emitted by the executing scriptblock. Never null, but may be empty.</returns>
|
||||
/// <param name="sessionState"></param>
|
||||
/// <param name="scriptBlock"></param>
|
||||
/// <param name="args"></param>
|
||||
/// <returns></returns>
|
||||
public Collection<PSObject> InvokeScript(
|
||||
SessionState sessionState,
|
||||
ScriptBlock scriptBlock,
|
||||
params object[] args)
|
||||
SessionState sessionState, ScriptBlock scriptBlock, params object[] args)
|
||||
{
|
||||
if (scriptBlock == null)
|
||||
{
|
||||
|
@ -745,18 +739,13 @@ namespace System.Management.Automation
|
|||
/// <summary>
|
||||
/// Invoke a scriptblock in the current runspace, controlling if it gets a new scope.
|
||||
/// </summary>
|
||||
/// <param name="useLocalScope">If true, executes the scriptblock in a new child scope, otherwise the scriptblock is dot-sourced into the calling scope.</param>
|
||||
/// <param name="useLocalScope">If true, a new scope will be created.</param>
|
||||
/// <param name="scriptBlock">The scriptblock to execute.</param>
|
||||
/// <param name="input">Optionall input to the command.</param>
|
||||
/// <param name="args">Arguments to pass to the scriptblock.</param>
|
||||
/// <returns>
|
||||
/// A collection of the PSObjects generated by executing the script. Never null, but may be empty.
|
||||
/// </returns>
|
||||
/// <returns>The result of the evaluation.</returns>
|
||||
public Collection<PSObject> InvokeScript(
|
||||
bool useLocalScope,
|
||||
ScriptBlock scriptBlock,
|
||||
IList input,
|
||||
params object[] args)
|
||||
bool useLocalScope, ScriptBlock scriptBlock, IList input, params object[] args)
|
||||
{
|
||||
if (scriptBlock == null)
|
||||
{
|
||||
|
@ -782,25 +771,21 @@ namespace System.Management.Automation
|
|||
/// </summary>
|
||||
/// <param name="script">The script to evaluate.</param>
|
||||
/// <param name="useNewScope">If true, evaluate the script in its own scope.
|
||||
/// If false, the script will be evaluated in the current scope i.e. it will be dot-sourced.</param>
|
||||
/// If false, the script will be evaluated in the current scope i.e. it will be "dotted"</param>
|
||||
/// <param name="writeToPipeline">If set to Output, all output will be streamed
|
||||
/// to the output pipe of the calling cmdlet. If set to None, the result will be returned
|
||||
/// to the caller as a collection of PSObjects. No other flags are supported at this time and
|
||||
/// will result in an exception if used.</param>
|
||||
/// <param name="input">The list of objects to use as input to the script.</param>
|
||||
/// <param name="args">The array of arguments to the command, available as $args.</param>
|
||||
/// <returns>A collection of PSObjects generated by the script. This will be
|
||||
/// empty if output was redirected. Never null.</returns>
|
||||
/// <param name="args">The array of arguments to the command.</param>
|
||||
/// <returns>A collection of MshCobjects generated by the script. This will be
|
||||
/// empty if output was redirected.</returns>
|
||||
/// <exception cref="ParseException">Thrown if there was a parsing error in the script.</exception>
|
||||
/// <exception cref="RuntimeException">Represents a script-level exception.</exception>
|
||||
/// <exception cref="NotImplementedException">Thrown if any redirect other than output is attempted.</exception>
|
||||
/// <exception cref="FlowControlException"></exception>
|
||||
public Collection<PSObject> InvokeScript(
|
||||
string script,
|
||||
bool useNewScope,
|
||||
PipelineResultTypes writeToPipeline,
|
||||
IList input,
|
||||
params object[] args)
|
||||
public Collection<PSObject> InvokeScript(string script, bool useNewScope,
|
||||
PipelineResultTypes writeToPipeline, IList input, params object[] args)
|
||||
{
|
||||
if (script == null)
|
||||
throw new ArgumentNullException(nameof(script));
|
||||
|
@ -811,12 +796,8 @@ namespace System.Management.Automation
|
|||
return InvokeScript(sb, useNewScope, writeToPipeline, input, args);
|
||||
}
|
||||
|
||||
private Collection<PSObject> InvokeScript(
|
||||
ScriptBlock sb,
|
||||
bool useNewScope,
|
||||
PipelineResultTypes writeToPipeline,
|
||||
IList input,
|
||||
params object[] args)
|
||||
private Collection<PSObject> InvokeScript(ScriptBlock sb, bool useNewScope,
|
||||
PipelineResultTypes writeToPipeline, IList input, params object[] args)
|
||||
{
|
||||
if (_cmdlet != null)
|
||||
_cmdlet.ThrowIfStopping();
|
||||
|
|
|
@ -928,8 +928,7 @@ namespace System.Management.Automation
|
|||
/// </summary>
|
||||
internal string PipelineVariable { get; set; }
|
||||
|
||||
private PSVariable _pipelineVarReference;
|
||||
private bool _shouldRemovePipelineVariable;
|
||||
private PSVariable _pipelineVarReference = null;
|
||||
|
||||
internal void SetupOutVariable()
|
||||
{
|
||||
|
@ -942,8 +941,10 @@ namespace System.Management.Automation
|
|||
|
||||
// Handle the creation of OutVariable in the case of Out-Default specially,
|
||||
// as it needs to handle much of its OutVariable support itself.
|
||||
if (!OutVariable.StartsWith('+') &&
|
||||
string.Equals("Out-Default", _commandInfo.Name, StringComparison.OrdinalIgnoreCase))
|
||||
if (
|
||||
(!string.IsNullOrEmpty(this.OutVariable)) &&
|
||||
(!(this.OutVariable.StartsWith('+'))) &&
|
||||
string.Equals("Out-Default", _thisCommand.CommandInfo.Name, StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
if (_state == null)
|
||||
_state = new SessionState(Context.EngineSessionState);
|
||||
|
@ -971,7 +972,7 @@ namespace System.Management.Automation
|
|||
// This can't use the common SetupVariable implementation, as this needs to persist for an entire
|
||||
// pipeline.
|
||||
|
||||
if (string.IsNullOrEmpty(PipelineVariable))
|
||||
if (string.IsNullOrEmpty(this.PipelineVariable))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
@ -982,24 +983,12 @@ namespace System.Management.Automation
|
|||
_state = new SessionState(Context.EngineSessionState);
|
||||
|
||||
// Create the pipeline variable
|
||||
_pipelineVarReference = new PSVariable(PipelineVariable);
|
||||
object varToUse = _state.Internal.SetVariable(
|
||||
_pipelineVarReference,
|
||||
force: false,
|
||||
CommandOrigin.Internal);
|
||||
_pipelineVarReference = new PSVariable(this.PipelineVariable);
|
||||
_state.PSVariable.Set(_pipelineVarReference);
|
||||
|
||||
if (ReferenceEquals(_pipelineVarReference, varToUse))
|
||||
{
|
||||
// The returned variable is the exact same instance, which means we set a new variable.
|
||||
// In this case, we will try removing the pipeline variable in the end.
|
||||
_shouldRemovePipelineVariable = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
// A variable with the same name already exists in the same scope and it was returned.
|
||||
// In this case, we update the reference and don't remove the variable in the end.
|
||||
_pipelineVarReference = (PSVariable)varToUse;
|
||||
}
|
||||
// Get the reference again in case we re-used one from the
|
||||
// same scope.
|
||||
_pipelineVarReference = _state.PSVariable.Get(this.PipelineVariable);
|
||||
|
||||
if (_thisCommand is not PSScriptCmdlet)
|
||||
{
|
||||
|
@ -1007,15 +996,6 @@ namespace System.Management.Automation
|
|||
}
|
||||
}
|
||||
|
||||
internal void RemovePipelineVariable()
|
||||
{
|
||||
if (_shouldRemovePipelineVariable)
|
||||
{
|
||||
// Remove pipeline variable when a pipeline is being torn down.
|
||||
_state.PSVariable.Remove(PipelineVariable);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Configures the number of objects to buffer before calling the downstream Cmdlet.
|
||||
/// </summary>
|
||||
|
@ -1083,7 +1063,7 @@ namespace System.Management.Automation
|
|||
/// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype1")]
|
||||
|
@ -1106,7 +1086,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string,string)"/>
|
||||
|
@ -1177,7 +1157,7 @@ namespace System.Management.Automation
|
|||
/// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype2")]
|
||||
|
@ -1200,7 +1180,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string,string)"/>
|
||||
|
@ -1280,7 +1260,7 @@ namespace System.Management.Automation
|
|||
/// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype3")]
|
||||
|
@ -1306,7 +1286,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
|
||||
|
@ -1395,7 +1375,7 @@ namespace System.Management.Automation
|
|||
/// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype3")]
|
||||
|
@ -1423,7 +1403,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
|
||||
|
@ -1701,7 +1681,7 @@ namespace System.Management.Automation
|
|||
/// to ShouldProcess for the Cmdlet instance.
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
|
||||
|
@ -1745,7 +1725,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string,ref bool,ref bool)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
|
@ -1883,7 +1863,7 @@ namespace System.Management.Automation
|
|||
/// to ShouldProcess for the Cmdlet instance.
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
|
||||
|
@ -1932,7 +1912,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
|
@ -2424,6 +2404,7 @@ namespace System.Management.Automation
|
|||
}
|
||||
|
||||
// Log a command health event
|
||||
|
||||
MshLog.LogCommandHealthEvent(
|
||||
Context,
|
||||
e,
|
||||
|
@ -3762,10 +3743,8 @@ namespace System.Management.Automation
|
|||
{
|
||||
Diagnostics.Assert(_thisCommand is PSScriptCmdlet, "this is only done for script cmdlets");
|
||||
|
||||
if (_outVarList != null && !OutputPipe.IgnoreOutVariableList)
|
||||
if (_outVarList != null)
|
||||
{
|
||||
// A null pipe is used when executing the 'Clean' block of a PSScriptCmdlet.
|
||||
// In such a case, we don't capture output to the out variable list.
|
||||
this.OutputPipe.AddVariableList(VariableStreamKind.Output, _outVarList);
|
||||
}
|
||||
|
||||
|
@ -3786,13 +3765,26 @@ namespace System.Management.Automation
|
|||
|
||||
if (this.PipelineVariable != null)
|
||||
{
|
||||
// _state can be null if the current script block is dynamicparam, etc.
|
||||
if (_state != null)
|
||||
{
|
||||
// Create the pipeline variable
|
||||
_state.PSVariable.Set(_pipelineVarReference);
|
||||
|
||||
// Get the reference again in case we re-used one from the
|
||||
// same scope.
|
||||
_pipelineVarReference = _state.PSVariable.Get(this.PipelineVariable);
|
||||
}
|
||||
|
||||
this.OutputPipe.SetPipelineVariable(_pipelineVarReference);
|
||||
}
|
||||
}
|
||||
|
||||
internal void RemoveVariableListsInPipe()
|
||||
{
|
||||
if (_outVarList != null && !OutputPipe.IgnoreOutVariableList)
|
||||
// Diagnostics.Assert(thisCommand is PSScriptCmdlet, "this is only done for script cmdlets");
|
||||
|
||||
if (_outVarList != null)
|
||||
{
|
||||
this.OutputPipe.RemoveVariableList(VariableStreamKind.Output, _outVarList);
|
||||
}
|
||||
|
@ -3815,6 +3807,9 @@ namespace System.Management.Automation
|
|||
if (this.PipelineVariable != null)
|
||||
{
|
||||
this.OutputPipe.RemovePipelineVariable();
|
||||
// '_state' could be null when a 'DynamicParam' block runs because the 'DynamicParam' block runs in 'DoPrepare',
|
||||
// before 'PipelineProcessor.SetupParameterVariables' is called, where '_state' is initialized.
|
||||
_state?.PSVariable.Remove(this.PipelineVariable);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -884,7 +884,7 @@ namespace System.Management.Automation
|
|||
errorMsg,
|
||||
errorId);
|
||||
|
||||
var errorRecord = new ErrorRecord(exception, errorId, ErrorCategory.NotSpecified, targetObject: Path);
|
||||
var errorRecord = new ErrorRecord(exception, errorId, ErrorCategory.NotSpecified, targetObject: NativeCommandName);
|
||||
this.commandRuntime._WriteErrorSkipAllowCheck(errorRecord);
|
||||
}
|
||||
}
|
||||
|
@ -1101,9 +1101,15 @@ namespace System.Management.Automation
|
|||
#if UNIX
|
||||
return false;
|
||||
#else
|
||||
if (!Platform.IsWindowsDesktop)
|
||||
if (!Platform.IsWindowsDesktop) { return false; }
|
||||
|
||||
// SHGetFileInfo() does not understand reparse points and returns 0 ("non exe or error")
|
||||
// so we are trying to get a real path before.
|
||||
// It is a workaround for Microsoft Store applications.
|
||||
string realPath = Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods.WinInternalGetTarget(fileName);
|
||||
if (realPath is not null)
|
||||
{
|
||||
return false;
|
||||
fileName = realPath;
|
||||
}
|
||||
|
||||
SHFILEINFO shinfo = new SHFILEINFO();
|
||||
|
|
|
@ -64,7 +64,6 @@ namespace System.Management.Automation
|
|||
private static readonly SemanticVersion s_psV62Version = new SemanticVersion(6, 2, 0, preReleaseLabel: null, buildLabel: null);
|
||||
private static readonly SemanticVersion s_psV7Version = new SemanticVersion(7, 0, 0, preReleaseLabel: null, buildLabel: null);
|
||||
private static readonly SemanticVersion s_psV71Version = new SemanticVersion(7, 1, 0, preReleaseLabel: null, buildLabel: null);
|
||||
private static readonly SemanticVersion s_psV72Version = new SemanticVersion(7, 2, 0, preReleaseLabel: null, buildLabel: null);
|
||||
private static readonly SemanticVersion s_psSemVersion;
|
||||
private static readonly Version s_psVersion;
|
||||
|
||||
|
@ -111,7 +110,7 @@ namespace System.Management.Automation
|
|||
s_psVersionTable[PSVersionInfo.PSVersionName] = s_psSemVersion;
|
||||
s_psVersionTable[PSVersionInfo.PSEditionName] = PSEditionValue;
|
||||
s_psVersionTable[PSGitCommitIdName] = rawGitCommitId;
|
||||
s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV61Version, s_psV62Version, s_psV7Version, s_psV71Version, s_psV72Version, s_psVersion };
|
||||
s_psVersionTable[PSCompatibleVersionsName] = new Version[] { s_psV1Version, s_psV2Version, s_psV3Version, s_psV4Version, s_psV5Version, s_psV51Version, s_psV6Version, s_psV61Version, s_psV62Version, s_psV7Version, s_psV71Version, s_psVersion };
|
||||
s_psVersionTable[PSVersionInfo.SerializationVersionName] = new Version(InternalSerializer.DefaultVersion);
|
||||
s_psVersionTable[PSVersionInfo.PSRemotingProtocolVersionName] = RemotingConstants.ProtocolVersion;
|
||||
s_psVersionTable[PSVersionInfo.WSManStackVersionName] = GetWSManStackVersion();
|
||||
|
|
|
@ -109,13 +109,6 @@ namespace System.Management.Automation.Internal
|
|||
/// </summary>
|
||||
internal int OutBufferCount { get; set; } = 0;
|
||||
|
||||
/// <summary>
|
||||
/// Gets whether the out variable list should be ignored.
|
||||
/// This is used for scenarios like the `clean` block, where writing to output stream is intentionally
|
||||
/// disabled and thus out variables should also be ignored.
|
||||
/// </summary>
|
||||
internal bool IgnoreOutVariableList { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// If true, then all input added to this pipe will simply be discarded...
|
||||
/// </summary>
|
||||
|
|
|
@ -247,30 +247,6 @@ namespace System.Management.Automation
|
|||
return commandMetadata.GetEndBlock();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// This method constructs a string representing the clean block of the command
|
||||
/// specified by <paramref name="commandMetadata"/>. The returned string only contains the
|
||||
/// script, it is not enclosed in "clean { }".
|
||||
/// </summary>
|
||||
/// <param name="commandMetadata">
|
||||
/// An instance of CommandMetadata representing a command.
|
||||
/// </param>
|
||||
/// <returns>
|
||||
/// A string representing the end block of the command.
|
||||
/// </returns>
|
||||
/// <exception cref="ArgumentNullException">
|
||||
/// If <paramref name="commandMetadata"/> is null.
|
||||
/// </exception>
|
||||
public static string GetClean(CommandMetadata commandMetadata)
|
||||
{
|
||||
if (commandMetadata == null)
|
||||
{
|
||||
throw PSTraceSource.NewArgumentNullException(nameof(commandMetadata));
|
||||
}
|
||||
|
||||
return commandMetadata.GetCleanBlock();
|
||||
}
|
||||
|
||||
private static T GetProperty<T>(PSObject obj, string property) where T : class
|
||||
{
|
||||
T result = null;
|
||||
|
|
|
@ -6,7 +6,6 @@ using System.Collections.Generic;
|
|||
using System.Diagnostics;
|
||||
using System.Management.Automation.Internal;
|
||||
using System.Management.Automation.Language;
|
||||
using System.Management.Automation.Runspaces;
|
||||
using System.Reflection;
|
||||
|
||||
using Dbg = System.Management.Automation.Diagnostics;
|
||||
|
@ -48,7 +47,7 @@ namespace System.Management.Automation
|
|||
protected bool _dontUseScopeCommandOrigin;
|
||||
|
||||
/// <summary>
|
||||
/// If true, then an exit exception will be rethrown instead of caught and processed...
|
||||
/// If true, then an exit exception will be rethrown to instead of caught and processed...
|
||||
/// </summary>
|
||||
protected bool _rethrowExitException;
|
||||
|
||||
|
@ -238,7 +237,6 @@ namespace System.Management.Automation
|
|||
private MutableTuple _localsTuple;
|
||||
private bool _runOptimizedCode;
|
||||
private bool _argsBound;
|
||||
private bool _anyClauseExecuted;
|
||||
private FunctionContext _functionContext;
|
||||
|
||||
internal DlrScriptCommandProcessor(ScriptBlock scriptBlock, ExecutionContext context, bool useNewScope, CommandOrigin origin, SessionStateInternal sessionState, object dollarUnderbar)
|
||||
|
@ -329,7 +327,8 @@ namespace System.Management.Automation
|
|||
|
||||
ScriptBlock.LogScriptBlockStart(_scriptBlock, Context.CurrentRunspace.InstanceId);
|
||||
|
||||
// Even if there is no begin, we need to set up the execution scope for this script...
|
||||
// Even if there is no begin, we need to set up the execution scope for this
|
||||
// script...
|
||||
SetCurrentScopeToExecutionScope();
|
||||
CommandProcessorBase oldCurrentCommandProcessor = Context.CurrentCommandProcessor;
|
||||
try
|
||||
|
@ -411,7 +410,6 @@ namespace System.Management.Automation
|
|||
if (_scriptBlock.HasEndBlock)
|
||||
{
|
||||
var endBlock = _runOptimizedCode ? _scriptBlock.EndBlock : _scriptBlock.UnoptimizedEndBlock;
|
||||
|
||||
if (this.CommandRuntime.InputPipe.ExternalReader == null)
|
||||
{
|
||||
if (IsPipelineInputExpected())
|
||||
|
@ -435,33 +433,7 @@ namespace System.Management.Automation
|
|||
}
|
||||
finally
|
||||
{
|
||||
if (!_scriptBlock.HasCleanBlock)
|
||||
{
|
||||
ScriptBlock.LogScriptBlockEnd(_scriptBlock, Context.CurrentRunspace.InstanceId);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected override void CleanResource()
|
||||
{
|
||||
if (_scriptBlock.HasCleanBlock && _anyClauseExecuted)
|
||||
{
|
||||
// The 'Clean' block doesn't write to pipeline.
|
||||
Pipe oldOutputPipe = _functionContext._outputPipe;
|
||||
_functionContext._outputPipe = new Pipe { NullPipe = true };
|
||||
|
||||
try
|
||||
{
|
||||
RunClause(
|
||||
clause: _runOptimizedCode ? _scriptBlock.CleanBlock : _scriptBlock.UnoptimizedCleanBlock,
|
||||
dollarUnderbar: AutomationNull.Value,
|
||||
inputToProcess: AutomationNull.Value);
|
||||
}
|
||||
finally
|
||||
{
|
||||
_functionContext._outputPipe = oldOutputPipe;
|
||||
ScriptBlock.LogScriptBlockEnd(_scriptBlock, Context.CurrentRunspace.InstanceId);
|
||||
}
|
||||
ScriptBlock.LogScriptBlockEnd(_scriptBlock, Context.CurrentRunspace.InstanceId);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -487,7 +459,6 @@ namespace System.Management.Automation
|
|||
{
|
||||
ExecutionContext.CheckStackDepth();
|
||||
|
||||
_anyClauseExecuted = true;
|
||||
Pipe oldErrorOutputPipe = this.Context.ShellFunctionErrorOutputPipe;
|
||||
|
||||
// If the script block has a different language mode than the current,
|
||||
|
@ -582,7 +553,7 @@ namespace System.Management.Automation
|
|||
}
|
||||
finally
|
||||
{
|
||||
Context.ShellFunctionErrorOutputPipe = oldErrorOutputPipe;
|
||||
this.Context.RestoreErrorPipe(oldErrorOutputPipe);
|
||||
|
||||
if (oldLanguageMode.HasValue)
|
||||
{
|
||||
|
@ -613,12 +584,15 @@ namespace System.Management.Automation
|
|||
}
|
||||
catch (RuntimeException e)
|
||||
{
|
||||
// This method always throws.
|
||||
ManageScriptException(e);
|
||||
ManageScriptException(e); // always throws
|
||||
// This quiets the compiler which wants to see a return value
|
||||
// in all codepaths.
|
||||
throw;
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// This cmdlet threw an exception, so wrap it and bubble it up.
|
||||
// This cmdlet threw an exception, so
|
||||
// wrap it and bubble it up.
|
||||
throw ManageInvocationException(e);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1747,7 +1747,7 @@ namespace System.Management.Automation.Runspaces
|
|||
|
||||
/// <summary>
|
||||
/// This exception is used by TypeTable constructor to indicate errors
|
||||
/// occurred during construction time.
|
||||
/// occured during construction time.
|
||||
/// </summary>
|
||||
[Serializable]
|
||||
public class TypeTableLoadException : RuntimeException
|
||||
|
@ -1796,7 +1796,7 @@ namespace System.Management.Automation.Runspaces
|
|||
/// time.
|
||||
/// </summary>
|
||||
/// <param name="loadErrors">
|
||||
/// The errors that occurred
|
||||
/// The errors that occured
|
||||
/// </param>
|
||||
internal TypeTableLoadException(ConcurrentBag<string> loadErrors)
|
||||
: base(TypesXmlStrings.TypeTableLoadErrors)
|
||||
|
|
|
@ -680,7 +680,10 @@ namespace System.Management.Automation.Runspaces
|
|||
AddMember(
|
||||
errors,
|
||||
typeName,
|
||||
new PSAliasProperty(@"Target", @"LinkTarget", conversionType: null),
|
||||
new PSCodeProperty(
|
||||
@"Target",
|
||||
GetMethodInfo(typeof(Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods), @"GetTarget"),
|
||||
setterCodeReference: null),
|
||||
typeMembers,
|
||||
isOverride: false);
|
||||
|
||||
|
@ -805,7 +808,10 @@ namespace System.Management.Automation.Runspaces
|
|||
AddMember(
|
||||
errors,
|
||||
typeName,
|
||||
new PSAliasProperty(@"Target", @"LinkTarget", conversionType: null),
|
||||
new PSCodeProperty(
|
||||
@"Target",
|
||||
GetMethodInfo(typeof(Microsoft.PowerShell.Commands.InternalSymbolicLinkLinkCodeMethods), @"GetTarget"),
|
||||
setterCodeReference: null),
|
||||
typeMembers,
|
||||
isOverride: false);
|
||||
|
||||
|
|
|
@ -1559,6 +1559,100 @@ namespace System.Management.Automation
|
|||
|
||||
return oldMode;
|
||||
}
|
||||
|
||||
#region PSAnsiRendering
|
||||
|
||||
internal static bool ShouldOutputPlainText(bool isHost, bool? supportsVirtualTerminal)
|
||||
{
|
||||
var outputRendering = OutputRendering.Ansi;
|
||||
|
||||
if (supportsVirtualTerminal != false)
|
||||
{
|
||||
switch (PSStyle.Instance.OutputRendering)
|
||||
{
|
||||
case OutputRendering.Host:
|
||||
outputRendering = isHost ? OutputRendering.Ansi : OutputRendering.PlainText;
|
||||
break;
|
||||
default:
|
||||
outputRendering = PSStyle.Instance.OutputRendering;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return outputRendering == OutputRendering.PlainText;
|
||||
}
|
||||
|
||||
internal static string GetOutputString(string s, bool isHost, bool? supportsVirtualTerminal = null, bool isOutputRedirected = false)
|
||||
{
|
||||
var sd = new ValueStringDecorated(s);
|
||||
|
||||
if (sd.IsDecorated)
|
||||
{
|
||||
var outputRendering = OutputRendering.Ansi;
|
||||
if (InternalTestHooks.BypassOutputRedirectionCheck)
|
||||
{
|
||||
isOutputRedirected = false;
|
||||
}
|
||||
|
||||
if (isOutputRedirected || ShouldOutputPlainText(isHost, supportsVirtualTerminal))
|
||||
{
|
||||
outputRendering = OutputRendering.PlainText;
|
||||
}
|
||||
|
||||
s = sd.ToString(outputRendering);
|
||||
}
|
||||
|
||||
return s;
|
||||
}
|
||||
|
||||
internal enum FormatStyle
|
||||
{
|
||||
Reset,
|
||||
FormatAccent,
|
||||
TableHeader,
|
||||
ErrorAccent,
|
||||
Error,
|
||||
Warning,
|
||||
Verbose,
|
||||
Debug,
|
||||
}
|
||||
|
||||
internal static string GetFormatStyleString(FormatStyle formatStyle)
|
||||
{
|
||||
// redirected console gets plaintext output to preserve existing behavior
|
||||
if (!InternalTestHooks.BypassOutputRedirectionCheck &&
|
||||
((PSStyle.Instance.OutputRendering == OutputRendering.PlainText) ||
|
||||
(formatStyle == FormatStyle.Error && Console.IsErrorRedirected) ||
|
||||
(formatStyle != FormatStyle.Error && Console.IsOutputRedirected)))
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
PSStyle psstyle = PSStyle.Instance;
|
||||
switch (formatStyle)
|
||||
{
|
||||
case FormatStyle.Reset:
|
||||
return psstyle.Reset;
|
||||
case FormatStyle.FormatAccent:
|
||||
return psstyle.Formatting.FormatAccent;
|
||||
case FormatStyle.TableHeader:
|
||||
return psstyle.Formatting.TableHeader;
|
||||
case FormatStyle.ErrorAccent:
|
||||
return psstyle.Formatting.ErrorAccent;
|
||||
case FormatStyle.Error:
|
||||
return psstyle.Formatting.Error;
|
||||
case FormatStyle.Warning:
|
||||
return psstyle.Formatting.Warning;
|
||||
case FormatStyle.Verbose:
|
||||
return psstyle.Formatting.Verbose;
|
||||
case FormatStyle.Debug:
|
||||
return psstyle.Formatting.Debug;
|
||||
default:
|
||||
return string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -801,7 +801,7 @@ namespace System.Management.Automation
|
|||
/// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype1")]
|
||||
|
@ -824,7 +824,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string,string)"/>
|
||||
|
@ -897,7 +897,7 @@ namespace System.Management.Automation
|
|||
/// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype2")]
|
||||
|
@ -920,7 +920,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string,string)"/>
|
||||
|
@ -1001,7 +1001,7 @@ namespace System.Management.Automation
|
|||
/// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype3")]
|
||||
|
@ -1027,7 +1027,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
|
||||
|
@ -1117,7 +1117,7 @@ namespace System.Management.Automation
|
|||
/// <see cref="System.Management.Automation.ActionPreferenceStopException"/>,
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype3")]
|
||||
|
@ -1145,7 +1145,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string,string)"/>
|
||||
|
@ -1233,7 +1233,7 @@ namespace System.Management.Automation
|
|||
/// to ShouldProcess for the Cmdlet instance.
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
|
||||
|
@ -1277,7 +1277,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string,ref bool,ref bool)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
|
@ -1362,7 +1362,7 @@ namespace System.Management.Automation
|
|||
/// to ShouldProcess for the Cmdlet instance.
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
|
||||
|
@ -1411,7 +1411,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
|
@ -1502,7 +1502,7 @@ namespace System.Management.Automation
|
|||
/// to ShouldProcess for the Cmdlet instance.
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// namespace Microsoft.Samples.MSH.Cmdlet
|
||||
/// {
|
||||
/// [Cmdlet(VerbsCommon.Remove,"myobjecttype4")]
|
||||
|
@ -1551,7 +1551,7 @@ namespace System.Management.Automation
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldContinue(string,string)"/>
|
||||
/// <seealso cref="System.Management.Automation.Cmdlet.ShouldProcess(string)"/>
|
||||
|
|
|
@ -531,16 +531,15 @@ namespace System.Management.Automation
|
|||
|
||||
// Not found. First, we check if the line/column is before any real code. If so, we'll
|
||||
// move the breakpoint to the first interesting sequence point (could be a dynamicparam,
|
||||
// begin, process, end, or clean block.)
|
||||
// begin, process, or end block.)
|
||||
if (scriptBlock != null)
|
||||
{
|
||||
var ast = scriptBlock.Ast;
|
||||
var bodyAst = ((IParameterMetadataProvider)ast).Body;
|
||||
if ((bodyAst.DynamicParamBlock == null || bodyAst.DynamicParamBlock.Extent.IsAfter(Line, Column))
|
||||
&& (bodyAst.BeginBlock == null || bodyAst.BeginBlock.Extent.IsAfter(Line, Column))
|
||||
&& (bodyAst.ProcessBlock == null || bodyAst.ProcessBlock.Extent.IsAfter(Line, Column))
|
||||
&& (bodyAst.EndBlock == null || bodyAst.EndBlock.Extent.IsAfter(Line, Column))
|
||||
&& (bodyAst.CleanBlock == null || bodyAst.CleanBlock.Extent.IsAfter(Line, Column)))
|
||||
if ((bodyAst.DynamicParamBlock == null || bodyAst.DynamicParamBlock.Extent.IsAfter(Line, Column)) &&
|
||||
(bodyAst.BeginBlock == null || bodyAst.BeginBlock.Extent.IsAfter(Line, Column)) &&
|
||||
(bodyAst.ProcessBlock == null || bodyAst.ProcessBlock.Extent.IsAfter(Line, Column)) &&
|
||||
(bodyAst.EndBlock == null || bodyAst.EndBlock.Extent.IsAfter(Line, Column)))
|
||||
{
|
||||
SetBreakpoint(functionContext, 0);
|
||||
return true;
|
||||
|
|
|
@ -1458,7 +1458,7 @@ namespace System.Management.Automation.Host
|
|||
/// Provided for clearing regions -- less chatty than passing an array of cells.
|
||||
/// </remarks>
|
||||
/// <example>
|
||||
/// <code>
|
||||
/// <snippet Code="C#">
|
||||
/// using System;
|
||||
/// using System.Management.Automation;
|
||||
/// using System.Management.Automation.Host;
|
||||
|
@ -1474,7 +1474,7 @@ namespace System.Management.Automation.Host
|
|||
/// }
|
||||
/// }
|
||||
/// }
|
||||
/// </code>
|
||||
/// </snippet>
|
||||
/// </example>
|
||||
/// <seealso cref="System.Management.Automation.Host.PSHostRawUserInterface.NewBufferCellArray(int, int, BufferCell)"/>
|
||||
/// <seealso cref="System.Management.Automation.Host.PSHostRawUserInterface.NewBufferCellArray(Size, BufferCell)"/>
|
||||
|
|
|
@ -232,161 +232,6 @@ namespace System.Management.Automation.Host
|
|||
/// </summary>
|
||||
public virtual void WriteInformation(InformationRecord record) { }
|
||||
|
||||
private static bool ShouldOutputPlainText(bool isHost, bool? supportsVirtualTerminal)
|
||||
{
|
||||
var outputRendering = OutputRendering.PlainText;
|
||||
|
||||
if (supportsVirtualTerminal != false)
|
||||
{
|
||||
switch (PSStyle.Instance.OutputRendering)
|
||||
{
|
||||
case OutputRendering.Host:
|
||||
outputRendering = isHost ? OutputRendering.Ansi : OutputRendering.PlainText;
|
||||
break;
|
||||
default:
|
||||
outputRendering = PSStyle.Instance.OutputRendering;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return outputRendering == OutputRendering.PlainText;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The format styles that are supported by the host.
|
||||
/// </summary>
|
||||
public enum FormatStyle
|
||||
{
|
||||
/// <summary>
|
||||
/// Reset the formatting to the default.
|
||||
/// </summary>
|
||||
Reset,
|
||||
|
||||
/// <summary>
|
||||
/// Highlight text used in output formatting.
|
||||
/// </summary>
|
||||
FormatAccent,
|
||||
|
||||
/// <summary>
|
||||
/// Highlight for table headers.
|
||||
/// </summary>
|
||||
TableHeader,
|
||||
|
||||
/// <summary>
|
||||
/// Highlight for detailed error view.
|
||||
/// </summary>
|
||||
ErrorAccent,
|
||||
|
||||
/// <summary>
|
||||
/// Style for error messages.
|
||||
/// </summary>
|
||||
Error,
|
||||
|
||||
/// <summary>
|
||||
/// Style for warning messages.
|
||||
/// </summary>
|
||||
Warning,
|
||||
|
||||
/// <summary>
|
||||
/// Style for verbose messages.
|
||||
/// </summary>
|
||||
Verbose,
|
||||
|
||||
/// <summary>
|
||||
/// Style for debug messages.
|
||||
/// </summary>
|
||||
Debug,
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the ANSI escape sequence for the given format style.
|
||||
/// </summary>
|
||||
/// <param name="formatStyle">
|
||||
/// The format style to get the escape sequence for.
|
||||
/// </param>
|
||||
/// <param name="isOutputRedirected">
|
||||
/// True if the output is redirected.
|
||||
/// </param>
|
||||
/// <returns>
|
||||
/// The ANSI escape sequence for the given format style.
|
||||
/// </returns>
|
||||
public static string GetFormatStyleString(FormatStyle formatStyle, bool isOutputRedirected)
|
||||
{
|
||||
// redirected console gets plaintext output to preserve existing behavior
|
||||
if (!InternalTestHooks.BypassOutputRedirectionCheck &&
|
||||
(PSStyle.Instance.OutputRendering == OutputRendering.PlainText ||
|
||||
isOutputRedirected))
|
||||
{
|
||||
return string.Empty;
|
||||
}
|
||||
|
||||
PSStyle psstyle = PSStyle.Instance;
|
||||
switch (formatStyle)
|
||||
{
|
||||
case FormatStyle.Reset:
|
||||
return psstyle.Reset;
|
||||
case FormatStyle.FormatAccent:
|
||||
return psstyle.Formatting.FormatAccent;
|
||||
case FormatStyle.TableHeader:
|
||||
return psstyle.Formatting.TableHeader;
|
||||
case FormatStyle.ErrorAccent:
|
||||
return psstyle.Formatting.ErrorAccent;
|
||||
case FormatStyle.Error:
|
||||
return psstyle.Formatting.Error;
|
||||
case FormatStyle.Warning:
|
||||
return psstyle.Formatting.Warning;
|
||||
case FormatStyle.Verbose:
|
||||
return psstyle.Formatting.Verbose;
|
||||
case FormatStyle.Debug:
|
||||
return psstyle.Formatting.Debug;
|
||||
default:
|
||||
return string.Empty;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Get the appropriate output string based on different criteria.
|
||||
/// </summary>
|
||||
/// <param name="text">
|
||||
/// The text to format.
|
||||
/// </param>
|
||||
/// <param name="supportsVirtualTerminal">
|
||||
/// True if the host supports virtual terminal.
|
||||
/// </param>
|
||||
/// <param name="isOutputRedirected">
|
||||
/// True if the output is redirected.
|
||||
/// </param>
|
||||
/// <returns>
|
||||
/// The formatted text.
|
||||
/// </returns>
|
||||
public static string GetOutputString(string text, bool supportsVirtualTerminal, bool isOutputRedirected)
|
||||
{
|
||||
return GetOutputString(text, isHost: true, supportsVirtualTerminal: supportsVirtualTerminal, isOutputRedirected: isOutputRedirected);
|
||||
}
|
||||
|
||||
internal static string GetOutputString(string text, bool isHost, bool? supportsVirtualTerminal = null, bool isOutputRedirected = false)
|
||||
{
|
||||
var sd = new ValueStringDecorated(text);
|
||||
|
||||
if (sd.IsDecorated)
|
||||
{
|
||||
var outputRendering = OutputRendering.Ansi;
|
||||
if (InternalTestHooks.BypassOutputRedirectionCheck)
|
||||
{
|
||||
isOutputRedirected = false;
|
||||
}
|
||||
|
||||
if (isOutputRedirected || ShouldOutputPlainText(isHost, supportsVirtualTerminal))
|
||||
{
|
||||
outputRendering = OutputRendering.PlainText;
|
||||
}
|
||||
|
||||
text = sd.ToString(outputRendering);
|
||||
}
|
||||
|
||||
return text;
|
||||
}
|
||||
|
||||
// Gets the state associated with PowerShell transcription.
|
||||
//
|
||||
// Ideally, this would be associated with the host instance, but remoting recycles host instances
|
||||
|
|
|
@ -445,7 +445,7 @@ namespace System.Management.Automation.Runspaces
|
|||
///
|
||||
/// This flag is used to force the redirection. By default it is false to maintain compatibility with
|
||||
/// V1, but the V2 hosting interface (PowerShell class) sets this flag to true to ensure the global
|
||||
/// error output pipe is always set and $ErrorActionPreference is checked when invoking the Pipeline.
|
||||
/// error output pipe is always set and $ErrorActionPreference when invoking the Pipeline.
|
||||
/// </summary>
|
||||
internal bool RedirectShellErrorOutputPipe { get; set; } = false;
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue