Merge pull request #456 from tannergooding/main

Updating to libClang v16.0.6

Author: tannergooding

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13)
 
-project(ClangSharp VERSION 15.0.0)
+project(ClangSharp VERSION 16.0.6)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

ClangSharp.sln

@@ -70,11 +70,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang", "libclang", "{C8
 		packages\libclang\libclang\runtime.json = packages\libclang\libclang\runtime.json
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.freebsd.12-x64", "libclang.runtime.freebsd.12-x64", "{C90094F6-26DF-4B2C-BD61-540D4CE988A4}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libclang\libclang.runtime.freebsd.12-x64\libclang.runtime.freebsd.12-x64.nuspec = packages\libclang\libclang.runtime.freebsd.12-x64\libclang.runtime.freebsd.12-x64.nuspec
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.linux-arm64", "libclang.runtime.linux-arm64", "{7D89072F-8E3E-4009-BCCD-5D3C69F88042}"
 	ProjectSection(SolutionItems) = preProject
 		packages\libclang\libclang.runtime.linux-arm64\libclang.runtime.linux-arm64.nuspec = packages\libclang\libclang.runtime.linux-arm64\libclang.runtime.linux-arm64.nuspec
@@ -85,11 +80,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.osx-x64",
 		packages\libclang\libclang.runtime.osx-x64\libclang.runtime.osx-x64.nuspec = packages\libclang\libclang.runtime.osx-x64\libclang.runtime.osx-x64.nuspec
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.ubuntu.18.04-x64", "libclang.runtime.ubuntu.18.04-x64", "{8756B75F-F244-43AD-9C79-1610059BDF36}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libclang\libclang.runtime.ubuntu.18.04-x64\libclang.runtime.ubuntu.18.04-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.18.04-x64\libclang.runtime.ubuntu.18.04-x64.nuspec
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.win-x64", "libclang.runtime.win-x64", "{4A298C7E-BF4D-418D-B70D-FE6D6F8097FD}"
 	ProjectSection(SolutionItems) = preProject
 		packages\libclang\libclang.runtime.win-x64\libclang.runtime.win-x64.nuspec = packages\libclang\libclang.runtime.win-x64\libclang.runtime.win-x64.nuspec
@@ -108,11 +98,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp", "libClangSh
 		packages\libClangSharp\libClangSharp\runtime.json = packages\libClangSharp\libClangSharp\runtime.json
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.freebsd.12-x64", "libClangSharp.runtime.freebsd.12-x64", "{8DCBB5E9-A44C-462F-B9FE-418B18EC7E31}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libClangSharp\libClangSharp.runtime.freebsd.12-x64\libClangSharp.runtime.freebsd.12-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.freebsd.12-x64\libClangSharp.runtime.freebsd.12-x64.nuspec
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.linux-arm64", "libClangSharp.runtime.linux-arm64", "{4F2F7171-202E-4E23-AABF-EB3501BDB0B2}"
 	ProjectSection(SolutionItems) = preProject
 		packages\libClangSharp\libClangSharp.runtime.linux-arm64\libClangSharp.runtime.linux-arm64.nuspec = packages\libClangSharp\libClangSharp.runtime.linux-arm64\libClangSharp.runtime.linux-arm64.nuspec
@@ -123,16 +108,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.osx-x
 		packages\libClangSharp\libClangSharp.runtime.osx-x64\libClangSharp.runtime.osx-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.osx-x64\libClangSharp.runtime.osx-x64.nuspec
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.ubuntu.18.04-x64", "libClangSharp.runtime.ubuntu.18.04-x64", "{A04F314B-2373-496E-879F-763B5C8EAF00}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libClangSharp\libClangSharp.runtime.ubuntu.18.04-x64\libClangSharp.runtime.ubuntu.18.04-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.ubuntu.18.04-x64\libClangSharp.runtime.ubuntu.18.04-x64.nuspec
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.ubuntu.20.04-x64", "libClangSharp.runtime.ubuntu.20.04-x64", "{21997B0D-AE07-4F1E-8042-84EB399269D5}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libClangSharp\libClangSharp.runtime.ubuntu.20.04-x64\libClangSharp.runtime.ubuntu.20.04-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.ubuntu.20.04-x64\libClangSharp.runtime.ubuntu.20.04-x64.nuspec
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.win-x64", "libClangSharp.runtime.win-x64", "{C1218464-0B5A-480E-BA13-2C6EA370987E}"
 	ProjectSection(SolutionItems) = preProject
 		packages\libClangSharp\libClangSharp.runtime.win-x64\libClangSharp.runtime.win-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.win-x64\libClangSharp.runtime.win-x64.nuspec
@@ -164,43 +139,18 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp", "libClangSh
 		sources\libClangSharp\CXType.h = sources\libClangSharp\CXType.h
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.ubuntu.20.04-x64", "libclang.runtime.ubuntu.20.04-x64", "{DD1C0393-4144-4A08-AD27-C98DC1A85023}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libclang\libclang.runtime.ubuntu.20.04-x64\libclang.runtime.ubuntu.20.04-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.20.04-x64\libclang.runtime.ubuntu.20.04-x64.nuspec
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.ubuntu.22.04-x64", "libclang.runtime.ubuntu.22.04-x64", "{F3254760-351E-4886-A243-FF3778837C40}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libclang\libclang.runtime.ubuntu.22.04-x64\libclang.runtime.ubuntu.22.04-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.22.04-x64\libclang.runtime.ubuntu.22.04-x64.nuspec
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.win-arm64", "libclang.runtime.win-arm64", "{B3F3A831-DA09-40A2-A25C-DE47A58BB93B}"
 	ProjectSection(SolutionItems) = preProject
 		packages\libclang\libclang.runtime.win-arm64\libclang.runtime.win-arm64.nuspec = packages\libclang\libclang.runtime.win-arm64\libclang.runtime.win-arm64.nuspec
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.ubuntu.22.04-x64", "libClangSharp.runtime.ubuntu.22.04-x64", "{D90C3C52-DA8D-44BB-B8B0-3E4EF4CBF4DC}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libClangSharp\libClangSharp.runtime.ubuntu.22.04-x64\libClangSharp.runtime.ubuntu.22.04-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.ubuntu.22.04-x64\libClangSharp.runtime.ubuntu.22.04-x64.nuspec
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.win-arm64", "libClangSharp.runtime.win-arm64", "{69B805C6-230D-49A2-A569-3CAC2EC9F293}"
 	ProjectSection(SolutionItems) = preProject
 		packages\libClangSharp\libClangSharp.runtime.win-arm64\libClangSharp.runtime.win-arm64.nuspec = packages\libClangSharp\libClangSharp.runtime.win-arm64\libClangSharp.runtime.win-arm64.nuspec
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClangSharp.Interop", "sources\ClangSharp.Interop\ClangSharp.Interop.csproj", "{AADBAAC3-45F0-484F-BCB2-9809EDF1CA82}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.freebsd.13-x64", "libclang.runtime.freebsd.13-x64", "{8FD0223B-88AD-4FA9-AE29-0B446FF17922}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libclang\libclang.runtime.freebsd.13-x64\libclang.runtime.freebsd.13-x64.nuspec = packages\libclang\libclang.runtime.freebsd.13-x64\libclang.runtime.freebsd.13-x64.nuspec
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libClangSharp.runtime.freebsd.13-x64", "libClangSharp.runtime.freebsd.13-x64", "{B3A22C21-0699-4963-B665-F9AA74F0AF08}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libClangSharp\libClangSharp.runtime.freebsd.13-x64\libClangSharp.runtime.freebsd.13-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.freebsd.13-x64\libClangSharp.runtime.freebsd.13-x64.nuspec
-	EndProjectSection
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{FF42B475-5025-45BA-B278-60F29B53C023}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{034EBD16-E96F-4530-B37D-30B16C4E9876}"
@@ -270,30 +220,20 @@ Global
 		{9D29BA0E-79C6-484E-B630-86A9510F1B74} = {394E17BB-B1EA-4A98-98C8-78ACD44182FC}
 		{DFACF682-2673-4AE1-8F10-816D025C2D45} = {AE6CF12F-5CC3-463B-A74B-6CCAE26EE4EF}
 		{C8DB18BE-701A-46C4-98F9-2524914CB5DC} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
-		{C90094F6-26DF-4B2C-BD61-540D4CE988A4} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
 		{7D89072F-8E3E-4009-BCCD-5D3C69F88042} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
 		{8006B5D7-5E0E-4A0A-884F-62C5216144EE} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
-		{8756B75F-F244-43AD-9C79-1610059BDF36} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
 		{4A298C7E-BF4D-418D-B70D-FE6D6F8097FD} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
 		{98BDA79D-8D81-4381-B794-65BAF82349D4} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
 		{EDEC2130-DA14-4415-91A3-225733FB61F8} = {AE6CF12F-5CC3-463B-A74B-6CCAE26EE4EF}
 		{B043C50D-8B06-4663-943A-DEBB6CFACEA6} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
-		{8DCBB5E9-A44C-462F-B9FE-418B18EC7E31} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
 		{4F2F7171-202E-4E23-AABF-EB3501BDB0B2} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
 		{C2BE41E6-95E9-431A-9C49-923BD50692AB} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
-		{A04F314B-2373-496E-879F-763B5C8EAF00} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
-		{21997B0D-AE07-4F1E-8042-84EB399269D5} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
 		{C1218464-0B5A-480E-BA13-2C6EA370987E} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
 		{6DF42BA2-F962-4BFC-9444-D0FD53D022B0} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
 		{520C1055-34A1-4C72-AC24-023F84EF461D} = {732BA761-B58E-4C34-9C96-097382A55A7A}
-		{DD1C0393-4144-4A08-AD27-C98DC1A85023} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
-		{F3254760-351E-4886-A243-FF3778837C40} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
 		{B3F3A831-DA09-40A2-A25C-DE47A58BB93B} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
-		{D90C3C52-DA8D-44BB-B8B0-3E4EF4CBF4DC} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
 		{69B805C6-230D-49A2-A569-3CAC2EC9F293} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
 		{AADBAAC3-45F0-484F-BCB2-9809EDF1CA82} = {732BA761-B58E-4C34-9C96-097382A55A7A}
-		{8FD0223B-88AD-4FA9-AE29-0B446FF17922} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
-		{B3A22C21-0699-4963-B665-F9AA74F0AF08} = {EDEC2130-DA14-4415-91A3-225733FB61F8}
 		{034EBD16-E96F-4530-B37D-30B16C4E9876} = {FF42B475-5025-45BA-B278-60F29B53C023}
 		{7A12C7A3-3152-49C2-A831-3DA77922BF2A} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
 		{1CA1A906-1A19-46D5-8AC4-87C13523899B} = {DFACF682-2673-4AE1-8F10-816D025C2D45}

Directory.Build.props

@@ -45,7 +45,7 @@
     <PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
     <Product>ClangSharp</Product>
     <RootNamespace>ClangSharp</RootNamespace>
-    <VersionPrefix>15.0.3</VersionPrefix>
+    <VersionPrefix>16.0.0</VersionPrefix>
     <VersionSuffix Condition="'$(EXCLUDE_SUFFIX_FROM_VERSION)' != 'true'">rc1</VersionSuffix>
     <VersionSuffix Condition="'$(GITHUB_EVENT_NAME)' == 'pull_request'">pr</VersionSuffix>
   </PropertyGroup>

Directory.Packages.props

@@ -12,13 +12,13 @@
 
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
-    <PackageVersion Include="libClang" Version="15.0.0" />
-    <PackageVersion Include="libClangSharp" Version="15.0.0" />
+    <PackageVersion Include="libClang" Version="16.0.6" />
+    <PackageVersion Include="libClangSharp" Version="16.0.6" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.6.2" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="1.1.1" />
     <PackageVersion Include="NUnit" Version="3.13.3" />
-    <PackageVersion Include="NUnit3TestAdapter" Version="4.4.2" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageVersion Include="System.CommandLine" Version="2.0.0-beta3.22114.1" />
     <PackageVersion Include="System.Memory" Version="4.5.5" />
   </ItemGroup>

README.md

@@ -13,7 +13,7 @@ A convenience package which provides the native libClang library for several pla
 
 A helper package which exposes many Clang APIs missing from libClang is provided here: https://www.nuget.org/packages/libClangSharp
 
-**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/15.0.0); 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).
+**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/16.0.6); 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).
 
 Nightly packages are available via the NuGet Feed URL: https://pkgs.clangsharp.dev/index.json
 
