Skip to content

Commit 4027c3c

Browse files
tannergoodingtannergooding
authored
Fixing up some infrastructure so we can consume the libLLVM 8.0.0 packages (#104)
* Fixing the build scripts to properly opt out of the first time experience. * Marking Microsoft.Net.Compilers.Toolset with PrivateAssets="all" * Updating Microsoft.NET.Test.Sdk to 16.1.1 * Updating nunit to 3.12.0 * Upgrading netcoreapp projects to 2.1, since 2.0 is end of life * Adding a nuspec file for creating the libLLVM package.
1 parent 69850c2 commit 4027c3c

File tree

27 files changed

+673
-20
lines changed

27 files changed

+673
-20
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
###############################################################################
44
artifacts/
55
*.binlog
6+
*.dll
7+
*.dylib
8+
*.so
69

710
###############################################################################
811
# Default Artifacts

‎Directory.Build.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767

6868
<!-- Package references which are consumed by all projects -->
6969
<ItemGroup>
70-
<PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" />
70+
<PackageReference Include="Microsoft.Net.Compilers.Toolset" IsImplicitlyDefined="true" PrivateAssets="all" />
7171
</ItemGroup>
7272

7373
</Project>

‎Directory.Build.targets‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818
<!-- Package versions for package references across all projects -->
1919
<ItemGroup>
2020
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.2.0-beta1-final" />
21-
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.7.2" />
22-
<PackageReference Update="NUnit" Version="3.10.1" />
23-
<PackageReference Update="NUnit3TestAdapter" Version="3.10.0" />
21+
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.1.1" />
22+
<PackageReference Update="NUnit" Version="3.12.0" />
23+
<PackageReference Update="NUnit3TestAdapter" Version="3.13.0" />
2424
</ItemGroup>
2525

2626
</Project>

‎LLVMSharp.sln‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,70 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{9BF3
4848
scripts\cibuild.sh = scripts\cibuild.sh
4949
EndProjectSection
5050
EndProject
51+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "packages", "packages", "{CD611531-75EA-4328-8C25-8D0496E61EC2}"
52+
EndProject
53+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM", "libLLVM", "{568A07AC-AF60-4A3E-ABD3-2B51D9DD4EBF}"
54+
ProjectSection(SolutionItems) = preProject
55+
packages\libLLVM\libLLVM.nuspec = packages\libLLVM\libLLVM.nuspec
56+
packages\libLLVM\LICENSE.TXT = packages\libLLVM\LICENSE.TXT
57+
packages\libLLVM\runtime.json = packages\libLLVM\runtime.json
58+
EndProjectSection
59+
EndProject
60+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.freebsd.11-x64", "libLLVM.runtime.freebsd.11-x64", "{7B8F6AD5-F16F-4605-BD50-6C4DAD69C792}"
61+
ProjectSection(SolutionItems) = preProject
62+
packages\libLLVM.runtime.freebsd.11-x64\libLLVM.runtime.freebsd.11-x64.nuspec = packages\libLLVM.runtime.freebsd.11-x64\libLLVM.runtime.freebsd.11-x64.nuspec
63+
EndProjectSection
64+
EndProject
65+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.freebsd.11-x86", "libLLVM.runtime.freebsd.11-x86", "{4D4A9DD2-00BB-4D9F-A20B-9926CE70C8C0}"
66+
ProjectSection(SolutionItems) = preProject
67+
packages\libLLVM.runtime.freebsd.11-x86\libLLVM.runtime.freebsd.11-x86.nuspec = packages\libLLVM.runtime.freebsd.11-x86\libLLVM.runtime.freebsd.11-x86.nuspec
68+
EndProjectSection
69+
EndProject
70+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.linux-arm", "libLLVM.runtime.linux-arm", "{A7F2EA37-BFBA-4659-969D-E9A4A696E10A}"
71+
ProjectSection(SolutionItems) = preProject
72+
packages\libLLVM.runtime.linux-arm\libLLVM.runtime.linux-arm.nuspec = packages\libLLVM.runtime.linux-arm\libLLVM.runtime.linux-arm.nuspec
73+
EndProjectSection
74+
EndProject
75+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.linux-arm64", "libLLVM.runtime.linux-arm64", "{16539CB8-8AC7-4AD0-9D54-8EE615B2FCF3}"
76+
ProjectSection(SolutionItems) = preProject
77+
packages\libLLVM.runtime.linux-arm64\libLLVM.runtime.linux-arm64.nuspec = packages\libLLVM.runtime.linux-arm64\libLLVM.runtime.linux-arm64.nuspec
78+
EndProjectSection
79+
EndProject
80+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.osx-x64", "libLLVM.runtime.osx-x64", "{D4550E5E-9485-4480-B2B6-9503EEC935BF}"
81+
ProjectSection(SolutionItems) = preProject
82+
packages\libLLVM.runtime.osx-x64\libLLVM.runtime.osx-x64.nuspec = packages\libLLVM.runtime.osx-x64\libLLVM.runtime.osx-x64.nuspec
83+
EndProjectSection
84+
EndProject
85+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.sles-x64", "libLLVM.runtime.sles-x64", "{8C0E6B8A-9FFD-43A1-9324-CA4B8DE997C8}"
86+
ProjectSection(SolutionItems) = preProject
87+
packages\libLLVM.runtime.sles-x64\libLLVM.runtime.sles-x64.nuspec = packages\libLLVM.runtime.sles-x64\libLLVM.runtime.sles-x64.nuspec
88+
EndProjectSection
89+
EndProject
90+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.ubuntu.14.04-x64", "libLLVM.runtime.ubuntu.14.04-x64", "{DC151BEE-774F-4032-8D2F-F3360F7F4D82}"
91+
ProjectSection(SolutionItems) = preProject
92+
packages\libLLVM.runtime.ubuntu.14.04-x64\libLLVM.runtime.ubuntu.14.04-x64.nuspec = packages\libLLVM.runtime.ubuntu.14.04-x64\libLLVM.runtime.ubuntu.14.04-x64.nuspec
93+
EndProjectSection
94+
EndProject
95+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.ubuntu.16.04-x64", "libLLVM.runtime.ubuntu.16.04-x64", "{9F3C3619-32D3-489E-BE7A-92FEE299DE34}"
96+
ProjectSection(SolutionItems) = preProject
97+
packages\libLLVM.runtime.ubuntu.16.04-x64\libLLVM.runtime.ubuntu.16.04-x64.nuspec = packages\libLLVM.runtime.ubuntu.16.04-x64\libLLVM.runtime.ubuntu.16.04-x64.nuspec
98+
EndProjectSection
99+
EndProject
100+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.ubuntu.18.04-x64", "libLLVM.runtime.ubuntu.18.04-x64", "{481409E0-F009-4583-B587-7D6915E9B16E}"
101+
ProjectSection(SolutionItems) = preProject
102+
packages\libLLVM.runtime.ubuntu.18.04-x64\libLLVM.runtime.ubuntu.18.04-x64.nuspec = packages\libLLVM.runtime.ubuntu.18.04-x64\libLLVM.runtime.ubuntu.18.04-x64.nuspec
103+
EndProjectSection
104+
EndProject
105+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.win-x64", "libLLVM.runtime.win-x64", "{E785DDD0-B9CD-4412-8A3C-4E65C601168C}"
106+
ProjectSection(SolutionItems) = preProject
107+
packages\libLLVM.runtime.win-x64\libLLVM.runtime.win-x64.nuspec = packages\libLLVM.runtime.win-x64\libLLVM.runtime.win-x64.nuspec
108+
EndProjectSection
109+
EndProject
110+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libLLVM.runtime.win-x86", "libLLVM.runtime.win-x86", "{540AB7F4-29FD-462A-8791-259764FD4950}"
111+
ProjectSection(SolutionItems) = preProject
112+
packages\libLLVM.runtime.win-x86\libLLVM.runtime.win-x86.nuspec = packages\libLLVM.runtime.win-x86\libLLVM.runtime.win-x86.nuspec
113+
EndProjectSection
114+
EndProject
51115
Global
52116
GlobalSection(SolutionConfigurationPlatforms) = preSolution
53117
Debug|Any CPU = Debug|Any CPU
@@ -69,6 +133,18 @@ Global
69133
GlobalSection(NestedProjects) = preSolution
70134
{B4D577B6-47B7-494B-9590-80247F14F2E7} = {62B5C536-C224-4EE1-972F-05F732B5980B}
71135
{293C5F55-2CB1-4398-946B-8AD8E37D7FEE} = {5E2DA015-A829-4304-9B2F-B868ECB77A95}
136+
{568A07AC-AF60-4A3E-ABD3-2B51D9DD4EBF} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
137+
{7B8F6AD5-F16F-4605-BD50-6C4DAD69C792} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
138+
{4D4A9DD2-00BB-4D9F-A20B-9926CE70C8C0} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
139+
{A7F2EA37-BFBA-4659-969D-E9A4A696E10A} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
140+
{16539CB8-8AC7-4AD0-9D54-8EE615B2FCF3} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
141+
{D4550E5E-9485-4480-B2B6-9503EEC935BF} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
142+
{8C0E6B8A-9FFD-43A1-9324-CA4B8DE997C8} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
143+
{DC151BEE-774F-4032-8D2F-F3360F7F4D82} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
144+
{9F3C3619-32D3-489E-BE7A-92FEE299DE34} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
145+
{481409E0-F009-4583-B587-7D6915E9B16E} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
146+
{E785DDD0-B9CD-4412-8A3C-4E65C601168C} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
147+
{540AB7F4-29FD-462A-8791-259764FD4950} = {CD611531-75EA-4328-8C25-8D0496E61EC2}
72148
EndGlobalSection
73149
GlobalSection(ExtensibilityGlobals) = postSolution
74150
SolutionGuid = {75550D8C-A492-4ED3-8387-206830F8B21E}

‎packages/libLLVM.runtime.freebsd.11-x64/libLLVM.runtime.freebsd.11-x64.nuspec‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata minClientVersion="2.12">
4+
<id>libLLVM.runtime.freebsd.11-x64</id>
5+
<version>8.0.0</version>
6+
<authors>Microsoft and Contributors</authors>
7+
<owners>Microsoft and Contributors</owners>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<license type="expression">Apache-2.0</license>
10+
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
11+
<description>freebsd 11 x64 native library for libLLVM.</description>
12+
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
13+
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
14+
</metadata>
15+
<files>
16+
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
17+
<file src="runtimes\freebsd.11-x64\native\libLLVM.so" target="runtimes\freebsd.11-x64\native\libLLVM.so" />
18+
</files>
19+
</package>

‎packages/libLLVM.runtime.freebsd.11-x86/libLLVM.runtime.freebsd.11-x86.nuspec‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata minClientVersion="2.12">
4+
<id>libLLVM.runtime.freebsd.11-x86</id>
5+
<version>8.0.0</version>
6+
<authors>Microsoft and Contributors</authors>
7+
<owners>Microsoft and Contributors</owners>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<license type="expression">Apache-2.0</license>
10+
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
11+
<description>freebsd 11 x86 native library for libLLVM.</description>
12+
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
13+
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
14+
</metadata>
15+
<files>
16+
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
17+
<file src="runtimes\freebsd.11-x86\native\libLLVM.so" target="runtimes\freebsd.11-x86\native\libLLVM.so" />
18+
</files>
19+
</package>

‎packages/libLLVM.runtime.linux-arm/libLLVM.runtime.linux-arm.nuspec‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata minClientVersion="2.12">
4+
<id>libLLVM.runtime.linux-arm</id>
5+
<version>8.0.0</version>
6+
<authors>Microsoft and Contributors</authors>
7+
<owners>Microsoft and Contributors</owners>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<license type="expression">Apache-2.0</license>
10+
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
11+
<description>linux arm native library for libLLVM.</description>
12+
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
13+
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
14+
</metadata>
15+
<files>
16+
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
17+
<file src="runtimes\linux-arm\native\libLLVM.so" target="runtimes\linux-arm\native\libLLVM.so" />
18+
</files>
19+
</package>

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

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata minClientVersion="2.12">
4+
<id>libLLVM.runtime.linux-arm64</id>
5+
<version>8.0.0</version>
6+
<authors>Microsoft and Contributors</authors>
7+
<owners>Microsoft and Contributors</owners>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<license type="expression">Apache-2.0</license>
10+
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
11+
<description>linux arm64 native library for libLLVM.</description>
12+
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
13+
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
14+
</metadata>
15+
<files>
16+
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
17+
<file src="runtimes\linux-arm64\native\libLLVM.so" target="runtimes\linux-arm64\native\libLLVM.so" />
18+
</files>
19+
</package>

‎packages/libLLVM.runtime.osx-x64/libLLVM.runtime.osx-x64.nuspec‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata minClientVersion="2.12">
4+
<id>libLLVM.runtime.osx-x64</id>
5+
<version>8.0.0</version>
6+
<authors>Microsoft and Contributors</authors>
7+
<owners>Microsoft and Contributors</owners>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<license type="expression">Apache-2.0</license>
10+
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
11+
<description>osx x64 native library for libLLVM.</description>
12+
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
13+
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
14+
</metadata>
15+
<files>
16+
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
17+
<file src="runtimes\osx-x64\native\libLLVM.dylib" target="runtimes\osx-x64\native\libLLVM.dylib" />
18+
</files>
19+
</package>

‎packages/libLLVM.runtime.sles-x64/libLLVM.runtime.sles-x64.nuspec‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
3+
<metadata minClientVersion="2.12">
4+
<id>libLLVM.runtime.sles-x64</id>
5+
<version>8.0.0</version>
6+
<authors>Microsoft and Contributors</authors>
7+
<owners>Microsoft and Contributors</owners>
8+
<requireLicenseAcceptance>true</requireLicenseAcceptance>
9+
<license type="expression">Apache-2.0</license>
10+
<projectUrl>https://github.com/microsoft/llvmsharp</projectUrl>
11+
<description>sles x64 native library for libLLVM.</description>
12+
<copyright>Copyright © University of Illinois at Urbana-Champaign</copyright>
13+
<repository type="git" url="https://github.com/llvm-mirror/llvm" branch="release_80" />
14+
</metadata>
15+
<files>
16+
<file src="..\libLLVM\LICENSE.TXT" target="LICENSE.TXT" />
17+
<file src="runtimes\sles-x64\native\libLLVM.so" target="runtimes\sles-x64\native\libLLVM.so" />
18+
</files>
19+
</package>

0 commit comments

Comments
 (0)