Update master for 10.4.1

.gitattributes

@@ -1 +1,5 @@
 * -text
+ports/** -linguist-detectable
+
+# Declare files that will always have LF line endings on checkout.
+scripts/ci.baseline.txt text eol=lf

.github/ISSUE_TEMPLATE/i-have-a-question.md

@@ -7,4 +7,4 @@ assignees: ''
 
 ---
 
-When asking a question please also include where you looked for an answer (so we can update the documentation if needed).
+Please create a discussion in https://github.com/microsoft/vcpkg/discussions/new instead.

.github/pull_request_template.md

@@ -0,0 +1,15 @@
+**Describe the pull request**
+
+- #### What does your PR fix?  
+  Fixes #...
+
+- #### Which triplets are supported/not supported? Have you updated the [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)?  
+  <all / linux, windows, ...>, <Yes/No>
+
+- #### Does your PR follow the [maintainer guide](https://github.com/microsoft/vcpkg/blob/master/docs/maintainers/maintainer-guide.md)?  
+  `Your answer`
+
+- #### If you have added/updated a port: Have you run `./vcpkg x-add-version --all` and committed the result?  
+  <Yes / I am still working on this PR>
+
+**If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/**

.github/workflows/trustedPR.yml

@@ -0,0 +1,58 @@
+# Modelled after https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
+
+name: Post PR Suggestions
+
+on:
+  workflow_run:
+    workflows: ["PR Suggestions"]
+    types:
+      - completed
+
+jobs:
+  comment:
+    runs-on: ubuntu-latest
+    if: >
+      ${{ github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success' }}
+
+    steps:
+      - name: 'Download artifact'
+        uses: actions/github-script@v3.1.0
+        with:
+          script: |
+            var artifacts = await github.actions.listWorkflowRunArtifacts({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               run_id: ${{github.event.workflow_run.id }},
+            });
+            var matchArtifact = artifacts.data.artifacts.filter((artifact) => {
+              return artifact.name == "pr"
+            })[0];
+            var download = await github.actions.downloadArtifact({
+               owner: context.repo.owner,
+               repo: context.repo.repo,
+               artifact_id: matchArtifact.id,
+               archive_format: 'zip',
+            });
+            var fs = require('fs');
+            fs.writeFileSync('${{github.workspace}}/pr.zip', Buffer.from(download.data));
+      - run: unzip pr.zip
+
+      - uses: actions/github-script@v4
+        with:
+          script: |
+            const { promises: fs } = require('fs')
+            const event = (await fs.readFile('event', 'utf8')).trim()
+            const body = (await fs.readFile('body', 'utf8')).trim()
+            const issue_number = Number(await fs.readFile('./NR'));
+
+            var req = {
+              owner: context.repo.owner,
+              pull_number: issue_number,
+              repo: context.repo.repo,
+              event: event
+            };
+            if (body !== "") {
+              req.body = body;
+            }
+            await github.pulls.createReview(req);

.github/workflows/untrustedPR.yml

@@ -0,0 +1,121 @@
+# Modelled after https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
+
+# These "checks" are also performed as part of our critical-path azure-pipelines review,
+# however here they are better able to post back to the original PR
+name: PR Suggestions
+
+on:
+  pull_request:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          # fetch-depth 50 tries to ensure we capture the whole history of the branch
+          fetch-depth: 50
+
+      - uses: actions/cache@v2
+        id: cache
+        with:
+          path: |
+            ./vcpkg
+          key: ${{ runner.os }}-${{ hashFiles('scripts/bootstrap*') }}
+
+      - name: bootstrap
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: ./bootstrap-vcpkg.sh
+
+      - name: Save PR number
+        run: |
+          mkdir -p ./pr
+          echo ${{ github.event.number }} > ./pr/NR
+
+      - name: Formatting
+        run: |
+          git config user.email github-actions
+          git config user.name github-actions@github.com
+
+          git diff --name-status --merge-base HEAD^ HEAD --diff-filter=MAR -- '*portfile.cmake' | sed 's/[MAR]\t*//' | while read filename; do grep -q -E '(vcpkg_install_cmake|vcpkg_build_cmake|vcpkg_configure_cmake|vcpkg_fixup_cmake_targets)' "$filename" && echo " - \`$filename\`" || true; done > .github-pr.deprecated-cmake
+          ./vcpkg format-manifest --all --convert-control
+          git diff > .github-pr.format-manifest
+          git add -u
+          git commit -m "tmp" --allow-empty
+          # HEAD^^ refers to the "main" commit that was merged into
+          git checkout HEAD^^ -- versions
+          git restore --staged versions
+          ./vcpkg x-add-version --all --skip-formatting-check > .github-pr.x-add-version.out
+          git diff > .github-pr.x-add-version.diff
+          git reset HEAD~ --mixed
+
+      - uses: actions/github-script@v4
+        with:
+          script: |
+            const { promises: fs } = require('fs')
+            const add_version = (await fs.readFile('.github-pr.x-add-version.diff', 'utf8')).trim()
+            const add_version_out = (await fs.readFile('.github-pr.x-add-version.out', 'utf8')).trim()
+            const format = (await fs.readFile('.github-pr.format-manifest', 'utf8')).trim()
+            const cmake = (await fs.readFile('.github-pr.deprecated-cmake', 'utf8')).trim()
+
+            let approve = true;
+            var output = ''
+            if (format !== "") {
+              output += "<details><summary><b>All manifest files must be formatted</b></summary>\n\n"
+              output += "`./vcpkg format-manifest ports/*/vcpkg.json`\n"
+              output += "<details><summary><b>Diff</b></summary>\n\n"
+              output += "```diff\n" + format + "\n```\n"
+              output += "</details></details>\n\n"
+              approve = false;
+            }
+            if (add_version_out !== "") {
+              output += "<details><summary><b>PRs must add only one version and must not modify any published versions</b></summary>\n\n"
+              output += "When making any changes to a library, the version or port-version in `vcpkg.json` or `CONTROL` must be modified.\n"
+              output += "```\n" + add_version_out + "\n```\n</details>\n"
+              approve = false;
+            }
+            if (add_version !== "") {
+              output += "<details><summary><b>After committing all other changes, the version database must be updated</b></summary>\n\n"
+              output += "```sh\n"
+              output += "git add -u && git commit\n"
+              output += "git checkout ${{ github.event.pull_request.base.sha }} -- versions\n"
+              output += "./vcpkg x-add-version --all\n"
+              output += "```\n"
+              output += "<details><summary><b>Diff</b></summary>\n\n"
+              output += "```diff\n" + add_version + "\n```\n"
+              output += "</details></details>\n\n"
+              approve = false;
+            }
+            if (cmake !== "") {
+              output += "You have modified or added at least one portfile where deprecated functions are used.\n"
+              output += "<details>\n\n"
+              output += "If you feel able to do so, please consider migrating them to the new functions:\n"
+              output += "    `vcpkg_install_cmake` -> `vcpkg_cmake_install` (from port `vcpkg-cmake`)\n"
+              output += "    `vcpkg_build_cmake` -> `vcpkg_cmake_build` (from port `vcpkg-cmake`)\n"
+              output += "    `vcpkg_configure_cmake` -> `vcpkg_cmake_configure` (Please remove the option `PREFER_NINJA`) (from port `vcpkg-cmake`)\n"
+              output += "    `vcpkg_fixup_cmake_targets` -> `vcpkg_cmake_config_fixup` (from port `vcpkg-cmake-config`)\n"
+              output += "\n"
+              output += "In the ports that use the new function, you have to add the corresponding dependencies:\n"
+              output += "```json\n"
+              output += '{\n  "name": "vcpkg-cmake",\n  "host": true\n},\n'
+              output += '{\n  "name": "vcpkg-cmake-config",\n  "host": true\n}\n'
+              output += "```\n"
+              output += `The following files are affected:\n${cmake}\n`
+              output += "</details>\n"
+            }
+
+            if (approve) {
+              await fs.writeFile("pr/event", "APPROVE")
+            } else {
+              output = "_This is a new experimental fast check for PR issues. Please let us know if this bot is helpful!_\n\n" + output
+              await fs.writeFile("pr/event", "REQUEST_CHANGES")
+            }
+            await fs.writeFile("pr/body", output)
+
+            console.log(output);
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: pr
+          path: pr/

