Merge pull request #93 from TheAngryByrd/latest-sdk-and-targets

latest dotnet sdk and targets, remove netstandard 1.6
TheAngryByrd · Jul 10, 2018 · a8b6cd7 · a8b6cd7
2 parents 70410a1 + 07bdd90
commit a8b6cd7
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,9 @@ language: csharp
 sudo: required
 dist: trusty
 
-dotnet: 2.1.101
+dotnet: 2.1.301
 mono:
-  - 5.8.0
+  - 5.12.0
   - latest # => "stable release"
   - alpha
   - beta

diff --git a/Content/.paket/Paket.Restore.targets b/Content/.paket/Paket.Restore.targets
@@ -71,7 +71,10 @@
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '$(PaketRestoreCachedHash)' ">false</PaketRestoreRequired>
       <PaketRestoreRequired Condition=" '$(PaketRestoreLockFileHash)' == '' ">true</PaketRestoreRequired>
     </PropertyGroup>
-
+
+    <PropertyGroup Condition="'$(PaketPropsVersion)' != '5.174.2' ">
+      <PaketRestoreRequired>true</PaketRestoreRequired>
+    </PropertyGroup>
 
     <!-- Do a global restore if required -->
     <Exec Command='$(PaketBootStrapperCommand)' Condition="Exists('$(PaketBootStrapperExePath)') AND !(Exists('$(PaketExePath)'))" ContinueOnError="false" />
@@ -132,11 +135,11 @@
     <Error Condition=" '$(DoAllResolvedFilesExist)' != 'true' AND '$(ResolveNuGetPackages)' != 'False' " Text="One Paket file '@(PaketResolvedFilePaths)' is missing while restoring $(MSBuildProjectFile). Please delete 'paket-files/paket.restore.cached' and call 'paket restore'." />
 
     <!-- Step 4 forward all msbuild properties (PackageReference, DotNetCliToolReference) to msbuild -->
-    <ReadLinesFromFile Condition="'@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" ><!--Condition="Exists('%(PaketResolvedFilePaths.Identity)')"-->
+    <ReadLinesFromFile Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketResolvedFilePaths)' != ''" File="%(PaketResolvedFilePaths.Identity)" >
       <Output TaskParameter="Lines" ItemName="PaketReferencesFileLines"/>
     </ReadLinesFromFile>
 
-    <ItemGroup Condition=" '@(PaketReferencesFileLines)' != '' " >
+    <ItemGroup Condition="($(DesignTimeBuild) != true OR '$(PaketPropsLoaded)' != 'true') AND '@(PaketReferencesFileLines)' != '' " >
       <PaketReferencesFileLinesInfo Include="@(PaketReferencesFileLines)" >
         <PackageName>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[0])</PackageName>
         <PackageVersion>$([System.String]::Copy('%(PaketReferencesFileLines.Identity)').Split(',')[1])</PackageVersion>

diff --git a/Content/.travis.yml b/Content/.travis.yml
@@ -2,9 +2,9 @@ language: csharp
 sudo: required
 dist: trusty
 
-dotnet: 2.1.101
+dotnet: 2.1.301
 mono:
-  - 5.8.0
+  - 5.12.0
   - latest # => "stable release"
   - alpha
   - beta

diff --git a/Content/src/MyLib.1/MyLib.1.fsproj b/Content/src/MyLib.1/MyLib.1.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard1.6;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <PropertyGroup>

diff --git a/Content/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj b/Content/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
+        <TargetFrameworks>netcoreapp2.1;netcoreapp2.0;net461</TargetFrameworks>
     </PropertyGroup>
     <ItemGroup>
         <Compile Include="AssemblyInfo.fs" />

diff --git a/MiniScaffold.csproj b/MiniScaffold.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Description>F# Template for creating and publishing libraries targeting .NET Full (net461) and Core (netstandard1.6, netstandard2.0)</Description>
+    <Description>F# Template for creating and publishing libraries targeting .NET Full (net461) and Core (netstandard2.0)</Description>
     <Authors>Jimmy Byrd</Authors>
     <PackageProjectUrl>https://github.com/TheAngryByrd/MiniScaffold</PackageProjectUrl>
     <PackageLicenseUrl>https://github.com/TheAngryByrd/MiniScaffold/blob/master/LICENSE.md</PackageLicenseUrl>

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # MiniScaffold
-F# Template for creating and publishing libraries targeting .NET Full (net461) and Core (netstandard1.6,netstandard2.0)
+F# Template for creating and publishing libraries targeting .NET Full (net461) and Core (netstandard2.0)
 
 ## Builds
 
@@ -99,10 +99,6 @@ src/MyCoolNewLib/bin/Release/
 │   ├── FSharp.Core.dll
 │   ├── MyLib.dll
 │   ├── MyLib.pdb
-├── netstandard1.6
-│   ├── MyLib.deps.json
-│   ├── MyLib.dll
-│   └── MyLib.pdb
 └── netstandard2.0
     ├── MyLib.deps.json
     ├── MyLib.dll