Skip to content

Commit

Permalink
Merge branch 'release/0.6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalberger committed Mar 8, 2018
2 parents 6424182 + 74ec9a1 commit a1cb8b9
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 13 deletions.
2 changes: 1 addition & 1 deletion nuspec/nuget/Cake.DocFx.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<copyright>Copyright (c) Cake Contributions 2016 - Present</copyright>
<tags>Cake Script DocFx</tags>
<releaseNotes>https://github.com/cake-contrib/Cake.DocFx/releases/tag/0.4.1</releaseNotes>
<releaseNotes>https://github.com/cake-contrib/Cake.DocFx/releases/tag/0.6.0</releaseNotes>
</metadata>
<files>
<file src="Cake.DocFx.dll" target="lib\net45" />
Expand Down
3 changes: 2 additions & 1 deletion setup.cake
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ BuildParameters.SetParameters(context: Context,
title: "Cake.DocFx",
repositoryOwner: "cake-contrib",
repositoryName: "Cake.DocFx",
appVeyorAccountName: "cakecontrib");
appVeyorAccountName: "cakecontrib",
shouldRunCodecov: false);

BuildParameters.PrintParameters(Context);

Expand Down
8 changes: 4 additions & 4 deletions src/Cake.DocFx.Tests/Cake.DocFx.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cake.Core, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.22.0\lib\net46\Cake.Core.dll</HintPath>
<Reference Include="Cake.Core, Version=0.26.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.26.0\lib\net46\Cake.Core.dll</HintPath>
</Reference>
<Reference Include="Cake.Testing, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Testing.0.22.0\lib\net46\Cake.Testing.dll</HintPath>
<Reference Include="Cake.Testing, Version=0.26.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Testing.0.26.0\lib\net46\Cake.Testing.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
4 changes: 2 additions & 2 deletions src/Cake.DocFx.Tests/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Cake.Core" version="0.22.0" targetFramework="net46" />
<package id="Cake.Testing" version="0.22.0" targetFramework="net46" />
<package id="Cake.Core" version="0.26.0" targetFramework="net46" />
<package id="Cake.Testing" version="0.26.0" targetFramework="net46" />
<package id="xunit" version="2.2.0" targetFramework="net46" />
<package id="xunit.abstractions" version="2.0.1" targetFramework="net46" />
<package id="xunit.assert" version="2.2.0" targetFramework="net46" />
Expand Down
8 changes: 5 additions & 3 deletions src/Cake.DocFx/Cake.DocFx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<DocumentationFile>bin\Release\Cake.DocFx.XML</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Cake.Core, Version=0.22.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.22.0\lib\net46\Cake.Core.dll</HintPath>
<Reference Include="Cake.Core, Version=0.26.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Cake.Core.0.26.0\lib\net46\Cake.Core.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down Expand Up @@ -65,7 +65,9 @@
<Compile Include="Properties\AssemblyInfo.Static.cs" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion src/Cake.DocFx/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.Core" version="0.22.0" targetFramework="net46" />
<package id="Cake.Core" version="0.26.0" targetFramework="net46" />
</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" />
<package id="Cake" version="0.23.0" />
</packages>

0 comments on commit a1cb8b9

Please sign in to comment.