Skip to content

Json library update and Xcode15 #5681

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.

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
merged 69 commits into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
73adc91
Move up macos and xcode version
danieljurek May 30, 2024
45b62f8
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-cpp int…
gearama May 30, 2024
af81533
first pass
gearama May 30, 2024
6f984c9
to trigger builds, some other issue
gearama May 30, 2024
bd9f970
rewrwe
gearama May 30, 2024
6a59f61
Remove MSVC compiler warning suppressions in KeyVault
gearama May 30, 2024
de38030
dassa
gearama May 31, 2024
3ea8e8e
Add UseDotNet@2 where test proxy might run on a macos agent
danieljurek May 31, 2024
76ad1c7
test CI
gearama May 31, 2024
0e70430
Merge branch 'osx-matrix' of https://github.com/Azure/azure-sdk-for-c…
gearama May 31, 2024
17c9623
fsd
gearama May 31, 2024
211080f
dasdas
gearama May 31, 2024
7e14fd7
gregre
gearama May 31, 2024
034edc2
gerregr
gearama May 31, 2024
2d1416d
ffdsfsd
gearama May 31, 2024
383fc9e
fwefew
gearama May 31, 2024
060f61b
fewfwew
gearama May 31, 2024
2ef7c39
reter
gearama May 31, 2024
3a951b7
fewfew
gearama May 31, 2024
6faf25e
fwefwe
gearama May 31, 2024
ccdba73
rewrw
gearama May 31, 2024
d3ef18f
rwe
gearama May 31, 2024
60624b6
temp move build step to exec faster
gearama May 31, 2024
a4ba1ae
gdfgd
gearama May 31, 2024
815cdd8
fsdfd
gearama May 31, 2024
a233541
fdsfs
gearama May 31, 2024
f9c90d7
dgdf
gearama May 31, 2024
6deb47c
Roll forward instead of installing .NET 6
danieljurek May 31, 2024
f5fab03
remove manual install
gearama Jun 3, 2024
99f3472
rewrew
gearama Jun 3, 2024
06b8067
gfdffg
gearama Jun 3, 2024
c22e68c
rewrwe
gearama Jun 3, 2024
a55cbb1
gfdgd
gearama Jun 3, 2024
dc07648
fdsfs
gearama Jun 3, 2024
57f45e7
gfdgdf
gearama Jun 3, 2024
647e48d
tertre
gearama Jun 3, 2024
d52c387
dasda
gearama Jun 3, 2024
68b46bf
try http for test proxy
gearama Jun 3, 2024
c3d34ac
revert readmes
gearama Jun 3, 2024
8dcafa9
rew
gearama Jun 3, 2024
4fe2bd6
rew
gearama Jun 3, 2024
60468c9
fdsfsd
gearama Jun 3, 2024
f172dc9
ewrew
gearama Jun 3, 2024
92f0bb5
revert storages
gearama Jun 3, 2024
3e67b04
KV
gearama Jun 3, 2024
4ab2622
opentelemetry
gearama Jun 3, 2024
f85a8ab
remove warnbing
gearama Jun 3, 2024
73aab5a
anton comments
gearama Jun 5, 2024
0beac98
unit tests
gearama Jun 6, 2024
bffeb7c
clangs
gearama Jun 6, 2024
8cb0117
clang
gearama Jun 6, 2024
b0088b2
comment out some asserts
gearama Jun 6, 2024
1051538
restore originals
gearama Jun 6, 2024
0851661
updated tests
gearama Jun 6, 2024
c32e0b9
clangs
gearama Jun 6, 2024
e986a5a
restore cmake
gearama Jun 6, 2024
21aaab1
test
gearama Jun 6, 2024
b94ce0f
Remove manual workaround (eng/common change fixes this)
danieljurek Jun 7, 2024
fc24a6d
test2
gearama Jun 7, 2024
20cc4a5
Merge branch 'osx-matrix' of https://github.com/Azure/azure-sdk-for-c…
gearama Jun 7, 2024
b2f4339
Merge branch 'main' of https://github.com/Azure/azure-sdk-for-cpp int…
gearama Jun 7, 2024
87f1d9e
the fix doesn't work, need to put back
gearama Jun 7, 2024
8ac0764
Remove DOTNET_ROLL_FORWARD
danieljurek Jun 10, 2024
851497f
annotate macro , put back DOTNET_ROLL_FORWARD
gearama Jun 11, 2024
f130399
remove leftover files
gearama Jun 13, 2024
358ae9f
reww
gearama Jun 13, 2024
8a9f575
update changelog
gearama Jun 13, 2024
c2093f5
remove left over file
gearama Jun 13, 2024
7720dea
remove some doxygen comments
gearama Jun 13, 2024
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
4 changes: 4 additions & 0 deletions eng/pipelines/templates/jobs/ci.tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,10 @@ jobs:
ServiceDirectory: ${{ parameters.ServiceDirectory }}
TestPipeline: ${{ parameters.TestPipeline }}

- pwsh: |
Write-Host "##vso[task.setvariable variable=DOTNET_ROLL_FORWARD]Major"
displayName: Set DOTNET_ROLL_FORWARD to Major globally

- template: /eng/pipelines/templates/steps/cmake-build.yml
parameters:
ServiceDirectory: ${{ parameters.ServiceDirectory }}
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/stages/platform-matrix-live.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"include": [
{
"StaticConfigs": {
"macOS-11": {
"macOS-14": {
"Pool": "env:MACPOOL",
"OSVmImage": "env:MACVMIMAGE",
"VCPKG_DEFAULT_TRIPLET": "x64-osx",
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/stages/platform-matrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
"include": [
{
"OSConfiguration": {
"macOS-11": {
"macOS-14": {
"OSVmImage": "env:MACVMIMAGE",
"XCODE_VERSION": "12.5.1"
"XCODE_VERSION": "15.0.1"
}
},
"StaticConfigs": {
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/templates/variables/image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ variables:
- name: WINDOWSPREVIOUSVMIMAGE
value: azsdk-pool-mms-win-2019-1espt
- name: MACVMIMAGE
value: macos-11
value: macOS-14

# Values required for pool.os field in 1es pipeline templates
- name: LINUXOS
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ namespace Azure { namespace Core { namespace Test {
// Using a reference because the context lives in the test_base class and we don't want to make
// a copy.
Azure::Core::Test::TestContextManager& m_testContext;
const std::string m_proxy = "https://localhost:5001";
const std::string m_proxy = "http://localhost:5000";
bool m_isInsecureEnabled = true;
TestMode m_currentMode = TestMode::LIVE;
std::unique_ptr<Azure::Core::Http::_internal::HttpPipeline> m_privatePipeline;
Expand Down
2 changes: 2 additions & 0 deletions sdk/core/azure-core/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@

### Other Changes

- Updated JSON library to 3.11.3.

## 1.13.0-beta.1 (2024-06-06)

### Bugs Fixed
Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The library allows client libraries to expose common functionality in a consiste

## Getting started

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`.
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`.

### Include the package

Expand Down
2 changes: 1 addition & 1 deletion sdk/core/azure-core/cgmanifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"Type": "git",
"git": {
"RepositoryUrl": "https://github.com/nlohmann/json",
"CommitHash": "db78ac1d7716f56fc9f1b030b715f872f93964e4"
"CommitHash": "9cca280a4d0ccf0c08f47a99aa71d1b0e52f8d03"
}
},
"DevelopmentDependency": false
Expand Down
Loading