Skip to content

Commit b304acd

Browse files
tannergoodingtannergooding
authored
Merge branch 'main' into excludeintrinsics
2 parents 7bcf3ae + e1a4e13 commit b304acd

234 files changed

Lines changed: 1921 additions & 1980 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.

‎.github/workflows/ci.yml‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
configuration: [ debug, release ]
1717
os: [ windows ]
1818
steps:
19-
- uses: actions/checkout@v3
19+
- uses: actions/checkout@v4
2020
- run: ./scripts/cibuild.cmd -configuration ${{ matrix.configuration }} -architecture ${{ matrix.architecture }}
2121
shell: cmd
22-
- uses: actions/upload-artifact@v3
22+
- uses: actions/upload-artifact@v4
2323
with:
2424
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
2525
path: |
@@ -36,10 +36,10 @@ jobs:
3636
configuration: [ debug, release ]
3737
os: [ ubuntu ]
3838
steps:
39-
- uses: actions/checkout@v3
39+
- uses: actions/checkout@v4
4040
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
4141
shell: bash
42-
- uses: actions/upload-artifact@v3
42+
- uses: actions/upload-artifact@v4
4343
with:
4444
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
4545
path: |
@@ -56,10 +56,10 @@ jobs:
5656
configuration: [ debug, release ]
5757
os: [ macos ]
5858
steps:
59-
- uses: actions/checkout@v3
59+
- uses: actions/checkout@v4
6060
- run: ./scripts/cibuild.sh --configuration ${{ matrix.configuration }} --architecture ${{ matrix.architecture }}
6161
shell: bash
62-
- uses: actions/upload-artifact@v3
62+
- uses: actions/upload-artifact@v4
6363
with:
6464
name: ${{ matrix.os }}_${{ matrix.configuration }}_${{ matrix.architecture }}
6565
path: |
@@ -71,13 +71,13 @@ jobs:
7171
build-nuget-preview:
7272
runs-on: windows-latest
7373
steps:
74-
- uses: actions/checkout@v3
74+
- uses: actions/checkout@v4
7575
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
7676
shell: cmd
7777
env:
7878
EXCLUDE_RUN_ID_FROM_PACKAGE: true
7979
EXCLUDE_SUFFIX_FROM_VERSION: false
80-
- uses: actions/upload-artifact@v3
80+
- uses: actions/upload-artifact@v4
8181
with:
8282
name: nuget_preview
8383
path: |
@@ -93,17 +93,17 @@ jobs:
9393
permissions:
9494
id-token: write
9595
steps:
96-
- uses: actions/checkout@v3
97-
- uses: actions/download-artifact@v3
96+
- uses: actions/checkout@v4
97+
- uses: actions/download-artifact@v4
9898
with:
9999
name: nuget_preview
100100
path: ./artifacts
101-
- uses: actions/setup-dotnet@v3
101+
- uses: actions/setup-dotnet@v4
102102
with:
103103
global-json-file: ./global.json
104-
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.23530.1
104+
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.24170.3
105105
- run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name ".NET Foundation" --description "ClangSharp" --description-url "https://github.com/dotnet/clangsharp" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}" --azure-key-vault-client-id "${{ secrets.SC_AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.SC_AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.SC_AZURE_TENANT_ID }}" --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}"
106-
- uses: actions/upload-artifact@v3
106+
- uses: actions/upload-artifact@v4
107107
with:
108108
name: sign_nuget_preview
109109
path: |
@@ -112,13 +112,13 @@ jobs:
112112
build-nuget-release:
113113
runs-on: windows-latest
114114
steps:
115-
- uses: actions/checkout@v3
115+
- uses: actions/checkout@v4
116116
- run: ./scripts/cibuild.cmd -configuration release -architecture x64
117117
shell: cmd
118118
env:
119119
EXCLUDE_RUN_ID_FROM_PACKAGE: true
120120
EXCLUDE_SUFFIX_FROM_VERSION: true
121-
- uses: actions/upload-artifact@v3
121+
- uses: actions/upload-artifact@v4
122122
with:
123123
name: nuget_release
124124
path: |
@@ -134,17 +134,17 @@ jobs:
134134
permissions:
135135
id-token: write
136136
steps:
137-
- uses: actions/checkout@v3
138-
- uses: actions/download-artifact@v3
137+
- uses: actions/checkout@v4
138+
- uses: actions/download-artifact@v4
139139
with:
140140
name: nuget_release
141141
path: ./artifacts
142-
- uses: actions/setup-dotnet@v3
142+
- uses: actions/setup-dotnet@v4
143143
with:
144144
global-json-file: ./global.json
145-
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.23530.1
145+
- run: dotnet tool install --tool-path ./artifacts/tools sign --version 0.9.1-beta.24170.3
146146
- run: ./artifacts/tools/sign code azure-key-vault "**/*.nupkg" --timestamp-url "http://timestamp.digicert.com" --base-directory "${{ github.workspace }}/artifacts/pkg" --file-list "${{ github.workspace }}/scripts/SignClientFileList.txt" --publisher-name ".NET Foundation" --description "ClangSharp" --description-url "https://github.com/dotnet/clangsharp" --azure-key-vault-certificate "${{ secrets.SC_KEY_VAULT_CERTIFICATE_ID }}" --azure-key-vault-client-id "${{ secrets.SC_AZURE_CLIENT_ID }}" --azure-key-vault-client-secret "${{ secrets.SC_AZURE_CLIENT_SECRET }}" --azure-key-vault-tenant-id "${{ secrets.SC_AZURE_TENANT_ID }}" --azure-key-vault-url "${{ secrets.SC_KEY_VAULT_URL }}"
147-
- uses: actions/upload-artifact@v3
147+
- uses: actions/upload-artifact@v4
148148
with:
149149
name: sign_nuget_release
150150
path: |
@@ -155,13 +155,13 @@ jobs:
155155
if: ${{ github.event_name == 'push' }}
156156
needs: [ windows-x64, linux-x64, macos-x64, sign-nuget-preview, sign-nuget-release ]
157157
steps:
158-
- uses: actions/download-artifact@v3
158+
- uses: actions/download-artifact@v4
159159
with:
160160
name: windows_release_x64
161161
path: ./artifacts
162-
- uses: actions/setup-dotnet@v3
162+
- uses: actions/setup-dotnet@v4
163163
with:
164-
dotnet-version: '6.0.x'
164+
dotnet-version: '8.0.x'
165165
source-url: https://pkgs.clangsharp.dev/index.json
166166
env:
167167
NUGET_AUTH_TOKEN: ${{ secrets.AZURE_DEVOPS_PAT }}
@@ -171,11 +171,11 @@ jobs:
171171
if: false
172172
needs: [ windows-x64, linux-x64, macos-x64, sign-nuget-preview, sign-nuget-release ]
173173
steps:
174-
- uses: actions/download-artifact@v3
174+
- uses: actions/download-artifact@v4
175175
with:
176176
name: windows_release_x64
177177
path: ./artifacts
178-
- uses: actions/setup-dotnet@v3
178+
- uses: actions/setup-dotnet@v4
179179
with:
180-
dotnet-version: '6.0.x'
180+
dotnet-version: '8.0.x'
181181
- run: dotnet nuget push "./artifacts/pkg/Release/*.nupkg" --source https://nuget.pkg.github.com/dotnet/index.json --api-key ${{ secrets.GITHUB_TOKEN }} --skip-duplicate

