Merge branch 'release/0.7.0'

cake-contrib · Jun 22, 2018 · 9fabfa5 · 9fabfa5
2 parents a1cb8b9 + 1832950
commit 9fabfa5
Show file tree

Hide file tree

Showing 11 changed files with 56 additions and 237 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,3 +1,8 @@
+#---------------------------------#
+#  Build Image                    #
+#---------------------------------#
+image: Visual Studio 2017
+
 #---------------------------------#
 #  Build Script                   #
 #---------------------------------#
@@ -22,5 +27,4 @@ branches:
 #  Build Cache                    #
 #---------------------------------#
 cache:
-- src\packages -> src\**\packages.config
 - tools -> setup.cake
diff --git a/nuspec/nuget/Cake.DocFx.nuspec b/nuspec/nuget/Cake.DocFx.nuspec
@@ -14,11 +14,11 @@
     <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.6.0</releaseNotes>
+    <releaseNotes>https://github.com/cake-contrib/Cake.DocFx/releases/tag/0.7.0</releaseNotes>
   </metadata>
   <files>
-    <file src="Cake.DocFx.dll" target="lib\net45" />
-    <file src="Cake.DocFx.pdb" target="lib\net45" />
-    <file src="Cake.DocFx.xml" target="lib\net45" />
+    <file src="netstandard2.0\Cake.DocFx.dll" target="lib\netstandard2.0" />
+    <file src="netstandard2.0\Cake.DocFx.pdb" target="lib\netstandard2.0" />
+    <file src="netstandard2.0\Cake.DocFx.xml" target="lib\netstandard2.0" />
   </files>
 </package>
diff --git a/setup.cake b/setup.cake
@@ -15,9 +15,10 @@ BuildParameters.PrintParameters(Context);
 
 ToolSettings.SetToolSettings(context: Context,
                             dupFinderExcludePattern: new string[] { 
-                                BuildParameters.RootDirectoryPath + "/src/Cake.DocFx.Tests/*.cs" },
+                                BuildParameters.RootDirectoryPath + "/src/Cake.DocFx.Tests/*.cs",
+                                BuildParameters.RootDirectoryPath + "/src/Cake.DocFx*/**/*.AssemblyInfo.cs" },
                             testCoverageFilter: "+[*]* -[xunit.*]* -[Cake.Core]* -[Cake.Testing]* -[*.Tests]* ",
                             testCoverageExcludeByAttribute: "*.ExcludeFromCodeCoverage*",
                             testCoverageExcludeByFile: "*/*Designer.cs;*/*.g.cs;*/*.g.i.cs");
 
-Build.Run();
+Build.RunDotNetCore();
diff --git a/src/Cake.DocFx.Tests/Cake.DocFx.Tests.csproj b/src/Cake.DocFx.Tests/Cake.DocFx.Tests.csproj
@@ -1,89 +1,32 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{66E919D6-749E-49B0-93B9-5AC123256346}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Cake.DocFx.Tests</RootNamespace>
-    <AssemblyName>Cake.DocFx.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFrameworks>netcoreapp2.0</TargetFrameworks>
+    <IsPackable>false</IsPackable>
+    <Description>Tests for the Cake.DocFx addin</Description>
+    <Authors>Paul Reichelt and contributors</Authors>
+    <Company></Company>
+    <Copyright>Copyright 2016 (c) Paul Reichelt and contributors</Copyright>
+    <Product>Cake.DocFx</Product>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <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.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" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.assert.2.2.0\lib\netstandard1.1\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.core.2.2.0\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.2.0.3545, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\packages\xunit.extensibility.execution.2.2.0\lib\net452\xunit.execution.desktop.dll</HintPath>
-    </Reference>
-  </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Build\DocFxBuildRunnerFixture.cs" />
-    <Compile Include="Build\DocFxBuildRunnerTests.cs" />
-    <Compile Include="DocFxFixture.cs" />
-    <Compile Include="Init\DocFxInitRunnerFixture.cs" />
-    <Compile Include="Init\DocFxInitRunnerTests.cs" />
-    <Compile Include="ExceptionAssertExtensions.cs" />
-    <Compile Include="Metadata\DocFxMetadataRunnerFixture.cs" />
-    <Compile Include="Metadata\DocFxMetadataRunnerTests.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
+    <PackageReference Include="Cake.Core" Version="0.28.0" />
+    <PackageReference Include="Cake.Testing" Version="0.28.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.abstractions" Version="2.0.1" />
+    <PackageReference Include="xunit.assert" Version="2.3.1" />
+    <PackageReference Include="xunit.core" Version="2.3.1" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.3.1" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
+
   <ItemGroup>
