Updating to Clang v12.0.0 (#235)

* Updating Clang/LLVM to 12.0.0 * Splitting the main project into ClangSharp and ClangSharp.Interop * Enable long file paths before cloning win32metadata * Add ClangSharpPInvokeGenerator to the path when testing win32metadata
dotnet · May 28, 2021 · 702d470 · 702d470
1 parent b3fdc2f
commit 702d470
Show file tree

Hide file tree

Showing 275 changed files with 1,263 additions and 937 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13)
 
-project(ClangSharp VERSION 11.0.0)
+project(ClangSharp VERSION 12.0.0)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)

diff --git a/ClangSharp.sln b/ClangSharp.sln
@@ -93,31 +93,11 @@ 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.sles-x64", "libclang.runtime.sles-x64", "{C0D4BF1E-CFDA-4E9D-9A15-2A1FDA7D56C2}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libclang\libclang.runtime.sles-x64\libclang.runtime.sles-x64.nuspec = packages\libclang\libclang.runtime.sles-x64\libclang.runtime.sles-x64.nuspec
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.ubuntu.14.04-x64", "libclang.runtime.ubuntu.14.04-x64", "{9F9CD2A9-475B-4D9A-AFB6-958B71AC0111}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libclang\libclang.runtime.ubuntu.14.04-x64\libclang.runtime.ubuntu.14.04-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.14.04-x64\libclang.runtime.ubuntu.14.04-x64.nuspec
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libclang.runtime.ubuntu.16.04-x64", "libclang.runtime.ubuntu.16.04-x64", "{6185B159-5F40-4D96-AD52-EB2D37241E25}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libclang\libclang.runtime.ubuntu.16.04-x64\libclang.runtime.ubuntu.16.04-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.16.04-x64\libclang.runtime.ubuntu.16.04-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.ubuntu.19.04-x64", "libclang.runtime.ubuntu.19.04-x64", "{47FA436A-8E82-4002-AB49-751F1953450C}"
-	ProjectSection(SolutionItems) = preProject
-		packages\libclang\libclang.runtime.ubuntu.19.04-x64\libclang.runtime.ubuntu.19.04-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.19.04-x64\libclang.runtime.ubuntu.19.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
@@ -204,6 +184,33 @@ 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.21.04-x64", "libclang.runtime.ubuntu.21.04-x64", "{F3254760-351E-4886-A243-FF3778837C40}"
+	ProjectSection(SolutionItems) = preProject
+		packages\libclang\libclang.runtime.ubuntu.21.04-x64\libclang.runtime.ubuntu.21.04-x64.nuspec = packages\libclang\libclang.runtime.ubuntu.21.04-x64\libclang.runtime.ubuntu.21.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.21.04-x64", "libClangSharp.runtime.ubuntu.21.04-x64", "{D90C3C52-DA8D-44BB-B8B0-3E4EF4CBF4DC}"
+	ProjectSection(SolutionItems) = preProject
+		packages\libClangSharp\libClangSharp.runtime.ubuntu.21.04-x64\libClangSharp.runtime.ubuntu.21.04-x64.nuspec = packages\libClangSharp\libClangSharp.runtime.ubuntu.21.04-x64\libClangSharp.runtime.ubuntu.21.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
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -230,6 +237,10 @@ Global
 		{9D29BA0E-79C6-484E-B630-86A9510F1B74}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9D29BA0E-79C6-484E-B630-86A9510F1B74}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{9D29BA0E-79C6-484E-B630-86A9510F1B74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AADBAAC3-45F0-484F-BCB2-9809EDF1CA82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AADBAAC3-45F0-484F-BCB2-9809EDF1CA82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AADBAAC3-45F0-484F-BCB2-9809EDF1CA82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AADBAAC3-45F0-484F-BCB2-9809EDF1CA82}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -247,11 +258,7 @@ Global
 		{F9915660-2229-418C-B269-83FE74C1943E} = {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}
-		{C0D4BF1E-CFDA-4E9D-9A15-2A1FDA7D56C2} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
-		{9F9CD2A9-475B-4D9A-AFB6-958B71AC0111} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
-		{6185B159-5F40-4D96-AD52-EB2D37241E25} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
 		{8756B75F-F244-43AD-9C79-1610059BDF36} = {DFACF682-2673-4AE1-8F10-816D025C2D45}
-		{47FA436A-8E82-4002-AB49-751F1953450C} = {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}
@@ -266,6 +273,12 @@ Global
 		{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}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {A9D18E0B-5409-457D-B5F3-0E217136BB01}

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -42,8 +42,8 @@
     <ContinuousIntegrationBuild Condition="'$(BUILD_BUILDNUMBER)' != ''">true</ContinuousIntegrationBuild>
     <PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
     <Product>ClangSharp</Product>
-    <VersionPrefix>11.0.0</VersionPrefix>
-    <VersionSuffix>beta3</VersionSuffix>
+    <VersionPrefix>12.0.0</VersionPrefix>
+    <VersionSuffix>beta1</VersionSuffix>
     <VersionSuffix Condition="'$(BUILD_REASON)' == 'PullRequest'">pr</VersionSuffix>
   </PropertyGroup>
 

diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -33,12 +33,12 @@
 
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
-    <PackageReference Update="libClang" Version="11.0.0" />
-    <PackageReference Update="libClangSharp" Version="11.0.0-beta2" />
+    <PackageReference Update="libClang" Version="12.0.0" />
+    <PackageReference Update="libClangSharp" Version="12.0.0-beta1" />
     <PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.8.3" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.10.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.0.0" />
-    <PackageReference Update="System.CommandLine" Version="2.0.0-beta1.20574.7" />
+    <PackageReference Update="System.CommandLine" Version="2.0.0-beta1.21216.1" />
     <PackageReference Update="System.Memory" Version="4.5.4" />
     <PackageReference Update="xunit" Version="2.4.1" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />

diff --git a/README.md b/README.md
@@ -89,7 +89,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 11.0.0-beta2
+dotnet tool install --global ClangSharpPInvokeGenerator --version 12.0.0-beta1
 ClangSharpPInvokeGenerator @generate.rsp
 ```
 

diff --git a/...angSharp/libClangSharp.runtime.freebsd.11-x64/libClangSharp.runtime.freebsd.11-x64.nuspec b/...angSharp/libClangSharp.runtime.freebsd.11-x64/libClangSharp.runtime.freebsd.11-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.freebsd.11-x64</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/...angSharp/libClangSharp.runtime.freebsd.11-x86/libClangSharp.runtime.freebsd.11-x86.nuspec b/...angSharp/libClangSharp.runtime.freebsd.11-x86/libClangSharp.runtime.freebsd.11-x86.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.freebsd.11-x86</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/...ages/libClangSharp/libClangSharp.runtime.linux-arm/libClangSharp.runtime.linux-arm.nuspec b/...ages/libClangSharp/libClangSharp.runtime.linux-arm/libClangSharp.runtime.linux-arm.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.linux-arm</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/.../libClangSharp/libClangSharp.runtime.linux-arm64/libClangSharp.runtime.linux-arm64.nuspec b/.../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.linux-arm64</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/packages/libClangSharp/libClangSharp.runtime.osx-x64/libClangSharp.runtime.osx-x64.nuspec b/packages/libClangSharp/libClangSharp.runtime.osx-x64/libClangSharp.runtime.osx-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.osx-x64</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/...harp/libClangSharp.runtime.ubuntu.18.04-x64/libClangSharp.runtime.ubuntu.18.04-x64.nuspec b/...harp/libClangSharp.runtime.ubuntu.18.04-x64/libClangSharp.runtime.ubuntu.18.04-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.ubuntu.18.04-x64</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/...harp/libClangSharp.runtime.ubuntu.20.04-x64/libClangSharp.runtime.ubuntu.20.04-x64.nuspec b/...harp/libClangSharp.runtime.ubuntu.20.04-x64/libClangSharp.runtime.ubuntu.20.04-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.ubuntu.20.04-x64</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/...harp/libClangSharp.runtime.ubuntu.21.04-x64/libClangSharp.runtime.ubuntu.21.04-x64.nuspec b/...harp/libClangSharp.runtime.ubuntu.21.04-x64/libClangSharp.runtime.ubuntu.21.04-x64.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata minClientVersion="2.12">
+    <id>libClangSharp.runtime.ubuntu.21.04-x64</id>
+    <version>12.0.0-beta1</version>
+    <authors>Microsoft and Contributors</authors>
+    <owners>Microsoft and Contributors</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="expression">NCSA</license>
+    <projectUrl>https://github.com/microsoft/clangsharp</projectUrl>
+    <description>ubuntu 21.04 x64 native library for libClangSharp.</description>
+    <copyright>Copyright © Microsoft and Contributors</copyright>
+    <repository type="git" url="https://github.com/microsoft/clangsharp" branch="main" />
+  </metadata>
+  <files>
+    <file src="..\libClangSharp\LICENSE.TXT" target="LICENSE.TXT" />
+    <file src="..\libClangSharp\NOTICE.TXT" target="NOTICE.TXT" />
+    <file src="libClangSharp.so" target="runtimes\ubuntu.21.04-x64\native\libClangSharp.so" />
+  </files>
+</package>
diff --git a/...ages/libClangSharp/libClangSharp.runtime.win-arm64/libClangSharp.runtime.win-arm64.nuspec b/...ages/libClangSharp/libClangSharp.runtime.win-arm64/libClangSharp.runtime.win-arm64.nuspec
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata minClientVersion="2.12">
+    <id>libClangSharp.runtime.win-arm64</id>
+    <version>12.0.0-beta1</version>
+    <authors>Microsoft and Contributors</authors>
+    <owners>Microsoft and Contributors</owners>
+    <requireLicenseAcceptance>true</requireLicenseAcceptance>
+    <license type="expression">NCSA</license>
+    <projectUrl>https://github.com/microsoft/clangsharp</projectUrl>
+    <description>win arm64 native library for libClangSharp.</description>
+    <copyright>Copyright © Microsoft and Contributors</copyright>
+    <repository type="git" url="https://github.com/microsoft/clangsharp" branch="main" />
+  </metadata>
+  <files>
+    <file src="..\libClangSharp\LICENSE.TXT" target="LICENSE.TXT" />
+    <file src="..\libClangSharp\NOTICE.TXT" target="NOTICE.TXT" />
+    <file src="libClangSharp.dll" target="runtimes\win-arm64\native\libClangSharp.dll" />
+  </files>
+</package>
diff --git a/packages/libClangSharp/libClangSharp.runtime.win-x64/libClangSharp.runtime.win-x64.nuspec b/packages/libClangSharp/libClangSharp.runtime.win-x64/libClangSharp.runtime.win-x64.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.win-x64</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/packages/libClangSharp/libClangSharp.runtime.win-x86/libClangSharp.runtime.win-x86.nuspec b/packages/libClangSharp/libClangSharp.runtime.win-x86/libClangSharp.runtime.win-x86.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp.runtime.win-x86</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/packages/libClangSharp/libClangSharp/libClangSharp.nuspec b/packages/libClangSharp/libClangSharp/libClangSharp.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libClangSharp</id>
-    <version>11.0.0-beta3</version>
+    <version>12.0.0-beta1</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>

diff --git a/packages/libClangSharp/libClangSharp/runtime.json b/packages/libClangSharp/libClangSharp/runtime.json
@@ -2,47 +2,57 @@
   "runtimes": {
     "freebsd.11-x64": {
       "libClangSharp": {
-        "libClangSharp.runtime.freebsd.11-x64": "11.0.0-beta3"
+        "libClangSharp.runtime.freebsd.11-x64": "12.0.0-beta1"
       }
     },
     "freebsd.11-x86": {
       "libClangSharp": {
-        "libClangSharp.runtime.freebsd.11-x86": "11.0.0-beta3"
+        "libClangSharp.runtime.freebsd.11-x86": "12.0.0-beta1"
       }
     },
     "linux-arm": {
       "libClangSharp": {
-        "libClangSharp.runtime.linux-arm": "11.0.0-beta3"
+        "libClangSharp.runtime.linux-arm": "12.0.0-beta1"
       }
     },
     "linux-arm64": {
       "libClangSharp": {
-        "libClangSharp.runtime.linux-arm64": "11.0.0-beta3"
+        "libClangSharp.runtime.linux-arm64": "12.0.0-beta1"
       }
     },
     "osx-x64": {
       "libClangSharp": {
-        "libClangSharp.runtime.osx-x64": "11.0.0-beta3"
+        "libClangSharp.runtime.osx-x64": "12.0.0-beta1"
       }
     },
     "ubuntu.18.04-x64": {
       "libClangSharp": {
-        "libClangSharp.runtime.ubuntu.18.04-x64": "11.0.0-beta3"
+        "libClangSharp.runtime.ubuntu.18.04-x64": "12.0.0-beta1"
       }
     },
     "ubuntu.20.04-x64": {
       "libClangSharp": {
-        "libClangSharp.runtime.ubuntu.20.04-x64": "11.0.0-beta3"
+        "libClangSharp.runtime.ubuntu.20.04-x64": "12.0.0-beta1"
+      }
+    },
+    "ubuntu.21.04-x64": {
+      "libClangSharp": {
+        "libClangSharp.runtime.ubuntu.21.04-x64": "12.0.0-beta1"
+      }
+    },
+    "win-arm64": {
+      "libClangSharp": {
+        "libClangSharp.runtime.win-arm64": "12.0.0-beta1"
       }
     },
     "win-x64": {
       "libClangSharp": {
-        "libClangSharp.runtime.win-x64": "11.0.0-beta3"
+        "libClangSharp.runtime.win-x64": "12.0.0-beta1"
       }
     },
     "win-x86": {
       "libClangSharp": {
-        "libClangSharp.runtime.win-x86": "11.0.0-beta3"
+        "libClangSharp.runtime.win-x86": "12.0.0-beta1"
       }
     }
   }

diff --git a/packages/libclang/libclang.runtime.freebsd.11-x64/libclang.runtime.freebsd.11-x64.nuspec b/packages/libclang/libclang.runtime.freebsd.11-x64/libclang.runtime.freebsd.11-x64.nuspec
@@ -2,15 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
   <metadata minClientVersion="2.12">
     <id>libclang.runtime.freebsd.11-x64</id>
-    <version>11.0.0</version>
+    <version>12.0.0</version>
     <authors>Microsoft and Contributors</authors>
     <owners>Microsoft and Contributors</owners>
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
-    <license type="expression">Apache-2.0</license>
+    <license type="expression">Apache-2.0 WITH LLVM-exception</license>
     <projectUrl>https://github.com/microsoft/clangsharp</projectUrl>
     <description>freebsd 11 x64 native library for libclang.</description>
-    <copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
-    <repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-11.0.0" />
+    <copyright>Copyright © LLVM Project</copyright>
+    <repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-12.0.0" />
   </metadata>
   <files>
     <file src="..\libclang\LICENSE.TXT" target="LICENSE.TXT" />