Skip to content

Commit 9fabfa5

Browse files
pascalbergerpascalberger
committed
Merge branch 'release/0.7.0'
2 parents a1cb8b9 + 1832950 commit 9fabfa5

File tree

11 files changed

+56
-237
lines changed

11 files changed

+56
-237
lines changed

‎.appveyor.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#---------------------------------#
2+
# Build Image #
3+
#---------------------------------#
4+
image: Visual Studio 2017
5+
16
#---------------------------------#
27
# Build Script #
38
#---------------------------------#
@@ -22,5 +27,4 @@ branches:
2227
# Build Cache #
2328
#---------------------------------#
2429
cache:
25-
- src\packages -> src\**\packages.config
2630
- tools -> setup.cake

‎nuspec/nuget/Cake.DocFx.nuspec‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1515
<copyright>Copyright (c) Cake Contributions 2016 - Present</copyright>
1616
<tags>Cake Script DocFx</tags>
17-
<releaseNotes>https://github.com/cake-contrib/Cake.DocFx/releases/tag/0.6.0</releaseNotes>
17+
<releaseNotes>https://github.com/cake-contrib/Cake.DocFx/releases/tag/0.7.0</releaseNotes>
1818
</metadata>
1919
<files>
20-
<file src="Cake.DocFx.dll" target="lib\net45" />
21-
<file src="Cake.DocFx.pdb" target="lib\net45" />
22-
<file src="Cake.DocFx.xml" target="lib\net45" />
20+
<file src="netstandard2.0\Cake.DocFx.dll" target="lib\netstandard2.0" />
21+
<file src="netstandard2.0\Cake.DocFx.pdb" target="lib\netstandard2.0" />
22+
<file src="netstandard2.0\Cake.DocFx.xml" target="lib\netstandard2.0" />
2323
</files>
2424
</package>

‎setup.cake‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ BuildParameters.PrintParameters(Context);
1515

1616
ToolSettings.SetToolSettings(context: Context,
1717
dupFinderExcludePattern: new string[] {
18-
BuildParameters.RootDirectoryPath + "/src/Cake.DocFx.Tests/*.cs" },
18+
BuildParameters.RootDirectoryPath + "/src/Cake.DocFx.Tests/*.cs",
19+
BuildParameters.RootDirectoryPath + "/src/Cake.DocFx*/**/*.AssemblyInfo.cs" },
1920
testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
2021
testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
2122
testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
2223

23-
Build.Run();
24+
Build.RunDotNetCore();

‎src/Cake.DocFx.Tests/Cake.DocFx.Tests.csproj‎

Lines changed: 23 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{66E919D6-749E-49B0-93B9-5AC123256346}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Cake.DocFx.Tests</RootNamespace>
11-
<AssemblyName>Cake.DocFx.Tests</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
4+
<TargetFrameworks>netcoreapp2.0</TargetFrameworks>
5+
<IsPackable>false</IsPackable>
6+
<Description>Tests for the Cake.DocFx addin</Description>
7+
<Authors>Paul Reichelt and contributors</Authors>
8+
<Company></Company>
9+
<Copyright>Copyright 2016 (c) Paul Reichelt and contributors</Copyright>
10+
<Product>Cake.DocFx</Product>
1511
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="Cake.Core, Version=0.26.0.0, Culture=neutral, processorArchitecture=MSIL">
35-
<HintPath>..\packages\Cake.Core.0.26.0\lib\net46\Cake.Core.dll</HintPath>
36-
</Reference>
37-
<Reference Include="Cake.Testing, Version=0.26.0.0, Culture=neutral, processorArchitecture=MSIL">
38-
<HintPath>..\packages\Cake.Testing.0.26.0\lib\net46\Cake.Testing.dll</HintPath>
39-
</Reference>
40-
<Reference Include="System" />
41-
<Reference Include="System.Core" />
42-
<Reference Include="System.Xml.Linq" />
43-
<Reference Include="System.Data.DataSetExtensions" />
44-
<Reference Include="Microsoft.CSharp" />
45-
<Reference Include="System.Data" />
46-
<Reference Include="System.Net.Http" />
47-
<Reference Include="System.Xml" />
48-
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
49-
<HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
50-
</Reference>
51-
<Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
52-
<HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
53-
</Reference>
54-
<Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
55-
<HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
56-
</Reference>
57-
<Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
58-
<HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
59-
</Reference>
60-
</ItemGroup>
12+
6113
<ItemGroup>
62-
<Compile Include="Build\DocFxBuildRunnerFixture.cs" />
63-
<Compile Include="Build\DocFxBuildRunnerTests.cs" />
64-
<Compile Include="DocFxFixture.cs" />
65-
<Compile Include="Init\DocFxInitRunnerFixture.cs" />
66-
<Compile Include="Init\DocFxInitRunnerTests.cs" />
67-
<Compile Include="ExceptionAssertExtensions.cs" />
68-
<Compile Include="Metadata\DocFxMetadataRunnerFixture.cs" />
69-
<Compile Include="Metadata\DocFxMetadataRunnerTests.cs" />
70-
<Compile Include="Properties\AssemblyInfo.cs" />
14+
<PackageReference Include="Cake.Core" Version="0.28.0" />
15+
<PackageReference Include="Cake.Testing" Version="0.28.0" />
16+
<PackageReference Include="xunit" Version="2.3.1" />
17+
<PackageReference Include="xunit.abstractions" Version="2.0.1" />
18+
<PackageReference Include="xunit.assert" Version="2.3.1" />
19+
<PackageReference Include="xunit.core" Version="2.3.1" />
20+
<PackageReference Include="xunit.extensibility.core" Version="2.3.1" />
21+
<PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
22+
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
7123
</ItemGroup>
24+
7225
<ItemGroup>
73-
<ProjectReference Include="..\Cake.DocFx\Cake.DocFx.csproj">
74-
<Project>{6ef132f8-9a11-438f-aad4-4afdcf752920}</Project>
75-
<Name>Cake.DocFx</Name>
76-
</ProjectReference>
26+
<ProjectReference Include="..\Cake.DocFx\Cake.DocFx.csproj" />
7727
</ItemGroup>
28+
7829
<ItemGroup>
79-
<None Include="packages.config" />
30+
<Folder Include="Properties\" />
8031
</ItemGroup>
81-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
82-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
83-
Other similar extension points exist, see Microsoft.Common.targets.
84-
<Target Name="BeforeBuild">
85-
</Target>
86-
<Target Name="AfterBuild">
87-
</Target>
88-
-->
8932
</Project>

