Skip to content

Commit

Permalink
Merge branch 'nikitasavinov-master'
Browse files Browse the repository at this point in the history
* nikitasavinov-master:
  (#11) Updated cake to 0.28.0 and removed .NET4.6 from TargetFramework
  • Loading branch information
devlead committed Jun 21, 2018
2 parents 8f5bb67 + 2111c76 commit e1debd1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 15 deletions.
3 changes: 0 additions & 3 deletions nuspec/nuget/Cake.Kudu.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,6 @@
<tags>Cake, Script, Build, Microsoft Teams</tags>
</metadata>
<files>
<file src="net46\Cake.Kudu.dll" target="lib/net46" />
<file src="net46\Cake.Kudu.pdb" target="lib/net46" />
<file src="net46\Cake.Kudu.xml" target="lib/net46" />
<file src="netstandard2.0\Cake.Kudu.dll" target="lib/netstandard2.0" />
<file src="netstandard2.0\Cake.Kudu.pdb" target="lib/netstandard2.0" />
</files>
Expand Down
2 changes: 1 addition & 1 deletion setup.cake
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Environment.SetVariableNames();
BuildParameters.SetParameters(context: Context,
buildSystem: BuildSystem,
sourceDirectoryPath: "./src",
solutionFilePath: "./src/Cake.Kudu.sln",
solutionFilePath: "./src/Cake.Kudu.sln",
title: "Cake.Kudu",
repositoryOwner: "cake-contrib",
repositoryName: "Cake.Kudu",
Expand Down
20 changes: 9 additions & 11 deletions src/Cake.Kudu/Cake.Kudu.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
<TargetFrameworks>netstandard2.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
<Version>0.0.0</Version>
Expand All @@ -9,20 +9,18 @@
<CodeAnalysisRuleSet>..\Cake.Kudu.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Debug\netstandard1.6\Cake.Kudu.xml</DocumentationFile>
<DocumentationFile>bin\Debug\netstandard2.0\Cake.Kudu.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
<DocumentationFile>bin\Release\netstandard1.6\Cake.Kudu.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|net46|AnyCPU'">
<DocumentationFile>bin\Debug\net46\Cake.Kudu.xml</DocumentationFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|net46|AnyCPU'">
<DocumentationFile>bin\Release\net46\Cake.Kudu.xml</DocumentationFile>
<DocumentationFile>bin\Release\netstandard2.0\Cake.Kudu.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Cake.Common" Version="0.26.0" />
<PackageReference Include="Cake.Core" Version="0.26.0" />
<PackageReference Include="Cake.Common" Version="0.28.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="Cake.Core" Version="0.28.0">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
<PackageReference Include="StyleCop.Analyzers" Version="1.0.2" />
</ItemGroup>
</Project>

0 comments on commit e1debd1

Please sign in to comment.