Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
e348e96
bump keys version to 7.3
gearama Mar 24, 2022
3d3466a
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
37f7d00
bump keys version to 7.3
gearama Mar 24, 2022
d166434
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
cacd864
Merge branch 'main' of https://github.com/gearama/azure-sdk-for-cpp
gearama Mar 30, 2022
a5424aa
bump keys version to 7.3
gearama Mar 24, 2022
0427480
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
4d28466
bump keys version to 7.3
gearama Mar 24, 2022
08dd72e
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
7673914
Merge branch 'main' of https://github.com/gearama/azure-sdk-for-cpp
gearama Mar 31, 2022
a7c02ff
bump keys version to 7.3
gearama Mar 24, 2022
53b1896
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
21d9655
bump keys version to 7.3
gearama Mar 24, 2022
a1101c4
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
d95fba5
Merge branch 'main' of https://github.com/gearama/azure-sdk-for-cpp
gearama Mar 31, 2022
b95c3a4
bump keys version to 7.3
gearama Mar 24, 2022
b178c77
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
37ea826
bump keys version to 7.3
gearama Mar 24, 2022
87c8228
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
844368a
Merge branch 'main' of https://github.com/gearama/azure-sdk-for-cpp
gearama Mar 31, 2022
e570008
bump keys version to 7.3
gearama Mar 24, 2022
3d1daa6
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
dd8fe7f
bump keys version to 7.3
gearama Mar 24, 2022
410e52d
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
dfac3c0
bump keys version to 7.3
gearama Mar 24, 2022
dae7331
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
fb4dc81
bump keys version to 7.3
gearama Mar 24, 2022
0fbf743
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
9cc39b6
bump keys version to 7.3
gearama Mar 24, 2022
e77cdfd
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
ae33070
bump keys version to 7.3
gearama Mar 24, 2022
3b29a1c
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
13431a9
bump keys version to 7.3
gearama Mar 24, 2022
d2f9c1c
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
4e371d9
bump keys version to 7.3
gearama Mar 24, 2022
5a5c405
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
b7289f8
Merge branch 'main' of https://github.com/gearama/azure-sdk-for-cpp
gearama Apr 5, 2022
9f307b6
bump keys version to 7.3
gearama Mar 24, 2022
4f9c473
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
bf99d7f
bump keys version to 7.3
gearama Mar 24, 2022
76e2437
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
20a9871
bump keys version to 7.3
gearama Mar 24, 2022
dccafff
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
2df855c
bump keys version to 7.3
gearama Mar 24, 2022
53bb1dd
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
8738f7a
bump keys version to 7.3
gearama Mar 24, 2022
804ec3e
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
558dbfc
bump keys version to 7.3
gearama Mar 24, 2022
6971e9d
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
455ca3a
bump keys version to 7.3
gearama Mar 24, 2022
c4e9b15
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
79ebeff
bump keys version to 7.3
gearama Mar 24, 2022
41cef4f
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
c6c5d86
Merge branch 'main' of https://github.com/gearama/azure-sdk-for-cpp
gearama Apr 5, 2022
3debc12
bump keys version to 7.3
gearama Mar 24, 2022
eea3226
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
aab777b
bump keys version to 7.3
gearama Mar 24, 2022
515af91
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
77ff444
bump keys version to 7.3
gearama Mar 24, 2022
e808bb0
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
c59eea1
bump keys version to 7.3
gearama Mar 24, 2022
8d14d6d
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
9a4145e
bump keys version to 7.3
gearama Mar 24, 2022
9d3da15
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
3449f05
bump keys version to 7.3
gearama Mar 24, 2022
7a248c2
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
c2d638e
bump keys version to 7.3
gearama Mar 24, 2022
af67649
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
1135ebe
bump keys version to 7.3
gearama Mar 24, 2022
0b3e8c7
Revert "bump keys version to 7.3"
gearama Mar 24, 2022
923561e
Merge branch 'main' of https://github.com/gearama/azure-sdk-for-cpp
gearama Apr 5, 2022
e9ea70c
update the versions for the core and identity deps for the keyvault A…
gearama Apr 8, 2022
4195a8a
removed identity dep
gearama Apr 11, 2022
ea77349
put back ident
gearama Apr 11, 2022
fd5122d
remove ident from folder
gearama Apr 11, 2022
eb619c6
1.4.0
gearama Apr 11, 2022
b8c9580
update vcpkg commit
gearama Apr 11, 2022
3f635cf
put back ident
gearama Apr 11, 2022
c369d78
remove again
gearama Apr 11, 2022
0f76412
update vcpkg commit
gearama Apr 11, 2022
a923b25
PR comment
gearama Apr 19, 2022
02b769c
vcpkg commit min for azure core 1.5
gearama Apr 19, 2022
bac28ec
increase timeout
gearama Apr 19, 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
6 changes: 3 additions & 3 deletions cmake-modules/FolderList.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ macro(GetFolderList project)
message ("project found ${project}")
message ("FLAG VALUE : ${FETCH_SOURCE_DEPS}")
if(${project} STREQUAL CERTIFICATES)
DownloadDepVersion(sdk/core azure-core 1.2.0)
DownloadDepVersion(sdk/core azure-core 1.5.0)
DownloadDepVersion(sdk/identity azure-identity 1.1.0)
elseif(${project} STREQUAL IDENTITY)
DownloadDepVersion(sdk/core azure-core 1.2.0)
elseif(${project} STREQUAL SECRETS)
DownloadDepVersion(sdk/core azure-core 1.2.0)
DownloadDepVersion(sdk/core azure-core 1.5.0)
DownloadDepVersion(sdk/identity azure-identity 1.1.0)
elseif(${project} STREQUAL KEYS)
DownloadDepVersion(sdk/core azure-core 1.2.0)
DownloadDepVersion(sdk/core azure-core 1.5.0)
DownloadDepVersion(sdk/identity azure-identity 1.1.0)
elseif(${project} STREQUAL STORAGE_COMMON)
DownloadDepVersion(sdk/core azure-core 1.3.1)
Expand Down
5 changes: 5 additions & 0 deletions eng/pipelines/templates/jobs/archetype-sdk-cmake-generate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,14 @@ parameters:
- name: CMakeSourceTestOptions
type: object
default: []
- name: GenerateTimeoutInMinutes
type: number
default: 90

