Skip to content

Commit 0b5b5ac

Browse files
gearamadanieljurek
andauthored
Json library update and Xcode15 (#5681)
* Move up macos and xcode version * first pass * to trigger builds, some other issue * rewrwe * Remove MSVC compiler warning suppressions in KeyVault The code within the `mocked_transport_adapter_test.hpp` file, specifically within the `Azure::Security::KeyVault::Keys` namespace, has been updated. The `#if defined(_MSC_VER)` preprocessor directive along with its associated `#pragma warning(push)` and `#pragma warning(disable : 4996)` directives have been removed. The corresponding `#pragma warning(pop)` directive has also been removed. The lines of code that were between these preprocessor directives remain unchanged. These changes remove specific compiler warning suppressions for MSVC compilers, but do not alter the functional behavior of the code. * dassa * Add UseDotNet@2 where test proxy might run on a macos agent * test CI * fsd * dasdas * gregre * gerregr * ffdsfsd * fwefew * fewfwew * reter * fewfew * fwefwe * rewrw * rwe * temp move build step to exec faster * gdfgd * fsdfd * fdsfs * dgdf * Roll forward instead of installing .NET 6 * remove manual install * rewrew * gfdffg * rewrwe * gfdgd * fdsfs * gfdgdf * tertre * dasda * try http for test proxy * revert readmes * rew * rew * fdsfsd * ewrew * revert storages * KV * opentelemetry * remove warnbing * anton comments * unit tests * clangs * clang * comment out some asserts * restore originals * updated tests * clangs * restore cmake * test * Remove manual workaround (eng/common change fixes this) * test2 * the fix doesn't work, need to put back * Remove DOTNET_ROLL_FORWARD * annotate macro , put back DOTNET_ROLL_FORWARD * remove leftover files * reww * update changelog * remove left over file * remove some doxygen comments --------- Co-authored-by: Daniel Jurek <[email protected]>
1 parent 2f74d85 commit 0b5b5ac

File tree

59 files changed

+31047
-23054
lines changed

Some content is hidden

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

59 files changed

+31047
-23054
lines changed

eng/pipelines/templates/jobs/ci.tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,10 @@ jobs:
184184
ServiceDirectory: ${{ parameters.ServiceDirectory }}
185185
TestPipeline: ${{ parameters.TestPipeline }}
186186

187+
- pwsh: |
188+
Write-Host "##vso[task.setvariable variable=DOTNET_ROLL_FORWARD]Major"
189+
displayName: Set DOTNET_ROLL_FORWARD to Major globally
190+
187191
- template: /eng/pipelines/templates/steps/cmake-build.yml
188192
parameters:
189193
ServiceDirectory: ${{ parameters.ServiceDirectory }}

eng/pipelines/templates/stages/platform-matrix-live.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"include": [
66
{
77
"StaticConfigs": {
8-
"macOS-11": {
8+
"macOS-14": {
99
"Pool": "env:MACPOOL",
1010
"OSVmImage": "env:MACVMIMAGE",
1111
"VCPKG_DEFAULT_TRIPLET": "x64-osx",

eng/pipelines/templates/stages/platform-matrix.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
"include": [
66
{
77
"OSConfiguration": {
8-
"macOS-11": {
8+
"macOS-14": {
99
"OSVmImage": "env:MACVMIMAGE",
10-
"XCODE_VERSION": "12.5.1"
10+
"XCODE_VERSION": "15.0.1"
1111
}
1212
},
1313
"StaticConfigs": {

eng/pipelines/templates/variables/image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ variables:
2121
- name: WINDOWSPREVIOUSVMIMAGE
2222
value: azsdk-pool-mms-win-2019-1espt
2323
- name: MACVMIMAGE
24-
value: macos-11
24+
value: macOS-14
2525

2626
# Values required for pool.os field in 1es pipeline templates
2727
- name: LINUXOS

sdk/core/azure-core-test/inc/azure/core/test/test_proxy_manager.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ namespace Azure { namespace Core { namespace Test {
5656
// Using a reference because the context lives in the test_base class and we don't want to make
5757
// a copy.
5858
Azure::Core::Test::TestContextManager& m_testContext;
59-
const std::string m_proxy = "https://localhost:5001";
59+
const std::string m_proxy = "http://localhost:5000";
6060
bool m_isInsecureEnabled = true;
6161
TestMode m_currentMode = TestMode::LIVE;
6262
std::unique_ptr<Azure::Core::Http::_internal::HttpPipeline> m_privatePipeline;

sdk/core/azure-core/CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
### Other Changes
1212

13+
- Updated JSON library to 3.11.3.
14+
1315
## 1.13.0-beta.1 (2024-06-06)
1416

1517
### Bugs Fixed

sdk/core/azure-core/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ The library allows client libraries to expose common functionality in a consiste
66

77
## Getting started
88

9-
Typically, you will not need to download `azure-core`; it will be downloaded for you as a dependency of the client libraries. In case you want to download it explicitly (to implement your own client library, for example), you can find the source in here, or use vcpkg to install the package `azure-core-cpp`.
9+
Typically, you will not need to download `azure-core`; it will be downloaded for you as a dependency of the client libraries. In case you want to download it explicitly (to implement your own client library, for example), you can find the source in here, or use vcpkg to install the package `azure-core-cpp`.
1010

1111
### Include the package
1212

sdk/core/azure-core/cgmanifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"Type": "git",
3737
"git": {
3838
"RepositoryUrl": "https://github.com/nlohmann/json",
39-
"CommitHash": "db78ac1d7716f56fc9f1b030b715f872f93964e4"
39+
"CommitHash": "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
4040
}
4141
},
4242
"DevelopmentDependency": false

0 commit comments

Comments
 (0)