Skip to content

Commit b05da88

Browse files
Merge branch 'main' into fix/sdk-docker-file-ownership
Keep trunk's generator and runtime upgrades, and keep docker-run as the place that chooses the container user. Co-authored-by: Cursor <cursoragent@cursor.com>
2 parents 0bf3f8c + 7459ff8 commit b05da88

1,640 files changed

Lines changed: 21505 additions & 18699 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.

‎composer.lock‎

Lines changed: 40 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎sdks/dotnet/.github/workflows/github-actions.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,9 @@ jobs:
6161
- name: Setup .NET
6262
uses: actions/setup-dotnet@v3
6363
with:
64-
dotnet-version: 8.0.x
64+
dotnet-version: |
65+
8.0.x
66+
10.0.x
6567
6668
- name: Restore dependencies
6769
run: dotnet restore ${SOLUTION}.sln

‎sdks/dotnet/README.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ directory that corresponds to the file you want updated.
2323
This C# SDK is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
2424

2525
- API version: 3.0.0
26-
- SDK version: 2.2-dev
27-
- Generator version: 7.12.0
26+
- SDK version: 2.6-dev
27+
- Generator version: 7.26.0
2828
- Build package: org.openapitools.codegen.languages.CSharpClientCodegen
2929

3030
### Building
@@ -45,6 +45,9 @@ this command.
4545

4646
<a id="frameworks-supported"></a>
4747
## Frameworks supported
48+
- .NET 8.0 or later (the package includes `net8.0` and `net10.0` builds)
49+
50+
Building the SDK from source works with the .NET 8 SDK (`net8.0` build) or the .NET 10 SDK (`net8.0` and `net10.0` builds).
4851

4952
<a id="dependencies"></a>
5053
## Dependencies

‎sdks/dotnet/VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2.2-dev
1+
2.6-dev

‎sdks/dotnet/bin/dotnet‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ exec "${DIR}/../../../bin/docker-run" \
1515
-e HOME=/tmp/home \
1616
-e NUGET_PACKAGES=/tmp/nuget \
1717
-w "${WORKING_DIR}" \
18-
mcr.microsoft.com/dotnet/sdk:8.0 "$@"
18+
"${DOTNET_IMAGE:-mcr.microsoft.com/dotnet/sdk:10.0}" "$@"

‎sdks/dotnet/composer.lock‎

Lines changed: 33 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)