Skip to content

Commit 913ab1f

Browse files
Merge pull request #596 from tannergooding/main
Rengerate bindings for libClang 20.1.2
2 parents e00d1c2 + 25ad8de commit 913ab1f

File tree

160 files changed

+965
-693
lines changed

Some content is hidden

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

160 files changed

+965
-693
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ jobs:
4848
./artifacts/pkg/**/*
4949
./artifacts/tst/**/*
5050
if-no-files-found: error
51-
macos-x64:
51+
macos-arm64:
5252
runs-on: ${{ matrix.os }}-latest
5353
strategy:
5454
matrix:
55-
architecture: [ x64 ]
55+
architecture: [ arm64 ]
5656
configuration: [ debug, release ]
5757
os: [ macos ]
5858
steps:
@@ -153,7 +153,7 @@ jobs:
153153
publish-nightlies-azure:
154154
runs-on: ubuntu-latest
155155
if: ${{ github.event_name == 'push' }}
156-
needs: [ windows-x64, linux-x64, macos-x64, sign-nuget-preview, sign-nuget-release ]
156+
needs: [ windows-x64, linux-x64, macos-arm64, sign-nuget-preview, sign-nuget-release ]
157157
steps:
158158
- uses: actions/download-artifact@v4
159159
with:
@@ -169,7 +169,7 @@ jobs:
169169
publish-nightlies-github:
170170
runs-on: ubuntu-latest
171171
if: false
172-
needs: [ windows-x64, linux-x64, macos-x64, sign-nuget-preview, sign-nuget-release ]
172+
needs: [ windows-x64, linux-x64, macos-arm64, sign-nuget-preview, sign-nuget-release ]
173173
steps:
174174
- uses: actions/download-artifact@v4
175175
with:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.13)
22

3-
project(ClangSharp VERSION 18.1.3)
3+
project(ClangSharp VERSION 20.1.2)
44

55
set(CMAKE_CXX_STANDARD 17)
66
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<PackageValidationBaselineVersion>17.0.0</PackageValidationBaselineVersion>
4848
<Product>ClangSharp</Product>
4949
<RootNamespace>ClangSharp</RootNamespace>
50-
<VersionPrefix>18.1.0.4</VersionPrefix>
50+
<VersionPrefix>20.1.2</VersionPrefix>
5151
<VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc1</VersionSuffix>
5252
<VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
5353
</PropertyGroup>

Directory.Packages.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
<!-- Package versions for package references across all projects -->
1414
<ItemGroup>
15-
<PackageVersion Include="libClang" Version="18.1.3.2" />
16-
<PackageVersion Include="libClangSharp" Version="18.1.3.1" />
17-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
18-
<PackageVersion Include="NUnit" Version="4.1.0" />
19-
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
15+
<PackageVersion Include="libClang" Version="20.1.2" />
16+
<PackageVersion Include="libClangSharp" Version="20.1.2" />
17+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
18+
<PackageVersion Include="NUnit" Version="4.3.2" />
19+
<PackageVersion Include="NUnit3TestAdapter" Version="5.0.0" />
2020
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
2121
</ItemGroup>
2222

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ A convenience package which provides the native libClang library for several pla
1313

1414
A helper package which exposes many Clang APIs missing from libClang is provided here: https://www.nuget.org/packages/libClangSharp
1515

