Resolving remaining CI issues

Author: tannergooding

.travis.yml

@@ -8,6 +8,4 @@ cache:
   apt: true
 
 script:
-  - dotnet restore
-  - dotnet build
-  - dotnet test
+  - scripts/cibuild.sh

Directory.Build.targets

@@ -17,7 +17,6 @@
 
   <!-- Package versions for package references across all projects -->
   <ItemGroup>
-    <PackageReference Update="libLLVM" Version="7.0.1" NoWarn="NU1701" />
     <PackageReference Update="Microsoft.Net.Compilers.Toolset" Version="3.2.0-beta1-final" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Update="NUnit" Version="3.10.1" />

build.sh

@@ -118,8 +118,9 @@ try {
     $DotNetInstallDirectory = Join-Path -Path $ArtifactsDir -ChildPath "dotnet"
     Create-Directory -Path $DotNetInstallDirectory
 
-    & $DotNetInstallScript -Channel 2.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
+    & $DotNetInstallScript -Channel release/3.0.1xx -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture
     & $DotNetInstallScript -Channel 2.1 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Runtime dotnet
+    & $DotNetInstallScript -Channel 2.0 -Version latest -InstallDir $DotNetInstallDirectory -Architecture $architecture -Runtime dotnet
 
     $env:PATH="$DotNetInstallDirectory;$env:PATH"
   }

pack.sh

@@ -196,14 +196,15 @@ CreateDirectory "$LogDir"
 if [[ ! -z "$architecture" ]]; then
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
 
-  DotNetInstallScript="$ArtifactsDir/dotnet-install.ps1"
+  DotNetInstallScript="$ArtifactsDir/dotnet-install.sh"
   wget -O "$DotNetInstallScript" "https://dot.net/v1/dotnet-install.sh"
 
   DotNetInstallDirectory="$ArtifactsDir/dotnet"
   CreateDirectory "$DotNetInstallDirectory"
 
-  . "$DotNetInstallScript" --channel 2.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
+  . "$DotNetInstallScript" --channel release/3.0.1xx --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture"
   . "$DotNetInstallScript" --channel 2.1 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" --runtime dotnet
+  . "$DotNetInstallScript" --channel 2.0 --version latest --install-dir "$DotNetInstallDirectory" --architecture "$architecture" --runtime dotnet
 
   PATH="$DotNetInstallDirectory:$PATH:"
 fi

restore.sh

@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="libLLVM" />
+    <PackageReference Include="libLLVM" Version="7.0.1" NoWarn="NU1701" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>