Skip to content
This repository was archived by the owner on Aug 6, 2019. It is now read-only.

Commit 542b267

Browse files
olivier-spinelliolivier-spinelli
committed
Removed obsolete setup/teardown and useless host interface.
Do not use explore feed anymore. Upgraded to SGV 0.16.0-beta.
1 parent a5b8f51 commit 542b267

File tree

10 files changed

+61
-65
lines changed

10 files changed

+61
-65
lines changed

‎Code.Cake/Code.Cake.csproj

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,20 +87,19 @@
8787
<Compile Include="Diagnostics\Formatting\LiteralToken.cs" />
8888
<Compile Include="Diagnostics\Formatting\PropertyToken.cs" />
8989
<Compile Include="Diagnostics\IVerbosityAware.cs" />
90-
<Compile Include="CodeCakeSpecific\ICodeCakeHost.cs" />
9190
<Compile Include="CodeCakeSpecific\MutableCakeEnvironment.cs" />
9291
<Compile Include="Properties\AssemblyInfo.cs" />
9392
</ItemGroup>
9493
<ItemGroup>
9594
<None Include="packages.config" />
9695
</ItemGroup>
9796
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
98-
<Import Project="..\packages\SimpleGitVersionTask.0.14.4\build\SimpleGitVersionTask.targets" Condition="Exists('..\packages\SimpleGitVersionTask.0.14.4\build\SimpleGitVersionTask.targets')" />
97+
<Import Project="..\packages\SimpleGitVersionTask.0.16.0-b\build\SimpleGitVersionTask.targets" Condition="Exists('..\packages\SimpleGitVersionTask.0.16.0-b\build\SimpleGitVersionTask.targets')" />
9998
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
10099
<PropertyGroup>
101100
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
102101
</PropertyGroup>
103-
<Error Condition="!Exists('..\packages\SimpleGitVersionTask.0.14.4\build\SimpleGitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SimpleGitVersionTask.0.14.4\build\SimpleGitVersionTask.targets'))" />
102+
<Error Condition="!Exists('..\packages\SimpleGitVersionTask.0.16.0-b\build\SimpleGitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SimpleGitVersionTask.0.16.0-b\build\SimpleGitVersionTask.targets'))" />
104103
</Target>
105104
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
106105
Other similar extension points exist, see Microsoft.Common.targets.

‎Code.Cake/CodeCakeApplication.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,11 @@ public int Run( string[] args )
174174
break;
175175
}
176176
}
177+
catch( TargetInvocationException ex )
178+
{
179+
logger.Error( "Error occurred: '{0}'.", ex.InnerException?.Message ?? ex.Message );
180+
return -1;
181+
}
177182
catch( Exception ex )
178183
{
179184
logger.Error( "Error occurred: '{0}'.", ex.Message );

‎Code.Cake/CodeCakeSpecific/CodeCakeHost.cs

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace CodeCake
1212
/// <summary>
1313
/// Base class for build objects.
1414
/// </summary>
15-
public abstract class CodeCakeHost : ICodeCakeHost
15+
public abstract class CodeCakeHost
1616
{
1717
[ThreadStatic]
1818
internal static IScriptHost _injectedActualHost;
@@ -36,11 +36,21 @@ public ICakeContext Cake
3636
get { return _host.Context; }
3737
}
3838

39+
/// <summary>
40+
/// Obsolete: Use Setup( Action&lt;ICakeContext&gt; ) instead.
41+
/// </summary>
42+
/// <param name="action"></param>
43+
[Obsolete( "Use Setup( Action<ICakeContext> ) instead." )]
44+
public void Setup( Action action )
45+
{
46+
_host.Setup( action );
47+
}
48+
3949
/// <summary>
4050
/// Registers the Setup operation.
4151
/// </summary>
4252
/// <param name="action">Action to execute.</param>
43-
public void Setup( Action action )
53+
public void Setup( Action<ICakeContext> action )
4454
{
4555
_host.Setup( action );
4656
}
@@ -55,11 +65,21 @@ public CakeTaskBuilder<ActionTask> Task( string name )
5565
return _host.Task( name );
5666
}
5767