‎src/Cake.DocFx.Tests/Properties/AssemblyInfo.cs‎

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

‎src/Cake.DocFx.Tests/packages.config‎

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

‎src/Cake.DocFx/Cake.DocFx.csproj‎

Lines changed: 20 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,28 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{6EF132F8-9A11-438F-AAD4-4AFDCF752920}</ProjectGuid>
8-
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<RootNamespace>Cake.DocFx</RootNamespace>
11-
<AssemblyName>Cake.DocFx</AssemblyName>
12-
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
4+
<TargetFrameworks>netstandard2.0</TargetFrameworks>
5+
<Description>Cake Addin providing DocFx support</Description>
6+
<Authors>Paul Reichelt and contributors</Authors>
7+
<Company></Company>
8+
<Copyright>Copyright 2016 (c) Paul Reichelt and contributors</Copyright>
9+
<Product>Cake.DocFx</Product>
1510
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
11+
12+
<PropertyGroup>
1813
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
<DocumentationFile>bin\Debug\Cake.DocFx.XML</DocumentationFile>
14+
<DebugSymbols>true</DebugSymbols>
2515
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<DebugType>pdbonly</DebugType>
28-
<Optimize>true</Optimize>
29-
<OutputPath>bin\Release\</OutputPath>
30-
<DefineConstants>TRACE</DefineConstants>
31-
<ErrorReport>prompt</ErrorReport>
32-
<WarningLevel>4</WarningLevel>
33-
<DocumentationFile>bin\Release\Cake.DocFx.XML</DocumentationFile>
16+
17+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
18+
<DocumentationFile>bin\Debug\netstandard2.0\Cake.DocFx.xml</DocumentationFile>
3419
</PropertyGroup>
20+
21+
<PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
22+
<DocumentationFile>bin\Release\netstandard2.0\Cake.DocFx.xml</DocumentationFile>
23+
</PropertyGroup>
24+
3525
<ItemGroup>
36-
<Reference Include="Cake.Core, Version=0.26.0.0, Culture=neutral, processorArchitecture=MSIL">
37-
<HintPath>..\packages\Cake.Core.0.26.0\lib\net46\Cake.Core.dll</HintPath>
38-
</Reference>
39-
<Reference Include="System" />
40-
<Reference Include="System.Core" />
41-
<Reference Include="System.Xml.Linq" />
42-
<Reference Include="System.Data.DataSetExtensions" />
43-
<Reference Include="Microsoft.CSharp" />
44-
<Reference Include="System.Data" />
45-
<Reference Include="System.Net.Http" />
46-
<Reference Include="System.Xml" />
47-
</ItemGroup>
48-
<ItemGroup>
49-
<Compile Include="DocFxLogLevel.cs" />
50-
<Compile Include="Build\DocFxBuildRunner.cs" />
51-
<Compile Include="Build\DocFxBuildSettings.cs" />
52-
<Compile Include="DocFxMetadataAliases.cs" />
53-
<Compile Include="DocFxInitAliases.cs" />
54-
<Compile Include="DocFxBuildAliases.cs" />
55-
<Compile Include="DocFxAliases.cs" />
56-
<Compile Include="DocFxGlobalMetadata.cs" />
57-
<Compile Include="Init\DocFxInitRunner.cs" />
58-
<Compile Include="Init\DocFxInitSettings.cs" />
59-
<Compile Include="DocFxSettings.cs" />
60-
<Compile Include="DocFxTool.cs" />
61-
<Compile Include="Helper\Contract.cs" />
62-
<Compile Include="Metadata\DocFxMetadataRunner.cs" />
63-
<Compile Include="Metadata\DocFxMetadataSettings.cs" />
64-
<Compile Include="Properties\AssemblyInfo.cs" />
65-
<Compile Include="Properties\AssemblyInfo.Static.cs" />
66-
</ItemGroup>
67-
<ItemGroup>
68-
<None Include="packages.config">
69-
<SubType>Designer</SubType>
70-
</None>
26+
<PackageReference Include="Cake.Core" Version="0.28.0" />
7127
</ItemGroup>
72-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
73-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
74-
Other similar extension points exist, see Microsoft.Common.targets.
75-
<Target Name="BeforeBuild">
76-
</Target>
77-
<Target Name="AfterBuild">
78-
</Target>
79-
-->
8028
</Project>

‎src/Cake.DocFx/DocFxInitAliases.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace Cake.DocFx
1010
/// projects.
1111
/// </summary>
1212
[CakeAliasCategory("DocFx")]
13-
[CakeNamespaceImport("Cake.DocFx.Build")]
13+
[CakeNamespaceImport("Cake.DocFx.Init")]
1414
public static class DocFxInitAliases
1515
{
1616
/// <summary>

‎src/Cake.DocFx/Properties/AssemblyInfo.cs‎

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

‎src/Cake.DocFx/packages.config‎

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

0 commit comments

Comments
 (0)