-    <ProjectReference Include="..\Cake.DocFx\Cake.DocFx.csproj">
-      <Project>{6ef132f8-9a11-438f-aad4-4afdcf752920}</Project>
-      <Name>Cake.DocFx</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Cake.DocFx\Cake.DocFx.csproj" />
   </ItemGroup>
+
   <ItemGroup>
-    <None Include="packages.config" />
+    <Folder Include="Properties\" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/src/Cake.DocFx.Tests/Properties/AssemblyInfo.cs b/src/Cake.DocFx.Tests/Properties/AssemblyInfo.cs
diff --git a/src/Cake.DocFx.Tests/packages.config b/src/Cake.DocFx.Tests/packages.config
diff --git a/src/Cake.DocFx/Cake.DocFx.csproj b/src/Cake.DocFx/Cake.DocFx.csproj
@@ -1,80 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6EF132F8-9A11-438F-AAD4-4AFDCF752920}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Cake.DocFx</RootNamespace>
-    <AssemblyName>Cake.DocFx</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
+    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <Description>Cake Addin providing DocFx support</Description>
+    <Authors>Paul Reichelt and contributors</Authors>
+    <Company></Company>
+    <Copyright>Copyright 2016 (c) Paul Reichelt and contributors</Copyright>
+    <Product>Cake.DocFx</Product>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
+
+  <PropertyGroup>
     <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Debug\Cake.DocFx.XML</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>bin\Release\Cake.DocFx.XML</DocumentationFile>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Debug|netstandard2.0|AnyCPU'">
+    <DocumentationFile>bin\Debug\netstandard2.0\Cake.DocFx.xml</DocumentationFile>
   </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard2.0|AnyCPU'">
+    <DocumentationFile>bin\Release\netstandard2.0\Cake.DocFx.xml</DocumentationFile>
+  </PropertyGroup>
+
   <ItemGroup>
-    <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" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="DocFxLogLevel.cs" />
-    <Compile Include="Build\DocFxBuildRunner.cs" />
-    <Compile Include="Build\DocFxBuildSettings.cs" />
-    <Compile Include="DocFxMetadataAliases.cs" />
-    <Compile Include="DocFxInitAliases.cs" />
-    <Compile Include="DocFxBuildAliases.cs" />
-    <Compile Include="DocFxAliases.cs" />
-    <Compile Include="DocFxGlobalMetadata.cs" />
-    <Compile Include="Init\DocFxInitRunner.cs" />
-    <Compile Include="Init\DocFxInitSettings.cs" />
-    <Compile Include="DocFxSettings.cs" />
-    <Compile Include="DocFxTool.cs" />
-    <Compile Include="Helper\Contract.cs" />
-    <Compile Include="Metadata\DocFxMetadataRunner.cs" />
-    <Compile Include="Metadata\DocFxMetadataSettings.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Properties\AssemblyInfo.Static.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <PackageReference Include="Cake.Core" Version="0.28.0" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- 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">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
 </Project>
diff --git a/src/Cake.DocFx/DocFxInitAliases.cs b/src/Cake.DocFx/DocFxInitAliases.cs
@@ -10,7 +10,7 @@ namespace Cake.DocFx
     /// projects.
     /// </summary>
     [CakeAliasCategory("DocFx")]
-    [CakeNamespaceImport("Cake.DocFx.Build")]
+    [CakeNamespaceImport("Cake.DocFx.Init")]
     public static class DocFxInitAliases
     {
         /// <summary>

diff --git a/src/Cake.DocFx/Properties/AssemblyInfo.cs b/src/Cake.DocFx/Properties/AssemblyInfo.cs
diff --git a/src/Cake.DocFx/packages.config b/src/Cake.DocFx/packages.config
diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs