Skip to content

Commit 8b8b522

Browse files
microzchangantkmsftazure-sdkbenbpdanieljurek
authored
[Storage STG95 Branch] Merge Main to fix cmake build error (#5796)
* Update vcpkg SHA (#5757) Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com> * Sync eng/common directory with azure-sdk-tools for PR 8528 (#5755) * Fix default value for env vars in build-test-resource-config template * Add empty pool condition --------- Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com> * Sync eng/common directory with azure-sdk-tools for PR 8516 (#5752) * Ensure subConfigFiles is not an empty string * Skip instances where $file is an empty string --------- Co-authored-by: Daniel Jurek <djurek@microsoft.com> * Sync eng/common directory with azure-sdk-tools for PR 8549 (#5762) * commit the file changes so that we can see them running * use standalone tool --------- Co-authored-by: Scott Beddall (from Dev Box) <scbedd@microsoft.com> * Disable codeql as it is causing build issues (#5761) All the other languages have disabled codeql and we are now hitting blocking issues when running codeql on macos (https://dev.azure.com/twcdot/Data/_workitems/edit/138580) and even on the other OS's the configuration causes the builds to run for a long time. * Delete eng/common/InterdependencyGraph.html which is unused. (#5763) Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com> * Add missing include (#5766) * Update GitHubEventProcessor version to 1.0.0-dev.20240708.1 (#5768) Co-authored-by: James Suplizio <jasupliz@microsoft.com> * Provide a walkthrough for how to install the Azure SDK packages in a VS (#5751) MSBuild project via vcpkg. * Sync eng/common directory with azure-sdk-tools for PR 8558 (#5764) * Support storage network access and worm removal in remove test resources script * Move storage network access script to common resource helpers file * Improve storage container deletion resilience * Plumb through pool variable to live test cleanup template * Add sleep for network rule application --------- Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com> * add the ability to override default succeeded() conditioning by parameter (#5780) Co-authored-by: Scott Beddall <scbedd@microsoft.com> * Support regex/negative regex filters for stress test discovery. Add storage env defaults (#5779) Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com> * Update vcpkg SHA (#5772) * Show-FailureLogs to include vcpkg build failure logs (#5776) * Show-FailureLogs to include vcpkg build failure logs * Add comment * Add proper array syntax * Use proper syntax to create an array even if there's only a single element Co-authored-by: Ben Broderick Phillips <ben@benbp.net> --------- Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com> Co-authored-by: Ben Broderick Phillips <ben@benbp.net> * Turn federated auth on for Identity tests. (#5785) * Turn federated auth on for Identity tests. * Update test resources json. * Move tests to use azure pipeline credentials (#5754) * test1 * hgdfchg * remove the remnants of azure client secret * test KV with federated auth * UseFederatedAuth * fdsa * kv template with managed * try try again * retry permissions * add net acls * blunt force replace the resource json * put back stuff * trey again with new method * attempt * missed something * flip if else * Temporarily use empty sub config file path for preview cloud * remove client secret * try to fix the identity tests * live skip failing tests and return in samples * samples for identity fix * disable failing samples in identity * fix winhttp failing test * comment out code * remove managed identity * restore version from main * revert readme changes * PR comments * test 2 * clang * attempt default creds with pipeline chanined * clangs * identity test and clangs * oops * live * cleanup * reter * test * revert the DAC change * missed one * taking the samples to a farm upstate * PR comments * Fix bad merge --------- Co-authored-by: Daniel Jurek <djurek@microsoft.com> Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com> Co-authored-by: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> * Update the RetryPolicy for the GA release, keeping ShouldRetry extension point hidden. (#5771) * Update the RetryPolicy for the GA release, keeping ShouldRetry extension point hidden. * Mark test helper virtual functions private, so they aren't accessible/callable by callers. * Update the changelog. * Update CL. * Azure Core July GA Release (#5792) Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com> * Revert commits related to the new RetryPolicy method (#5793) * Revert "Update the RetryPolicy for the GA release, keeping ShouldRetry extension point hidden. (#5771)" This reverts commit 9ccd206. * Revert "Update the RetryPolicy and ShouldRetry customization logic to allow loosening the retry condition. (#5656)" This reverts commit f1d9552. * Do not remove changelog entry from a previous beta release * Revert "Add a virtual ShouldRetry method to the RetryPolicy for customization. (#5584)" This reverts commit ab90ef6. --------- Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com> * Sync eng/common directory with azure-sdk-tools for PR 8598 (#5777) * Set storage account test resources to disable blob public access * Skip adding network rules to storage accounts that don't need them during cleanup * Add succeeded check to set pipeline subnet info step * Disable network firewall by default in resource creation/removal --------- Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com> * Increment package version after release of azure-core (#5794) * Acknowledge community contribution in the changelog (#5797) * Mention community contribution in the changelog * cspell * Remove double spaces --------- Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com> --------- Co-authored-by: Anton Kolesnyk <41349689+antkmsft@users.noreply.github.com> Co-authored-by: Anton Kolesnyk <antkmsft@users.noreply.github.com> Co-authored-by: Azure SDK Bot <53356347+azure-sdk@users.noreply.github.com> Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com> Co-authored-by: Daniel Jurek <djurek@microsoft.com> Co-authored-by: Scott Beddall (from Dev Box) <scbedd@microsoft.com> Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com> Co-authored-by: Robert Schulze <robert@clickhouse.com> Co-authored-by: James Suplizio <jasupliz@microsoft.com> Co-authored-by: Ahson Khan <ahson_ahmedk@yahoo.com> Co-authored-by: Ben Broderick Phillips <ben@benbp.net> Co-authored-by: George Arama <50641385+gearama@users.noreply.github.com>
1 parent a4333f3 commit 8b8b522

52 files changed

Lines changed: 1038 additions & 1037 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/event-processor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
run: >
5959
dotnet tool install
6060
Azure.Sdk.Tools.GitHubEventProcessor
61-
--version 1.0.0-dev.20240610.2
61+
--version 1.0.0-dev.20240708.1
6262
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
6363
--global
6464
shell: bash
@@ -114,7 +114,7 @@ jobs:
114114
run: >
115115
dotnet tool install
116116
Azure.Sdk.Tools.GitHubEventProcessor
117-
--version 1.0.0-dev.20240610.2
117+
--version 1.0.0-dev.20240708.1
118118
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
119119
--global
120120
shell: bash

.github/workflows/scheduled-event-processor.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
run: >
4040
dotnet tool install
4141
Azure.Sdk.Tools.GitHubEventProcessor
42-
--version 1.0.0-dev.20240610.2
42+
--version 1.0.0-dev.20240708.1
4343
--add-source https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-net/nuget/v3/index.json
4444
--global
4545
shell: bash

.vscode/cspell.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,11 +216,13 @@
216216
"rehydrated",
217217
"Reitz",
218218
"retriable",
219+
"rschu",
219220
"rtti",
220221
"rwxrw",
221222
"sasia",
222223
"sbom",
223224
"Schonberger",
225+
"Schulze",
224226
"scus",
225227
"SDDL",
226228
"sdpath",

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ vcpkg add port azure-identity-cpp azure-storage-blobs-cpp
4040
}
4141
```
4242

43-
### Configure project files
43+
### Configure CMake project files
4444

4545
- Replace the contents of `CMakeLists.txt` with the following:
4646

@@ -57,6 +57,12 @@ add_executable(HelloWorld helloworld.cpp)
5757
target_link_libraries(HelloWorld PRIVATE Azure::azure-identity Azure::azure-storage-blobs)
5858
```
5959

60+
### Installing Azure SDK packages in a Visual Studio MSBuild (.vcxproj) project
61+
62+
Here's a walkthrough video on how to install the Azure SDK packages, using vcpkg, into an MSBuild project in VS: https://aka.ms/azsdk/cpp/gettingstarted-vcpkg-msbuild-video
63+
64+
See the [vcpkg documentation](https://learn.microsoft.com/en-us/vcpkg/get_started/get-started-msbuild?pivots=shell-cmd) for more details.
65+
6066
### Additional methods for installing and configuring
6167

6268
<!-- Commenting out for now until we know if something similar already exists or if we have to create it. -->

cmake-modules/AzureVcpkg.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ macro(az_vcpkg_integrate)
1818
message("AZURE_SDK_DISABLE_AUTO_VCPKG is not defined. Fetch a local copy of vcpkg.")
1919
# GET VCPKG FROM SOURCE
2020
# User can set env var AZURE_SDK_VCPKG_COMMIT to pick the VCPKG commit to fetch
21-
set(VCPKG_COMMIT_STRING 8150939b69720adc475461978e07c2d2bf5fb76e) # default SDK tested commit
21+
set(VCPKG_COMMIT_STRING 5312e9f976e89b256954f571433e34f783dd2d12) # default SDK tested commit
2222
if(DEFINED ENV{AZURE_SDK_VCPKG_COMMIT})
2323
message("AZURE_SDK_VCPKG_COMMIT is defined. Using that instead of the default.")
2424
set(VCPKG_COMMIT_STRING "$ENV{AZURE_SDK_VCPKG_COMMIT}") # default SDK tested commit

0 commit comments

Comments
 (0)