Merge pull request #69 from pascalberger/feature/cake-0-26

(GH-68) Add support for Cake 0.26.0
cake-contrib · Mar 17, 2018 · 54300e1 · 54300e1
2 parents b8c09ad + ae9581c
commit 54300e1
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 3 deletions.
diff --git a/nuspec/nuget/Cake.Incubator.nuspec b/nuspec/nuget/Cake.Incubator.nuspec
@@ -25,5 +25,8 @@
  <file src="netstandard1.6\Cake.Incubator.dll" target="lib/netstandard1.6" />
  <file src="netstandard1.6\Cake.Incubator.xml" target="lib/netstandard1.6" />
  <file src="netstandard1.6\Cake.Incubator.pdb" target="lib/netstandard1.6" />
+ <file src="netstandard2.0\Cake.Incubator.dll" target="lib/netstandard2.0" />
+ <file src="netstandard2.0\Cake.Incubator.xml" target="lib/netstandard2.0" />
+ <file src="netstandard2.0\Cake.Incubator.pdb" target="lib/netstandard2.0" />
  </files>
 </package>
diff --git a/src/Cake.Incubator.Tests/Cake.Incubator.Tests.csproj b/src/Cake.Incubator.Tests/Cake.Incubator.Tests.csproj
@@ -7,10 +7,10 @@
  <PackageReference Include="FluentAssertions" Version="4.19.4" />
  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
  <PackageReference Include="xunit" Version="2.3.1" />
- <PackageReference Include="Cake.Common" Version="0.22.0">
+ <PackageReference Include="Cake.Common" Version="0.26.0">
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
- <PackageReference Include="Cake.Core" Version="0.22.0">
+ <PackageReference Include="Cake.Core" Version="0.26.0">
  <PrivateAssets>all</PrivateAssets>
  </PackageReference>
  <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />

diff --git a/src/Cake.Incubator/Cake.Incubator.csproj b/src/Cake.Incubator/Cake.Incubator.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
  <PropertyGroup>
- <TargetFrameworks>netstandard1.6;net45;net46</TargetFrameworks>
+ <TargetFrameworks>netstandard2.0;netstandard1.6;net45;net46</TargetFrameworks>
  <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
  <Version>0.1.0</Version>
  <Description>Provides useful extensions and additional aliases for Cake.Build scripts</Description>
@@ -15,10 +15,21 @@
  <ReleaseNotes>https://github.com/cake-contrib/Cake.Incubator/releases</ReleaseNotes>
  </PropertyGroup>
 
+ <PropertyGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
+ <DefineConstants>NETSTANDARD2_0;</DefineConstants>
+ </PropertyGroup>
+
  <PropertyGroup Condition="'$(TargetFramework)'=='netstandard1.6'">
  <DefineConstants>NETSTANDARD1_6;</DefineConstants>
  </PropertyGroup>
 
+ <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+ <DocumentationFile>bin\Release\netstandard2.0\Cake.Incubator.xml</DocumentationFile>
+ <DebugType>full</DebugType>
+ <DebugSymbols>true</DebugSymbols>
+ <Optimize>false</Optimize>
+ </PropertyGroup>
+
  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.6|AnyCPU'">
  <DocumentationFile>bin\Release\netstandard1.6\Cake.Incubator.xml</DocumentationFile>
  <DebugType>full</DebugType>
@@ -67,4 +78,16 @@
  </PackageReference>
  </ItemGroup>
 
+ <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+ <PackageReference Include="System.Collections.Specialized">
+ <Version>4.3.0</Version>
+ </PackageReference>
+ <PackageReference Include="Cake.Common" Version="0.26.0">
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
+ <PackageReference Include="Cake.Core" Version="0.26.0">
+ <PrivateAssets>all</PrivateAssets>
+ </PackageReference>
+ </ItemGroup>
+
 </Project>