Skip to content

Commit fb4e9dd

Browse files
tannergoodingtannergooding
committed
Fixup libClang and libClangSharp to use versions that target the downlevel C runtimes for portability
1 parent aaf42c2 commit fb4e9dd

File tree

16 files changed

+48
-23
lines changed

16 files changed

+48
-23
lines changed

‎Directory.Packages.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
<!-- Package versions for package references across all projects -->
1414
<ItemGroup>
15-
<PackageVersion Include="libClang" Version="18.1.3.1" />
16-
<PackageVersion Include="libClangSharp" Version="18.1.3" />
15+
<PackageVersion Include="libClang" Version="18.1.3.2" />
16+
<PackageVersion Include="libClangSharp" Version="18.1.3.1" />
1717
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
1818
<PackageVersion Include="NUnit" Version="4.1.0" />
1919
<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />

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

+1-1
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</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

+1-1
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</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

+1-1
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</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

+1-1
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>18.1.3</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

+1-1
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</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-x64/libClangSharp.runtime.win-x64.nuspec

+1-1
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</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/libClangSharp.nuspec

+1-1
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</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.json

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,32 @@
22
"runtimes": {
33
"linux-arm64": {
44
"libClangSharp": {
5-
"libClangSharp.runtime.linux-arm64": "18.1.3"
5+
"libClangSharp.runtime.linux-arm64": "18.1.3.1"
66
}
77
},
88
"linux-x64": {
99
"libClangSharp": {
10-
"libClangSharp.runtime.linux-x64": "18.1.3"
10+
"libClangSharp.runtime.linux-x64": "18.1.3.1"
1111
}
1212
},
1313
"osx-arm64": {
1414
"libClangSharp": {
15-
"libClangSharp.runtime.osx-arm64": "18.1.3"
15+
"libClangSharp.runtime.osx-arm64": "18.1.3.1"
1616
}
1717
},
1818
"osx-x64": {
1919
"libClangSharp": {
20-
"libClangSharp.runtime.osx-x64": "18.1.3"
20+
"libClangSharp.runtime.osx-x64": "18.1.3.1"
2121
}
2222
},
2323
"win-arm64": {
2424
"libClangSharp": {
25-
"libClangSharp.runtime.win-arm64": "18.1.3"
25+
"libClangSharp.runtime.win-arm64": "18.1.3.1"
2626
}
2727
},
2828
"win-x64": {
2929
"libClangSharp": {
30-
"libClangSharp.runtime.win-x64": "18.1.3"
30+
"libClangSharp.runtime.win-x64": "18.1.3.1"
3131
}
3232
}
3333
}

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

+1-1
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>libclang.runtime.linux-arm64</id>
5-
<version>18.1.3</version>
5+
<version>18.1.3.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

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

+1-1
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>libclang.runtime.linux-x64</id>
5-
<version>18.1.3</version>
5+
<version>18.1.3.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

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

+1-1
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>libclang.runtime.win-x64</id>
5-
<version>18.1.3.1</version>
5+
<version>18.1.3.2</version>
66
<authors>.NET Foundation and Contributors</authors>
77
<owners>.NET Foundation and Contributors</owners>
88
<requireLicenseAcceptance>true</requireLicenseAcceptance>

‎packages/libclang/libclang/libclang.nuspec

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

‎packages/libclang/libclang/runtime.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
"runtimes": {
33
"linux-arm64": {
44
"libclang": {
5-
"libclang.runtime.linux-arm64": "18.1.3"
5+
"libclang.runtime.linux-arm64": "18.1.3.2"
66
}
77
},
88
"linux-x64": {
99
"libclang": {
10-
"libclang.runtime.linux-x64": "18.1.3"
10+
"libclang.runtime.linux-x64": "18.1.3.2"
1111
}
1212
},
1313
"osx-arm64": {
@@ -27,7 +27,7 @@
2727
},
2828
"win-x64": {
2929
"libclang": {
30-
"libclang.runtime.win-x64": "18.1.3.1"
30+
"libclang.runtime.win-x64": "18.1.3.2"
3131
}
3232
}
3333
}

‎sources/ClangSharp.Interop/Extensions/CXCursor.cs

+18-1
Original file line numberDiff line numberDiff line change
@@ -802,7 +802,20 @@ public readonly string DeclKindSpelling
802802

803803
public readonly CXCursor DecomposedDecl => clangsharp.Cursor_getDecomposedDecl(this);
804804

805-
public readonly CXCursor DefaultArg => clangsharp.Cursor_getDefaultArg(this);
805+
public readonly CXCursor DefaultArg
806+
{
807+
get
808+
{
809+
if (DeclKind == CX_DeclKind_ParmVar)
810+
{
811+
if (HasUnparsedDefaultArg || HasUninstantiatedDefaultArg)
812+
{
813+
return CXCursor.Null;
814+
}
815+
}
816+
return clangsharp.Cursor_getDefaultArg(this);
817+
}
818+
}
806819

807820
public readonly CXType DefaultArgType => clangsharp.Cursor_getDefaultArgType(this);
808821

@@ -888,6 +901,10 @@ public readonly string DeclKindSpelling
888901

889902
public readonly bool HasTemplateKeyword => clangsharp.Cursor_getHasTemplateKeyword(this) != 0;
890903

904+
public readonly bool HasUninstantiatedDefaultArg => clangsharp.Cursor_getHasUninstantiatedDefaultArg(this) != 0;
905+
906+
public readonly bool HasUnparsedDefaultArg => clangsharp.Cursor_getHasUnparsedDefaultArg(this) != 0;
907+
891908
public readonly bool HasUserDeclaredConstructor => clangsharp.Cursor_getHasUserDeclaredConstructor(this) != 0;
892909

893910
public readonly bool HasUserDeclaredCopyAssignment => clangsharp.Cursor_getHasUserDeclaredCopyAssignment(this) != 0;

‎sources/ClangSharp.Interop/clangsharp/clangsharp.cs

+8
Original file line numberDiff line numberDiff line change
@@ -270,6 +270,14 @@ public static partial class @clangsharp
270270
[return: NativeTypeName("unsigned int")]
271271
public static extern uint Cursor_getHasDefaultArg(CXCursor C);
272272

273+
[DllImport("libClangSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "clangsharp_Cursor_getHasUnparsedDefaultArg", ExactSpelling = true)]
274+
[return: NativeTypeName("unsigned int")]
275+
public static extern uint Cursor_getHasUnparsedDefaultArg(CXCursor C);
276+
277+
[DllImport("libClangSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "clangsharp_Cursor_getHasUninstantiatedDefaultArg", ExactSpelling = true)]
278+
[return: NativeTypeName("unsigned int")]
279+
public static extern uint Cursor_getHasUninstantiatedDefaultArg(CXCursor C);
280+
273281
[DllImport("libClangSharp", CallingConvention = CallingConvention.Cdecl, EntryPoint = "clangsharp_Cursor_getHasElseStorage", ExactSpelling = true)]
274282
[return: NativeTypeName("unsigned int")]
275283
public static extern uint Cursor_getHasElseStorage(CXCursor C);

0 commit comments

Comments
 (0)