Skip to content

Commit b74de81

Browse files
gavinbarronCopilot
andcommitted
fix: resolve merge conflicts with main
Take the higher version for each conflicting package: - aiohttp: 3.13.5 (dependabot), anyio: 4.13.0 (dependabot), attrs: 26.1.0 (dependabot) - azure-core: 1.41.0 (main), azure-identity: 1.25.3 (main) - cryptography: 48.0.0 (dependabot), Deprecated: 1.3.1 (main), dill: 0.4.1 (dependabot) - opentelemetry-*: 1.42.0/0.63b0 (dependabot), packaging: 26.2 (main) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
2 parents 56c3394 + 872f0d7 commit b74de81

1,871 files changed

Lines changed: 124249 additions & 4593 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.

.azurepipelines/build.yml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
trigger: none
2+
pr: none
3+
4+
schedules:
5+
- cron: '0 0 * * *'
6+
displayName: Daily builds
7+
branches:
8+
include:
9+
- main
10+
always: true
11+
12+
resources:
13+
repositories:
14+
- repository: 1ESPipelineTemplates
15+
type: git
16+
name: 1ESPipelineTemplates/1ESPipelineTemplates
17+
ref: refs/tags/release
18+
19+
extends:
20+
template: v1/1ES.Unofficial.PipelineTemplate.yml@1ESPipelineTemplates
21+
parameters:
22+
pool:
23+
name: Azure-Pipelines-1ESPT-ExDShared
24+
os: linux
25+
sdl:
26+
sourceAnalysisPool:
27+
name: Azure-Pipelines-1ESPT-ExDShared
28+
image: windows-2022
29+
os: windows
30+
credscan:
31+
enabled: true
32+
policheck:
33+
enabled: true
34+
binskim:
35+
enabled: true
36+
stages:
37+
- stage: Build
38+
jobs:
39+
- job: Build
40+
displayName: Build Python Beta SDK
41+
steps:
42+
- checkout: self
43+
submodules: recursive
44+
45+
- task: UsePythonVersion@0
46+
displayName: Set up Python
47+
inputs:
48+
versionSpec: '3.12'
49+
50+
- script: python -m pip install --upgrade pip
51+
displayName: Upgrade pip
52+
workingDirectory: $(Build.SourcesDirectory)
53+
54+
- script: pip install -e ".[dev]"
55+
displayName: Install dependencies
56+
workingDirectory: $(Build.SourcesDirectory)

