From 87b714b61267c3760b9783377e46b086992de171 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Wed, 1 Sep 2021 10:36:58 -0700 Subject: [PATCH] Add `.stylecop` to `filetypexml` and format it (#16025) --- CHANGELOG/6.0.md | 2 +- CHANGELOG/6.1.md | 2 +- CHANGELOG/6.2.md | 2 +- CHANGELOG/7.0.md | 2 +- .../CommandCompletion/CompletionCompleters.cs | 2 +- .../releaseBuild/azureDevOps/releaseBuild.yml | 8 + .../azureDevOps/templates/compliance.yml | 5 +- tools/terms/FileTypeSet.xml | 379 ------------------ tools/terms/TermsExclusion.xml | 11 + 9 files changed, 26 insertions(+), 387 deletions(-) delete mode 100644 tools/terms/FileTypeSet.xml create mode 100644 tools/terms/TermsExclusion.xml diff --git a/CHANGELOG/6.0.md b/CHANGELOG/6.0.md index 2c4da7b70..948197f06 100644 --- a/CHANGELOG/6.0.md +++ b/CHANGELOG/6.0.md @@ -104,7 +104,7 @@ work is required for Microsoft to continue to sign and release packages from the project as official Microsoft packages. - Remove `PerformWSManPluginReportCompletion`, which was not used, from `pwrshplugin.dll` (#5498) (Thanks @bergmeister!) -- Remove exclusion for hang and add context exception for remaining instances (#5595) +- Remove exclusion for unresponsive condition and add context exception for remaining instances (#5595) - Replace `strlen` with `strnlen` in native code (#5510) ## [6.0.0-rc] - 2017-11-16 diff --git a/CHANGELOG/6.1.md b/CHANGELOG/6.1.md index f8e12f470..59cf2842d 100644 --- a/CHANGELOG/6.1.md +++ b/CHANGELOG/6.1.md @@ -428,7 +428,7 @@ - Fix crash when terminal is reset (#6777) - Fix a module-loading regression that caused an infinite loop (#6843) - Further improve `PSMethod` to `Delegate` conversion (#6851) -- Blacklist `System.Windows.Forms` from loading to prevent a crash (#6822) +- Block list `System.Windows.Forms` from loading to prevent a crash (#6822) - Fix `Format-Table` where rows were being trimmed unnecessarily if there's only one row of headers (#6772) - Fix `SetDate` function in `libpsl-native` to avoid corrupting memory during `P/Invoke` (#6881) - Fix tab completions for hash table (#6839) (Thanks @iSazonov!) diff --git a/CHANGELOG/6.2.md b/CHANGELOG/6.2.md index 06ad8f414..bf54f978e 100644 --- a/CHANGELOG/6.2.md +++ b/CHANGELOG/6.2.md @@ -844,7 +844,7 @@ ### Documentation and Help Content -- Replace ambiguous `hang` term (#7902, #7931) (Thanks @iSazonov!) +- Replace ambiguous term (#7902, #7931) (Thanks @iSazonov!) - Updating incorrect example of `PowerShell.Create()` (#7926) (Thanks @1RedOne!) - Update `governance.md` (#7927) (Thanks @tommymaynard!) - Add `cURL` to the Bash users list in `README.md` (#7948) (Thanks @vmsilvamolina!) diff --git a/CHANGELOG/7.0.md b/CHANGELOG/7.0.md index fe0eca4c5..9b7c0a9f4 100644 --- a/CHANGELOG/7.0.md +++ b/CHANGELOG/7.0.md @@ -327,7 +327,7 @@ Move to .NET Core 3.1.202 SDK and update packages. - Skip null data in output data received handler to fix a `NullReferenceException` (#11448) (Thanks @iSazonov!) - Add `ssh` parameter sets for the parameter `-JobName` in `Invoke-Command` (#11444) - Adding `PowerShell Editor Services` and `PSScriptAnalyzer` to tracked modules (#11514) -- Fix key exchange hang with `SecureString` for the `OutOfProc` transports (#11380, #11406) +- Fix condition when key exchange stops responding with `SecureString` for the `OutOfProc` transports (#11380, #11406) - Add setting to disable the implicit `WinPS` module loading (#11332) ### General Cmdlet Updates and Fixes diff --git a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs index b525098ac..d8360e714 100644 --- a/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs +++ b/src/System.Management.Automation/engine/CommandCompletion/CompletionCompleters.cs @@ -7652,7 +7652,7 @@ namespace System.Management.Automation /// /// Initializes a new instance of the class. /// - /// The name of the property of the input object for witch to complete with property names. + /// The name of the property of the input object for which to complete with property names. public PropertyNameCompleter(string parameterNameOfInput) { _parameterNameOfInput = parameterNameOfInput; diff --git a/tools/releaseBuild/azureDevOps/releaseBuild.yml b/tools/releaseBuild/azureDevOps/releaseBuild.yml index bd45d7ffb..4ffa04fe3 100644 --- a/tools/releaseBuild/azureDevOps/releaseBuild.yml +++ b/tools/releaseBuild/azureDevOps/releaseBuild.yml @@ -10,6 +10,11 @@ pr: - master - release* +parameters: + - name: ForceAzureBlobDelete + displayName: Delete Azure Blob + default: false + resources: repositories: - repository: ComplianceRepo @@ -29,6 +34,9 @@ variables: value: $[format('{0:yyyyMMdd}-{1}', pipeline.startTime,variables['Build.SourceBranch'])] - name: branchCounter value: $[counter(variables['branchCounterKey'], 1)] + - name: ForceAzureBlobDelete + value: ${{ parameters.ForceAzureBlobDelete }} + stages: - stage: prep jobs: diff --git a/tools/releaseBuild/azureDevOps/templates/compliance.yml b/tools/releaseBuild/azureDevOps/templates/compliance.yml index 9e6c7ad1c..280ae3551 100644 --- a/tools/releaseBuild/azureDevOps/templates/compliance.yml +++ b/tools/releaseBuild/azureDevOps/templates/compliance.yml @@ -85,12 +85,11 @@ jobs: inputs: targetType: F optionsFC: 0 - optionsXS: 0 + optionsXS: 1 optionsPE: '1|2|3|4' optionsHMENABLE: 0 optionsRulesDBPath: '$(Build.SourcesDirectory)\tools\terms\PowerShell-Terms-Rules.mdb' - optionsFTPATH: '$(Build.SourcesDirectory)\tools\terms\FileTypeSet.xml' - toolVersion: 5.8.2.1 + optionsUEPath: $(Build.SourcesDirectory)\tools\terms\TermsExclusion.xml continueOnError: true # add RoslynAnalyzers diff --git a/tools/terms/FileTypeSet.xml b/tools/terms/FileTypeSet.xml deleted file mode 100644 index 2b0821d67..000000000 --- a/tools/terms/FileTypeSet.xml +++ /dev/null @@ -1,379 +0,0 @@ - - - - -Pure Text Files - -.txt -.des -.pwd -.asm -.cmd -.ini -.poc -.pwt -.hpj -.sql -.inf -.log -.def -.url -.bat -.aspx -.idl -.sys -.resources -.strings -.md -.yml -.yaml -.spelling -.gitignore -.gitattributes -.gitmodules -.csv -.tsv - - - -CodeFiles - -.frm -.inc -.cpp -.cls -.c -.hpp -.vbs -.java -.cs -.cxx -.h -.jav -.bas -.hxx -.js -.pl -.rc -.vb -.json -.resjson -.fs -.fsi -.fsx -.m -.psm1 -.config -.ps1 -.psd1 -.cmake -.sh -.cshtml -.plist -.mof -.mc - - - -XML Files - -.xml -.hxa -.hxk -.hxl -.xsl -.hxc -.hxt -.hxm -.resx -.hxe -.hxf -.hxv -.acctb -.accfl -.xaml -.ttml -.ddue -.sln -.props -.ps1xml -.csproj -.xsd -.svg -.clixml -.nuspec -.cdxml -.manifest - - - -Microsoft Word Documents - -.doc -.dot -.wiz - - - -Microsoft Access Database Compatible - -.mdb -.mda -.mde -.mpd -.mdt - - - -Microsoft PowerPoint Presentation - -.ppt -.pot -.pps - - - -Microsoft Publisher Files - -.pub - - - -Microsoft Excel Workbooks - -.xls -.xlt - - - -Pure Binary Files - -.com -.bin -.tlb -.drv -.fon -.blg -.gif -.png -.icns -.ico -.bmp -.pfx - - - -Localization resource databases - -.edb -.lcl -.xlf -.xliff - - - -Microsoft Project Files - -.mpp -.mpt - - - -Microsoft Visio Files - -.vsd -.vdx -.vss -.vst - - - -Windows Installer databases - -.msi -.msm - - - -Zip Files - -.zip -.accdt -.axtr - - - -Cabinet / MS Compression Files - -.cab - - - -Table driven IME lexicons - -.mb - - - -IME ( IMD ) Files - -.imd - - - -TrueType Font Files - -.ttf - - - -Microsoft Outlook Mail Files - -.msg -.oft - - - -HTML Help 2.0 Files / InfoTech5.x Storage System Files - -.its -.hxh -.hxr -.hxw -.hxi -.hxs -.hxq - - - -Adobe Acrobat PDF Files - -.pdf - - - -HTML Files / Web Page - -.htm -.dtd -.hhk -.htw -.asp -.htc -.htx -.html -.hhc -.css -.stm - - - -Rich Text Files - -.rtf - - - -Windows 3.x Write Files - -.wri - - - -MHTML Files - -.eml -.nws -.mht - - - -Word 2007 Files - -.docx -.docm -.dotx -.dotm - - - -Excel 2007 Files - -.xlsx -.xlsm -.xltx -.xltm -.xlsb -.xlam - - - -Power Point 2007 Files - -.pptx -.pptm -.potx -.potm -.ppsx -.ppsm -.ppam - - - -Access 2007 Files - -.accdb -.accde -.accdr - - - -Win32/64-based executable (image) Files - -.exe -.dll -.ocx -.scr -.acm -.rll -.cpl -.mui -.ax -.ime - - - -HTML Help 1.0 Files - -.chm - - - -LocStudio lsg - -.lsg - - - -Microsoft Office OneNote Files - -.one -.onepkg - - - -Custom Parsers - - - - -Visio 2011 Files - -.vstx -.vsdx -.vssx - - - - - diff --git a/tools/terms/TermsExclusion.xml b/tools/terms/TermsExclusion.xml new file mode 100644 index 000000000..e314fc1b7 --- /dev/null +++ b/tools/terms/TermsExclusion.xml @@ -0,0 +1,11 @@ + + + + .GIT + + + + + + +