Skip to content

[ms-gsl] Bump GSL to 4.0.0 #22791

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 22 commits into from
Feb 1, 2022
Merged

[ms-gsl] Bump GSL to 4.0.0 #22791

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
56c1709
Bump GSL to 4.0.0
dmitrykobets-msft Jan 26, 2022
1935ea7
Update version database
dmitrykobets-msft Jan 26, 2022
2e28474
Fix typo
dmitrykobets-msft Jan 26, 2022
d2b3c44
Add missing file
dmitrykobets-msft Jan 26, 2022
c1dfa92
Update version database
dmitrykobets-msft Jan 26, 2022
3539302
GSL portfile properly expose Microsoft.GSL package
dmitrykobets-msft Jan 27, 2022
4de3640
Merge branch 'microsoft:master' into master
dmitrykobets-msft Jan 27, 2022
ff0f4fd
Merge branch 'master' of https://github.com/dmitrykobets-msft/vcpkg
dmitrykobets-msft Jan 27, 2022
e8e2845
Update version database
dmitrykobets-msft Jan 27, 2022
6f71b66
Respond to review
dmitrykobets-msft Jan 27, 2022
8c9fce4
Update version database
dmitrykobets-msft Jan 27, 2022
83e7e35
Update version database v2
dmitrykobets-msft Jan 27, 2022
f772ac6
Merge branch 'microsoft:master' into master
dmitrykobets-msft Jan 28, 2022
c242432
Update release ref
dmitrykobets-msft Jan 28, 2022
99dc37b
Update version database
dmitrykobets-msft Jan 28, 2022
d2ae5ce
Respond to review
dmitrykobets-msft Jan 28, 2022
4931ce5
Update version database
dmitrykobets-msft Jan 28, 2022
65ad9f9
Add patch to SEAL to link to correct GSL version
dmitrykobets-msft Jan 31, 2022
f263756
Merge branch 'microsoft:master' into master
dmitrykobets-msft Jan 31, 2022
a161b7a
Merge branch 'master' of https://github.com/dmitrykobets-msft/vcpkg
dmitrykobets-msft Jan 31, 2022
8816a7e
Update version database
dmitrykobets-msft Jan 31, 2022
53c209a
Update version database v2
dmitrykobets-msft Jan 31, 2022
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
1 change: 1 addition & 0 deletions ports/coroutine/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ vcpkg_from_github(
PATCHES
fix-errorC7651.patch
add-noexcept-to-frame.patch
gsl-4_0_0.patch
)

vcpkg_configure_cmake(
Expand Down
2 changes: 1 addition & 1 deletion ports/coroutine/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "coroutine",
"version": "1.5.0",
"port-version": 3,
"port-version": 4,
"description": "C++ 20 Coroutines helper/example library",
"homepage": "https://github.com/luncliff/coroutine",
"supports": "!uwp",
Expand Down
16 changes: 6 additions & 10 deletions ports/ms-gsl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,20 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Microsoft/GSL
REF 0f6dbc9e2915ef5c16830f3fa3565738de2a9230
SHA512 f72d7d9a18b8055401feb99d99f17c70c0c2015b1a2112ae13fedd27949ff7f9b30718b6afd0b5730ed5573390cb1cc987cd45b7e7fbb92f4134f11d1637ddb7
HEAD_REF master
REF ebf0498363c53f0d3c403b0548212c147e3747fe
SHA512 c28cde973c88e2ab7d686c1bb1cfc1d969632dc99eee88d62c2bddd50288e10ece0458adc75edad8c245a2197ffc5da2bff8c63d1b50917697adbc5fdfb57e6d
HEAD_REF main
)

vcpkg_configure_cmake(
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
Comment thread
dmitrykobets-msft marked this conversation as resolved.
Outdated
PREFER_NINJA
OPTIONS
-DGSL_TEST=OFF
)

vcpkg_install_cmake()
vcpkg_cmake_install()

vcpkg_fixup_cmake_targets(
CONFIG_PATH share/cmake/Microsoft.GSL
TARGET_PATH share/Microsoft.GSL
)
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/Microsoft.GSL)

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

Expand Down
14 changes: 12 additions & 2 deletions ports/ms-gsl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,17 @@
{
"name": "ms-gsl",
"version-string": "3.1.0",
"version-string": "4.0.0",

@JonLiu1993 JonLiu1993 Jan 28, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"version-string": "4.0.0",
"version": "4.0.0",

"port-version": 1,
Comment thread
dmitrykobets-msft marked this conversation as resolved.
Outdated
"description": "Microsoft implementation of the Guidelines Support Library",
"homepage": "https://github.com/Microsoft/GSL"
"homepage": "https://github.com/Microsoft/GSL",
"dependencies": [
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}
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 @@ -1510,7 +1510,7 @@
},
"coroutine": {
"baseline": "1.5.0",
"port-version": 3
"port-version": 4
},
"corrade": {
"baseline": "2020.06",
Expand Down Expand Up @@ -4573,7 +4573,7 @@
"port-version": 1
},
"ms-gsl": {
"baseline": "3.1.0",
"baseline": "4.0.0",
"port-version": 1
},
"ms-quic": {
Expand Down
5 changes: 5 additions & 0 deletions versions/c-/coroutine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "563f4a3900b599145352f8517d9566358f51ceae",
"version": "1.5.0",
"port-version": 4
},
{
"git-tree": "d6cef429d17c011260cd718a2738ec7282098866",
"version": "1.5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/m-/ms-gsl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6d7896bb36379ffa6821ab13f674da1685f42886",
"version-string": "4.0.0",
"port-version": 1
},
{
"git-tree": "d51947d40835a72b1728c68ca8587e04e3f8e1e2",
"version-string": "3.1.0",
Expand Down