Skip to content

Commit

Permalink
Merge branch 'hotfix/0.6.1'
Browse files Browse the repository at this point in the history
* hotfix/0.6.1:
  (GH-30) Removed references to gep13.* packages
  (GH-28) Updated Cake Version
  (GH-29) Corrected spelling mistake
  • Loading branch information
gep13 committed Jun 22, 2017
2 parents dbc2c67 + 299b295 commit d8d5368
Show file tree
Hide file tree
Showing 6 changed files with 4 additions and 20 deletions.
6 changes: 3 additions & 3 deletions setup.cake
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

Environment.SetVariableNames();

BuildParameters.SetParameters(context: Context,
BuildParameters.SetParameters(context: Context,
buildSystem: BuildSystem,
sourceDirectoryPath: "./src",
title: "Cake.AliaSql",
repositoryOwner: "cake-contrib",
repositoryName: "Cake.AliaSql",
appVeyorAccountName: "cakecontrib");

BuildParameters.PrintParamters(Context);
BuildParameters.PrintParameters(Context);

ToolSettings.SetToolSettings(context: Context,
dupFinderExcludePattern: new string[] {
dupFinderExcludePattern: new string[] {
BuildParameters.RootDirectoryPath + "/src/Cake.AliaSql.Tests/*.cs" },
testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
Expand Down
7 changes: 0 additions & 7 deletions src/Cake.AliaSql.Tests/Cake.AliaSql.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -86,13 +86,6 @@
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\gep13.xUnitRunner.0.1.0\build\gep13.xUnitRunner.targets" Condition="Exists('..\packages\gep13.xUnitRunner.0.1.0\build\gep13.xUnitRunner.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\packages\gep13.xUnitRunner.0.1.0\build\gep13.xUnitRunner.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\gep13.xUnitRunner.0.1.0\build\gep13.xUnitRunner.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
1 change: 0 additions & 1 deletion src/Cake.AliaSql.Tests/packages.config
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<packages>
<package id="Cake.Core" version="0.17.0" targetFramework="net45" />
<package id="Cake.Testing" version="0.17.1" targetFramework="net45" />
<package id="gep13.xUnitRunner" version="0.1.0" targetFramework="net45" />
<package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
<package id="xunit" version="2.1.0" targetFramework="net45" />
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
Expand Down
7 changes: 0 additions & 7 deletions src/Cake.AliaSql/Cake.AliaSql.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,6 @@
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets" Condition="Exists('..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\gep13.ApplicationRunner.0.1.2\build\gep13.ApplicationRunner.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
Expand Down
1 change: 0 additions & 1 deletion src/Cake.AliaSql/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake.Core" version="0.17.0" targetFramework="net45" />
<package id="gep13.ApplicationRunner" version="0.1.2" targetFramework="net45" />
</packages>
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.18.0-alpha0033" />
<package id="Cake" version="0.20.0" />
</packages>

0 comments on commit d8d5368

Please sign in to comment.