Revert "Update master for 10.4.1 (#1)"

This reverts commit 0c94dd9.
imanagedev · Sep 20, 2021 · 73f2068 · 73f2068
1 parent 0c94dd9
commit 73f2068
Show file tree

Hide file tree

Showing 9,323 changed files with 114,801 additions and 288,320 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,5 +1 @@
 * -text
-ports/** -linguist-detectable
-
-# Declare files that will always have LF line endings on checkout.
-scripts/ci.baseline.txt text eol=lf
diff --git a/.github/ISSUE_TEMPLATE/i-have-a-question.md b/.github/ISSUE_TEMPLATE/i-have-a-question.md
@@ -7,4 +7,4 @@ assignees: ''
 
 ---
 
-Please create a discussion in https://github.com/microsoft/vcpkg/discussions/new instead.
+When asking a question please also include where you looked for an answer (so we can update the documentation if needed).
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
diff --git a/.github/workflows/trustedPR.yml b/.github/workflows/trustedPR.yml
diff --git a/.github/workflows/untrustedPR.yml b/.github/workflows/untrustedPR.yml
diff --git a/.gitignore b/.gitignore
@@ -10,10 +10,9 @@
 *.user
 *.userosscache
 *.sln.docstates
-/vcpkg-configuration.json
 
-# fuzzing
-sync_dir*
+toolsrc/out*
+toolsrc/CMakeSettings.json
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs
@@ -287,37 +286,40 @@ __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/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/**
-
+!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
 *.exe
 *.zip
 
 ############################################################
 # vcpkg - End
 ############################################################
-vcpkg.disable-metrics
 archives
-.DS_Store
-prefab/
-*.swp
-
-###################
-# Codespaces
-###################
-pythonenv3.8/
-.venv/
+
+############################################################
+# Maven - Start
+############################################################
+
 target/
-vcpkg_installed
+
+############################################################
+# Maven - End
+############################################################