@@ -73,7 +73,7 @@ Building this requires [CMake 3.13 or later](https://cmake.org/download/) as wel
 
 To succesfully build `libClangSharp` you must first build Clang (https://clang.llvm.org/get_started.html). The process done on Windows is roughly:
 ```cmd
-git clone --single-branch --branch llvmorg-15.0.0 https://github.com/llvm/llvm-project
+git clone --single-branch --branch llvmorg-16.0.6 https://github.com/llvm/llvm-project
 cd llvm-project
 mkdir artifacts/bin
 cd artifacts/bin
@@ -118,7 +118,7 @@ This program will take a given set of C or C++ header files and generate C# bind
 
 The simplest and recommended setup is to install the generator as a .NET tool and then use response files:
 ```
-dotnet tool install --global ClangSharpPInvokeGenerator --version 15.0.0
+dotnet tool install --global ClangSharpPInvokeGenerator --version 16.0.6
 ClangSharpPInvokeGenerator @generate.rsp
 ```
 

packages/libClangSharp/libClangSharp.runtime.freebsd.12-x64/libClangSharp.runtime.freebsd.12-x64.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.linux-arm64</id>
-    <version>15.0.0</version>
+    <version>16.0.6</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -13,8 +13,8 @@
     <repository type="git" url="https://github.com/dotnet/clangsharp" branch="main" />
   </metadata>
   <files>
-    <file src="..\..\..\LICENSE.md" target="LICENSE.TXT" />
-    <file src="..\..\..\NOTICE.md" target="NOTICE.TXT" />
+    <file src="..\..\..\LICENSE.md" target="LICENSE.md" />
+    <file src="..\..\..\NOTICE.md" target="NOTICE.md" />
     <file src="libClangSharp.so" target="runtimes\linux-arm64\native\libClangSharp.so" />
   </files>
 </package>

packages/libClangSharp/libClangSharp.runtime.freebsd.13-x64/libClangSharp.runtime.freebsd.13-x64.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.linux-x64</id>
-    <version>15.0.0</version>
+    <version>16.0.6</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -13,8 +13,8 @@
     <repository type="git" url="https://github.com/dotnet/clangsharp" branch="main" />
   </metadata>
   <files>
-    <file src="..\..\..\LICENSE.md" target="LICENSE.TXT" />
-    <file src="..\..\..\NOTICE.md" target="NOTICE.TXT" />
+    <file src="..\..\..\LICENSE.md" target="LICENSE.md" />
+    <file src="..\..\..\NOTICE.md" target="NOTICE.md" />
     <file src="libClangSharp.so" target="runtimes\linux-x64\native\libClangSharp.so" />
   </files>
 </package>

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

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.osx-arm64</id>
-    <version>15.0.0</version>
+    <version>16.0.6</version>
     <authors>.NET Foundation and Contributors</authors>
     <owners>.NET Foundation and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
@@ -13,8 +13,8 @@
     <repository type="git" url="https://github.com/dotnet/clangsharp" branch="main" />
   </metadata>
   <files>
-    <file src="..\..\..\LICENSE.md" target="LICENSE.TXT" />
-    <file src="..\..\..\NOTICE.md" target="NOTICE.TXT" />
+    <file src="..\..\..\LICENSE.md" target="LICENSE.md" />
+    <file src="..\..\..\NOTICE.md" target="NOTICE.md" />
     <file src="libClangSharp.dylib" target="runtimes\osx-arm64\native\libClangSharp.dylib" />
   </files>
 </package>