Skip to content

Commit

Permalink
Merge from main (#3760)
Browse files Browse the repository at this point in the history
* one commit to rule them all

* Sync eng/common directory with azure-sdk-tools for PR 3000 (#3485)

* Sort by client, mgmt, track2, track1

* sort by the type

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

* fix the sorting

* Define the order of new and type

* address comments

* fix typo

* Address your comments

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update Generate-DocIndex.ps1

* Update Generate-DocIndex.ps1

* Update eng/common/docgeneration/Generate-DocIndex.ps1

Co-authored-by: Wes Haggard <[email protected]>

Co-authored-by: sima-zhu <[email protected]>
Co-authored-by: Sima Zhu <[email protected]>
Co-authored-by: Wes Haggard <[email protected]>

* Support BaseName overrides in CI mode for New-TestResources.ps1 (#3559)

Co-authored-by: Ben Broderick Phillips <[email protected]>

* Do not pass Generated to -BaseName (#3562)

Co-authored-by: Heath Stewart <[email protected]>

* Sort by service name first (#3570)

Co-authored-by: sima-zhu <[email protected]>

* Initialize the suppression file. (#3569)

* Sync eng/common directory with azure-sdk-tools for PR 3169 (#3572)

* Use the batch version of ValidateDocsMsPackagesFn

* Use proper pipelining for GetPackageInfoJson function

Co-authored-by: Patrick Hallisey <[email protected]>

* [Tech Docs] Libcurl transport adapter (#3484)

* libcurl transport adapter

* updates

* Update LibcurlTransportAdapter.md

* Update LibcurlTransportAdapter.md

* Update doc/LibcurlTransportAdapter.md

Co-authored-by: Jeffrey Richter <[email protected]>

Co-authored-by: Jeffrey Richter <[email protected]>

* Skip azcopy download if it already exists (#3576)

Co-authored-by: Patrick Hallisey <[email protected]>

* Pin openssl to 1.1.1n (#3575)

* Pin openssl to 1.1.1n

* Updated vcpkg commit to one containing OpenSSL 1.1.1n

* Fixed version number in vcpkg.json

* Fix typo (#3583)

* update curl transport options to support ignore proxy from system (#3564)

* update curl transport options to support ignore proxy from system

* update changelog

* bug fix for cl

* update log level from Retry policy (#3586)

* update log level

* Update sdk/core/azure-core/CHANGELOG.md

Co-authored-by: Ahson Khan <[email protected]>

Co-authored-by: Ahson Khan <[email protected]>

* Add batch protocol layer (#3580)

* Add batch protocol layer

* some small fixes on Storage cmakefiles (#3588)

* Migrate to matrix generator (#3553)

* Represent existing matrix in json
* Use new matrix
* Move to stage
* Cloud configuration
* MaxParallel
* DependsOn
* Quote CtestRegex
* Use template for cmake generate tests
* Template name mappings
* Formatting, parameters
* Remove duplicate bypass-local-dns.yml
* Enable Location override
* Add Location
* Add spelling words
* Use Ubuntu 20 where the name specifies Ubuntu 20
* Apply suggestions from code review

Co-authored-by: Ben Broderick Phillips <[email protected]>

* PR feedback
* fix storage sample
* Matrix documentation

Co-authored-by: Ben Broderick Phillips <[email protected]>
Co-authored-by: Victor Vazquez <[email protected]>

* Sync eng/common directory with azure-sdk-tools for PR 3212 (#3587)

* bump consumed version of test proxy. update scripting to target the fully cross-platform image tag name.
* update target version of the test-proxy to one that enforces http/1.1

Co-authored-by: scbedd <[email protected]>

* Sync eng/common directory with azure-sdk-tools for PR 3238 (#3590)

* pin proxy version to one that properly sets listenoptions
* update targeted test-proxy docker repo. "testproxy" -> "test-proxy"

Co-authored-by: scbedd <[email protected]>

* Sync eng/common directory with azure-sdk-tools for PR 3221 (#3591)

* Make docs.ms link relative link

* Update Update-DocsMsMetadata.ps1

* Update eng/common/scripts/Update-DocsMsMetadata.ps1

Co-authored-by: Daniel Jurek <[email protected]>

Co-authored-by: sima-zhu <[email protected]>
Co-authored-by: Sima Zhu <[email protected]>
Co-authored-by: Daniel Jurek <[email protected]>

* Remove the daily branch before date (#3593)

Co-authored-by: sima-zhu <[email protected]>

* Add ClientCertificateCredential (#3578)

* Add ClientCertificateCredential

* Update unit test

* cspell

* Update Readme

* Cosmetic fixes

* Changelog to mention env cred update

* Fix warning

* cspell

* Tell CI to install openssl

* openssl for all Windows

* update dependency manifest

* Re-phrase changelog

* Clang warnings

* Clang warning

* Clang warning - 2

* Ubuntu18 warning

* Update sdk/identity/azure-identity/CHANGELOG.md

Co-authored-by: Victor Vazquez <[email protected]>

* PR feedback

Co-authored-by: Anton Kolesnyk <[email protected]>
Co-authored-by: Victor Vazquez <[email protected]>

* Sync eng/common directory with azure-sdk-tools for PR 3250 (#3595)

* Change the direction of the commit date

* Log on right place

* remove auth

* fix typo

* Add auth token back

* add delete back

* Update eng/common/scripts/Delete-RemoteBranches.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update Delete-RemoteBranches.ps1

* Update Delete-RemoteBranches.ps1

* Update Delete-RemoteBranches.ps1

* Update Delete-RemoteBranches.ps1

* Update Delete-RemoteBranches.ps1

Co-authored-by: sima-zhu <[email protected]>
Co-authored-by: Sima Zhu <[email protected]>
Co-authored-by: Wes Haggard <[email protected]>

* Create a session handle once in the transport ctor and reuse it for all requests rather than creating a new one each time. (#3585)

* Reuse the same session handle for all requests rather than creating a new one each time.

* Move the session handle creation to the transport adapter ctor.

* Update changelog entry.

* Address PR feedback.

* Change CreateSessionHandle to return a local session handle

* Fix-up the changelog entry link for the curtransportoption bug fix (#3598)

* Remove extra period at ends of exception messages in winhttp transport (#3601)

* fix cmake in storage (#3604)

* Reword the curl proxy fix changelog entry. (#3606)

* Add Emma Zhu as code owner (#3605)

* Short circuit out of msdocs publish if no package locations are specified (#3607)

Co-authored-by: Patrick Hallisey <[email protected]>

* sdk/core: Reimplement Md5OpenSSL using EVP API (#3609)

The MD5_Init/Update/Final functions are deprecated in OpenSSL 3.0 and result in
a compile-time warning. Due to the default usage of -Werror during compilation,
these warnings are treated as errors and prevent the SDK from being built on
Ubuntu 22.04, which ships with OpenSSL by default. The deprecated APIs should
be replaced by the EVP APIs, which are already in use for the SHA family of
functions, and supported on all versions of OpenSSL.

* API Review Feedback for Attestation SDK (#3543)

* API Review Feedback for Attestation SDK

* Updated changelog to reflect API Review updates

* Remove version pin for OpenSSL (#3610)

* Remove version pin for OpenSSL

* Gratuitous change to trigger CI pipelines

* Update the version tool to the latest (#3616)

Co-authored-by: sima-zhu <[email protected]>

* Get rid of warnings in nullable.hpp (#3617)

* cl (#3613)

* Update pipeline-generator version (#3623)

Co-authored-by: Patrick Hallisey <[email protected]>

* Prepare Attestation SDK for May Release. (#3625)

* Prepare attestation for May release

* Removed some noise from changelog

* Increment package version after release of azure-core (#3624)

* Update CODEOWNERS (#3628)

* Fix identity samples running in CI (#3632)

* azure identity may 2022 release (#3615)

* Increment package version after release of azure-identity (#3637)

* Removed uwp-x86 from platform matrix. (#3629)

* Increment package version after release of azure-security-attestation (#3636)

* Update readme for -pre and -post TestResource scripts (#3645)

Co-authored-by: Christopher Scott <[email protected]>

* Fixed a bug where text of XML element cannot be empty. (#3643)

* String parsing improvements to service directory resource names (#3644)

Co-authored-by: Ben Broderick Phillips <[email protected]>

* Adding Acknowledgments (#3611)

* cl

* Update sdk/core/azure-core/CHANGELOG.md

Co-authored-by: Ahson Khan <[email protected]>

* cspell

Co-authored-by: Ahson Khan <[email protected]>

* Add skip variable for remove test resources to support debugging (#3648)

Co-authored-by: Ben Broderick Phillips <[email protected]>

* Storage Blob Stg78 Features (#3650)

* Clean up target_include_directories() (#3641)

Co-authored-by: Anton Kolesnyk <[email protected]>

* Update all-inclusive headers, and CMakeFiles for including all headers (#3640)

* Remove (#3657)

oexcept specifier from Context::IsCancelled()

Co-authored-by: Anton Kolesnyk <[email protected]>

* Add Language product slug (#3665)

Co-authored-by: Deyaaeldeen Almahallawi <[email protected]>

* Sync eng/common directory with azure-sdk-tools for PR 3342 (#3664)

* Delete PR and branch which central PR is closed

* more logging changes

* resume the delete operations.

* Change the pr link directly

* fix the regex

* Refactor on regex name

* change the function to inline logic

* change typo

* delete on branch

* make changes on comments

* add commnets

* Update eng/common/scripts/Delete-RemoteBranches.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/scripts/Delete-RemoteBranches.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/scripts/Delete-RemoteBranches.ps1

Co-authored-by: Wes Haggard <[email protected]>

* Update eng/common/scripts/Delete-RemoteBranches.ps1

Co-authored-by: Wes Haggard <[email protected]>

Co-authored-by: sima-zhu <[email protected]>
Co-authored-by: Sima Zhu <[email protected]>
Co-authored-by: Wes Haggard <[email protected]>

* Split out attestation client factory into separate class (#3654)

* Split out attestation client factory into separate class

* Updated readme; clang-format

* Final set of API review changes

* Replaced () constructors with {} constructors

* Initial implementation of OpenTelemetry APIs. (#3561)

* Start of tracing prototype

* Created initial implementation of azure-core-opentelemetry package

* New version of enabling MSVCRT Lib for static configs

* Attempt to add OpenTelemetry tests to build

* Take a dependency on OpenTelemetry version 1.3

* Added service API level tracing support

* API Review feedback

* storage unittest fix and improvement (#3667)

* main merge

* error

* Sync eng/common directory with azure-sdk-tools for PR 3362 (#3676)

* spell-check skippable by commit

* suceededOrFailed -> succeededOrFailed

Co-authored-by: scbedd <[email protected]>

* Sync eng/common directory with azure-sdk-tools for PR 3378 (#3679)

* Create json package property parent directory

* Fix the issue in script

Co-authored-by: praveenkuttappan <[email protected]>

* Vcpkg sample (#3670)

* one commit to rule them all

* main merge

* error

* all smoke

* typo

* 120 minutes

* timeout param missing on job

* actual url

* Update samples/integration/vcpkg-all-smoke/src/main.cpp

Co-authored-by: Larry Osterman <[email protected]>

* actual creds

Co-authored-by: Larry Osterman <[email protected]>

* main merge

* error

* Complete the initial implementation of OpenTelemetry (#3677)

* Added telemetry support for HTTP pipeline elements

* Finish OpenTelemetry implementation

* clang-format and added doxygen comments

* Creadscan skips (#3671)

* one commit to rule them all

* main merge

* error

* add recordings for cred scan skipping

* certificates added

* remove dupe

* cspell

* Moved attestation factory back to static method on attestation class … (#3682)

* Moved attestation factory back to static method on attestation class and return a concrete type not a pointer

* Fixed factory in readme file

* main merge

* error

* main merge

* error

* iyuuyyu

* revert space

* OpenTelemetry API Review Feedback (#3687)

* OpenTelemetry API Review Feedback

* vcpkg version

* typos

* Attestation 1.0.0 GA Release (#3693)

* Prepare attestation for release

* removed references to RetrieveResponseValidationCollateral from docs

* Added C++ SDK team as owners of attestation SDK

* Added Ahmad from attestation team to attestation owners

* Removed dead API; switched attestation back to beta-3

* Disable detached head warnings on sparse checkout to commit (#3680)

Co-authored-by: Ben Broderick Phillips <[email protected]>

* Remove samples with docker.io (#3621)

* remove samples using docker.io

* removing docker files

* remove project

* Fix issue where matrix replace was not using imported display names (#3694)

Co-authored-by: Ben Broderick Phillips <[email protected]>

* Additional OpenTelemetry Feedback... (#3691)

* OpenTelemetry API Review Feedback

* Returns std::unique_ptr<DiagnosticTracingFactory instead of raw pointer

* Late breaking pull request feedback

* Renamed clientContext parameter to CreateSpan

* Renamed ContextAndSpanFactory to TracingContextFactory and CreateSpan to CreateTracingContext.

* Added ability to create instance with pointer (#3698)

* Added ability to create instance with pointer

* Pull request feedback

* Core 1.7.0-beta.1 Release (#3684)

Co-authored-by: Anton Kolesnyk <[email protected]>

* Increment package version after release of azure-core (#3699)

* Format vcpkg.json (#3701)

Co-authored-by: Anton Kolesnyk <[email protected]>

* Update README to list all the vcpkgs (#3704)

Co-authored-by: Anton Kolesnyk <[email protected]>

* Removed version>= fields for openssl in vcpkg.json files (#3705)

* Tab vcpkg publishing condition in to apply to the task (#3709)

* Storage June Release (#3686)

* Override live test location default to westus (#3696)

* Changelog updates for secrets and certificates (#3714)

* Changelog updates for secrets and certificates

* Update package versions

* Removed empty sections in changelog (#3718)

* Identity 1.3.0 Release (#3685)

Co-authored-by: Anton Kolesnyk <[email protected]>

* OpenTelemetry vcpkg fixes (#3716)

* OpenTelemetry vcpkg fixes

* Update ci.yml

* Drop version >= from project-level vcpkg

* find_package only supports numeric versions

* include(AzureBuildTargetForCI)

* Do not build as Windows/UWP DLL

* Docs and package dependencies

* Update condition

* Move condition down

* Move more under condition

* Rephrase condition

* Try hack for CI that won't affect vcpkg

Co-authored-by: Anton Kolesnyk <[email protected]>

* Increment package version after release of azure-identity (#3721)

* Increment version for storage releases (#3713)

* Increment package version after release of azure-storage-common

* Increment package version after release of azure-storage-blobs

* [EngSys] Get Vcpkg automatically (#3614)

* get vcpkg automatically

* Updated changelog (#3726)

* Increment package version after release of azure-core-tracing-opentelemetry (#3727)

* Increment package version after release of azure-security-attestation (#3717)

* Increment package version after release of azure-security-attestation (#3720)

* Enable Distributed Tracing for Attestation SDK client. (#3706)

* Implement tracing for Attestation and Template services

* Pipeline no longer requires service name if opting into distributed tracing; enable tracing in attestation service

* Generate user-agent header from request activity policy

* Added test to catch the redacted header regression

* Updated documentation to reflect API surface changes

* Make sample service an object library (#3728)

Co-authored-by: Anton Kolesnyk <[email protected]>

* Include �pi-version to default list of unredacted query params for logging (#3730)

Co-authored-by: Anton Kolesnyk <[email protected]>

* Sync eng/common directory with azure-sdk-tools for PR 3433 (#3731)

* add condition

* divide line

Co-authored-by: Mariana Rios Flores <[email protected]>

* Sync eng/common directory with azure-sdk-tools for PR 3267 (#3655)

* Use seperate scripts

* address comments.

* do compare and update

* save on the service level readme

* have the helper for reuse function

* remove mgmt table

* changes

* fix

* no return on error

* return if no contents

* Address comments

* change the table

* address wes comments.

* address wes comments.

* address more comments.

Co-authored-by: sima-zhu <[email protected]>

* Sync eng/common directory with azure-sdk-tools for PR 3386 (#3733)

* Update the order of remarks and examples to align with docs.ms

* change all occurance

* Update class.tmpl.partial

Co-authored-by: sizhu <[email protected]>
Co-authored-by: Sima Zhu <[email protected]>

* ensure conditions all work properly in the case of a previous error (#3732)

Co-authored-by: Scott Beddall <[email protected]>

* InputSanitizer: rename to HttpSanitizer, remove static member (#3736)

* InputSanitizer => HttpSanitizer, remove static

* Update cpp

* Clang format

Co-authored-by: Anton Kolesnyk <[email protected]>

* Increment version for keyvault releases (#3719)

* Increment package version after release of azure-security-keyvault-certificates

* Increment package version after release of azure-security-keyvault-secrets

* Update DistributedTracing.md (#3715)

Fix typo

* ApiView command line generation script (#3711)

* ApiView command line generation script

* Strongly typed parameters

Co-authored-by: Ben Broderick Phillips <[email protected]>

Co-authored-by: Anton Kolesnyk <[email protected]>
Co-authored-by: Ben Broderick Phillips <[email protected]>

* Add missing license header to http_sanitizer source file (#3739)

* Add ResourceType parameter - Selects live test or perf test resources (#3740)

Co-authored-by: Mike Harder <[email protected]>

* Update identity codeowners (#3744)

* ManagedIdentityCredential: Add support for AppServiceV2019 (#3734)

* ManagedIdentityCredential: Add support for AppServiceV2019

* Attempt to create 2019 before 2017

* Changelog update

Co-authored-by: Anton Kolesnyk <[email protected]>

* sasa

* format file

Co-authored-by: Azure SDK Bot <[email protected]>
Co-authored-by: sima-zhu <[email protected]>
Co-authored-by: Sima Zhu <[email protected]>
Co-authored-by: Wes Haggard <[email protected]>
Co-authored-by: Ben Broderick Phillips <[email protected]>
Co-authored-by: Heath Stewart <[email protected]>
Co-authored-by: Patrick Hallisey <[email protected]>
Co-authored-by: Victor Vazquez <[email protected]>
Co-authored-by: Jeffrey Richter <[email protected]>
Co-authored-by: Larry Osterman <[email protected]>
Co-authored-by: Rick Winter <[email protected]>
Co-authored-by: Ahson Khan <[email protected]>
Co-authored-by: JinmingHu <[email protected]>
Co-authored-by: Daniel Jurek <[email protected]>
Co-authored-by: Ben Broderick Phillips <[email protected]>
Co-authored-by: Victor Vazquez <[email protected]>
Co-authored-by: scbedd <[email protected]>
Co-authored-by: Anton Kolesnyk <[email protected]>
Co-authored-by: Anton Kolesnyk <[email protected]>
Co-authored-by: Ahson Khan <[email protected]>
Co-authored-by: Jeremi Piotrowski <[email protected]>
Co-authored-by: Christopher Scott <[email protected]>
Co-authored-by: Deyaaeldeen Almahallawi <[email protected]>
Co-authored-by: praveenkuttappan <[email protected]>
Co-authored-by: Mariana Rios Flores <[email protected]>
Co-authored-by: Scott Beddall <[email protected]>
Co-authored-by: Mike Harder <[email protected]>
  • Loading branch information
1 parent a1ab0e3 commit 6e129f5
Show file tree
Hide file tree
Showing 427 changed files with 19,564 additions and 7,274 deletions.
78 changes: 0 additions & 78 deletions .devcontainer/Dockerfile

This file was deleted.

32 changes: 0 additions & 32 deletions .devcontainer/devcontainer.json

This file was deleted.

8 changes: 4 additions & 4 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
################

# Git Hub integration and bot rules
/.github/ @AlexGhiondea @jsquire @rickwinter
/.github/ @jsquire @rickwinter

###########
# SDK
Expand All @@ -23,20 +23,20 @@
/sdk/core/ @rickwinter @ahsonkhan @antkmsft @vhvb1989 @gearama @LarryOsterman

# PRLabel: %Azure.Identity
/sdk/identity/ @antkmsft @schaabs @ahsonkhan @rickwinter @vhvb1989 @gearama
/sdk/identity/ @antkmsft @schaabs @ahsonkhan @rickwinter @vhvb1989 @gearama @LarryOsterman

###########
# Client SDKs
###########

# PRLabel: %Attestation
/sdk/attestation/ @LarryOsterman @gkostal @anilba06 @kroshkina-ms
/sdk/attestation/ @LarryOsterman @gkostal @anilba06 @kroshkina-ms @ahmadmsft @rickwinter @ahsonkhan @antkmsft @vhvb1989 @gearama

# PRLabel: %KeyVault
/sdk/keyvault/ @vhvb1989 @gearama @antkmsft @rickwinter

# PRLabel: %Storage
/sdk/storage/ @vinjiang @katmsft @Jinming-Hu @antkmsft @vhvb1989 @gearama @LarryOsterman
/sdk/storage/ @vinjiang @katmsft @Jinming-Hu @EmmaZhu @antkmsft @vhvb1989 @gearama @LarryOsterman

# PRLabel: %EngSys
/sdk/template/ @danieljurek @weshaggard
Expand Down
13 changes: 12 additions & 1 deletion .vscode/cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"Dockerfile",
"*nlohmann-json*",
"eng/docs/api/assets/**/*",
"eng/CredScanSuppression.json",
"**/test/ut/recordings/*.json"
],
// * Unless configured otherwise, these words are not case sensitive
Expand All @@ -42,9 +43,11 @@
"cuse",
"CUSEUAP",
"DCMAKE",
"DDISABLE",
"deserializers",
"Deserializes",
"DFETCH",
"DMSVC",
"docfx",
"DPAPI",
"DRUN",
Expand All @@ -67,6 +70,8 @@
"Intel",
"itfactor",
"iusg",
"jepio",
"Jeremi",
"Kirilov",
"lcov",
"LIBCMTD",
Expand All @@ -79,6 +84,7 @@
"ncus",
"Niels",
"nlohmann",
"nostd",
"noclean",
"NOCLOSE",
"NOCRLF",
Expand All @@ -87,8 +93,11 @@
"northcentralus",
"NTSTATUS",
"okhttp",
"opentelemetry",
"otel",
"PBYTE",
"pdbs",
"Piotrowski",
"PUCHAR",
"pwsh",
"Ragrs",
Expand Down Expand Up @@ -149,7 +158,9 @@
"issecret",
"PSScriptRoot",
"BUILDID",
"cppvcpkgcache"
"cppvcpkgcache",
"cmakegenerate",
"cmakesourcegenerate"
]
},
{
Expand Down
16 changes: 13 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,31 @@ if(MSVC_USE_STATIC_CRT AND MSVC)
#
# 5. We "replace with empty string" (i.e. remove) first, then add, so that '/MT'
# will be present (and present once) even if '/MD' was not.

message(STATUS "Configuring Static Runtime Library.")
if(${CMAKE_CXX_FLAGS} MATCHES ".*/MD.*")
string(REGEX REPLACE "/MD" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MT")
endif()

if(${CMAKE_CXX_FLAGS_RELEASE} MATCHES ".*/MD.*")
string(REGEX REPLACE "/MD" "" CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /MT")

endif()

if(${CMAKE_CXX_FLAGS_RELWITHDEBINFO} MATCHES ".*/MD.*")
string(REGEX REPLACE "/MD" "" CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT")
endif()

if(${CMAKE_CXX_FLAGS_MINSIZEREL} MATCHES ".*/MD.*")
string(REGEX REPLACE "/MD" "" CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL}")
set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} /MT")
endif()

if(${CMAKE_CXX_FLAGS_DEBUG} MATCHES ".*/MD.*")
string(REGEX REPLACE "/MDd" "" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
endif()
endif()

if(BUILD_TESTING)
Expand All @@ -91,6 +101,7 @@ include(AzureVersion)

if(BUILD_SAMPLES)
add_subdirectory(samples/helpers/get-env)
add_subdirectory(samples/helpers/service)
endif()

# sub-projects
Expand All @@ -102,6 +113,5 @@ add_subdirectory(sdk/storage)
add_subdirectory(sdk/template)

if(BUILD_SAMPLES)
add_subdirectory(samples/integration/vcpkg-keyvault)
add_subdirectory(samples/integration/vcpkg-all-smoke)
endif()
21 changes: 21 additions & 0 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,13 @@
"name": "VCPKG_TARGET_TRIPLET",
"value": "x64-windows-static",
"type": "STRING"
},
{
"name": "MSVC_USE_STATIC_CRT",
"value": "True",
"type": "BOOL"
}

]
},
{
Expand All @@ -33,6 +39,11 @@
"name": "VCPKG_TARGET_TRIPLET",
"value": "x64-windows-static",
"type": "STRING"
},
{
"name": "MSVC_USE_STATIC_CRT",
"value": "True",
"type": "BOOL"
}
]
},
Expand All @@ -51,6 +62,11 @@
"name": "VCPKG_TARGET_TRIPLET",
"value": "x86-windows-static",
"type": "STRING"
},
{
"name": "MSVC_USE_STATIC_CRT",
"value": "True",
"type": "BOOL"
}
]
},
Expand All @@ -70,6 +86,11 @@
"value": "True",
"type": "BOOL"
},
{
"name": "MSVC_USE_STATIC_CRT",
"value": "True",
"type": "BOOL"
},
{
"name": "BUILD_TRANSPORT_CURL",
"value": "True",
Expand Down
Loading

0 comments on commit 6e129f5

Please sign in to comment.