.devcontainer/devcontainer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
{
44
"name": "Python 3",
55
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
6-
// "image": "mcr.microsoft.com/devcontainers/python:3.9-bookworm",
76
// "image": "mcr.microsoft.com/devcontainers/python:3.10-bookworm",
87
// "image": "mcr.microsoft.com/devcontainers/python:3.11-bookworm",
98
// "image": "mcr.microsoft.com/devcontainers/python:3.12-bookworm",
109
// "image": "mcr.microsoft.com/devcontainers/python:1-3.12-bullseye",
1110
//"image": "mcr.microsoft.com/devcontainers/python:3.13-bookworm",
12-
"image": "mcr.microsoft.com/devcontainers/python:3.13-bullseye",
11+
//"image": "mcr.microsoft.com/devcontainers/python:3.13-bullseye",
12+
"image": "mcr.microsoft.com/devcontainers/python:3.14-bookworm",
1313

1414
"features": {
1515

.github/workflows/auto-merge-dependabot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
steps:
1818
- name: Dependabot metadata
1919
id: metadata
20-
uses: dependabot/fetch-metadata@v2.4.0
20+
uses: dependabot/fetch-metadata@v3.1.0
2121
with:
2222
github-token: "${{ secrets.GITHUB_TOKEN }}"
2323

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
strategy:
1616
max-parallel: 5
1717
matrix:
18-
python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
18+
python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
1919
steps:
20-
- uses: actions/checkout@v5
20+
- uses: actions/checkout@v6
2121
- name: Set up Python ${{ matrix.python-version }}
2222
uses: actions/setup-python@v6
2323
with:

.github/workflows/codeql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545

4646
steps:
4747
- name: Checkout repository
48-
uses: actions/checkout@v5
48+
uses: actions/checkout@v6
4949

5050
# Initializes the CodeQL tools for scanning.
5151
- name: Initialize CodeQL

.github/workflows/project-auto-add.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
steps:
1919
- name: Generate token
2020
id: generate_token
21-
uses: actions/create-github-app-token@v2
21+
uses: actions/create-github-app-token@v3
2222
with:
2323
app-id: ${{ secrets.GRAPHBOT_APP_ID }}
2424
private-key: ${{ secrets.GRAPHBOT_APP_PEM }}

.github/workflows/publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
needs: [build]
1818
steps:
1919
- name: Checkout code
20-
uses: actions/checkout@v5
20+
uses: actions/checkout@v6
2121
- name: Set up Python
2222
uses: actions/setup-python@v6
2323
with:

.github/workflows/release-please-gha.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,17 @@ jobs:
1919
release:
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323

2424
- name: Generate GitHub App token
2525
id: app-token
26-
uses: actions/create-github-app-token@v2
26+
uses: actions/create-github-app-token@v3
2727
with:
2828
app-id: ${{ vars.RELEASE_PLEASE_TOKEN_PROVIDER_APP_ID }}
2929
private-key: ${{ secrets.RELEASE_PLEASE_TOKEN_PROVIDER_PEM }}
3030

3131
- name: Release Please
32-
uses: googleapis/release-please-action@v4
32+
uses: googleapis/release-please-action@v5
3333
with:
3434
token: ${{ steps.app-token.outputs.token }}
3535
config-file: release-please-config.json

.release-please-manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.56.0"
2+
".": "1.59.0"
33
}

CHANGELOG.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,29 @@
22

33
All notable changes to this project will be documented in this file.
44

5+
## [1.59.0](https://github.com/microsoftgraph/msgraph-beta-sdk-python/compare/v1.58.0...v1.59.0) (2026-05-06)
6+
7+
8+
### Features
9+
10+
* **generation:** update request builders and models ([40c2273](https://github.com/microsoftgraph/msgraph-beta-sdk-python/commit/40c22734c527c7c4a8b750310a7657c7cdb14453))
11+
* **generation:** update request builders and models ([50802ae](https://github.com/microsoftgraph/msgraph-beta-sdk-python/commit/50802aeb4ba071312821c220e73e21d1ecb3b94e))
12+
13+
## [1.58.0](https://github.com/microsoftgraph/msgraph-beta-sdk-python/compare/v1.57.0...v1.58.0) (2026-04-16)
14+
15+
16+
### Features
17+
18+
* **generation:** update request builders and models ([f671f30](https://github.com/microsoftgraph/msgraph-beta-sdk-python/commit/f671f30c6a0c87ab7bb70a8cf6c5c98784aaa281))
19+
* **generation:** update request builders and models ([89ed85b](https://github.com/microsoftgraph/msgraph-beta-sdk-python/commit/89ed85b3f1d5fa7435b8523bf9d4ec776bc0a544))
20+
21+
## [1.57.0](https://github.com/microsoftgraph/msgraph-beta-sdk-python/compare/v1.56.0...v1.57.0) (2026-03-19)
22+
23+
24+
### Features
25+
26+
* **generation:** update request builders and models ([4cd4397](https://github.com/microsoftgraph/msgraph-beta-sdk-python/commit/4cd43970a86385e30991d8dad048a7e3950bff71))
27+
528
## [1.56.0](https://github.com/microsoftgraph/msgraph-beta-sdk-python/compare/v1.55.0...v1.56.0) (2026-02-19)
629

730

0 commit comments

Comments
 (0)