‎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 17.0.4)
3+
project(ClangSharp VERSION 18.1.3)
44

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

‎Directory.Build.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<!-- Default settings that explicitly differ from the Sdk.props defaults -->
2121
<PropertyGroup>
2222
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
23-
<AnalysisLevel>preview-all</AnalysisLevel>
23+
<AnalysisLevel>latest-all</AnalysisLevel>
2424
<BaseIntermediateOutputPath>$(BaseArtifactsPath)obj/$(BaseArtifactsPathSuffix)/</BaseIntermediateOutputPath>
2525
<DebugType>embedded</DebugType>
2626
<EnableDefaultNoneItems>false</EnableDefaultNoneItems>
@@ -42,12 +42,12 @@
4242
<BaseOutputPath>$(BaseArtifactsPath)bin/$(BaseArtifactsPathSuffix)/</BaseOutputPath>
4343
<Company>.NET Foundation</Company>
4444
<ContinuousIntegrationBuild Condition="'$(GITHUB_RUN_ID)' != ''">true</ContinuousIntegrationBuild>
45-
<EnforceCodeStyleInBuild>false</EnforceCodeStyleInBuild>
45+
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
4646
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
4747
<PackageValidationBaselineVersion>17.0.0</PackageValidationBaselineVersion>
4848
<Product>ClangSharp</Product>
4949
<RootNamespace>ClangSharp</RootNamespace>
50-
<VersionPrefix>17.0.2</VersionPrefix>
50+
<VersionPrefix>18.1.0</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: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212

1313
<!-- Package versions for package references across all projects -->
1414
<ItemGroup>
15-
<PackageVersion Include="libClang" Version="17.0.4" />
16-
<PackageVersion Include="libClangSharp" Version="17.0.4" />
17-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
18-
<PackageVersion Include="NUnit" Version="3.14.0" />
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" />
1919
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
2020
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
2121
</ItemGroup>

‎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/17.0.4); 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/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).
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-17.0.4 https://github.com/llvm/llvm-project
80+
git clone --single-branch --branch llvmorg-18.1.3 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-17.0.4 https://github.com/llvm/llvm-project
104+
git clone --single-branch --branch llvmorg-18.1.3 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 17.0.0
136+
dotnet tool install --global ClangSharpPInvokeGenerator --version 18.1.0
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>17.0.4</version>
5+
<version>18.1.3.1</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>17.0.4</version>
5+
<version>18.1.3.1</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>17.0.4</version>
5+
<version>18.1.3.1</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: 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-x64</id>
5-
<version>17.0.4</version>
5+
<version>18.1.3.1</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

‎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>17.0.4</version>
5+
<version>18.1.3.1</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

0 commit comments

Comments
 (0)