jobs:
- job: CMakeGenerate
condition: and(succeededOrFailed(), ne(variables['Skip.CMakeGenerate'], 'true'))
timeoutInMinutes: ${{ parameters.GenerateTimeoutInMinutes }}
strategy:
matrix:
Linux:
Expand Down Expand Up @@ -73,6 +77,7 @@ jobs:

- job: CMakeSourceGenerate
condition: and(succeededOrFailed(), ne(variables['Skip.CMakeGenerate'], 'true'))
timeoutInMinutes: ${{ parameters.GenerateTimeoutInMinutes }}
strategy:
matrix:
Windows:
Expand Down
2 changes: 1 addition & 1 deletion eng/vcpkg-commit.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
be5c4ef68b51142ba705f0678b45d284977de677
d8cd44e7026e294ad82c49eaf2cb6a046cf2c994
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.2.0" CONFIG QUIET)
find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.2.0" REQUIRED)
find_package(azure-core-cpp "1.5.0" REQUIRED)
endif()
endif()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-core-cpp "1.3.1")
find_dependency(azure-core-cpp "1.5.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-certificates-cppTargets.cmake")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.3.1"
"version>=": "1.5.0"
},
{
"name": "vcpkg-cmake",
Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-keys/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder} EXCLUDE_FROM_ALL)
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.2.0" CONFIG QUIET)
find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.2.0" REQUIRED)
find_package(azure-core-cpp "1.5.0" REQUIRED)
endif()
endif()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-core-cpp "1.3.1")
find_dependency(azure-core-cpp "1.5.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-keys-cppTargets.cmake")

Expand Down
2 changes: 1 addition & 1 deletion sdk/keyvault/azure-security-keyvault-keys/vcpkg/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.3.1"
"version>=": "1.5.0"
},
{
"name": "vcpkg-cmake",
Expand Down
4 changes: 2 additions & 2 deletions sdk/keyvault/azure-security-keyvault-secrets/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ if(FETCH_SOURCE_DEPS)
add_subdirectory(${oneFolder})
endforeach()
elseif(NOT AZ_ALL_LIBRARIES)
find_package(azure-core-cpp "1.2.0" CONFIG QUIET)
find_package(azure-core-cpp "1.5.0" CONFIG QUIET)
if(NOT azure-core-cpp_FOUND)
find_package(azure-core-cpp "1.2.0" REQUIRED)
find_package(azure-core-cpp "1.5.0" REQUIRED)
endif()
endif()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
@PACKAGE_INIT@

include(CMakeFindDependencyMacro)
find_dependency(azure-core-cpp "1.3.1")
find_dependency(azure-core-cpp "1.5.0")

include("${CMAKE_CURRENT_LIST_DIR}/azure-security-keyvault-secrets-cppTargets.cmake")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
"name": "azure-core-cpp",
"default-features": false,
"version>=": "1.3.1"
"version>=": "1.5.0"
},
{
"name": "vcpkg-cmake",
Expand Down