Skip to content

Commit

Permalink
Update to LLVM 10.0.0 (#131)
Browse files Browse the repository at this point in the history
* Update to LLVM 10.0.0

* Updating dependencies to their latest stable versions

* Upgrading to .NET Core 3.1

* Update to LLVM 10.0.0

* Fixing up the Interop.Extensions

* Updating the Linux rid to ubuntu.18.04-x64
  • Loading branch information
tannergooding committed Apr 14, 2020
1 parent 729d58e commit 966513f
Show file tree
Hide file tree
Showing 131 changed files with 359 additions and 195 deletions.
2 changes: 1 addition & 1 deletion Directory.Build.props
Expand Up @@ -40,7 +40,7 @@
<Company>Microsoft</Company>
<PackageOutputPath>$(BaseArtifactsPath)pkg/$(Configuration)/</PackageOutputPath>
<Product>LLVMSharp</Product>
<VersionPrefix>9.0.0</VersionPrefix>
<VersionPrefix>10.0.0</VersionPrefix>
<VersionSuffix>beta</VersionSuffix>
</PropertyGroup>

Expand Down
12 changes: 6 additions & 6 deletions Directory.Build.targets
Expand Up @@ -22,13 +22,13 @@

<!-- Package versions for package references across all projects -->
<ItemGroup>
<PackageReference Update="libLLVM" Version="9.0.0" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.0.0" />
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.3.1" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.4.0" />
<PackageReference Update="libLLVM" Version="10.0.0" />
<PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.0" />
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.5.0" />
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Update="NUnit" Version="3.12.0" />
<PackageReference Update="NUnit3TestAdapter" Version="3.15.1" />
<PackageReference Update="System.Memory" Version="4.5.3" />
<PackageReference Update="NUnit3TestAdapter" Version="3.16.1" />
<PackageReference Update="System.Memory" Version="4.5.4" />
</ItemGroup>

</Project>
10 changes: 5 additions & 5 deletions LLVMSharp.sln
Expand Up @@ -91,11 +91,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.sles-x64",
packages\libLLVM\libLLVM.runtime.sles-x64\libLLVM.runtime.sles-x64.nuspec = packages\libLLVM\libLLVM.runtime.sles-x64\libLLVM.runtime.sles-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.ubuntu.14.04-x64", "libLLVM.runtime.ubuntu.14.04-x64", "{DC151BEE-774F-4032-8D2F-F3360F7F4D82}"
ProjectSection(SolutionItems) = preProject
packages\libLLVM\libLLVM.runtime.ubuntu.14.04-x64\libLLVM.runtime.ubuntu.14.04-x64.nuspec = packages\libLLVM\libLLVM.runtime.ubuntu.14.04-x64\libLLVM.runtime.ubuntu.14.04-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.ubuntu.16.04-x64", "libLLVM.runtime.ubuntu.16.04-x64", "{9F3C3619-32D3-489E-BE7A-92FEE299DE34}"
ProjectSection(SolutionItems) = preProject
packages\libLLVM\libLLVM.runtime.ubuntu.16.04-x64\libLLVM.runtime.ubuntu.16.04-x64.nuspec = packages\libLLVM\libLLVM.runtime.ubuntu.16.04-x64\libLLVM.runtime.ubuntu.16.04-x64.nuspec
Expand All @@ -106,6 +101,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.ubuntu.18.0
packages\libLLVM\libLLVM.runtime.ubuntu.18.04-x64\libLLVM.runtime.ubuntu.18.04-x64.nuspec = packages\libLLVM\libLLVM.runtime.ubuntu.18.04-x64\libLLVM.runtime.ubuntu.18.04-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.ubuntu.20.04-x64", "libLLVM.runtime.ubuntu.20.04-x64", "{DC151BEE-774F-4032-8D2F-F3360F7F4D82}"
ProjectSection(SolutionItems) = preProject
packages\libLLVM\libLLVM.runtime.ubuntu.20.04-x64\libLLVM.runtime.ubuntu.20.04-x64.nuspec = packages\libLLVM\libLLVM.runtime.ubuntu.20.04-x64\libLLVM.runtime.ubuntu.20.04-x64.nuspec
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.win-x64", "libLLVM.runtime.win-x64", "{E785DDD0-B9CD-4412-8A3C-4E65C601168C}"
ProjectSection(SolutionItems) = preProject
packages\libLLVM\libLLVM.runtime.win-x64\libLLVM.runtime.win-x64.nuspec = packages\libLLVM\libLLVM.runtime.win-x64\libLLVM.runtime.win-x64.nuspec
Expand Down
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.freebsd.11-x64</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>freebsd 11 x64 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\freebsd.11-x64\native\libLLVM.so" target="runtimes\freebsd.11-x64\native\libLLVM.so" />
<file src="libLLVM.so" target="runtimes\freebsd.11-x64\native\libLLVM.so" />
</files>
</package>
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.freebsd.11-x86</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>freebsd 11 x86 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\freebsd.11-x86\native\libLLVM.so" target="runtimes\freebsd.11-x86\native\libLLVM.so" />
<file src="libLLVM.so" target="runtimes\freebsd.11-x86\native\libLLVM.so" />
</files>
</package>
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.linux-arm</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>linux arm native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\linux-arm\native\libLLVM.so" target="runtimes\linux-arm\native\libLLVM.so" />
<file src="libLLVM.so" target="runtimes\linux-arm\native\libLLVM.so" />
</files>
</package>
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.linux-arm64</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>linux arm64 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\linux-arm64\native\libLLVM.so" target="runtimes\linux-arm64\native\libLLVM.so" />
<file src="libLLVM.so" target="runtimes\linux-arm64\native\libLLVM.so" />
</files>
</package>
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.osx-x64</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>osx x64 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\osx-x64\native\libLLVM.dylib" target="runtimes\osx-x64\native\libLLVM.dylib" />
<file src="libLLVM.dylib" target="runtimes\osx-x64\native\libLLVM.dylib" />
</files>
</package>
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.sles-x64</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>sles x64 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\sles-x64\native\libLLVM.so" target="runtimes\sles-x64\native\libLLVM.so" />
<file src="libLLVM.so" target="runtimes\sles-x64\native\libLLVM.so" />
</files>
</package>
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.ubuntu.16.04-x64</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>ubuntu 16.04 x64 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\ubuntu.16.04-x64\native\libLLVM.so" target="runtimes\ubuntu.16.04-x64\native\libLLVM.so" />
<file src="libLLVM.so" target="runtimes\ubuntu.16.04-x64\native\libLLVM.so" />
</files>
</package>
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.ubuntu.18.04-x64</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>ubuntu 18.04 x64 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\ubuntu.18.04-x64\native\libLLVM.so" target="runtimes\ubuntu.18.04-x64\native\libLLVM.so" />
<file src="libLLVM.so" target="runtimes\ubuntu.18.04-x64\native\libLLVM.so" />
</files>
</package>
@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.ubuntu.14.04-x64</id>
<version>8.0.0</version>
<id>libLLVM.runtime.ubuntu.20.04-x64</id>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>ubuntu 14.04 x64 native library for libLLVM.</description>
<description>ubuntu 20.04 x64 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\ubuntu.14.04-x64\native\libLLVM.so" target="runtimes\ubuntu.14.04-x64\native\libLLVM.so" />
<file src="libLLVM.so" target="runtimes\ubuntu.20.04-x64\native\libLLVM.so" />
</files>
</package>
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.win-x64</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>win x64 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\win-x64\native\libLLVM.dll" target="runtimes\win-x64\native\libLLVM.dll" />
<file src="libLLVM.dll" target="runtimes\win-x64\native\libLLVM.dll" />
</files>
</package>
Expand Up @@ -2,18 +2,18 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM.runtime.win-x86</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>win x86 native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
</metadata>
<files>
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
<file src="runtimes\win-x86\native\libLLVM.dll" target="runtimes\win-x86\native\libLLVM.dll" />
<file src="libLLVM.dll" target="runtimes\win-x86\native\libLLVM.dll" />
</files>
</package>
2 changes: 1 addition & 1 deletion packages/libLLVM/libLLVM/LICENSE.TXT
Expand Up @@ -239,7 +239,7 @@ Legacy LLVM License (https://llvm.org/docs/DeveloperPolicy.html#legacy):
University of Illinois/NCSA
Open Source License

Copyright (c) 2003-2019 University of Illinois at Urbana-Champaign.
Copyright (c) 2007-2019 University of Illinois at Urbana-Champaign.
All rights reserved.

Developed by:
Expand Down
4 changes: 2 additions & 2 deletions packages/libLLVM/libLLVM/libLLVM.nuspec
Expand Up @@ -2,15 +2,15 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata minClientVersion="2.12">
<id>libLLVM</id>
<version>8.0.0</version>
<version>10.0.0</version>
<authors>Microsoft and Contributors</authors>
<owners>Microsoft and Contributors</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<license type="expression">Apache-2.0</license>
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
<description>Multi-platform native library for libLLVM.</description>
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
<repository type="git" url="https://github.com/llvm/llvm-project" branch="llvmorg-10.0.0" />
<dependencies>
<group targetFramework=".NETStandard1.0">
<dependency id="Microsoft.NETCore.Platforms" version="1.0.1" />
Expand Down
28 changes: 14 additions & 14 deletions packages/libLLVM/libLLVM/runtime.json
Expand Up @@ -2,57 +2,57 @@
"runtimes": {
"freebsd.11-x64": {
"libLLVM": {
"libLLVM.runtime.freebsd.11-x64": "8.0.0"
"libLLVM.runtime.freebsd.11-x64": "10.0.0"
}
},
"freebsd.11-x86": {
"libLLVM": {
"libLLVM.runtime.freebsd.11-x86": "8.0.0"
"libLLVM.runtime.freebsd.11-x86": "10.0.0"
}
},
"linux-arm": {
"libLLVM": {
"libLLVM.runtime.linux-arm": "8.0.0"
"libLLVM.runtime.linux-arm": "10.0.0"
}
},
"linux-arm64": {
"libLLVM": {
"libLLVM.runtime.linux-arm64": "8.0.0"
"libLLVM.runtime.linux-arm64": "10.0.0"
}
},
"osx-x64": {
"libLLVM": {
"libLLVM.runtime.osx-x64": "8.0.0"
"libLLVM.runtime.osx-x64": "10.0.0"
}
},
"sles-x64": {
"libLLVM": {
"libLLVM.runtime.sles-x64": "8.0.0"
"libLLVM.runtime.sles-x64": "10.0.0"
}
},
"ubuntu.14.04-x64": {
"ubuntu.16.04-x64": {
"libLLVM": {
"libLLVM.runtime.ubuntu.14.04-x64": "8.0.0"
"libLLVM.runtime.ubuntu.16.04-x64": "10.0.0"
}
},
"ubuntu.16.04-x64": {
"ubuntu.18.04-x64": {
"libLLVM": {
"libLLVM.runtime.ubuntu.16.04-x64": "8.0.0"
"libLLVM.runtime.ubuntu.18.04-x64": "10.0.0"
}
},
"ubuntu.18.04-x64": {
"ubuntu.20.04-x64": {
"libLLVM": {
"libLLVM.runtime.ubuntu.18.04-x64": "8.0.0"
"libLLVM.runtime.ubuntu.20.04-x64": "10.0.0"
}
},
"win-x64": {
"libLLVM": {
"libLLVM.runtime.win-x64": "8.0.0"
"libLLVM.runtime.win-x64": "10.0.0"
}
},
"win-x86": {
"libLLVM": {
"libLLVM.runtime.win-x86": "8.0.0"
"libLLVM.runtime.win-x86": "10.0.0"
}
}
}
Expand Down

0 comments on commit 966513f

Please sign in to comment.