16-
**NOTE:** libclang and libClangSharp are meta-packages which point to the platform-specific runtime packages ([e.g.](https://www.nuget.org/packages/libClangSharp.runtime.win-x64/18.1.3); see others owned by [tannergooding](https://www.nuget.org/profiles/tannergooding)). Several manual steps may be required to use them, see discussion in [#46](https://github.com/dotnet/ClangSharp/issues/46) and [#118](https://github.com/dotnet/ClangSharp/issues/118).
16+
**NOTE:** libclang and libClangSharp are meta-packages which point to the platform-specific runtime packages ([e.g.](https://www.nuget.org/packages/libClangSharp.runtime.win-x64/20.1.2); see others owned by [tannergooding](https://www.nuget.org/profiles/tannergooding)). Several manual steps may be required to use them, see discussion in [#46](https://github.com/dotnet/ClangSharp/issues/46) and [#118](https://github.com/dotnet/ClangSharp/issues/118).
1717

1818
Nightly packages are available via the NuGet Feed URL: https://pkgs.clangsharp.dev/index.json
1919

@@ -77,7 +77,7 @@ To successfully build `libClangSharp` you must first build Clang (https://clang.
7777

7878
The process done on Windows is roughly:
7979
```cmd
80-
git clone --single-branch --branch llvmorg-18.1.3 https://github.com/llvm/llvm-project
80+
git clone --single-branch --branch llvmorg-20.1.2 https://github.com/llvm/llvm-project
8181
cd llvm-project
8282
mkdir artifacts/bin
8383
cd artifacts/bin
@@ -101,7 +101,7 @@ You can then open `libClangSharp.sln` in Visual Studio, change the configuration
101101

102102
The process done on Linux is roughly:
103103
```bash
104-
git clone --single-branch --branch llvmorg-18.1.3 https://github.com/llvm/llvm-project
104+
git clone --single-branch --branch llvmorg-20.1.2 https://github.com/llvm/llvm-project
105105
cd llvm-project
106106
mkdir -p artifacts/bin
107107
cd artifacts/bin
@@ -133,7 +133,7 @@ This program will take a given set of C or C++ header files and generate C# bind
133133

134134
The simplest and recommended setup is to install the generator as a .NET tool and then use response files:
135135
```
136-
dotnet tool install --global ClangSharpPInvokeGenerator --version 18.1.0
136+
dotnet tool install --global ClangSharpPInvokeGenerator --version 20.1.2
137137
ClangSharpPInvokeGenerator @generate.rsp
138138
```
139139

packages/libClangSharp/libClangSharp.runtime.linux-arm64/libClangSharp.runtime.linux-arm64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libClangSharp.runtime.linux-arm64</id>
5-
<version>18.1.3.1</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

packages/libClangSharp/libClangSharp.runtime.linux-x64/libClangSharp.runtime.linux-x64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libClangSharp.runtime.linux-x64</id>
5-
<version>18.1.3.1</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

packages/libClangSharp/libClangSharp.runtime.osx-arm64/libClangSharp.runtime.osx-arm64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libClangSharp.runtime.osx-arm64</id>
5-
<version>18.1.3.1</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

packages/libClangSharp/libClangSharp.runtime.osx-x64/libClangSharp.runtime.osx-x64.nuspec

Lines changed: 0 additions & 20 deletions
This file was deleted.

packages/libClangSharp/libClangSharp.runtime.win-arm64/libClangSharp.runtime.win-arm64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libClangSharp.runtime.win-arm64</id>
5-
<version>18.1.3.1</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

packages/libClangSharp/libClangSharp.runtime.win-x64/libClangSharp.runtime.win-x64.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libClangSharp.runtime.win-x64</id>
5-
<version>18.1.3.1</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

packages/libClangSharp/libClangSharp/libClangSharp.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libClangSharp</id>
5-
<version>18.1.3.1</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

packages/libClangSharp/libClangSharp/runtime.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,27 @@
22
"runtimes": {
33
"linux-arm64": {
44
"libClangSharp": {
5-
"libClangSharp.runtime.linux-arm64": "18.1.3.1"
5+
"libClangSharp.runtime.linux-arm64": "20.1.2"
66
}
77
},
88
"linux-x64": {
99
"libClangSharp": {
10-
"libClangSharp.runtime.linux-x64": "18.1.3.1"
10+
"libClangSharp.runtime.linux-x64": "20.1.2"
1111
}
1212
},
1313
"osx-arm64": {
1414
"libClangSharp": {
15-
"libClangSharp.runtime.osx-arm64": "18.1.3.1"
16-
}
17-
},
18-
"osx-x64": {
19-
"libClangSharp": {
20-
"libClangSharp.runtime.osx-x64": "18.1.3.1"
15+
"libClangSharp.runtime.osx-arm64": "20.1.2"
2116
}
2217
},
2318
"win-arm64": {
2419
"libClangSharp": {
25-
"libClangSharp.runtime.win-arm64": "18.1.3.1"
20+
"libClangSharp.runtime.win-arm64": "20.1.2"
2621
}
2722
},
2823
"win-x64": {
2924
"libClangSharp": {
30-
"libClangSharp.runtime.win-x64": "18.1.3.1"
25+
"libClangSharp.runtime.win-x64": "20.1.2"
3126
}
3227
}
3328
}

packages/libclang/libclang.runtime.linux-arm64/libclang.runtime.linux-arm64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libclang.runtime.linux-arm64</id>
5-
<version>18.1.3.2</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/clangsharp</projectUrl>
1111
<description>linux arm64 native library for libclang.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-20.1.2" />
1414
</metadata>
1515
<files>
1616
<file src="..\libclang\LICENSE.TXT" target="LICENSE.TXT" />

packages/libclang/libclang.runtime.linux-x64/libclang.runtime.linux-x64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libclang.runtime.linux-x64</id>
5-
<version>18.1.3.2</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/clangsharp</projectUrl>
1111
<description>linux x64 native library for libclang.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-20.1.2" />
1414
</metadata>
1515
<files>
1616
<file src="..\libclang\LICENSE.TXT" target="LICENSE.TXT" />

packages/libclang/libclang.runtime.osx-arm64/libclang.runtime.osx-arm64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libclang.runtime.osx-arm64</id>
5-
<version>18.1.3</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/clangsharp</projectUrl>
1111
<description>osx arm64 native library for libclang.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-20.1.2" />
1414
</metadata>
1515
<files>
1616
<file src="..\libclang\LICENSE.TXT" target="LICENSE.TXT" />

packages/libclang/libclang.runtime.osx-x64/libclang.runtime.osx-x64.nuspec

Lines changed: 0 additions & 19 deletions
This file was deleted.

packages/libclang/libclang.runtime.win-arm64/libclang.runtime.win-arm64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libclang.runtime.win-arm64</id>
5-
<version>18.1.3.1</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/clangsharp</projectUrl>
1111
<description>win arm64 native library for libclang.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-20.1.2" />
1414
</metadata>
1515
<files>
1616
<file src="..\libclang\LICENSE.TXT" target="LICENSE.TXT" />

packages/libclang/libclang.runtime.win-x64/libclang.runtime.win-x64.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libclang.runtime.win-x64</id>
5-
<version>18.1.3.2</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/clangsharp</projectUrl>
1111
<description>win x64 native library for libclang.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-20.1.2" />
1414
</metadata>
1515
<files>
1616
<file src="..\libclang\LICENSE.TXT" target="LICENSE.TXT" />

packages/libclang/libclang/libclang.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
33
<metadata minClientVersion="2.12">
44
<id>libclang</id>
5-
<version>18.1.3.2</version>
5+
<version>20.1.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>
99
<license type="expression">Apache-2.0 WITH LLVM-exception</license>
1010
<projectUrl>https://github.com/dotnet/clangsharp</projectUrl>
1111
<description>Multi-platform native library for libclang.</description>
1212
<copyright>Copyright © LLVM Project</copyright>
13-
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-18.1.3" />
13+
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-20.1.2" />
1414
<dependencies>
1515
<group targetFramework=".NETStandard2.0" />
1616
</dependencies>

packages/libclang/libclang/runtime.json

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,27 @@
22
"runtimes": {
33
"linux-arm64": {
44
"libclang": {
5-
"libclang.runtime.linux-arm64": "18.1.3.2"
5+
"libclang.runtime.linux-arm64": "20.1.2"
66
}
77
},
88
"linux-x64": {
99
"libclang": {
10-
"libclang.runtime.linux-x64": "18.1.3.2"
10+
"libclang.runtime.linux-x64": "20.1.2"
1111
}
1212
},
1313
"osx-arm64": {
1414
"libclang": {
15-
"libclang.runtime.osx-arm64": "18.1.3"
16-
}
17-
},
18-
"osx-x64": {
19-
"libclang": {
20-
"libclang.runtime.osx-x64": "18.1.3"
15+
"libclang.runtime.osx-arm64": "20.1.2"
2116
}
2217
},
2318
"win-arm64": {
2419
"libclang": {
25-
"libclang.runtime.win-arm64": "18.1.3.1"
20+
"libclang.runtime.win-arm64": "20.1.2"
2621
}
2722
},
2823
"win-x64": {
2924
"libclang": {
30-
"libclang.runtime.win-x64": "18.1.3.2"
25+
"libclang.runtime.win-x64": "20.1.2"
3126
}
3227
}
3328
}

0 commit comments

Comments
 (0)