Skip to content

Commit 1eb27c4

Browse files
Updating libLLVM to use the new 8.0.0 package. (#103)
* Adding MacOS 10.14 jobs to the azure-pipelines.yml file * Set a RuntimeIdentifier by default so testing works by default * Updating libLLVM to use the new 8.0.0 package. * Explicitly set the RuntimeIdentifier for the Ubuntu 16.04 CI legs.
1 parent 4027c3c commit 1eb27c4

File tree

4 files changed

+33
-5
lines changed

4 files changed

+33
-5
lines changed

Directory.Build.targets

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,14 @@
1515
<DefineConstants>$(DefineConstants);$(OS)</DefineConstants>
1616
</PropertyGroup>
1717

18+
<!-- Settings that allow testing to work by default -->
19+
<PropertyGroup>
20+
<RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == ''">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
21+
</PropertyGroup>
22+
1823
<!-- Package versions for package references across all projects -->
1924
<ItemGroup>
25+
<PackageReference Update="libLLVM" Version="8.0.0" />
2026
<PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.2.0-beta1-final" />
2127
<PackageReference Update="Microsoft.NET.Test.Sdk" Version="16.1.1" />
2228
<PackageReference Update="NUnit" Version="3.12.0" />

scripts/azure-pipelines.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ jobs:
5252
- job: ubuntu_1604_debug_x64
5353
pool:
5454
name: Hosted Ubuntu 1604
55+
variables:
56+
RuntimeIdentifier: ubuntu.16.04-x64
5557
steps:
5658
- task: Bash@3
5759
displayName: 'Run scripts/cibuild.sh'
@@ -63,6 +65,30 @@ jobs:
6365
- job: ubuntu_1604_release_x64
6466
pool:
6567
name: Hosted Ubuntu 1604
68+
variables:
69+
RuntimeIdentifier: ubuntu.16.04-x64
70+
steps:
71+
- task: Bash@3
72+
displayName: 'Run scripts/cibuild.sh'
73+
inputs:
74+
targetType: filePath
75+
filePath: ./scripts/cibuild.sh
76+
arguments: '--configuration Release --architecture x64'
77+
78+
- job: macos_1014_debug_x64
79+
pool:
80+
name: Hosted macOS
81+
steps:
82+
- task: Bash@3
83+
displayName: 'Run scripts/cibuild.sh'
84+
inputs:
85+
targetType: filePath
86+
filePath: ./scripts/cibuild.sh
87+
arguments: '--configuration Debug --architecture x64'
88+
89+
- job: macos_1014_release_x64
90+
pool:
91+
name: Hosted macOS
6692
steps:
6793
- task: Bash@3
6894
displayName: 'Run scripts/cibuild.sh'

sources/LLVMSharp/LLVMSharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="libLLVM" Version="7.0.1" NoWarn="NU1701" PrivateAssets="all" />
10+
<PackageReference Include="libLLVM" />
1111
</ItemGroup>
1212

1313
</Project>

tests/LLVMSharp.UnitTests/LLVMSharp.UnitTests.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,6 @@
55
<TargetFramework>netcoreapp2.1</TargetFramework>
66
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="libLLVM" Version="5.0.1" NoWarn="NU1701" />
10-
</ItemGroup>
11-
128
<ItemGroup>
139
<ProjectReference Include="..\..\sources\LLVMSharp\LLVMSharp.csproj" />
1410
</ItemGroup>

0 commit comments

Comments
 (0)