.gitignore

@@ -10,9 +10,10 @@
 *.user
 *.userosscache
 *.sln.docstates
+/vcpkg-configuration.json
 
-toolsrc/out*
-toolsrc/CMakeSettings.json
+# fuzzing
+sync_dir*
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -286,40 +287,37 @@ __pycache__/
 /installed*/
 /packages/
 /scripts/buildsystems/tmp/
-/toolsrc/build.rel/
-/toolsrc/msbuild.x86.debug/
-/toolsrc/msbuild.x86.release/
-/toolsrc/msbuild.x64.debug/
-/toolsrc/msbuild.x64.release/
 #ignore custom triplets
 /triplets/*
 #add vcpkg-designed triplets back in
-!triplets/arm-uwp.cmake
-!triplets/arm-windows.cmake
-!triplets/x64-uwp.cmake
-!triplets/x64-windows.cmake
-!triplets/x64-windows-static.cmake
-!triplets/x86-uwp.cmake
-!triplets/x86-windows.cmake
-!triplets/x86-windows-static.cmake
-!triplets/arm64-uwp.cmake
-!triplets/arm64-windows.cmake
-!triplets/x64-linux.cmake
-!triplets/x64-osx.cmake
+!/triplets/arm-uwp.cmake
+!/triplets/arm64-windows.cmake
+!/triplets/x64-linux.cmake
+!/triplets/x64-osx.cmake
+!/triplets/x64-uwp.cmake
+!/triplets/x64-windows-static.cmake
+!/triplets/x64-windows.cmake
+!/triplets/x86-windows.cmake
+
+!/triplets/community
+!/triplets/community/**
+
 *.exe
 *.zip
 
 ############################################################
 # vcpkg - End
 ############################################################
+vcpkg.disable-metrics
 archives
-
-############################################################
-# Maven - Start
-############################################################
-
+.DS_Store
+prefab/
+*.swp
+
+###################
+# Codespaces
+###################
+pythonenv3.8/
+.venv/
 target/
-
-############################################################
-# Maven - End
-############################################################
+vcpkg_installed