update master with upstream

.github/PULL_REQUEST_TEMPLATE.md

@@ -19,7 +19,7 @@
 - **[Breaking changes](https://github.com/PowerShell/PowerShell/blob/master/.github/CONTRIBUTING.md#making-breaking-changes)**
     - [ ] None
     - **OR**
-    - [ ] [Experimental feature(s) needed](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/staging/reference/6/Microsoft.PowerShell.Core/About/about_Experimental_Features.md)
+    - [ ] [Experimental feature(s) needed](https://github.com/MicrosoftDocs/PowerShell-Docs/blob/main/reference/7.3/Microsoft.PowerShell.Core/About/about_Experimental_Features.md)
         - [ ] Experimental feature name(s): <!-- Experimental feature name(s) here -->
 - **User-facing changes**
     - [ ] Not Applicable

.github/workflows/backport.yml

@@ -0,0 +1,61 @@
+name: Backport PR to branch
+on:
+  issue_comment:
+    types: [created]
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+jobs:
+  backport:
+    if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/backport to')
+    runs-on: ubuntu-20.04
+    steps:
+    - name: Extract backport target branch
+      uses: actions/github-script@v3
+      id: target-branch-extractor
+      with:
+        result-encoding: string
+        script: |
+          if (context.eventName !== "issue_comment") throw "Error: This action only works on issue_comment events.";
+
+          // extract the target branch name from the trigger phrase containing these characters: a-z, A-Z, digits, forward slash, dot, hyphen, underscore
+          const regex = /^\/backport to ([a-zA-Z\d\/\.\-\_]+)/;
+          target_branch = regex.exec(context.payload.comment.body);
+          if (target_branch == null) throw "Error: No backport branch found in the trigger phrase.";
+
+          return target_branch[1];
+    - name: Post backport started comment to pull request
+      uses: actions/github-script@v3
+      with:
+        script: |
+          const backport_start_body = `Started backporting to ${{ steps.target-branch-extractor.outputs.result }}: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+          await github.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: backport_start_body
+          });
+    - name: Checkout repo
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - name: Run backport
+      uses: ./tools/actions/backport
+      with:
+        target_branch: ${{ steps.target-branch-extractor.outputs.result }}
+        auth_token: ${{ secrets.GITHUB_TOKEN }}
+        pr_description_template: |
+          Backport of #%source_pr_number% to %target_branch%
+
+          /cc %cc_users%
+
+          ## Customer Impact
+
+          ## Testing
+
+          - [ ] For any change that affects the release process, please work with a maintainer to come up with a plan to test this.
+
+          ## Risk

.github/workflows/daily.yml

@@ -34,7 +34,7 @@ jobs:
           $currentVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
           Set-GWVariable -Name OLD_VERSION -Value $currentVersion
 
-          ./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging -UseInternalFeed
+          ./tools/UpdateDotnetRuntime.ps1 -UpdateMSIPackaging
           $newVersion = (Get-Content .\global.json | ConvertFrom-Json).sdk.version
           Set-GWVariable -Name NEW_VERSION -Value $newVersion
 
@@ -46,7 +46,7 @@ jobs:
         if: failure()
         with:
           webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
-          overwrite: "{title: `Failure in updating .NET build. Look at ${workflow_link}`}"
+          overwrite: "{title: `Failure in .github/daily.yml updating .NET build. Look at ${workflow_link}`}"
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@v3
         id: cpr
@@ -88,10 +88,54 @@ jobs:
         id: cprtpn
         if: env.CREATE_PR == 'true'
         with:
-          commit-message: "Update to the latest notice file"
+          commit-message: "Update to the latest NOTICES file"
           committer: GitHub <[email protected]>
           author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
-          title: "Update to the latest notice file"
+          title: "Update to the latest NOTICES file"
+          reviewers: travisez13
+          base: master
+          draft: false
+          branch: update-cgmanifest
+  update-cgmanifest:
+    name: Update cgmanifest
+    timeout-minutes: 15
+    runs-on: windows-latest
+    if: github.repository == 'PowerShell/PowerShell'
+    env:
+      CGMANIFEST_PATH: ''
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - 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 -Fix
+      - name: Upload cgmanifest
+        uses: actions/upload-artifact@v2
+        if: always() && env.CGMANIFEST_PATH != ''
+        with:
+          name: cgmanifest
+          path: ${{ env.CGMANIFEST_PATH }}
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        id: cprcgmanifest
+        if: env.CGMANIFEST_PATH != ''
+        with:
+          commit-message: "Update the cgmanifest"
+          committer: GitHub <[email protected]>
+          author: ${{ github.actor }} <${{ github.actor }}@users.noreply.github.com>
+          title: "Update the cgmanifest"
           reviewers: travisez13
           base: master
           draft: false

.github/workflows/exp-json.yml

@@ -0,0 +1,143 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+name: PowerShell Experimental Features Json Update
+on:
+    workflow_dispatch:
+    schedule:
+    # At 13:00 UTC every day.
+    - cron:  '0 13 * * *'
+
+defaults:
+  run:
+    shell: pwsh
+
+env:
+  DOTNET_CLI_TELEMETRY_OPTOUT: 1
+  POWERSHELL_TELEMETRY_OPTOUT: 1
+
+jobs:
+  create-expjson:
+    strategy:
+      matrix:
+        os: [windows-latest, ubuntu-latest]
+    timeout-minutes: 15
+    runs-on: ${{ matrix.os }}
+    env:
+      OS_TITLE: ${{ matrix.os }}
+    if: github.repository == 'PowerShell/PowerShell'
+    name: Update experimental features json
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - name: Create experimental features file
+        run: |
+          Import-Module ./build.psm1 -Force
+          Start-PSBootstrap
+          Start-PSBuild -Clean -PSModuleRestore
+          $builtPwsh = Get-PSOutput
+
+          Write-Verbose -Verbose "PWSH path: $builtPwsh"
+
+          $getExpFeatureJsonScript = @'
+            [System.Collections.ArrayList] $expFeatures = Get-ExperimentalFeature | Where-Object Name -NE PS7DscSupport | ForEach-Object -MemberName Name
+
+            # Make sure ExperimentalFeatures from modules in PSHome are added
+            # https://github.com/PowerShell/PowerShell/issues/10550
+            $ExperimentalFeaturesFromGalleryModulesInPSHome = @()
+            $ExperimentalFeaturesFromGalleryModulesInPSHome | ForEach-Object {
+                if (!$expFeatures.Contains($_)) {
+                    $null = $expFeatures.Add($_)
+                }
+            }
+
+            ConvertTo-Json $expFeatures
+          '@
+
+          $expFeaturesJson = & $builtPwsh -c $getExpFeatureJsonScript
+          $osname = $env:OS_TITLE -like 'windows*' ? 'windows' : 'linux'
+          $fileNamePrefix = "experimental-feature-$osname"
+          $newFileName = "${fileNamePrefix}-new.json"
+
+          Write-Verbose -Verbose 'Experimental features found'
+          $expFeaturesJson | Out-String | Write-Verbose -Verbose
+          $expFeaturesJson | Out-File $newFileName -Force
+
+      - name: Upload experimental features windows
+        uses: actions/upload-artifact@v2
+        with:
+          name: experimentalJson
+          path: experimental-feature-*-new.json
+
+  compare-expjson-files:
+    runs-on: ubuntu-latest
+    name: Compare experimental json files and create PR
+    needs: create-expjson
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: '0'
+      - name: Download artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: experimentalJson
+      - name: Compare json files
+        run: |
+          Import-Module ./.github/workflows/GHWorkflowHelper -Force
+
+          function ShouldCreatePR($currentFile, $newFile) {
+            if (Test-Path $currentFile) {
+              $currentExpFeatures =  Get-Content $currentFile -Raw | ConvertFrom-Json
+              $newExpFeatures =  Get-Content $newFile -Raw | ConvertFrom-Json
+
+              if (-not (Compare-Object $currentExpFeatures $newExpFeatures)) {
+                  Write-Verbose -Verbose "No changes to experimental features json file"
+                  return $false
+              }
+            }
+
+            return $true
+          }
+
+          $currentWinFile = "experimental-feature-windows.json"
+          $currentLinuxFile = "experimental-feature-linux.json"
+          $newWinFile = "experimental-feature-windows-new.json"
+          $newLinuxFile = "experimental-feature-linux-new.json"
+
+          $createPrWin = ShouldCreatePR $currentWinFile $newWinFile
+          Write-Verbose -Verbose "Create PR Windows == $createPrWin"
+
+          $createPrLinux = ShouldCreatePR $currentLinuxFile $newLinuxFile
+          Write-Verbose -Verbose "Create PR Windows == $createPrLinux"
+
+          $createPr = $createPrWin -or $createPrLinux
+          Write-Verbose -Verbose "Create PR == $createPr"
+
+          if ($createPrWin) {
+            Move-Item $newWinFile $currentWinFile -Verbose
+          }
+          else {
+            Remove-Item $newWinFile -Verbose
+          }
+
+          if ($createPrLinux) {
+            Move-Item $newLinuxFile $currentLinuxFile -Verbose
+          }
+          else {
+            Remove-Item $newLinuxFile -Verbose
+          }
+
+          Set-GWVariable -Name CREATE_EXP_JSON_PR -Value $createPR
+
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3
+        id: cpr
+        if: env.CREATE_EXP_JSON_PR == 'true'
+        with:
+          commit-message: "Update experimental-feature-windows.json"
+          title: "Update experimental-feature json files"
+          base: master
+          branch: expjson_update_windows

.github/workflows/markdown-link/config.json

@@ -0,0 +1,7 @@
+{
+  "timeout": "40s",
+  "retryOn429": true,
+  "retryCount": 5,
+  "fallbackRetryDelay": "30s",
+  "aliveStatusCodes": [504, 503, 403, 200]
+}

.github/workflows/markdownLink.yml

@@ -0,0 +1,18 @@
+on:
+  pull_request:
+    branches:
+      - master
+      - 'release/**'
+
+name: Check links for modified files
+jobs:
+  markdown-link-check:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@master
+    - uses: gaurav-nelson/github-action-markdown-link-check@v1
+      with:
+        use-quiet-mode: 'yes'
+        use-verbose-mode: 'yes'
+        check-modified-files-only: 'yes'
+        config-file: .github/workflows/markdown-link/config.json

.github/workflows/markdownLinkDaily.yml

@@ -0,0 +1,29 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT license.
+
+name: PowerShell Daily Markdown Link Verification
+
+on:
+  workflow_dispatch:
+  schedule:
+  # At 13:00 UTC every day.
+  - cron:  '0 13 * * *'
+
+jobs:
+  markdown-link-check:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@master
+    - name: Check Links
+      uses: gaurav-nelson/github-action-markdown-link-check@v1
+      with:
+        use-quiet-mode: 'yes'
+        use-verbose-mode: 'yes'
+        config-file: .github/workflows/markdown-link/config.json
+    - name: Microsoft Teams Notifier
+      uses: skitionek/notify-microsoft-teams@master
+      if: failure()
+      with:
+        webhook_url: ${{ secrets.PS_BUILD_TEAMS_CHANNEL }}
+        overwrite: "{title: `Failure in .github/markdownLinkDaily.yml validating links. Look at ${workflow_link}`}"

.github/workflows/rebase.yml

@@ -1,7 +1,7 @@
 # This cannot rebase workflow changes into a PR
 # It also only works if the GITHUB_TOKEN has permission to push to the branch
 # see: https://github.com/cirrus-actions/rebase/issues/12#issuecomment-632594995
-on: 
+on:
   issue_comment:
     types: [created]
 name: Automatic Rebase
@@ -15,7 +15,18 @@ jobs:
       uses: actions/checkout@v2
       with:
         fetch-depth: 0
+    - name: Post rebase started comment to pull request
+      uses: actions/github-script@v3
+      with:
+        script: |
+          const backport_start_body = `Started rebase: https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${process.env.GITHUB_RUN_ID}`;
+          await github.issues.createComment({
+            issue_number: context.issue.number,
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: backport_start_body
+          });
     - name: Automatic Rebase
-      uses: cirrus-actions/rebase@1.4
+      uses: cirrus-actions/rebase@1.6
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}