68+
/// <summary>
69+
/// Obsolete: Use Teardown( Action&lt;ICakeContext&gt; ) instead.
70+
/// </summary>
71+
/// <param name="action"></param>
72+
[Obsolete( "Use Teardown( Action<ICakeContext> ) instead." )]
73+
public void Teardown( Action action )
74+
{
75+
_host.Teardown( action );
76+
}
77+
5878
/// <summary>
5979
/// Registers the Teardown action.
6080
/// </summary>
6181
/// <param name="action">Action to execute.</param>
62-
public void Teardown( Action action )
82+
public void Teardown( Action<ICakeContext> action )
6383
{
6484
_host.Teardown( action );
6585
}

‎Code.Cake/CodeCakeSpecific/ICodeCakeHost.cs

Lines changed: 0 additions & 40 deletions
This file was deleted.

‎Code.Cake/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
<packages>
33
<package id="Cake.Common" version="0.11.0" targetFramework="net45" />
44
<package id="Cake.Core" version="0.11.0" targetFramework="net45" />
5-
<package id="SimpleGitVersionTask" version="0.14.4" targetFramework="net45" developmentDependency="true" />
5+
<package id="SimpleGitVersionTask" version="0.16.0-b" targetFramework="net45" developmentDependency="true" />
66
</packages>

‎CodeCakeBuilder/Build.cs

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ public Build()
4141
.Does( () =>
4242
{
4343
gitInfo = Cake.GetSimpleRepositoryInfo();
44-
if( gitInfo.IsValid )
44+
if( !gitInfo.IsValid )
4545
{
46-
configuration = gitInfo.IsValidRelease && gitInfo.PreReleaseName.Length == 0 ? "Release" : "Debug";
47-
Cake.Information( "Publishing {0} in {1}.", gitInfo.SemVer, configuration );
48-
}
49-
else
50-
{
51-
configuration = "Debug";
52-
Cake.Warning( "Repository is not ready to be published. Selecting '{0}' configuration.", configuration );
46+
if( Cake.IsInteractiveMode()
47+
&& Cake.ReadInteractiveOption( "Repository is not ready to be published. Proceed anyway?", 'Y', 'N' ) == 'Y' )
48+
{
49+
Cake.Warning( "GitInfo is not valid, but you choose to continue..." );
50+
}
51+
else throw new Exception( "Repository is not ready to be published." );
5352
}
53+
configuration = gitInfo.IsValidRelease && gitInfo.PreReleaseName.Length == 0 ? "Release" : "Debug";
5454
} );
5555

