Merge pull request #33 from TheAngryByrd/build-ci

Fix CI builds
TheAngryByrd · Jan 5, 2018 · 0eadafd · 0eadafd
2 parents c196e36 + 106c8ce
commit 0eadafd
Show file tree

Hide file tree

Showing 7 changed files with 544 additions and 103 deletions.
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/.travis.yml b/.travis.yml
@@ -2,25 +2,28 @@ language: csharp
 sudo: required
 dist: trusty
 
-dotnet: 1.0.1
+dotnet: 2.0.3
 mono:
-  - 4.6.1
-  - 4.8.1
+  - 5.4.1
   - latest # => "stable release"
   - alpha
   - beta
   - weekly # => "latest commits"
 os:
   - linux
-  - osx
+
+addons:
+  apt:
+    packages:
+    - dotnet-sharedframework-microsoft.netcore.app-1.1.2
 
 script:
   - ./build.sh
 
 matrix:
+  fast_finish: true
   allow_failures:
     - mono: latest
     - mono: alpha
     - mono: beta
     - mono: weekly
-    - os: osx # times out too often, disable at own risk
diff --git a/Content/.paket/Paket.Restore.targets b/Content/.paket/Paket.Restore.targets
diff --git a/Content/.travis.yml b/Content/.travis.yml
@@ -1,26 +1,29 @@
-language: csharp  
-sudo: required  
-dist: trusty  
+language: csharp
+sudo: required
+dist: trusty
 
-dotnet: 1.0.1
+dotnet: 2.0.3
 mono:
-  - 4.6.1
-  - 4.8.1
+  - 5.4.1
   - latest # => "stable release"
   - alpha
   - beta
   - weekly # => "latest commits"
-os:  
+os:
   - linux
-  - osx 
 
-script:  
+addons:
+  apt:
+    packages:
+    - dotnet-sharedframework-microsoft.netcore.app-1.1.2
+
+script:
   - ./build.sh
 
 matrix:
+  fast_finish: true
   allow_failures:
     - mono: latest
     - mono: alpha
     - mono: beta
     - mono: weekly
-    - os: osx # times out too often, disable at own risk
diff --git a/Content/src/MyLib/MyLib.fsproj b/Content/src/MyLib/MyLib.fsproj
@@ -1,6 +1,6 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.6;net45;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard1.6;net461</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -23,18 +23,11 @@
   <ItemGroup>
     <Compile Include="Library.fs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
-    <PackageReference Include="FSharp.Core" Version="4.0.0.*" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net461'">
-    <PackageReference Include="FSharp.Core" Version="4.2.*" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
-    <PackageReference Include="FSharp.Core" Version="4.2.*" />
-  </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
+    <PackageReference Include="FSharp.Core" Version="4.2.*" />
   </ItemGroup>
 
 
+
 </Project>
diff --git a/Content/tests/MyLib.Tests/MyLib.Tests.fsproj b/Content/tests/MyLib.Tests/MyLib.Tests.fsproj
@@ -1,30 +1,22 @@
-<Project Sdk="FSharp.NET.Sdk;Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp1.1;net45;net461</TargetFrameworks>
+    <TargetFrameworks>netcoreapp2.0;netcoreapp1.1;net461</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
     <Compile Include="Tests.fs" />
     <Compile Include="Main.fs" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net45'">
-    <PackageReference Include="Expecto" Version="4.1.*" />
-    <PackageReference Include="FSharp.Core" Version="4.1.*" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='net461'">
-    <PackageReference Include="Expecto" Version="5.0.*" />
-    <PackageReference Include="FSharp.Core" Version="4.2.*" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp1.1'">
+  <ItemGroup>
     <PackageReference Include="Expecto" Version="5.0.*" />
     <PackageReference Include="FSharp.Core" Version="4.2.*" />
   </ItemGroup>
+
   <ItemGroup>
-    <PackageReference Include="FSharp.NET.Sdk" Version="1.0.*" PrivateAssets="All" />
-    <ProjectReference Include="../../src/MyLib/MyLib.fsproj" />
+   <ProjectReference Include="../../src/MyLib/MyLib.fsproj" />
     <DotNetCliToolReference Include="dotnet-mono" Version="*" />
     <DotNetCliToolReference Include="Microsoft.DotNet.Watcher.Tools" Version="1.0.0" />
   </ItemGroup>

diff --git a/MiniScaffold.csproj b/MiniScaffold.csproj
@@ -8,10 +8,10 @@
     <PackageTags>class;library;template;fsharp</PackageTags>
     <NeutralLanguage>en-US</NeutralLanguage>
     <PackageType>Template</PackageType>
-
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <TargetFramework>netstandard0.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="Content/**/*" Exclude="Content/packages/**/*;Content/.fake/**;Content/bin/**/**/*;Content/dist/*;Content/temp/*;Content/**/bin/**/**/*;Content/**/obj/**/**/*" >