Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement downloads from json file #2

Draft
wants to merge 141 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
141 commits
Select commit Hold shift + click to select a range
8970d1d
Improve `depend-info --dot` output (#1369)
dg0yt Mar 25, 2024
a40caa5
Unify usage hint formatting (#1368)
dg0yt Mar 25, 2024
de85ec9
Paths in PrebuildInfo should be `Path` instead of `std::string` (#1366)
Thomas1664 Mar 25, 2024
c729404
Replace RHEL 7 with CBL-Mariner (#1373)
BillyONeal Mar 28, 2024
af2d85b
Enable multi-package `depend-info`, track triplets (#1370)
dg0yt Mar 28, 2024
8285230
Disable experimental boyer_moore_horspool_searcher. (#1375)
BillyONeal Mar 28, 2024
93dd7d9
Adopt 1ES Pipeline Templates (#1374)
BillyONeal Mar 28, 2024
33851ad
Update vcpkg-scripts-sha for 2024-03-28 (#1376)
BillyONeal Mar 29, 2024
ef804ba
implement github
Thomas1664 Apr 2, 2024
3943a8d
Make common fields reusable
Thomas1664 Apr 2, 2024
94ba2ff
apply patches
Thomas1664 Apr 2, 2024
8d8bef7
remove redundant flags
Thomas1664 Apr 2, 2024
a6d081d
wip
Thomas1664 Apr 3, 2024
2d6b5f4
Add cmake presets representing bootstrap-vcpkg.sh invokations (#1380)
SchaichAlonso Apr 4, 2024
31d5996
Dynamically link with glibc. (#1382)
BillyONeal Apr 5, 2024
db8cfb2
`<unsaved>` is an origin: Fix `format-manifest` command (#1385)
dg0yt Apr 8, 2024
5925f34
Upgrade MicroBuildArchiveSymbols (#1383)
BillyONeal Apr 8, 2024
77fa382
Colorize multi-triplet dot graphs (#1371)
dg0yt Apr 8, 2024
296a34e
Add "verify-messages" target (#1372)
JavierMatosD Apr 10, 2024
c8ee49f
Style: Use double newlines in generated issue body (#1386)
fwcd Apr 11, 2024
01cc2c3
Temporarily disable CodeQL for C++ until https://dev.azure.com/twcdot…
BillyONeal Apr 11, 2024
1603ecb
[postbuildlint] Don't read lib info twice (#1384)
Thomas1664 Apr 16, 2024
7b0cdcf
Fix hash-addtional-files tests (#1388)
autoantwort Apr 20, 2024
87adc3f
Fix default features control by top level manifest (#1331)
dg0yt Apr 20, 2024
62ef030
Avoid curl command line length limits (#1390)
BillyONeal Apr 22, 2024
d694564
Update the vcpkg-scripts SHA. (#1391)
BillyONeal Apr 22, 2024
cead04a
[localization][automated][ci skip] update locale files
embeddedbot Apr 23, 2024
28a4083
Soften the 'use version rather than version-string' message. (#1367)
BillyONeal Apr 29, 2024
1a13356
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202404…
csigs Apr 30, 2024
e38fa17
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202404…
csigs Apr 30, 2024
760992c
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202404…
csigs Apr 30, 2024
7db75d6
Remove BuildPackageOptions from the ActionPlan (#1339)
BillyONeal Apr 30, 2024
ff22556
[localization][automated][ci skip] update locale files
embeddedbot Apr 30, 2024
05dc81f
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202405…
csigs May 1, 2024
4381031
[portsdiff] Optimize for identical commits (#1399)
Thomas1664 May 1, 2024
a240558
Add support for VS 2022 using VS170COMNTOOLS environment variable (#1…
JavierMatosD May 1, 2024
968db4d
[localization][automated][ci skip] update locale files
embeddedbot May 2, 2024
3ddf475
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202405…
csigs May 2, 2024
7a32148
[localization][automated][ci skip] update locale files
embeddedbot May 3, 2024
0fb3000
Merge branch 'microsoft:main' into native-downloads
Thomas1664 May 4, 2024
80965a6
Deserialize other download sources
Thomas1664 May 4, 2024
6081c15
Use correct branch name in json schema ids (#1402)
fahrradflucht May 6, 2024
03a25db
Fixed version export in spdx module. (#1400)
xvitaly May 14, 2024
cae13bd
Fix wrong Header-only usage message (#1403)
LilyWangLL May 14, 2024
76f1e5d
Add missing switch --keep-going to set-installed (#1407)
Neumann-A May 20, 2024
d819a65
Add missing new line (#1412)
autoantwort May 28, 2024
071c997
AWS S3 cache miss should not issue warning (#1404)
petamas Jun 7, 2024
1e08aaa
Combine multiple prints to a single one (#1396)
Thomas1664 Jun 7, 2024
8014d4b
Ensure that all post-build checks have skip policies. (#1405)
BillyONeal Jun 7, 2024
4663e17
Update vcpkg-scripts SHA 2024-06-07. (#1416)
BillyONeal Jun 8, 2024
fb6c0b5
[localization][automated][ci skip] update locale files
embeddedbot Jun 8, 2024
ed9d6c8
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202406…
csigs Jun 10, 2024
02590c4
Suppress CMake version messages failing signed build. (#1423)
BillyONeal Jun 10, 2024
565c33b
Update the vcpkg-tool-release-process docs. (#1424)
BillyONeal Jun 11, 2024
e8807f3
[localization][automated][ci skip] update locale files
embeddedbot Jun 11, 2024
717b820
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202406…
csigs Jun 14, 2024
8a25087
Add VxWorks as a platform expression (#1427)
Neumann-A Jun 14, 2024
f09af89
Fix x-update-baseline to use reference field (#1414)
data-queue Jun 14, 2024
73b8645
Update clang-format to 18.1.6. (#1433)
BillyONeal Jun 14, 2024
2e27bc7
[localization][automated][ci skip] update locale files
embeddedbot Jun 14, 2024
c5e532a
Check .csh and .pl for absolute paths (#1426)
dg0yt Jun 17, 2024
e6bf0cc
Include missing <math.h>
luncliff Jun 19, 2024
349ab41
end-to-end-tests: Backup/restore GITHUB_ACTIONS (#1436)
dg0yt Jun 20, 2024
141061e
Sign posh-vcpkg.psd1 (#1432)
BillyONeal Jun 21, 2024
779ab31
Teach x-ci-verify-versions to check that versions exist in the databa…
BillyONeal Jun 22, 2024
bc47c05
[localization][automated][ci skip] update locale files
embeddedbot Jun 22, 2024
efb750b
Remove hardcoding ".DS_Store" (#1437)
miyanyan Jun 24, 2024
dfc8c0f
Add Campaign IDs (#1408)
JavierMatosD Jun 24, 2024
f80ef48
[localization][automated][ci skip] update locale files
embeddedbot Jun 25, 2024
5c688ef
Fix stealth merge conflict (#1441)
BillyONeal Jun 27, 2024
6228fb4
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202406…
csigs Jun 27, 2024
14877e3
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202406…
csigs Jun 27, 2024
d93dbb5
[localization][automated][ci skip] update locale files
embeddedbot Jun 27, 2024
420c5ac
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202407…
csigs Jul 3, 2024
9e362d2
[localization][automated][ci skip] update locale files
embeddedbot Jul 4, 2024
968b4f4
Use curl for download on windows when proxy auth is required (#1434)
sylvlecl Jul 5, 2024
b749be7
Raise errors for malformed overlay port manifests (#1435)
dg0yt Jul 5, 2024
7e0d199
Downloads: Improve error message url is invalid (#1411)
autoantwort Jul 6, 2024
68e3b2f
Update vcpkg-scripts SHA 2024-07-05. (#1449)
BillyONeal Jul 6, 2024
9eb99f7
Clarify asset caching output (#1409)
JavierMatosD Jul 6, 2024
471e3be
[localization][automated][ci skip] update locale files
embeddedbot Jul 7, 2024
3ab647c
Add "-ForceEnglishOutput" flag to the NuGet help command in tools.cpp…
kazssym Jul 8, 2024
bbb0318
Fix export command usage (#1450)
myd7349 Jul 9, 2024
ffee52c
Disable CodeQL until the hang is fixed (#1452)
BillyONeal Jul 9, 2024
d2dfc73
Update scripts sha 2024-07-09 (#1453)
BillyONeal Jul 9, 2024
ad27b25
[localization][automated][ci skip] update locale files
embeddedbot Jul 10, 2024
2e275d7
Fix crash if `"platform": "mips64"` is used (#1454)
autoantwort Jul 11, 2024
dbe3b31
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202407…
csigs Jul 23, 2024
1ede9b9
[localization][automated][ci skip] update locale files
embeddedbot Jul 23, 2024
bf8aee5
Http binary cache: One must use the {sha} variable if other variables…
autoantwort Jul 23, 2024
d67080f
Update fmt to v11.0.2 (#1457)
tchaikov Jul 23, 2024
2347a7b
Restore printing full paths to files containing absolute paths. (#1455)
BillyONeal Jul 23, 2024
dce67b3
Make print_plan actually print. (#1415)
BillyONeal Jul 23, 2024
46f5003
Bump braces from 3.0.2 to 3.0.3 in /vcpkg-artifacts (#1456)
dependabot[bot] Jul 23, 2024
4bfebfc
Optimize the output of portsdiff command (#1460)
jimwang118 Jul 23, 2024
0322079
[localization][automated][ci skip] update locale files
embeddedbot Jul 24, 2024
c427992
Fix several console output nitpicks. (#1461)
BillyONeal Jul 24, 2024
46805d5
[localization][automated][ci skip] update locale files
embeddedbot Jul 25, 2024
998c893
Fix package pattern in json schema configuration registry (#1429)
WangWeiLin-MV Jul 25, 2024
88ee931
Add VCPKG_POST_PORTFILE_INCLUDES (#1417)
Neumann-A Jul 25, 2024
d272c0d
[localization][automated][ci skip] update locale files
embeddedbot Jul 26, 2024
6d6266c
Allow running CI build manually.
BillyONeal Jul 26, 2024
0e30cb1
Rename the shell function to 'vcpkg-shell'. (#1442)
BillyONeal Jul 26, 2024
aef6706
[localization][automated][ci skip] update locale files
embeddedbot Jul 27, 2024
b52160c
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202407…
csigs Jul 30, 2024
c129934
[localization][automated][ci skip] update locale files
embeddedbot Jul 30, 2024
9317fb2
Allow "baseline" in filesystem registries. (#1463)
BillyONeal Jul 30, 2024
54b6a6e
Fix grammar in HashPortManyFiles warning message (#1467)
benjamin-hodgson Jul 30, 2024
3bde9bd
[localization][automated][ci skip] update locale files
embeddedbot Jul 31, 2024
2c086f9
Change the exit code to nonzero when there are ci regressions. (#1468)
BillyONeal Jul 31, 2024
abbe3ad
Actually make the exit code nonzero for regressions. (#1469)
BillyONeal Jul 31, 2024
57ea43d
Update vcpkg-scripts SHA 2024-07-31 (#1470)
BillyONeal Aug 1, 2024
fd884a0
Revert one of the warning skip removals from https://github.com/micro…
BillyONeal Aug 1, 2024
a6c9633
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202408…
csigs Aug 1, 2024
5ed9b36
[localization][automated][ci skip] update locale files
embeddedbot Aug 2, 2024
53c644f
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202408…
csigs Aug 2, 2024
cfa00f4
[localization][automated][ci skip] update locale files
embeddedbot Aug 3, 2024
33fe38d
Fix doubled warnings being printed for manifest warnings when loading…
BillyONeal Aug 3, 2024
4063a94
[localization][automated][ci skip] update locale files
embeddedbot Aug 4, 2024
ff55779
Re-enable CodeQL now that https://dev.azure.com/twcdot/Data/_workitem…
BillyONeal Aug 28, 2024
c828c2a
Updated for https://dev.azure.com/devdiv/0bdbc590-a062-4c3f-b0f6-9383…
BillyONeal Aug 28, 2024
b8b3c1b
Make comparison of installed files case-insensitive (#1483)
vicroms Aug 28, 2024
e720ee8
[upgrade] Don't crash on non-installed ports (#1473)
Thomas1664 Aug 29, 2024
d3fc357
Keep all CUDA_PATH_* environment variables when forming the clean env…
autoantwort Sep 3, 2024
ee9a254
Add `devdeviceid` telemetry (#1480)
vicroms Sep 10, 2024
a65b710
Preserve the full exit code range in the system.process layer. (#1489)
BillyONeal Sep 13, 2024
2488bd6
[localization][automated][ci skip] update locale files
embeddedbot Sep 13, 2024
e2f895e
Disallow invalid triplet names passed via `--triplet` (#1474)
Thomas1664 Sep 17, 2024
a47c79f
Use 7zr to unpack 7zip (#1477)
JavierMatosD Sep 17, 2024
6b07363
Ban $/include/module.modulemap (#1492)
BillyONeal Sep 18, 2024
5f5da30
Update vcpkg-scripts SHA 2024-09-18. (#1493)
BillyONeal Sep 18, 2024
6e31391
upgrade.ps1: Test without needing a whole git clone (#1494)
BillyONeal Sep 19, 2024
2af426b
Test cmd_execute with negative exit code (#1488)
WangWeiLin-MV Sep 19, 2024
c16c026
Remove unnecessary use of std::array (#1496)
BillyONeal Sep 24, 2024
b0393cb
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202409…
csigs Sep 25, 2024
12dbef3
[localization][automated][ci skip] update locale files
embeddedbot Sep 26, 2024
81b4999
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202409…
csigs Sep 26, 2024
72328bf
[localization][automated][ci skip] update locale files
embeddedbot Sep 27, 2024
53380ae
Juno: check in to juno/hb_cb3056d7-d122-4ef4-8657-e36080a7f8c6_202409…
csigs Sep 28, 2024
5f22943
[localization][automated][ci skip] update locale files
embeddedbot Sep 28, 2024
480cd2d
Merge remote-tracking branch 'upstream/main' into native-downloads
Thomas1664 Sep 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
14 changes: 14 additions & 0 deletions .config/1espt/PipelineAutobaseliningConfig.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
## DO NOT MODIFY THIS FILE MANUALLY. This is part of auto-baselining from 1ES Pipeline Templates. Go to [https://aka.ms/1espt-autobaselining] for more details.

pipelines:
17772:
retail:
source:
credscan:
lastModifiedDate: 2024-08-28
eslint:
lastModifiedDate: 2024-08-28
psscriptanalyzer:
lastModifiedDate: 2024-08-28
armory:
lastModifiedDate: 2024-08-28
6 changes: 3 additions & 3 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ jobs:
run: echo "::add-matcher::.github/workflows/matchers.json"
- name: '[CI Only] Initialize CodeQL'
if: inputs.codeql
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: cpp, javascript
languages: javascript-typescript, c-cpp
- name: Configure and Build
if: matrix.preset != 'windows-ci'
run: |
Expand All @@ -57,7 +57,7 @@ jobs:
cmake --build --preset ${{ matrix.preset }} -- -k0
- name: '[CI Only] Perform CodeQL Analysis'
if: inputs.codeql
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
- name: Run vcpkg unit tests
run: ctest --preset ${{ matrix.preset }} --output-on-failure 2>&1
- name: Run vcpkg-artifacts unit tests
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- main
workflow_dispatch:

permissions:
# Required for CodeQL
Expand Down
28 changes: 28 additions & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ jobs:
cmake --preset windows-ci
IF %ERRORLEVEL% NEQ 0 exit /B %ERRORLEVEL%
cmake --build --preset windows-ci --target generate-message-map -- -k0
- name: Verify Messages
shell: pwsh
run: |
cmake --build --preset windows-ci --target verify-messages -- -k0
- name: 'Format C++'
shell: pwsh
run: ./azure-pipelines/Format-CxxCode.ps1
Expand Down Expand Up @@ -66,3 +70,27 @@ jobs:
with:
name: format.patch
path: out/format.patch

json-schema:
runs-on: windows-2022
timeout-minutes: 10
steps:
- uses: actions/checkout@v3
- name: Get microsoft/vcpkg pinned sha into VCPKG_SHA
id: vcpkg_sha
shell: pwsh
run: |
"VCPKG_SHA="+(Get-Content vcpkg-init/vcpkg-scripts-sha.txt -Raw).Trim() >> $env:GITHUB_OUTPUT
- name: Checkout microsoft/vcpkg for end-to-end tests
uses: actions/checkout@v3
with:
fetch-depth: 0
path: ${{ github.workspace }}/vcpkg-root
repository: microsoft/vcpkg
ref: ${{ steps.vcpkg_sha.outputs.VCPKG_SHA }}
- name: Run vcpkg json-schema end-to-end tests
shell: pwsh
run: |
${{ github.workspace }}/azure-pipelines/json-schema-tests.ps1
env:
VCPKG_ROOT: ${{ github.workspace }}/vcpkg-root
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
"cinttypes": "cpp",
"typeindex": "cpp",
"typeinfo": "cpp",
"variant": "cpp"
"variant": "cpp",
"__bit_reference": "cpp"
}
}
53 changes: 35 additions & 18 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,23 +54,27 @@ if(MSVC AND NOT COMMAND target_precompile_headers)
endif()

if(VCPKG_EMBED_GIT_SHA)
find_package(Git REQUIRED)
execute_process(
COMMAND "${GIT_EXECUTABLE}" status --porcelain=v1
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
OUTPUT_VARIABLE VCPKG_GIT_STATUS
OUTPUT_STRIP_TRAILING_WHITESPACE
)

if(VCPKG_GIT_STATUS STREQUAL "")
if(DEFINED VCPKG_VERSION)
message(STATUS "Using supplied version SHA ${VCPKG_VERSION}.")
else()
find_package(Git REQUIRED)
execute_process(
COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
COMMAND "${GIT_EXECUTABLE}" status --porcelain=v1
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
OUTPUT_VARIABLE VCPKG_VERSION
OUTPUT_VARIABLE VCPKG_GIT_STATUS
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else()
message(WARNING "Skipping embedding SHA due to local changes.")

if(VCPKG_GIT_STATUS STREQUAL "")
execute_process(
COMMAND "${GIT_EXECUTABLE}" rev-parse HEAD
WORKING_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}"
OUTPUT_VARIABLE VCPKG_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else()
message(WARNING "Skipping embedding SHA due to local changes.")
endif()
endif()
endif()

Expand Down Expand Up @@ -173,6 +177,7 @@ file(GLOB VCPKG_TEST_INCLUDES CONFIGURE_DEPENDS "include/vcpkg-test/*.h")

set(VCPKG_FUZZ_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg-fuzz/main.cpp")
set(TLS12_DOWNLOAD_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/tls12-download.c")
set(CLOSES_EXIT_MINUS_ONE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/closes-exit-minus-one.c")
set(CLOSES_STDIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/closes-stdin.c")
set(CLOSES_STDOUT_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/closes-stdout.c")
set(READS_STDIN_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/reads-stdin.c")
Expand Down Expand Up @@ -440,14 +445,14 @@ endif()
# === Target: vcpkg-ps1 ===
add_custom_command(
OUTPUT
"${CMAKE_CURRENT_BINARY_DIR}/vcpkg.ps1"
"${CMAKE_CURRENT_BINARY_DIR}/vcpkg-shell.ps1"
COMMAND
"${CMAKE_COMMAND}" ARGS -E copy "${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg-in-development.ps1" "${CMAKE_CURRENT_BINARY_DIR}/vcpkg.ps1"
"${CMAKE_COMMAND}" ARGS -E copy "${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg-in-development.ps1" "${CMAKE_CURRENT_BINARY_DIR}/vcpkg-shell.ps1"
DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg-in-development.ps1"
VERBATIM
)
add_custom_target(vcpkg-ps1 ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/vcpkg.ps1")
add_custom_target(vcpkg-ps1 ALL DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/vcpkg-shell.ps1")

# === Target: vcpkg ===

Expand Down Expand Up @@ -496,7 +501,7 @@ if (BUILD_TESTING)
target_link_libraries(vcpkg-test PRIVATE log)
endif()

add_dependencies(vcpkg-test reads-stdin closes-stdin closes-stdout test-editor)
add_dependencies(vcpkg-test reads-stdin closes-exit-minus-one closes-stdin closes-stdout test-editor)

if(CMAKE_VERSION GREATER_EQUAL "3.16")
target_precompile_headers(vcpkg-test REUSE_FROM vcpkglib)
Expand Down Expand Up @@ -530,6 +535,11 @@ if(VCPKG_BUILD_TLS12_DOWNLOADER)
endif()

if (BUILD_TESTING)
# === Target: closes-exit-minus-one ===

add_executable(closes-exit-minus-one ${CLOSES_EXIT_MINUS_ONE_SOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg.manifest")
set_property(TARGET closes-exit-minus-one PROPERTY PDB_NAME "closes-exit-minus-one${VCPKG_PDB_SUFFIX}")

# === Target: closes-stdin ===

add_executable(closes-stdin ${CLOSES_STDIN_SOURCES} "${CMAKE_CURRENT_SOURCE_DIR}/src/vcpkg.manifest")
Expand All @@ -556,6 +566,13 @@ add_executable(test-script-asset-cache ${TEST_SCRIPT_ASSET_CACHE_SOURCES} "${CMA
set_property(TARGET test-script-asset-cache PROPERTY PDB_NAME "test-script-asset-cache${VCPKG_PDB_SUFFIX}")
endif()

# === Target: verify_messages ===
add_custom_target(
verify-messages
COMMAND pwsh -File "${CMAKE_CURRENT_SOURCE_DIR}/scripts/verifyMessages.ps1"
COMMENT "Running PowerShell script to verify message usage..."
)

# === Target: format ===

find_program(CLANG_FORMAT clang-format PATHS "$ENV{PROGRAMFILES}/LLVM/bin")
Expand All @@ -574,7 +591,7 @@ if(CLANG_FORMAT)
COMMAND "${CLANG_FORMAT}" -i -verbose ${VCPKG_TEST_INCLUDES}

COMMAND "${CLANG_FORMAT}" -i -verbose ${VCPKG_FUZZ_SOURCES} ${TLS12_DOWNLOAD_SOURCES}
${CLOSES_STDIN_SOURCES} ${CLOSES_STDOUT_SOURCES} ${READS_STDIN_SOURCES}
${CLOSES_STDIN_SOURCES} ${CLOSES_STDOUT_SOURCES} ${READS_STDIN_SOURCES} ${CLOSES_EXIT_MINUS_ONE_SOURCES}
${TEST_EDITOR_SOURCES} ${TEST_SCRIPT_ASSET_CACHE_SOURCES}
)
endif()
Expand Down
21 changes: 20 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,25 @@
"CMAKE_OSX_DEPLOYMENT_TARGET": "10.13",
"VCPKG_WARNINGS_AS_ERRORS": true
}
},
{
"name": "bootstrap.sh",
"description": "Preset used by vcpkg's bootstrap-vcpkg.sh",
"generator": "Ninja",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release",
"VCPKG_DEVELOPMENT_WARNINGS": "OFF"
}
},
{
"name": "bootstrap.sh parallel build",
"description": "Preset used by vcpkg's bootstrap-vcpkg.sh when the VCPKG_MAX_CONCURRENCY variable is non-empty",
"inherits": ["bootstrap.sh"],
"cacheVariables": {
"CMAKE_JOB_POOL_COMPILE": "compile",
"CMAKE_JOB_POOL_LINK": "link",
"CMAKE_JOB_POOLS": "compile=$env{VCPKG_MAX_CONCURRENCY};link=$env{VCPKG_MAX_CONCURRENCY}"
}
}
],
"buildPresets": [
Expand Down Expand Up @@ -202,4 +221,4 @@
"configurePreset": "macos-ci"
}
]
}
}
3 changes: 3 additions & 0 deletions azure-pipelines/arch-independent-signing.signproj
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
<FilesToSign Include="$(IntermediateOutputPath)\scripts\posh-vcpkg.psm1">
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
<FilesToSign Include="$(IntermediateOutputPath)\scripts\posh-vcpkg.psd1">
<Authenticode>Microsoft400</Authenticode>
</FilesToSign>
</ItemGroup>

<ImportGroup Label="ExtensionTargets">
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* -text
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "bad-git-tree",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "bad-history-name-is-bad",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "baseline-version-mismatch",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "has-local-edits",
"version": "1.0.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "malformed",
"version": "1.0",
~broken
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "mismatch-git-tree",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "version-mismatch",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "version-missing",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "version-scheme-mismatch",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "bad-git-tree",
"version": "1.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "bad-history-name",
"version": "1.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "baseline-version-mismatch",
"version": "1.1"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "baseline-version-missing",
"version": "1.0"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"name": "dependency-not-in-versions-database-feature",
"version": "1.0",
"features": {
"add-things": {
"description": "an example feature that adds some things",
"dependencies": [
"no-versions"
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "dependency-not-in-versions-database",
"version": "1.0",
"dependencies": [
"no-versions"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"name": "dependency-version-not-in-versions-database-feature",
"version": "1.0",
"features": {
"add-things": {
"description": "an example feature that adds some things",
"dependencies": [
{
"name": "good",
"version>=": "0.9"
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"name": "dependency-version-not-in-versions-database",
"version": "1.0",
"dependencies": [
{
"name": "good",
"version>=": "0.9"
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"name": "good",
"version": "1.0"
}
Loading