5656
Task( "Clean" )
@@ -162,7 +162,17 @@ public Build()
162162
}
163163
if( gitInfo.IsValidRelease )
164164
{
165-
PushNuGetPackages( "NUGET_API_KEY", "https://www.nuget.org/api/v2/package", nugetPackages );
165+
if( gitInfo.PreReleaseName == ""
166+
|| gitInfo.PreReleaseName == "prerelease"
167+
|| gitInfo.PreReleaseName == "rc" )
168+
{
169+
PushNuGetPackages( "NUGET_API_KEY", "https://www.nuget.org/api/v2/package", nugetPackages );
170+
}
171+
else
172+
{
173+
// An alpha, beta, delta, epsilon, gamma, kappa goes to invenietis-prerelease.
174+
PushNuGetPackages( "MYGET_PRERELEASE_API_KEY", "https://www.myget.org/F/invenietis-prerelease/api/v2/package", nugetPackages );
175+
}
166176
}
167177
else
168178
{

‎CodeCakeBuilder/CodeCakeBuilder.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\SimpleGitVersion.Core.0.14.4\build\SimpleGitVersion.Core.props" Condition="Exists('..\packages\SimpleGitVersion.Core.0.14.4\build\SimpleGitVersion.Core.props')" />
3+
<Import Project="..\packages\SimpleGitVersion.Core.0.16.0-b\build\SimpleGitVersion.Core.props" Condition="Exists('..\packages\SimpleGitVersion.Core.0.16.0-b\build\SimpleGitVersion.Core.props')" />
44
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -43,12 +43,12 @@
4343
<HintPath>..\packages\Cake.Core.0.11.0\lib\net45\Cake.Core.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="SimpleGitVersion.Cake, Version=0.14.0.0, Culture=neutral, processorArchitecture=MSIL">
47-
<HintPath>..\packages\SimpleGitVersion.Cake.0.14.4\lib\net45\SimpleGitVersion.Cake.dll</HintPath>
46+
<Reference Include="SimpleGitVersion.Cake, Version=0.16.0.0, Culture=neutral, processorArchitecture=MSIL">
47+
<HintPath>..\packages\SimpleGitVersion.Cake.0.16.0-b\lib\net45\SimpleGitVersion.Cake.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="SimpleGitVersion.Core, Version=0.14.0.0, Culture=neutral, PublicKeyToken=731c291b31fb8d27, processorArchitecture=MSIL">
51-
<HintPath>..\packages\SimpleGitVersion.Core.0.14.4\lib\net45\SimpleGitVersion.Core.dll</HintPath>
50+
<Reference Include="SimpleGitVersion.Core, Version=0.16.0.0, Culture=neutral, PublicKeyToken=731c291b31fb8d27, processorArchitecture=MSIL">
51+
<HintPath>..\packages\SimpleGitVersion.Core.0.16.0-b\lib\net45\SimpleGitVersion.Core.dll</HintPath>
5252
<Private>True</Private>
5353
</Reference>
5454
<Reference Include="System" />
@@ -92,7 +92,7 @@
9292
<PropertyGroup>
9393
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
9494
</PropertyGroup>
95-
<Error Condition="!Exists('..\packages\SimpleGitVersion.Core.0.14.4\build\SimpleGitVersion.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SimpleGitVersion.Core.0.14.4\build\SimpleGitVersion.Core.props'))" />
95+
<Error Condition="!Exists('..\packages\SimpleGitVersion.Core.0.16.0-b\build\SimpleGitVersion.Core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\SimpleGitVersion.Core.0.16.0-b\build\SimpleGitVersion.Core.props'))" />
9696
</Target>
9797
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
9898
Other similar extension points exist, see Microsoft.Common.targets.

‎CodeCakeBuilder/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="Cake.Common" version="0.11.0" targetFramework="net45" />
44
<package id="Cake.Core" version="0.11.0" targetFramework="net45" />
5-
<package id="SimpleGitVersion.Cake" version="0.14.4" targetFramework="net45" developmentDependency="true" />
6-
<package id="SimpleGitVersion.Core" version="0.14.4" targetFramework="net45" developmentDependency="true" />
5+
<package id="SimpleGitVersion.Cake" version="0.16.0-b" targetFramework="net45" developmentDependency="true" />
6+
<package id="SimpleGitVersion.Core" version="0.16.0-b" targetFramework="net45" developmentDependency="true" />
77
</packages>

‎appveyor.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ branches:
77
environment:
88
NUGET_API_KEY:
99
secure: Cx0q/gQZQpP3eDf6H9lzIDpYYki+sGCpruxgDcFUJRoYdpH7l5aDh7afloH3uNLD
10+
MYGET_PRERELEASE_API_KEY:
11+
secure: BmENGV1y8uv5cLhMhwpoDLwQiLJh4C66c53+FW8FuuVfu5Lf4Ac6NvSuqO/1MbPm
1012
MYGET_EXPLORE_API_KEY:
1113
secure: ZD+bH7GWRWC3hSiziFlXdMdV9X3uV1D9xlRwzLZ8jJwEqIMCA+HxKWobuf3WVBH6
1214
install:

‎nuget.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<packageSources>
44
<clear />
55
<add key="NuGet" value="https://nuget.org/api/v2/" />
6-
<add key="Invenietis - Explore" value="https://www.myget.org/F/invenietis-explore/api/v2/" />
6+
<add key="Invenietis - Prerelease" value="https://www.myget.org/F/invenietis-prerelease/api/v2/" />
77
</packageSources>
88
</configuration>

0 commit comments

Comments
 (0)