Skip to content

Commit

Permalink
Upgrading everything to newer version and standardizing.
Browse files Browse the repository at this point in the history
This fixes #17.
  • Loading branch information
phillipsj committed Aug 3, 2019
1 parent 3beaf7f commit f0482e3
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 260 deletions.
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2016 Jamie Phillips
Copyright 2016-Present Jamie Phillips

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ http://cakebuild.net

[CmdletBinding()]
Param(
[string]$Script = "setup.cake",
[string]$Script = "recipe.cake",
[string]$Target = "Default",
[ValidateSet("Release", "Debug")]
[string]$Configuration = "Release",
Expand Down
23 changes: 0 additions & 23 deletions nuspec/nuget/Cake.Ftp.nuspec

This file was deleted.

10 changes: 6 additions & 4 deletions setup.cake → recipe.cake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#load nuget:https://www.myget.org/F/cake-contrib/api/v2?package=Cake.Recipe&prerelease
#load nuget:?package=Cake.Recipe&version=1.0.0

Environment.SetVariableNames();

Expand All @@ -10,14 +10,16 @@ BuildParameters.SetParameters(context: Context,
repositoryName: "Cake.Ftp",
appVeyorAccountName: "cakecontrib",
shouldRunDupFinder: false,
shouldRunInspectCode: false);
shouldRunInspectCode: false,
shouldRunGitVersion: DirectoryExists(".git"), // This would allow building even without using a git repository
shouldRunDotNetCorePack: true);

BuildParameters.PrintParameters(Context);

ToolSettings.SetToolSettings(context: Context,
dupFinderExcludePattern: new string[] {
BuildParameters.RootDirectoryPath + "/src/Cake.Ftp.Tests/*.cs" },
testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* -[FluentAssertions]* -[Microsoft.Build.*]*",
testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs;");
Build.RunDotNetCore();
14 changes: 7 additions & 7 deletions src/Cake.Ftp.Tests/Cake.Ftp.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
Expand All @@ -7,12 +7,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Testing" Version="0.28.0" />
<PackageReference Include="FluentAssertions" Version="5.4.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
<PackageReference Include="NSubstitute" Version="3.1.0" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
<PackageReference Include="Cake.Testing" Version="0.33.0" />
<PackageReference Include="FluentAssertions" Version="5.7.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0-preview-20190715-02" />
<PackageReference Include="NSubstitute" Version="4.2.1" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
21 changes: 13 additions & 8 deletions src/Cake.Ftp/Cake.Ftp.csproj
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<DocumentationFile>C:\Users\cphil\code\Cake.Ftp\src\Cake.Ftp\Cake.Ftp.xml</DocumentationFile>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<DocumentationFile>C:\Users\cphil\code\Cake.Ftp\src\Cake.Ftp\Cake.Ftp.xml</DocumentationFile>
<PropertyGroup>
<Authors>Jamie Phillips</Authors>
<Copyright>Copyright © 2016-$([System.DateTime]::Now.Year) - Jamie Phillips</Copyright>
<Description>Cake Addin for working with FTP from a Cake script.</Description>
<PackageIconUrl>https://cdn.jsdelivr.net/gh/cake-contrib/graphics/png/cake-contrib-medium.png</PackageIconUrl>
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
<PackageProjectUrl>https://github.com/cake-contrib/Cake.Ftp</PackageProjectUrl>
<PackageTags>Cake;Script;Build;FTP;Addin</PackageTags>
<RepositoryUrl>$(PackageProjectUrl).git</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Cake.Core" Version="0.28.0" PrivateAssets="All" />
<PackageReference Include="Cake.Core" Version="0.33.0" PrivateAssets="All" />
</ItemGroup>

</Project>
215 changes: 0 additions & 215 deletions src/Cake.Ftp/Cake.Ftp.xml

This file was deleted.

2 changes: 1 addition & 1 deletion tools/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake" version="0.30.0" />
<package id="Cake" version="0.32.1" />
</packages>

0 comments on commit f0482e3

Please sign in to comment.