Skip to content

[wil] Updating WIL version to match its nuget package version #16575

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.

Sign up for GitHub

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

Merged
ras0219-msft merged 7 commits into from
Mar 10, 2021
Merged

[wil] Updating WIL version to match its nuget package version #16575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
afd38fd
[wil] Updating WIL version to match its nuget package version
aarumug Mar 6, 2021
28ffcba
Removing port version from CONTROL file
aarumug Mar 7, 2021
8728554
Revert "Removing port version from CONTROL file"
aarumug Mar 7, 2021
b33cef8
Updating baseline.json and w-/wil.json
Mar 9, 2021
6df4a07
update version
JonLiu1993 Mar 9, 2021
0f3c03d
modify portfile.cmake
JonLiu1993 Mar 9, 2021
6f7ec90
update version
JonLiu1993 Mar 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ports/wil/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Source: wil
Version: 2020-05-19
Port-Version: 1
Version: 2021-02-04
Homepage: https://github.com/microsoft/wil
Description: The Windows Implementation Libraries (WIL) is a header-only C++ library created to make life easier for developers on Windows through readable type-safe C++ interfaces for common Windows coding patterns.
12 changes: 0 additions & 12 deletions ports/wil/fix-install-headers.patch
View file
Open in desktop

This file was deleted.

7 changes: 3 additions & 4 deletions ports/wil/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/wil
REF 3c00e7f1d8cf9930bbb8e5be3ef0df65c84e8928
SHA512 c9c3b4a41f7523a6da6378def4a6b868e9f66438998d04ae8489b9784db91664af7af3ab6ef73c104b9ac100c0dc5ae6a13e9cb9f679ba428a4abc07b32a7dce
REF 86353933d5fba0caf61503c8b09e10e182dccdfb
SHA512 07694a3754c179aa629b8e3e8fc2a5554779601925131bffef311dee937b03db0d1be891eaee364b7a265b7268f39ad356d8302c02b05acf4fa8c7b2d4d51629
HEAD_REF master
PATCHES fix-install-headers.patch
)

vcpkg_configure_cmake(
Expand All @@ -22,4 +21,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/WIL)

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug")

file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/wil" RENAME copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6217,8 +6217,8 @@
"port-version": 0
},
"wil": {
"baseline": "2020-05-19",
"port-version": 1
"baseline": "2021-02-04",
"port-version": 0
},
"wildmidi": {
"baseline": "0.4.3-1",
Expand Down
5 changes: 5 additions & 0 deletions versions/w-/wil.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "1085a9ee690f6718715b28396f5250ad67d6f828",
"version-string": "2021-02-04",
"port-version": 0
},
{
"git-tree": "48d7b90ae1c7d5f223caad5330a293463f470860",
"version-string": "2020-05-19",
Expand Down